diff --git a/weboob/applications/qcineoob/minitorrent.py b/weboob/applications/qcineoob/minitorrent.py index c55c4508..596753a0 100644 --- a/weboob/applications/qcineoob/minitorrent.py +++ b/weboob/applications/qcineoob/minitorrent.py @@ -20,6 +20,7 @@ from PyQt4.QtGui import QFrame from weboob.applications.qcineoob.ui.minitorrent_ui import Ui_MiniTorrent +from weboob.applications.weboorrents.weboorrents import sizeof_fmt from weboob.capabilities.base import NotAvailable class MiniTorrent(QFrame): @@ -35,6 +36,8 @@ class MiniTorrent(QFrame): self.ui.nameLabel.setText(torrent.name) if torrent.seeders != NotAvailable and torrent.leechers != NotAvailable: self.ui.seedLeechLabel.setText('%s/%s'%(torrent.seeders,torrent.leechers)) + if torrent.size != NotAvailable: + self.ui.sizeLabel.setText(u'%s'%sizeof_fmt(torrent.size)) self.ui.backendLabel.setText(backend.name) def enterEvent(self, event): diff --git a/weboob/applications/qcineoob/movie.py b/weboob/applications/qcineoob/movie.py index 1423888c..94a5aa38 100644 --- a/weboob/applications/qcineoob/movie.py +++ b/weboob/applications/qcineoob/movie.py @@ -48,16 +48,18 @@ class Movie(QFrame): self.gotThumbnail() self.putReleases() + self.ui.idEdit.setText(u'%s@%s'%(movie.id,backend.name)) 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.releaseDateLabel.setText(movie.release_date.strftime('%Y-%m-%d')) 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) + self.ui.verticalLayout_2.setAlignment(Qt.AlignTop) def putReleases(self): rel = self.backend.get_movie_releases(self.movie.id) diff --git a/weboob/applications/qcineoob/person.py b/weboob/applications/qcineoob/person.py index 017f4a16..00810adf 100644 --- a/weboob/applications/qcineoob/person.py +++ b/weboob/applications/qcineoob/person.py @@ -40,14 +40,16 @@ class Person(QFrame): self.gotThumbnail() self.ui.nameLabel.setText(person.name) + self.ui.idEdit.setText(u'%s@%s'%(person.id,backend.name)) self.ui.realNameLabel.setText('%s'%person.real_name) self.ui.birthPlaceLabel.setText('%s'%person.birth_place) - self.ui.birthDateLabel.setText(person.birth_date.isoformat()) + self.ui.birthDateLabel.setText(person.birth_date.strftime('%Y-%m-%d')) if person.death_date != NotAvailable: - self.ui.deathDateLabel.setText(person.death_date.isoformat()) + self.ui.deathDateLabel.setText(person.death_date.strftime('%Y-%m-%d')) else: self.ui.deathDateLabel.parent().hide() self.ui.shortBioPlain.setPlainText('%s'%person.short_biography) + self.ui.verticalLayout_2.setAlignment(Qt.AlignTop) def gotThumbnail(self): if self.person.thumbnail_url != NotAvailable: diff --git a/weboob/applications/qcineoob/subtitle.py b/weboob/applications/qcineoob/subtitle.py index bcf165a5..03e95b0f 100644 --- a/weboob/applications/qcineoob/subtitle.py +++ b/weboob/applications/qcineoob/subtitle.py @@ -36,7 +36,14 @@ class Subtitle(QFrame): self.connect(self.ui.downloadButton, SIGNAL("clicked()"), self.download) self.subtitle = subtitle + self.ui.idEdit.setText(u'%s@%s'%(subtitle.id,backend.name)) self.ui.nameLabel.setText(u'%s'%subtitle.name) + if subtitle.nb_cd != NotAvailable: + self.ui.nbcdLabel.setText(u'%s'%subtitle.nb_cd) + if subtitle.language != NotAvailable: + self.ui.langLabel.setText(u'%s'%subtitle.language) + if subtitle.description != NotAvailable: + self.ui.descriptionPlain.setPlainText(u'%s'%subtitle.description) if subtitle.url != NotAvailable: self.ui.urlEdit.setText(u'%s'%subtitle.url) diff --git a/weboob/applications/qcineoob/torrent.py b/weboob/applications/qcineoob/torrent.py index 9a86025f..40861b7c 100644 --- a/weboob/applications/qcineoob/torrent.py +++ b/weboob/applications/qcineoob/torrent.py @@ -23,6 +23,7 @@ from PyQt4.QtCore import Qt,SIGNAL from PyQt4.QtGui import QFrame, QFileDialog from weboob.applications.qcineoob.ui.torrent_ui import Ui_Torrent +from weboob.applications.weboorrents.weboorrents import sizeof_fmt from weboob.capabilities.base import NotAvailable, NotLoaded class Torrent(QFrame): @@ -36,17 +37,24 @@ class Torrent(QFrame): self.connect(self.ui.downloadButton, SIGNAL("clicked()"), self.download) self.torrent = torrent + self.ui.idEdit.setText(u'%s@%s'%(torrent.id,backend.name)) self.ui.nameLabel.setText(u'%s'%torrent.name) if torrent.url != NotAvailable: self.ui.urlEdit.setText(u'%s'%torrent.url) else: self.ui.urlFrame.hide() self.ui.downloadButton.setDisabled(True) - self.ui.downloadButton.setToolTip('Use the magnet link') + if torrent.magnet != NotAvailable and torrent.magnet != NotLoaded: + self.ui.downloadButton.setText(u'Download not available\nbut magnet link provided') + self.ui.downloadButton.setToolTip(u'Use the magnet link') if torrent.magnet != NotAvailable and torrent.magnet != NotLoaded: self.ui.magnetEdit.setText(u'%s'%torrent.magnet) else: self.ui.magnetFrame.hide() + if torrent.seeders != NotAvailable and torrent.leechers != NotAvailable: + self.ui.seedLeechLabel.setText(u'%s/%s'%(torrent.seeders,torrent.leechers)) + if torrent.size != NotAvailable: + self.ui.sizeLabel.setText(u'%s'%sizeof_fmt(torrent.size)) self.ui.verticalLayout.setAlignment(Qt.AlignTop) diff --git a/weboob/applications/qcineoob/ui/main_window.ui b/weboob/applications/qcineoob/ui/main_window.ui index 77efd3c4..d8cfb1ab 100644 --- a/weboob/applications/qcineoob/ui/main_window.ui +++ b/weboob/applications/qcineoob/ui/main_window.ui @@ -143,6 +143,9 @@ Qt::AlignCenter + + true + @@ -197,8 +200,8 @@ 0 0 - 63 - 18 + 96 + 26 diff --git a/weboob/applications/qcineoob/ui/minimovie.ui b/weboob/applications/qcineoob/ui/minimovie.ui index 13bde7c5..73dbd214 100644 --- a/weboob/applications/qcineoob/ui/minimovie.ui +++ b/weboob/applications/qcineoob/ui/minimovie.ui @@ -78,6 +78,9 @@ TextLabel + + true + @@ -98,6 +101,9 @@ TextLabel + + true + diff --git a/weboob/applications/qcineoob/ui/miniperson.ui b/weboob/applications/qcineoob/ui/miniperson.ui index 48609800..67e8b30f 100644 --- a/weboob/applications/qcineoob/ui/miniperson.ui +++ b/weboob/applications/qcineoob/ui/miniperson.ui @@ -78,6 +78,9 @@ TextLabel + + true + @@ -98,6 +101,9 @@ TextLabel + + true + diff --git a/weboob/applications/qcineoob/ui/minisubtitle.ui b/weboob/applications/qcineoob/ui/minisubtitle.ui index 0628218f..52e77ec2 100644 --- a/weboob/applications/qcineoob/ui/minisubtitle.ui +++ b/weboob/applications/qcineoob/ui/minisubtitle.ui @@ -78,6 +78,9 @@ TextLabel + + true + diff --git a/weboob/applications/qcineoob/ui/minitorrent.ui b/weboob/applications/qcineoob/ui/minitorrent.ui index c40330b7..90de8821 100644 --- a/weboob/applications/qcineoob/ui/minitorrent.ui +++ b/weboob/applications/qcineoob/ui/minitorrent.ui @@ -100,7 +100,7 @@ - + @@ -113,13 +113,33 @@ - + TextLabel + + + + TextLabel + + + + + + + + 75 + true + + + + Size: + + + diff --git a/weboob/applications/qcineoob/ui/movie.ui b/weboob/applications/qcineoob/ui/movie.ui index 628ef31a..78c2e50b 100644 --- a/weboob/applications/qcineoob/ui/movie.ui +++ b/weboob/applications/qcineoob/ui/movie.ui @@ -7,7 +7,7 @@ 0 0 645 - 552 + 600 @@ -41,7 +41,7 @@ - QFrame::StyledPanel + QFrame::NoFrame QFrame::Raised @@ -63,6 +63,12 @@ QFrame::Raised + + 0 + + + 0 + @@ -101,6 +107,12 @@ QFrame::Raised + + 0 + + + 0 + @@ -120,6 +132,12 @@ QFrame::Raised + + 0 + + + 0 + @@ -145,12 +163,53 @@ - QFrame::StyledPanel + QFrame::NoFrame QFrame::Raised + + + + + 16777215 + 40 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 3 + + + 3 + + + + + Id: + + + + + + + Qt::AlignCenter + + + true + + + + + + diff --git a/weboob/applications/qcineoob/ui/person.ui b/weboob/applications/qcineoob/ui/person.ui index d373004a..a926f535 100644 --- a/weboob/applications/qcineoob/ui/person.ui +++ b/weboob/applications/qcineoob/ui/person.ui @@ -23,7 +23,7 @@ - QFrame::StyledPanel + QFrame::NoFrame QFrame::Raised @@ -88,12 +88,53 @@ filmography - QFrame::StyledPanel + QFrame::NoFrame QFrame::Raised + + + + + 16777215 + 40 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 3 + + + 3 + + + + + Id: + + + + + + + Qt::AlignCenter + + + true + + + + + + diff --git a/weboob/applications/qcineoob/ui/subtitle.ui b/weboob/applications/qcineoob/ui/subtitle.ui index 4e01bf60..30022dbc 100644 --- a/weboob/applications/qcineoob/ui/subtitle.ui +++ b/weboob/applications/qcineoob/ui/subtitle.ui @@ -41,7 +41,7 @@ - QFrame::StyledPanel + QFrame::NoFrame QFrame::Raised @@ -54,12 +54,53 @@ + + + + + 16777215 + 40 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 3 + + + 3 + + + + + Id: + + + + + + + Qt::AlignCenter + + + true + + + + + + 16777215 - 35 + 1000 @@ -81,6 +122,41 @@ + + true + + + + + + + + + + + 16777215 + 1000 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + Nb CD: + + + + + + + + @@ -91,7 +167,7 @@ 16777215 - 35 + 1000 @@ -104,12 +180,12 @@ - Size: + Lang: - + @@ -141,36 +217,15 @@ - - - - - - - - - - 16777215 - 200 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - Files: + + + + 16777215 + 120 + - - - diff --git a/weboob/applications/qcineoob/ui/torrent.ui b/weboob/applications/qcineoob/ui/torrent.ui index ec9f43f0..0fd173ae 100644 --- a/weboob/applications/qcineoob/ui/torrent.ui +++ b/weboob/applications/qcineoob/ui/torrent.ui @@ -41,7 +41,7 @@ - QFrame::StyledPanel + QFrame::NoFrame QFrame::Raised @@ -54,6 +54,47 @@ + + + + + 16777215 + 40 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 3 + + + 3 + + + + + Id: + + + + + + + Qt::AlignCenter + + + true + + + + + +