From 5ce13703dd92ccc02b6b3e8ca35f7811c125bf10 Mon Sep 17 00:00:00 2001 From: Julien Veyssier Date: Tue, 12 Mar 2013 23:05:38 +0100 Subject: [PATCH] [qcineoob] cosmetics --- weboob/applications/qcineoob/main_window.py | 12 +++++++++++- weboob/applications/qcineoob/minimovie.py | 4 +++- weboob/applications/qcineoob/miniperson.py | 8 +++++++- weboob/applications/qcineoob/ui/miniperson.ui | 2 +- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/weboob/applications/qcineoob/main_window.py b/weboob/applications/qcineoob/main_window.py index daf20bbe..8a49e2e5 100644 --- a/weboob/applications/qcineoob/main_window.py +++ b/weboob/applications/qcineoob/main_window.py @@ -18,7 +18,8 @@ # along with weboob. If not, see . -from PyQt4.QtCore import SIGNAL +from PyQt4.QtCore import SIGNAL, Qt +from PyQt4.QtGui import QApplication from weboob.capabilities.cinema import ICapCinema from weboob.capabilities.torrent import ICapTorrent @@ -108,6 +109,7 @@ class MainWindow(QtMainWindow): self.minis = [] self.ui.searchEdit.setEnabled(False) + QApplication.setOverrideCursor( Qt.WaitCursor ) backend_name = str(self.ui.backendEdit.itemData(self.ui.backendEdit.currentIndex()).toString()) @@ -123,6 +125,7 @@ class MainWindow(QtMainWindow): self.minis = [] self.ui.searchEdit.setEnabled(False) + QApplication.setOverrideCursor( Qt.WaitCursor ) backend_name = str(self.ui.backendEdit.itemData(self.ui.backendEdit.currentIndex()).toString()) @@ -153,6 +156,7 @@ class MainWindow(QtMainWindow): self.minis = [] self.ui.searchEdit.setEnabled(False) + QApplication.setOverrideCursor( Qt.WaitCursor ) backend_name = str(self.ui.backendEdit.itemData(self.ui.backendEdit.currentIndex()).toString()) @@ -162,6 +166,7 @@ class MainWindow(QtMainWindow): def addMovie(self, backend, movie): if not backend: self.ui.searchEdit.setEnabled(True) + QApplication.restoreOverrideCursor() self.process = None return minimovie = MiniMovie(self.weboob, backend, movie, self) @@ -177,6 +182,7 @@ class MainWindow(QtMainWindow): wmovie = Movie(movie,self) self.ui.info_content.layout().addWidget(wmovie) self.current_info_widget = wmovie + QApplication.restoreOverrideCursor() def searchPerson(self): pattern = unicode(self.ui.searchEdit.text()) @@ -193,6 +199,7 @@ class MainWindow(QtMainWindow): self.minis = [] self.ui.searchEdit.setEnabled(False) + QApplication.setOverrideCursor( Qt.WaitCursor ) backend_name = str(self.ui.backendEdit.itemData(self.ui.backendEdit.currentIndex()).toString()) @@ -202,6 +209,7 @@ class MainWindow(QtMainWindow): def addPerson(self, backend, person): if not backend: self.ui.searchEdit.setEnabled(True) + QApplication.restoreOverrideCursor() self.process = None return miniperson = MiniPerson(self.weboob, backend, person, self) @@ -233,6 +241,7 @@ class MainWindow(QtMainWindow): self.minis = [] self.ui.searchEdit.setEnabled(False) + QApplication.setOverrideCursor( Qt.WaitCursor ) backend_name = str(self.ui.backendEdit.itemData(self.ui.backendEdit.currentIndex()).toString()) @@ -242,6 +251,7 @@ class MainWindow(QtMainWindow): def addTorrent(self, backend, torrent): if not backend: self.ui.searchEdit.setEnabled(True) + QApplication.restoreOverrideCursor() self.process = None return minitorrent = MiniTorrent(self.weboob, backend, torrent, self) diff --git a/weboob/applications/qcineoob/minimovie.py b/weboob/applications/qcineoob/minimovie.py index c473351e..f7011e03 100644 --- a/weboob/applications/qcineoob/minimovie.py +++ b/weboob/applications/qcineoob/minimovie.py @@ -19,7 +19,8 @@ import urllib -from PyQt4.QtGui import QFrame, QImage, QPixmap +from PyQt4.QtGui import QFrame, QImage, QPixmap, QApplication +from PyQt4.QtCore import Qt from weboob.applications.qcineoob.ui.minimovie_ui import Ui_MiniMovie from weboob.capabilities.base import NotAvailable @@ -55,6 +56,7 @@ class MiniMovie(QFrame): def mousePressEvent(self, event): QFrame.mousePressEvent(self, event) + QApplication.setOverrideCursor( Qt.WaitCursor ) movie = self.backend.get_movie(self.movie.id) if 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 92f59049..a59dcd1b 100644 --- a/weboob/applications/qcineoob/miniperson.py +++ b/weboob/applications/qcineoob/miniperson.py @@ -35,7 +35,13 @@ class MiniPerson(QFrame): self.backend = backend self.person = person self.ui.nameLabel.setText('%s'%person.name) - self.ui.shortDescLabel.setText('%s'%person.short_description) + if person.short_description != NotAvailable: + if unicode(self.parent.ui.currentActionLabel.text()).startswith('Casting'): + self.ui.shortDescTitleLabel.setText(u'Role') + self.ui.shortDescLabel.setText('%s'%person.short_description) + else: + self.ui.shortDescTitleLabel.hide() + self.ui.shortDescLabel.hide() self.ui.backendLabel.setText(backend.name) def gotThumbnail(self, backend, person): diff --git a/weboob/applications/qcineoob/ui/miniperson.ui b/weboob/applications/qcineoob/ui/miniperson.ui index f2e4ec02..48609800 100644 --- a/weboob/applications/qcineoob/ui/miniperson.ui +++ b/weboob/applications/qcineoob/ui/miniperson.ui @@ -81,7 +81,7 @@ - + 75