diff options
Diffstat (limited to 'src/fringlib/fringui.py')
-rw-r--r-- | src/fringlib/fringui.py | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/fringlib/fringui.py b/src/fringlib/fringui.py index 7a59660..19beba3 100644 --- a/src/fringlib/fringui.py +++ b/src/fringlib/fringui.py @@ -69,7 +69,7 @@ class UI( gtk.Window ): self.walker.connect("list-changed",self.__event_walker_changed) self.walker.connect("progress",self.__event_walker_progress) self.walker.connect("finished", self.__event_walker_finished) - self.walker.connect("manually-stopped", lambda w: self.__show_busy_cursor(-1)) + self.walker.connect("manually-stopped", self.__event_walker_stopped) self.open_folder(uri) @@ -255,7 +255,7 @@ class UI( gtk.Window ): self.__show_busy_cursor(-1) d.destroy() - def refresh_tree(self,widget): + def refresh_tree(self,widget=None): """ Refresh the current folder """ self.walker.stop() self.collection.clear() @@ -270,13 +270,14 @@ class UI( gtk.Window ): d = self.collection.get_sumlist(uri) if d is not None: print "(load from collection)" + self.walker.stop() self.data = self.collection.get_sumlist(uri) self.uri = uri self.redraw() else: print "(walk)" - self.uri = uri self.walker.stop() + self.uri = uri if uri: self.walker.walk(uri) self.scan_active = True @@ -350,11 +351,17 @@ class UI( gtk.Window ): self.__show_busy_cursor(-1) self.scan_active = False self.pbar.set_text( _("Done") ) + self.pbar.set_fraction( 1 ) + + def __event_walker_stopped(self, widget): + self.__show_busy_cursor(-1) + self.scan_active = False + self.pbar.set_text( _("Stopped") ) def __event_walker_progress(self, widget, c, total, uri): self.pbar.set_sensitive(True) self.pbar.set_text( _("reading %s")%uri ) - self.pbar.set_fraction( float(c) / float(total) ) + self.pbar.set_fraction( 1.0*c/total ) def __event_resized(self, widget, event): r = self.eventbox.get_allocation() @@ -372,5 +379,3 @@ class UI( gtk.Window ): def __event_walker_changed(self,widget,data): self.data = data self.redraw() - - |