...
 
Commits (2)
  • Jobin Rezai's avatar
    Change label to 'Working...' · 2bdc9f03
    Jobin Rezai authored
    It used to say, 'Resizing...', but it's possible
    that no resizing will be done, depending on what settings
    the user has selected. So it's more accurate to say 'Working...'
    2bdc9f03
  • Jobin Rezai's avatar
    Fix: break out of loop if the user cancels · db638795
    Jobin Rezai authored
    It wasn't breaking out of the loop before, so cancelling
    and then starting the process again wouldn't work correctly.
    db638795
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<!-- Generated with glade 3.22.0 -->
<interface>
<requires lib="gtk+" version="3.20"/>
<object class="GtkImage" id="cancel_image">
......@@ -35,9 +35,6 @@
<property name="destroy_with_parent">True</property>
<signal name="delete-event" handler="on_delete_event" swapped="no"/>
<signal name="key-press-event" handler="on_progress_window_key_press_event" swapped="no"/>
<child>
<placeholder/>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
......@@ -50,7 +47,7 @@
<property name="halign">start</property>
<property name="margin_left">5</property>
<property name="margin_top">8</property>
<property name="label" translatable="yes">Resizing...</property>
<property name="label" translatable="yes">Working...</property>
<attributes>
<attribute name="font-desc" value="Sans 12"/>
</attributes>
......@@ -279,6 +276,9 @@
</child>
</object>
</child>
<child type="titlebar">
<placeholder/>
</child>
</object>
<object class="GtkImage" id="ok_image">
<property name="visible">True</property>
......
......@@ -2120,7 +2120,10 @@ has been reinstalled and this error no longer appears.""",
# The user wants to cancel, so close the progress window
GLib.idle_add(self.progress_window.close_progress_window)
# Exit the for-loop, because the user has cancelled
break
# Terminate the pool
#pool.terminate() (No need any more, since we're using a 'with' statement)
......