diff --git a/weboob/applications/qcineoob/main_window.py b/weboob/applications/qcineoob/main_window.py index ddcdf4c4..d9a56894 100644 --- a/weboob/applications/qcineoob/main_window.py +++ b/weboob/applications/qcineoob/main_window.py @@ -76,16 +76,18 @@ class MainWindow(QtMainWindow): else: self.ui.searchEdit.setEnabled(True) - def doAction(self, fun, args): + def doAction(self, description, fun, args): + self.ui.currentActionLabel.setText(description) if self.history['last_action'] != None: self.history['action_list'].append(self.history['last_action']) self.ui.backButton.setDisabled(False) - self.history['last_action'] = {'function':fun,'args':args} + self.history['last_action'] = {'function':fun,'args':args,'description':description} return fun(*args) def doBack(self): if len(self.history['action_list']) > 0: todo = self.history['action_list'].pop() + self.ui.currentActionLabel.setText(todo['description']) self.history['last_action'] = todo if len(self.history['action_list']) == 0: self.ui.backButton.setDisabled(True) @@ -117,7 +119,7 @@ class MainWindow(QtMainWindow): pattern = unicode(self.ui.searchEdit.text()) if not pattern: return - self.doAction(self.searchMovieAction,[pattern]) + self.doAction(u'Search movie results for "%s"'%pattern,self.searchMovieAction,[pattern]) def searchMovieAction(self,pattern): self.ui.stackedWidget.setCurrentWidget(self.ui.movie_list_page) @@ -157,7 +159,7 @@ class MainWindow(QtMainWindow): pattern = unicode(self.ui.searchEdit.text()) if not pattern: return - self.doAction(self.searchPersonAction,[pattern]) + self.doAction(u'Search person results for "%s"'%pattern,self.searchPersonAction,[pattern]) def searchPersonAction(self,pattern): self.ui.stackedWidget.setCurrentWidget(self.ui.person_list_page) diff --git a/weboob/applications/qcineoob/minimovie.py b/weboob/applications/qcineoob/minimovie.py index 0708339a..b856fd17 100644 --- a/weboob/applications/qcineoob/minimovie.py +++ b/weboob/applications/qcineoob/minimovie.py @@ -61,4 +61,4 @@ class MiniMovie(QFrame): movie = self.backend.get_movie(self.movie.id) if movie: - self.parent.doAction(self.parent.displayMovie,[movie]) + self.parent.doAction('Details of movie "%s"'%movie.original_title,self.parent.displayMovie,[movie]) diff --git a/weboob/applications/qcineoob/miniperson.py b/weboob/applications/qcineoob/miniperson.py index 7f528d06..6361ce61 100644 --- a/weboob/applications/qcineoob/miniperson.py +++ b/weboob/applications/qcineoob/miniperson.py @@ -61,4 +61,4 @@ class MiniPerson(QFrame): person = self.backend.get_person(self.person.id) if person: - self.parent.doAction(self.parent.displayPerson,[person]) + self.parent.doAction(u'Details of person "%s"'%person.name,self.parent.displayPerson,[person]) diff --git a/weboob/applications/qcineoob/movie.py b/weboob/applications/qcineoob/movie.py index ba187149..34c743e6 100644 --- a/weboob/applications/qcineoob/movie.py +++ b/weboob/applications/qcineoob/movie.py @@ -59,7 +59,10 @@ class Movie(QFrame): def casting(self): role = None tosearch = self.ui.castingCombo.currentText() + role_desc = '' if tosearch != 'all': role = tosearch[:-1] - self.parent.doAction(self.parent.castingAction,[self.movie.id,role]) + role_desc = ' as %s'%role + self.parent.doAction('Casting%s of movie "%s"'%(role_desc,self.movie.original_title), + self.parent.castingAction,[self.movie.id,role]) diff --git a/weboob/applications/qcineoob/ui/main_window.ui b/weboob/applications/qcineoob/ui/main_window.ui index b9e4bf83..899b0a3f 100644 --- a/weboob/applications/qcineoob/ui/main_window.ui +++ b/weboob/applications/qcineoob/ui/main_window.ui @@ -73,6 +73,16 @@ + + + + + + + Qt::AlignCenter + + + @@ -88,7 +98,7 @@ 0 0 660 - 313 + 292 @@ -109,8 +119,8 @@ 0 0 - 63 - 18 + 96 + 26 @@ -131,8 +141,8 @@ 0 0 - 63 - 18 + 96 + 26 @@ -153,8 +163,8 @@ 0 0 - 63 - 18 + 96 + 26