diff --git a/weboob/applications/qcineoob/main_window.py b/weboob/applications/qcineoob/main_window.py index c5e4d4b0..36f0ac91 100644 --- a/weboob/applications/qcineoob/main_window.py +++ b/weboob/applications/qcineoob/main_window.py @@ -191,13 +191,13 @@ class MainWindow(QtMainWindow): self.ui.list_content.layout().addWidget(minimovie) self.minis.append(minimovie) - def displayMovie(self, movie): + def displayMovie(self, movie, backend): self.ui.stackedWidget.setCurrentWidget(self.ui.info_page) if self.current_info_widget != None: self.ui.info_content.layout().removeWidget(self.current_info_widget) self.current_info_widget.hide() self.current_info_widget.deleteLater() - wmovie = Movie(movie,self) + wmovie = Movie(movie,backend,self) self.ui.info_content.layout().addWidget(wmovie) self.current_info_widget = wmovie QApplication.restoreOverrideCursor() @@ -234,13 +234,13 @@ class MainWindow(QtMainWindow): self.ui.list_content.layout().addWidget(miniperson) self.minis.append(miniperson) - def displayPerson(self, person): + def displayPerson(self, person, backend): self.ui.stackedWidget.setCurrentWidget(self.ui.info_page) if self.current_info_widget != None: self.ui.info_content.layout().removeWidget(self.current_info_widget) self.current_info_widget.hide() self.current_info_widget.deleteLater() - wperson = Person(person,self) + wperson = Person(person,backend,self) self.ui.info_content.layout().addWidget(wperson) self.current_info_widget = wperson QApplication.restoreOverrideCursor() diff --git a/weboob/applications/qcineoob/minimovie.py b/weboob/applications/qcineoob/minimovie.py index b5db934c..72ec1ced 100644 --- a/weboob/applications/qcineoob/minimovie.py +++ b/weboob/applications/qcineoob/minimovie.py @@ -63,4 +63,4 @@ class MiniMovie(QFrame): 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]) + self.parent.doAction('Details of movie "%s"'%movie.original_title,self.parent.displayMovie,[movie,self.backend]) diff --git a/weboob/applications/qcineoob/miniperson.py b/weboob/applications/qcineoob/miniperson.py index 63bb1d2e..9ff5b228 100644 --- a/weboob/applications/qcineoob/miniperson.py +++ b/weboob/applications/qcineoob/miniperson.py @@ -69,4 +69,4 @@ class MiniPerson(QFrame): QApplication.setOverrideCursor( Qt.WaitCursor ) person = self.backend.get_person(self.person.id) if person: - self.parent.doAction(u'Details of person "%s"'%person.name,self.parent.displayPerson,[person]) + self.parent.doAction(u'Details of person "%s"'%person.name,self.parent.displayPerson,[person,self.backend]) diff --git a/weboob/applications/qcineoob/movie.py b/weboob/applications/qcineoob/movie.py index bf5bd8e8..1423888c 100644 --- a/weboob/applications/qcineoob/movie.py +++ b/weboob/applications/qcineoob/movie.py @@ -27,7 +27,7 @@ from weboob.capabilities.base import NotAvailable from weboob.applications.suboob.suboob import LANGUAGE_CONV class Movie(QFrame): - def __init__(self, movie, parent=None): + def __init__(self, movie, backend, parent=None): QFrame.__init__(self, parent) self.parent = parent self.ui = Ui_Movie() @@ -42,21 +42,27 @@ class Movie(QFrame): self.connect(self.ui.subtitleButton, SIGNAL("clicked()"), self.searchSubtitle) self.movie = movie + self.backend = backend self.ui.titleLabel.setText(movie.original_title) self.ui.durationLabel.setText(unicode(movie.duration)) self.gotThumbnail() + self.putReleases() if movie.other_titles != NotAvailable: self.ui.otherTitlesPlain.setPlainText('\n'.join(movie.other_titles)) if movie.release_date != NotAvailable: self.ui.releaseDateLabel.setText(movie.release_date.isoformat()) - self.ui.durationLabel.setText('%s'%movie.duration) + self.ui.durationLabel.setText('%s min'%movie.duration) self.ui.pitchPlain.setPlainText('%s'%movie.pitch) self.ui.countryLabel.setText('%s'%movie.country) self.ui.noteLabel.setText('%s'%movie.note) self.ui.verticalLayout.setAlignment(Qt.AlignTop) + def putReleases(self): + rel = self.backend.get_movie_releases(self.movie.id) + self.ui.allReleasesPlain.setPlainText(rel) + def gotThumbnail(self): if self.movie.thumbnail_url != NotAvailable: data = urllib.urlopen(self.movie.thumbnail_url).read() diff --git a/weboob/applications/qcineoob/person.py b/weboob/applications/qcineoob/person.py index ffbeabb4..017f4a16 100644 --- a/weboob/applications/qcineoob/person.py +++ b/weboob/applications/qcineoob/person.py @@ -19,22 +19,24 @@ import urllib -from PyQt4.QtCore import SIGNAL -from PyQt4.QtGui import QFrame, QImage, QPixmap +from PyQt4.QtCore import SIGNAL, Qt +from PyQt4.QtGui import QFrame, QImage, QPixmap, QApplication from weboob.applications.qcineoob.ui.person_ui import Ui_Person from weboob.capabilities.base import NotAvailable class Person(QFrame): - def __init__(self, person, parent=None): + def __init__(self, person, backend, parent=None): QFrame.__init__(self, parent) self.parent = parent self.ui = Ui_Person() self.ui.setupUi(self) self.connect(self.ui.filmographyButton, SIGNAL("clicked()"), self.filmography) + self.connect(self.ui.biographyButton, SIGNAL("clicked()"), self.biography) self.person = person + self.backend = backend self.gotThumbnail() self.ui.nameLabel.setText(person.name) @@ -62,3 +64,11 @@ class Person(QFrame): role_desc = ' as %s'%role self.parent.doAction('Filmography of "%s"%s'%(self.person.name,role_desc), self.parent.filmographyAction,[self.person.id,role]) + + def biography(self): + QApplication.setOverrideCursor(Qt.WaitCursor) + bio = self.backend.get_person_biography(self.person.id) + self.ui.shortBioPlain.setPlainText(bio) + self.ui.biographyLabel.setText('Full biography:') + self.ui.biographyButton.hide() + QApplication.restoreOverrideCursor() diff --git a/weboob/applications/qcineoob/ui/movie.ui b/weboob/applications/qcineoob/ui/movie.ui index 75e5f098..628ef31a 100644 --- a/weboob/applications/qcineoob/ui/movie.ui +++ b/weboob/applications/qcineoob/ui/movie.ui @@ -6,7 +6,7 @@ 0 0 - 629 + 645 552 @@ -57,7 +57,7 @@ - QFrame::StyledPanel + QFrame::NoFrame QFrame::Raised @@ -95,7 +95,7 @@ - QFrame::StyledPanel + QFrame::NoFrame QFrame::Raised @@ -114,7 +114,7 @@ - QFrame::StyledPanel + QFrame::NoFrame QFrame::Raised @@ -218,7 +218,11 @@ - + + + Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + @@ -310,7 +314,11 @@ - + + + Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + @@ -379,6 +387,38 @@ + + + + + 16777215 + 200 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + All release dates: + + + + + + + Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + diff --git a/weboob/applications/qcineoob/ui/person.ui b/weboob/applications/qcineoob/ui/person.ui index ba57fcb5..d373004a 100644 --- a/weboob/applications/qcineoob/ui/person.ui +++ b/weboob/applications/qcineoob/ui/person.ui @@ -39,7 +39,7 @@ - QFrame::StyledPanel + QFrame::NoFrame QFrame::Raised @@ -234,10 +234,30 @@ filmography - - - Short biography: + + + QFrame::NoFrame + + QFrame::Raised + + + + + + Short biography: + + + + + + + view full +biography + + + + @@ -248,6 +268,9 @@ filmography 100 + + Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse +