Commit 233c18b2 authored by Julien Veyssier's avatar Julien Veyssier

[qcineoob] graphical fixes

add 'genres' field to Movie object of ICapCinema
parent 1c42b12a
......@@ -105,6 +105,7 @@ class ImdbBackend(BaseBackend, ICapCinema):
movie.country = mov.country
movie.note = mov.note
movie.roles = mov.roles
movie.genres = mov.genres
movie.short_description = mov.short_description
movie.thumbnail_url = mov.thumbnail_url
......
......@@ -106,6 +106,7 @@ class ImdbBrowser(BaseBrowser):
short_description = NotAvailable
thumbnail_url = NotAvailable
other_titles = []
genres = []
roles = {}
if 'title' not in jres:
......@@ -115,6 +116,9 @@ class ImdbBrowser(BaseBrowser):
thumbnail_url = unicode(jres['poster'])
if 'directors' in jres:
short_description = unicode(', '.join(jres['directors']))
if 'genres' in jres:
for g in jres['genres']:
genres.append(g)
if 'runtime' in jres:
dur_str = jres['runtime'][0].split(':')
if len(dur_str) == 1:
......@@ -154,6 +158,7 @@ class ImdbBrowser(BaseBrowser):
movie.other_titles = other_titles
movie.release_date = release_date
movie.duration = duration
movie.genres = genres
movie.pitch = pitch
movie.country = country
movie.note = note
......
......@@ -52,6 +52,10 @@ class MovieInfoFormatter(IFormatter):
if not empty(obj.duration):
result += 'Duration: %smin\n' % obj.duration
result += 'Note: %s\n' % obj.note
if not empty(obj.genres):
result += '\n%sGenres%s\n' % (self.BOLD, self.NC)
for g in obj.genres:
result += ' * %s\n' % g
if not empty(obj.roles):
result += '\n%sRelated persons%s\n' % (self.BOLD, self.NC)
for role, lpersons in obj.roles.items():
......
......@@ -55,6 +55,14 @@ class Movie(QFrame):
self.ui.otherTitlesPlain.setPlainText('\n'.join(movie.other_titles))
else:
self.ui.otherTitlesPlain.parent().hide()
if not empty(movie.genres):
genres = u''
for g in movie.genres:
genres += '%s, ' % g
genres = genres[:-2]
self.ui.genresLabel.setText(genres)
else:
self.ui.genresLabel.parent().hide()
if not empty(movie.release_date):
self.ui.releaseDateLabel.setText(movie.release_date.strftime('%Y-%m-%d'))
else:
......
......@@ -48,6 +48,17 @@ class Torrent(QFrame):
if not empty(torrent.magnet):
self.ui.downloadButton.setText(u'Download not available\nbut magnet link provided')
self.ui.downloadButton.setToolTip(u'Use the magnet link')
if not empty(torrent.description):
self.ui.descriptionPlain.setText(u'%s' % torrent.description)
else:
self.ui.descriptionPlain.parent().hide()
if not empty(torrent.files):
files = u''
for f in torrent.files:
files += '%s\n' % f
self.ui.filesPlain.setText(u'%s' % files)
else:
self.ui.filesPlain.parent().hide()
if not empty(torrent.magnet):
self.ui.magnetEdit.setText(u'%s' % torrent.magnet)
else:
......
......@@ -18,8 +18,8 @@
</property>
<property name="maximumSize">
<size>
<width>2000</width>
<height>600</height>
<width>10000</width>
<height>10000</height>
</size>
</property>
<property name="windowTitle">
......@@ -149,7 +149,7 @@
<property name="maximumSize">
<size>
<width>16777215</width>
<height>600</height>
<height>9000</height>
</size>
</property>
<property name="frameShape">
......@@ -182,6 +182,12 @@
</property>
<item>
<widget class="QLabel" name="label_9">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Id:</string>
</property>
......@@ -217,6 +223,12 @@
<layout class="QHBoxLayout" name="horizontalLayout_9">
<item>
<widget class="QLabel" name="label_7">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Title:</string>
</property>
......@@ -232,50 +244,6 @@
</layout>
</widget>
</item>
<item>
<widget class="QFrame" name="frame_8">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>200</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<widget class="QLabel" name="label_6">
<property name="maximumSize">
<size>
<width>100</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>Other titles:</string>
</property>
</widget>
</item>
<item>
<widget class="QPlainTextEdit" name="otherTitlesPlain">
<property name="textInteractionFlags">
<set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QFrame" name="frame_2">
<property name="maximumSize">
......@@ -293,6 +261,12 @@
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label_3">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Duration:</string>
</property>
......@@ -325,6 +299,12 @@
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QLabel" name="label_4">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Release date:</string>
</property>
......@@ -345,7 +325,7 @@
<property name="maximumSize">
<size>
<width>16777215</width>
<height>200</height>
<height>150</height>
</size>
</property>
<property name="frameShape">
......@@ -357,6 +337,12 @@
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QLabel" name="label_2">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Pitch:</string>
</property>
......@@ -364,6 +350,12 @@
</item>
<item>
<widget class="QTextEdit" name="pitchPlain">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="textInteractionFlags">
<set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
......@@ -389,6 +381,12 @@
<layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
<widget class="QLabel" name="label_5">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Country:</string>
</property>
......@@ -404,6 +402,47 @@
</layout>
</widget>
</item>
<item>
<widget class="QFrame" name="frame_14">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>35</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_14">
<item>
<widget class="QLabel" name="label_10">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Genres:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="genresLabel">
<property name="text">
<string/>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QFrame" name="frame">
<property name="maximumSize">
......@@ -421,6 +460,12 @@
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Note:</string>
</property>
......@@ -453,6 +498,12 @@
<layout class="QHBoxLayout" name="horizontalLayout_12">
<item>
<widget class="QLabel" name="label_8">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>All release dates:</string>
</property>
......@@ -468,6 +519,56 @@
</layout>
</widget>
</item>
<item>
<widget class="QFrame" name="frame_8">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>200</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<widget class="QLabel" name="label_6">
<property name="maximumSize">
<size>
<width>100</width>
<height>16777215</height>
</size>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Other titles:</string>
</property>
</widget>
</item>
<item>
<widget class="QPlainTextEdit" name="otherTitlesPlain">
<property name="textInteractionFlags">
<set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
......
......@@ -107,6 +107,12 @@ filmography</string>
</property>
<item>
<widget class="QLabel" name="label_11">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Id:</string>
</property>
......@@ -136,6 +142,12 @@ filmography</string>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>name:</string>
</property>
......@@ -162,6 +174,12 @@ filmography</string>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label_3">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Birth date:</string>
</property>
......@@ -188,6 +206,12 @@ filmography</string>
<layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
<widget class="QLabel" name="label_7">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Real Name:</string>
</property>
......@@ -214,6 +238,12 @@ filmography</string>
<layout class="QHBoxLayout" name="horizontalLayout_10">
<item>
<widget class="QLabel" name="label_10">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Birth place:</string>
</property>
......@@ -240,6 +270,12 @@ filmography</string>
<layout class="QHBoxLayout" name="horizontalLayout_9">
<item>
<widget class="QLabel" name="label_9">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Death date:</string>
</property>
......@@ -275,6 +311,12 @@ filmography</string>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QLabel" name="biographyLabel">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Short biography:</string>
</property>
......
......@@ -47,13 +47,6 @@
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QPushButton" name="downloadButton">
<property name="text">
<string>Download</string>
</property>
</widget>
</item>
<item>
<widget class="QFrame" name="idFrame">
<property name="maximumSize">
......@@ -77,6 +70,12 @@
</property>
<item>
<widget class="QLabel" name="label_9">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Id:</string>
</property>
......@@ -112,6 +111,12 @@
<layout class="QHBoxLayout" name="horizontalLayout_9">
<item>
<widget class="QLabel" name="label_7">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Name:</string>
</property>
......@@ -147,6 +152,12 @@
<layout class="QHBoxLayout" name="horizontalLayout_10">
<item>
<widget class="QLabel" name="label_8">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Nb CD:</string>
</property>
......@@ -179,6 +190,12 @@
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QLabel" name="label_4">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Lang:</string>
</property>
......@@ -211,6 +228,12 @@
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<widget class="QLabel" name="label_6">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Description:</string>
</property>
......@@ -252,6 +275,12 @@
</property>
<item>
<widget class="QLabel" name="label_5">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Url:</string>
</property>
......@@ -263,6 +292,13 @@
</layout>
</widget>
</item>
<item>
<widget class="QPushButton" name="downloadButton">
<property name="text">
<string>Download</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
......
......@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>629</width>
<height>552</height>
<height>571</height>
</rect>
</property>
<property name="sizePolicy">
......@@ -18,8 +18,8 @@
</property>
<property name="maximumSize">
<size>
<width>2000</width>
<height>600</height>
<width>10000</width>
<height>10000</height>
</size>
</property>
<property name="windowTitle">
......@@ -37,7 +37,7 @@
<property name="maximumSize">
<size>
<width>16777215</width>
<height>600</height>
<height>10000</height>
</size>
</property>
<property name="frameShape">
......@@ -47,13 +47,6 @@
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QPushButton" name="downloadButton">
<property name="text">
<string>Download</string>
</property>
</widget>
</item>
<item>
<widget class="QFrame" name="idFrame">
<property name="maximumSize">
......@@ -77,6 +70,12 @@
</property>
<item>
<widget class="QLabel" name="label_9">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Id:</string>
</property>
......@@ -112,6 +111,12 @@
<layout class="QHBoxLayout" name="horizontalLayout_9">
<item>
<widget class="QLabel" name="label_7">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Name:</string>
</property>
......@@ -144,6 +149,12 @@
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label_3">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Seed/leech:</string>
</property>
......@@ -176,6 +187,12 @@
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QLabel" name="label_4">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Size:</string>
</property>
......@@ -193,10 +210,16 @@
</item>
<item>
<widget class="QFrame" name="frame_8">
<property name="minimumSize">
<size>
<width>0</width>
<height>150</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>200</height>
<height>500</height>
</size>
</property>
<property name="frameShape">
......@@ -208,6 +231,12 @@
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<widget class="QLabel" name="label_6">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Description:</string>
</property>
......@@ -221,6 +250,12 @@
</item>
<item>
<widget class="QFrame" name="frame_5">
<property name="minimumSize">
<size>
<width>0</width>
<height>120</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
......@@ -236,6 +271,12 @@
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QLabel" name="label_2">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Files:</string>
</property>
......@@ -270,6 +311,12 @@
</property>
<item>
<widget class="QLabel" name="label_5">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Url:</string>
</property>
......@@ -304,6 +351,12 @@
</property>
<item>
<widget class="QLabel" name="label_8">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Magnet:</string>
</property>
......@@ -315,6 +368,13 @@
</layout>
</widget>
</item>
<item>
<widget class="QPushButton" name="downloadButton">