Fix #1983 (Schedule news download - user and password fields)

This commit is contained in:
Kovid Goyal 2009-03-04 12:20:49 -08:00
parent f967c00b9f
commit 750461e3ba
2 changed files with 222 additions and 248 deletions

View File

@ -366,9 +366,14 @@ class SchedulerDialog(QDialog, Ui_Dialog):
def show_recipe(self, index): def show_recipe(self, index):
recipe = self._model.data(index, Qt.UserRole) recipe = self._model.data(index, Qt.UserRole)
self.current_recipe = recipe self.current_recipe = recipe
self.title.setText(recipe.title) self.blurb.setText('''
self.author.setText(_('Created by: ') + recipe.author) <p>
self.description.setText(recipe.description if recipe.description else '') <b>%(title)s</b><br>
%(cb)s %(author)s<br/>
%(description)s
</p>
'''%dict(title=recipe.title, cb=_('Created by: '), author=recipe.author,
description=recipe.description if recipe.description else ''))
self.allow_scheduling = False self.allow_scheduling = False
schedule = -1 if recipe.schedule is None else recipe.schedule schedule = -1 if recipe.schedule is None else recipe.schedule
if schedule < 1e5 and schedule >= 0: if schedule < 1e5 and schedule >= 0:

View File

@ -55,252 +55,221 @@
<item row="0" column="1" > <item row="0" column="1" >
<layout class="QVBoxLayout" name="verticalLayout_3" > <layout class="QVBoxLayout" name="verticalLayout_3" >
<item> <item>
<widget class="QGroupBox" name="detail_box" > <widget class="QScrollArea" name="scrollArea" >
<property name="title" > <property name="frameShape" >
<string>Schedule for download</string> <enum>QFrame::NoFrame</enum>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_4" > <property name="widgetResizable" >
<item> <bool>true</bool>
<widget class="QLabel" name="title" > </property>
<property name="font" > <widget class="QWidget" name="scrollAreaWidgetContents" >
<font> <property name="geometry" >
<weight>75</weight> <rect>
<bold>true</bold> <x>0</x>
</font> <y>0</y>
</property> <width>361</width>
<property name="text" > <height>500</height>
<string>title</string> </rect>
</property> </property>
<property name="textFormat" > <layout class="QVBoxLayout" name="verticalLayout_5" >
<enum>Qt::PlainText</enum> <property name="margin" >
</property> <number>0</number>
</widget> </property>
</item> <item>
<item> <widget class="QGroupBox" name="detail_box" >
<widget class="QLabel" name="description" > <property name="title" >
<property name="text" > <string>Schedule for download</string>
<string>description</string> </property>
</property> <layout class="QVBoxLayout" name="verticalLayout_4" >
<property name="wordWrap" > <item>
<bool>true</bool> <widget class="QLabel" name="blurb" >
</property> <property name="text" >
</widget> <string>blurb</string>
</item> </property>
<item> <property name="textFormat" >
<widget class="QLabel" name="author" > <enum>Qt::RichText</enum>
<property name="text" > </property>
<string>author</string> <property name="wordWrap" >
</property> <bool>true</bool>
</widget> </property>
</item> <property name="openExternalLinks" >
<item> <bool>true</bool>
<spacer name="verticalSpacer_2" > </property>
<property name="orientation" > </widget>
<enum>Qt::Vertical</enum> </item>
</property> <item>
<property name="sizeHint" stdset="0" > <widget class="QCheckBox" name="schedule" >
<size> <property name="text" >
<width>20</width> <string>&amp;Schedule for download:</string>
<height>40</height> </property>
</size> </widget>
</property> </item>
</spacer> <item>
</item> <widget class="QWidget" native="1" name="widget" >
<item> <property name="enabled" >
<widget class="QCheckBox" name="schedule" > <bool>false</bool>
<property name="text" > </property>
<string>&amp;Schedule for download:</string> <layout class="QVBoxLayout" name="verticalLayout_2" >
</property> <item>
</widget> <layout class="QHBoxLayout" name="horizontalLayout_2" >
</item> <item>
<item> <widget class="QRadioButton" name="daily_button" >
<widget class="QWidget" native="1" name="widget" > <property name="text" >
<property name="enabled" > <string>Every </string>
<bool>false</bool> </property>
</property> </widget>
<layout class="QVBoxLayout" name="verticalLayout_2" > </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2" > <widget class="QComboBox" name="day" />
<item> </item>
<widget class="QRadioButton" name="daily_button" > <item>
<property name="text" > <widget class="QLabel" name="label_4" >
<string>Every </string> <property name="text" >
</property> <string>at</string>
</widget> </property>
</item> </widget>
<item> </item>
<widget class="QComboBox" name="day" /> <item>
</item> <widget class="QTimeEdit" name="time" />
<item> </item>
<widget class="QLabel" name="label_4" > <item>
<property name="text" > <spacer name="horizontalSpacer" >
<string>at</string> <property name="orientation" >
</property> <enum>Qt::Horizontal</enum>
</widget> </property>
</item> <property name="sizeHint" stdset="0" >
<item> <size>
<widget class="QTimeEdit" name="time" /> <width>40</width>
</item> <height>20</height>
<item> </size>
<spacer name="horizontalSpacer" > </property>
<property name="orientation" > </spacer>
<enum>Qt::Horizontal</enum> </item>
</property> </layout>
<property name="sizeHint" stdset="0" > </item>
<size> <item>
<width>40</width> <layout class="QHBoxLayout" name="horizontalLayout" >
<height>20</height> <item>
</size> <widget class="QRadioButton" name="interval_button" >
</property> <property name="text" >
</spacer> <string>Every </string>
</item> </property>
</layout> </widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout" > <widget class="QDoubleSpinBox" name="interval" >
<item> <property name="sizePolicy" >
<widget class="QRadioButton" name="interval_button" > <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<property name="text" > <horstretch>0</horstretch>
<string>Every </string> <verstretch>0</verstretch>
</property> </sizepolicy>
</widget> </property>
</item> <property name="toolTip" >
<item> <string>Interval at which to download this recipe. A value of zero means that the recipe will be downloaded every hour.</string>
<widget class="QDoubleSpinBox" name="interval" > </property>
<property name="sizePolicy" > <property name="suffix" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" > <string> days</string>
<horstretch>0</horstretch> </property>
<verstretch>0</verstretch> <property name="decimals" >
</sizepolicy> <number>1</number>
</property> </property>
<property name="toolTip" > <property name="minimum" >
<string>Interval at which to download this recipe. A value of zero means that the recipe will be downloaded every hour.</string> <double>0.000000000000000</double>
</property> </property>
<property name="suffix" > <property name="maximum" >
<string> days</string> <double>365.100000000000023</double>
</property> </property>
<property name="decimals" > <property name="singleStep" >
<number>1</number> <double>1.000000000000000</double>
</property> </property>
<property name="minimum" > <property name="value" >
<double>0.000000000000000</double> <double>1.000000000000000</double>
</property> </property>
<property name="maximum" > </widget>
<double>365.100000000000023</double> </item>
</property> </layout>
<property name="singleStep" > </item>
<double>1.000000000000000</double> </layout>
</property> </widget>
<property name="value" > </item>
<double>1.000000000000000</double> <item>
</property> <widget class="QLabel" name="last_downloaded" >
</widget> <property name="text" >
</item> <string/>
</layout> </property>
</item> <property name="wordWrap" >
</layout> <bool>true</bool>
</widget> </property>
</item> </widget>
<item> </item>
<widget class="QLabel" name="last_downloaded" > <item>
<property name="text" > <widget class="QGroupBox" name="account" >
<string/> <property name="title" >
</property> <string>&amp;Account</string>
<property name="wordWrap" > </property>
<bool>true</bool> <layout class="QGridLayout" name="gridLayout_2" >
</property> <item row="0" column="1" >
</widget> <widget class="QLineEdit" name="username" />
</item> </item>
<item> <item row="0" column="0" >
<widget class="QGroupBox" name="account" > <widget class="QLabel" name="label_2" >
<property name="title" > <property name="text" >
<string>&amp;Account</string> <string>&amp;Username:</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2" > <property name="buddy" >
<item row="0" column="1" > <cstring>username</cstring>
<widget class="QLineEdit" name="username" /> </property>
</item> </widget>
<item row="0" column="0" > </item>
<widget class="QLabel" name="label_2" > <item row="1" column="0" >
<property name="text" > <widget class="QLabel" name="label_3" >
<string>&amp;Username:</string> <property name="text" >
</property> <string>&amp;Password:</string>
<property name="buddy" > </property>
<cstring>username</cstring> <property name="buddy" >
</property> <cstring>password</cstring>
</widget> </property>
</item> </widget>
<item row="1" column="0" > </item>
<widget class="QLabel" name="label_3" > <item row="1" column="1" >
<property name="text" > <widget class="QLineEdit" name="password" >
<string>&amp;Password:</string> <property name="echoMode" >
</property> <enum>QLineEdit::Password</enum>
<property name="buddy" > </property>
<cstring>password</cstring> </widget>
</property> </item>
</widget> <item row="2" column="0" >
</item> <widget class="QCheckBox" name="show_password" >
<item row="1" column="1" > <property name="text" >
<widget class="QLineEdit" name="password" > <string>&amp;Show password</string>
<property name="echoMode" > </property>
<enum>QLineEdit::Password</enum> </widget>
</property> </item>
</widget> </layout>
</item> </widget>
<item row="2" column="0" > </item>
<widget class="QCheckBox" name="show_password" > <item>
<property name="text" > <widget class="QLabel" name="label" >
<string>&amp;Show password</string> <property name="text" >
</property> <string>For the scheduling to work, you must leave calibre running.</string>
</widget> </property>
</item> <property name="wordWrap" >
</layout> <bool>true</bool>
</widget> </property>
</item> </widget>
<item> </item>
<spacer name="verticalSpacer_3" > <item>
<property name="orientation" > <widget class="QPushButton" name="download" >
<enum>Qt::Vertical</enum> <property name="text" >
</property> <string>&amp;Download now</string>
<property name="sizeHint" stdset="0" > </property>
<size> </widget>
<width>20</width> </item>
<height>40</height> </layout>
</size> </widget>
</property> </item>
</spacer> </layout>
</item> </widget>
<item>
<widget class="QLabel" name="label" >
<property name="text" >
<string>For the scheduling to work, you must leave calibre running.</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="download" >
<property name="text" >
<string>&amp;Download now</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer" >
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget> </widget>
</item> </item>
</layout> </layout>