Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2702 (Trivial Calibre Welcome Wizard wording discrepancy)

Browse Source
This commit is contained in:
Kovid Goyal 2009-06-24 08:52:13 -07:00
parent 4739423f97
commit 8fff3d58c0
4 changed files with 482 additions and 427 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/calibre/gui2/main.py
View File

@ -318,8 +318,9 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
pm = QMenu() pm = QMenu()
ap = self.action_preferences ap = self.action_preferences
pm.addAction(ap.icon(), ap.text()) pm.addAction(ap.icon(), ap.text())
pm.addAction(self.preferences_action)
pm.addAction(_('Run welcome wizard')) pm.addAction(_('Run welcome wizard'))
self.connect(pm.actions()[0], SIGNAL('triggered(bool)'),
self.do_config)
self.connect(pm.actions()[1], SIGNAL('triggered(bool)'), self.connect(pm.actions()[1], SIGNAL('triggered(bool)'),
self.run_wizard) self.run_wizard)
self.action_preferences.setMenu(pm) self.action_preferences.setMenu(pm)

3
src/calibre/gui2/wizard/__init__.py
View File

@ -482,6 +482,9 @@ class Wizard(QWizard):
self.device_page = DevicePage() self.device_page = DevicePage()
self.library_page = LibraryPage() self.library_page = LibraryPage()
self.finish_page = FinishPage() self.finish_page = FinishPage()
bt = self.buttonText(self.FinishButton)
t = unicode(self.finish_page.finish_text.text())
self.finish_page.finish_text.setText(t%bt)
self.kindle_page = KindlePage() self.kindle_page = KindlePage()
self.stanza_page = StanzaPage() self.stanza_page = StanzaPage()
self.setPage(self.library_page.ID, self.library_page) self.setPage(self.library_page.ID, self.library_page)

4
src/calibre/gui2/wizard/finish.ui
View File

@ -21,9 +21,9 @@
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="finish_text">
<property name="text"> <property name="text">
<string>&lt;h2&gt;Congratulations!&lt;/h2&gt; You have succesfully setup calibre. Press the Finish button to apply your settings.</string> <string>&lt;h2&gt;Congratulations!&lt;/h2&gt; You have successfully setup calibre. Press the %s button to apply your settings.</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>

899
src/calibre/translations/calibre.pot
View File

File diff suppressed because it is too large Load Diff