From ae17b6554e05fb464f6be1de9dcc4f2518c418b1 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Sun, 10 Nov 2013 10:15:11 -0800 Subject: [PATCH] Updating UI for new features Former-commit-id: 919f207ce9b501886e0b139e9c085ac447c3385a --- ui/about.ui | 207 +++++++++++----------- ui/preferences.ui | 305 ++++++++++---------------------- ui/reader.ui | 72 +++++++- yomi_base/gen/about_ui.py | 37 ++-- yomi_base/gen/preferences_ui.py | 283 ++++++++++++----------------- yomi_base/gen/reader_ui.py | 68 ++++--- yomi_base/gen/resources_rc.py | 2 +- 7 files changed, 445 insertions(+), 529 deletions(-) diff --git a/ui/about.ui b/ui/about.ui index 457c96c..71f91df 100644 --- a/ui/about.ui +++ b/ui/about.ui @@ -6,16 +6,16 @@ 0 0 - 650 + 500 400 About - + - + @@ -27,14 +27,42 @@ - + + + + + <b>Yomichan {0}</b> + + + + + + + (c) 2013 by Alex Yatskov + + + + + + + <a href = "http://foosoft.net/yomichan">http://foosoft.net/yomichan</a> + + + true + + + + + + + - Qt::Vertical + Qt::Horizontal - 20 - 40 + 40 + 20 @@ -42,87 +70,64 @@ - - - - - <b>Yomichan {0}</b> - - - - - - - (c) 2012 by Alex Yatskov - - - - - - - <a href = "http://foosoft.net/yomichan">http://foosoft.net/yomichan</a> - - - true - - - - - - - Qt::Horizontal - - - - - - - This software uses the <a href = "http://www.famfamfam.com/lab/icons/silk/">Silk web icon set</a> created by Mark James. - - - true - - - true - - - - - - - Portions of this application's code and data are based on the <a href="http://www.polarcloud.com/rikaichan/">Rikaichan</a> extension developed by Jonathan Zarate. - - - true - - - true - - - - - - - This package uses the <a href="http://www.csse.monash.edu.au/~jwb/edict.html">EDICT</a> and <a href="http://www.csse.monash.edu.au/~jwb/kanjidic.html">KANJIDIC</a> dictionary files. These files are the property of the <a href="http://www.edrdg.org/"> Electronic Dictionary Research and Development Group</a>, and are used in conformance with the Group's <a href="http://www.edrdg.org/edrdg/licence.html">licence</a>. - - - true - - - true - - - - - - - QPlainTextEdit::NoWrap - - - true - - - GNU GENERAL PUBLIC LICENSE + + + Qt::Horizontal + + + + + + + This software uses the <a href = "http://www.famfamfam.com/lab/icons/silk/">Silk web icon set</a> created by Mark James. + + + true + + + true + + + + + + + Portions of this application's code and data are based on the <a href="http://www.polarcloud.com/rikaichan/">Rikaichan</a> extension developed by Jonathan Zarate. + + + true + + + true + + + + + + + This package uses the <a href="http://www.csse.monash.edu.au/~jwb/edict.html">EDICT</a> and <a href="http://www.csse.monash.edu.au/~jwb/kanjidic.html">KANJIDIC</a> dictionary files. These files are the property of the <a href="http://www.edrdg.org/"> Electronic Dictionary Research and Development Group</a>, and are used in conformance with the Group's <a href="http://www.edrdg.org/edrdg/licence.html">licence</a>. + + + true + + + true + + + + + + + Qt::ScrollBarAlwaysOff + + + QPlainTextEdit::NoWrap + + + true + + + GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> @@ -797,20 +802,18 @@ the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read <http://www.gnu.org/philosophy/why-not-lgpl.html>. - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Ok - - - - + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Ok + + diff --git a/ui/preferences.ui b/ui/preferences.ui index 02f5284..1162b2d 100644 --- a/ui/preferences.ui +++ b/ui/preferences.ui @@ -23,40 +23,47 @@ General - - - + + + Load recent file on startup - - + + - Strip readings in from loaded files + Strip readings from loaded files - - + + Check for updates on startup - - - - Qt::Vertical + + + + Maximum scan length - - - 20 - 139 - + + + + + + + 0 + 0 + - + + 1 + + @@ -68,10 +75,23 @@ - + + + + 0 + 0 + + + - + + + + 0 + 0 + + 1 @@ -84,14 +104,14 @@ - + Foreground... - + Background... @@ -100,7 +120,7 @@ - + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam accumsan nisi a leo faucibus ut varius velit fringilla. Cras hendrerit eleifend porttitor. Quisque eu elit quis tellus hendrerit ornare et ac tellus. Nunc id felis ut sapien blandit viverra vel ac est. Ut erat lorem, rutrum at scelerisque sollicitudin, lacinia quis diam. Suspendisse potenti. Integer id justo ac ligula aliquet mattis. Etiam malesuada faucibus risus, vel hendrerit elit consectetur quis. Etiam consectetur ipsum ut odio feugiat suscipit. Etiam a tellus metus. @@ -108,72 +128,13 @@ - - - Search - - - - - - - - Maximum scan length - - - - - - - 1 - - - - - - - Maximum result count - - - - - - - 1 - - - - - - - Group results by expression - - - - - - - - - Qt::Horizontal - - - - 423 - 20 - - - - - - Anki - + - + @@ -182,7 +143,7 @@ - + 0 @@ -199,7 +160,7 @@ - + 0 @@ -213,138 +174,62 @@ - Specify how your model fields are populated when adding facts + <html><head/><body><p>Specify how your model fields are populated when adding facts.<br />Allowed tags: <strong>{expression}</strong>, <strong>{reading}</strong>, <strong>{glossary}</strong> and <strong>{sentence}</p></body></html> - + + + + Field + + + + + Value + + + + + + - - - - Field - - - - - Value - - + + + Show settings for + - - - - - - - %e - - - - - - - - 75 - true - - - - Reading - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 75 - true - - - - Glossary - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - %g - - - - - - - - 75 - true - - - - Sentence - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - %s - - - - - - - %r - - - - - - - - 75 - true - - - - Expression - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - + + + Vocabulary + + + true + + + + + + + Kanji + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + diff --git a/ui/reader.ui b/ui/reader.ui index e3388a7..9912147 100644 --- a/ui/reader.ui +++ b/ui/reader.ui @@ -21,7 +21,7 @@ :/img/img/icon_logo_32.png:/img/img/icon_logo_32.png - + @@ -103,8 +103,9 @@ - + + @@ -137,9 +138,9 @@ - + - Definitions + Vocabulary 2 @@ -166,7 +167,7 @@ - + @@ -213,6 +214,35 @@ + + + Kanji + + + 2 + + + + + + + + + + + + Search + + + + + + + + + + + @@ -373,12 +403,12 @@ Toggle word wrap - + true - &Definitions + &Vocabulary Toggle definitions @@ -444,15 +474,23 @@ &Feedback... + + + true + + + &Kanji + + - actionToggleDefinitions + actionToggleVocabulary toggled(bool) - dockDefinitions + dockVocab setVisible(bool) @@ -497,5 +535,21 @@ + + actionToggleKanji + toggled(bool) + dockKanji + setVisible(bool) + + + 786 + 591 + + + 762 + 479 + + + diff --git a/yomi_base/gen/about_ui.py b/yomi_base/gen/about_ui.py index 46085c1..08d0f97 100644 --- a/yomi_base/gen/about_ui.py +++ b/yomi_base/gen/about_ui.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'ui/about.ui' # -# Created: Mon Feb 4 19:14:32 2013 -# by: PyQt4 UI code generator 4.9.6 +# Created: Sun Nov 10 10:14:42 2013 +# by: PyQt4 UI code generator 4.10 # # WARNING! All changes made in this file will be lost! @@ -26,19 +26,16 @@ except AttributeError: class Ui_DialogAbout(object): def setupUi(self, DialogAbout): DialogAbout.setObjectName(_fromUtf8("DialogAbout")) - DialogAbout.resize(650, 400) - self.horizontalLayout = QtGui.QHBoxLayout(DialogAbout) - self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout")) - self.verticalLayout_2 = QtGui.QVBoxLayout() + DialogAbout.resize(500, 400) + self.verticalLayout_2 = QtGui.QVBoxLayout(DialogAbout) self.verticalLayout_2.setObjectName(_fromUtf8("verticalLayout_2")) + self.horizontalLayout = QtGui.QHBoxLayout() + self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout")) self.label = QtGui.QLabel(DialogAbout) self.label.setText(_fromUtf8("")) self.label.setPixmap(QtGui.QPixmap(_fromUtf8(":/img/img/icon_logo_64.png"))) self.label.setObjectName(_fromUtf8("label")) - self.verticalLayout_2.addWidget(self.label) - spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.verticalLayout_2.addItem(spacerItem) - self.horizontalLayout.addLayout(self.verticalLayout_2) + self.horizontalLayout.addWidget(self.label) self.verticalLayout = QtGui.QVBoxLayout() self.verticalLayout.setObjectName(_fromUtf8("verticalLayout")) self.labelVersion = QtGui.QLabel(DialogAbout) @@ -51,37 +48,41 @@ class Ui_DialogAbout(object): self.label_4.setOpenExternalLinks(True) self.label_4.setObjectName(_fromUtf8("label_4")) self.verticalLayout.addWidget(self.label_4) + self.horizontalLayout.addLayout(self.verticalLayout) + spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout.addItem(spacerItem) + self.verticalLayout_2.addLayout(self.horizontalLayout) self.line = QtGui.QFrame(DialogAbout) self.line.setFrameShape(QtGui.QFrame.HLine) self.line.setFrameShadow(QtGui.QFrame.Sunken) self.line.setObjectName(_fromUtf8("line")) - self.verticalLayout.addWidget(self.line) + self.verticalLayout_2.addWidget(self.line) self.label_6 = QtGui.QLabel(DialogAbout) self.label_6.setWordWrap(True) self.label_6.setOpenExternalLinks(True) self.label_6.setObjectName(_fromUtf8("label_6")) - self.verticalLayout.addWidget(self.label_6) + self.verticalLayout_2.addWidget(self.label_6) self.label_7 = QtGui.QLabel(DialogAbout) self.label_7.setWordWrap(True) self.label_7.setOpenExternalLinks(True) self.label_7.setObjectName(_fromUtf8("label_7")) - self.verticalLayout.addWidget(self.label_7) + self.verticalLayout_2.addWidget(self.label_7) self.label_5 = QtGui.QLabel(DialogAbout) self.label_5.setWordWrap(True) self.label_5.setOpenExternalLinks(True) self.label_5.setObjectName(_fromUtf8("label_5")) - self.verticalLayout.addWidget(self.label_5) + self.verticalLayout_2.addWidget(self.label_5) self.plainTextEdit = QtGui.QPlainTextEdit(DialogAbout) + self.plainTextEdit.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff) self.plainTextEdit.setLineWrapMode(QtGui.QPlainTextEdit.NoWrap) self.plainTextEdit.setReadOnly(True) self.plainTextEdit.setObjectName(_fromUtf8("plainTextEdit")) - self.verticalLayout.addWidget(self.plainTextEdit) + self.verticalLayout_2.addWidget(self.plainTextEdit) self.buttonBox = QtGui.QDialogButtonBox(DialogAbout) self.buttonBox.setOrientation(QtCore.Qt.Horizontal) self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Ok) self.buttonBox.setObjectName(_fromUtf8("buttonBox")) - self.verticalLayout.addWidget(self.buttonBox) - self.horizontalLayout.addLayout(self.verticalLayout) + self.verticalLayout_2.addWidget(self.buttonBox) self.retranslateUi(DialogAbout) QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("accepted()")), DialogAbout.accept) @@ -91,7 +92,7 @@ class Ui_DialogAbout(object): def retranslateUi(self, DialogAbout): DialogAbout.setWindowTitle(_translate("DialogAbout", "About", None)) self.labelVersion.setText(_translate("DialogAbout", "Yomichan {0}", None)) - self.label_3.setText(_translate("DialogAbout", "(c) 2012 by Alex Yatskov", None)) + self.label_3.setText(_translate("DialogAbout", "(c) 2013 by Alex Yatskov", None)) self.label_4.setText(_translate("DialogAbout", "http://foosoft.net/yomichan", None)) self.label_6.setText(_translate("DialogAbout", "This software uses the Silk web icon set created by Mark James.", None)) self.label_7.setText(_translate("DialogAbout", "Portions of this application\'s code and data are based on the Rikaichan extension developed by Jonathan Zarate.", None)) diff --git a/yomi_base/gen/preferences_ui.py b/yomi_base/gen/preferences_ui.py index a13c7be..fc4785a 100644 --- a/yomi_base/gen/preferences_ui.py +++ b/yomi_base/gen/preferences_ui.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'ui/preferences.ui' # -# Created: Mon Feb 4 19:14:33 2013 -# by: PyQt4 UI code generator 4.9.6 +# Created: Sun Nov 10 10:14:42 2013 +# by: PyQt4 UI code generator 4.10 # # WARNING! All changes made in this file will be lost! @@ -33,19 +33,29 @@ class Ui_DialogPreferences(object): self.tabWidget.setObjectName(_fromUtf8("tabWidget")) self.tabGeneral = QtGui.QWidget() self.tabGeneral.setObjectName(_fromUtf8("tabGeneral")) - self.verticalLayout_4 = QtGui.QVBoxLayout(self.tabGeneral) - self.verticalLayout_4.setObjectName(_fromUtf8("verticalLayout_4")) - self.checkGeneralRecentLoad = QtGui.QCheckBox(self.tabGeneral) - self.checkGeneralRecentLoad.setObjectName(_fromUtf8("checkGeneralRecentLoad")) - self.verticalLayout_4.addWidget(self.checkGeneralRecentLoad) - self.checkGeneralReadingsStrip = QtGui.QCheckBox(self.tabGeneral) - self.checkGeneralReadingsStrip.setObjectName(_fromUtf8("checkGeneralReadingsStrip")) - self.verticalLayout_4.addWidget(self.checkGeneralReadingsStrip) - self.checkGeneralFindUpdates = QtGui.QCheckBox(self.tabGeneral) - self.checkGeneralFindUpdates.setObjectName(_fromUtf8("checkGeneralFindUpdates")) - self.verticalLayout_4.addWidget(self.checkGeneralFindUpdates) - spacerItem = QtGui.QSpacerItem(20, 139, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.verticalLayout_4.addItem(spacerItem) + self.formLayout_2 = QtGui.QFormLayout(self.tabGeneral) + self.formLayout_2.setObjectName(_fromUtf8("formLayout_2")) + self.checkLoadRecentFile = QtGui.QCheckBox(self.tabGeneral) + self.checkLoadRecentFile.setObjectName(_fromUtf8("checkLoadRecentFile")) + self.formLayout_2.setWidget(0, QtGui.QFormLayout.SpanningRole, self.checkLoadRecentFile) + self.checkStripReadings = QtGui.QCheckBox(self.tabGeneral) + self.checkStripReadings.setObjectName(_fromUtf8("checkStripReadings")) + self.formLayout_2.setWidget(1, QtGui.QFormLayout.SpanningRole, self.checkStripReadings) + self.checkCheckForUpdates = QtGui.QCheckBox(self.tabGeneral) + self.checkCheckForUpdates.setObjectName(_fromUtf8("checkCheckForUpdates")) + self.formLayout_2.setWidget(2, QtGui.QFormLayout.SpanningRole, self.checkCheckForUpdates) + self.label_14 = QtGui.QLabel(self.tabGeneral) + self.label_14.setObjectName(_fromUtf8("label_14")) + self.formLayout_2.setWidget(3, QtGui.QFormLayout.LabelRole, self.label_14) + self.spinMaxScanLength = QtGui.QSpinBox(self.tabGeneral) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.spinMaxScanLength.sizePolicy().hasHeightForWidth()) + self.spinMaxScanLength.setSizePolicy(sizePolicy) + self.spinMaxScanLength.setMinimum(1) + self.spinMaxScanLength.setObjectName(_fromUtf8("spinMaxScanLength")) + self.formLayout_2.setWidget(3, QtGui.QFormLayout.FieldRole, self.spinMaxScanLength) self.tabWidget.addTab(self.tabGeneral, _fromUtf8("")) self.tabAppearance = QtGui.QWidget() self.tabAppearance.setObjectName(_fromUtf8("tabAppearance")) @@ -53,149 +63,92 @@ class Ui_DialogPreferences(object): self.verticalLayout_3.setObjectName(_fromUtf8("verticalLayout_3")) self.horizontalLayout = QtGui.QHBoxLayout() self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout")) - self.comboContentFontFamily = QtGui.QFontComboBox(self.tabAppearance) - self.comboContentFontFamily.setObjectName(_fromUtf8("comboContentFontFamily")) - self.horizontalLayout.addWidget(self.comboContentFontFamily) - self.spinContentFontSize = QtGui.QSpinBox(self.tabAppearance) - self.spinContentFontSize.setMinimum(1) - self.spinContentFontSize.setMaximum(72) - self.spinContentFontSize.setProperty("value", 12) - self.spinContentFontSize.setObjectName(_fromUtf8("spinContentFontSize")) - self.horizontalLayout.addWidget(self.spinContentFontSize) - self.buttonContentColorFg = QtGui.QPushButton(self.tabAppearance) - self.buttonContentColorFg.setObjectName(_fromUtf8("buttonContentColorFg")) - self.horizontalLayout.addWidget(self.buttonContentColorFg) - self.buttonContentColorBg = QtGui.QPushButton(self.tabAppearance) - self.buttonContentColorBg.setObjectName(_fromUtf8("buttonContentColorBg")) - self.horizontalLayout.addWidget(self.buttonContentColorBg) + self.comboFontFamily = QtGui.QFontComboBox(self.tabAppearance) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.comboFontFamily.sizePolicy().hasHeightForWidth()) + self.comboFontFamily.setSizePolicy(sizePolicy) + self.comboFontFamily.setObjectName(_fromUtf8("comboFontFamily")) + self.horizontalLayout.addWidget(self.comboFontFamily) + self.spinFontSize = QtGui.QSpinBox(self.tabAppearance) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.spinFontSize.sizePolicy().hasHeightForWidth()) + self.spinFontSize.setSizePolicy(sizePolicy) + self.spinFontSize.setMinimum(1) + self.spinFontSize.setMaximum(72) + self.spinFontSize.setProperty("value", 12) + self.spinFontSize.setObjectName(_fromUtf8("spinFontSize")) + self.horizontalLayout.addWidget(self.spinFontSize) + self.buttonColorFg = QtGui.QPushButton(self.tabAppearance) + self.buttonColorFg.setObjectName(_fromUtf8("buttonColorFg")) + self.horizontalLayout.addWidget(self.buttonColorFg) + self.buttonColorBg = QtGui.QPushButton(self.tabAppearance) + self.buttonColorBg.setObjectName(_fromUtf8("buttonColorBg")) + self.horizontalLayout.addWidget(self.buttonColorBg) self.verticalLayout_3.addLayout(self.horizontalLayout) - self.textContentSample = QtGui.QPlainTextEdit(self.tabAppearance) - self.textContentSample.setObjectName(_fromUtf8("textContentSample")) - self.verticalLayout_3.addWidget(self.textContentSample) + self.textSample = QtGui.QPlainTextEdit(self.tabAppearance) + self.textSample.setObjectName(_fromUtf8("textSample")) + self.verticalLayout_3.addWidget(self.textSample) self.tabWidget.addTab(self.tabAppearance, _fromUtf8("")) - self.tabSearch = QtGui.QWidget() - self.tabSearch.setObjectName(_fromUtf8("tabSearch")) - self.horizontalLayout_2 = QtGui.QHBoxLayout(self.tabSearch) - self.horizontalLayout_2.setObjectName(_fromUtf8("horizontalLayout_2")) - self.formLayout = QtGui.QFormLayout() - self.formLayout.setObjectName(_fromUtf8("formLayout")) - self.label_5 = QtGui.QLabel(self.tabSearch) - self.label_5.setObjectName(_fromUtf8("label_5")) - self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.label_5) - self.spinSearchScanMax = QtGui.QSpinBox(self.tabSearch) - self.spinSearchScanMax.setMinimum(1) - self.spinSearchScanMax.setObjectName(_fromUtf8("spinSearchScanMax")) - self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.spinSearchScanMax) - self.label_6 = QtGui.QLabel(self.tabSearch) - self.label_6.setObjectName(_fromUtf8("label_6")) - self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.label_6) - self.spinSearchResultMax = QtGui.QSpinBox(self.tabSearch) - self.spinSearchResultMax.setMinimum(1) - self.spinSearchResultMax.setObjectName(_fromUtf8("spinSearchResultMax")) - self.formLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.spinSearchResultMax) - self.checkSearchGroupByExp = QtGui.QCheckBox(self.tabSearch) - self.checkSearchGroupByExp.setObjectName(_fromUtf8("checkSearchGroupByExp")) - self.formLayout.setWidget(2, QtGui.QFormLayout.SpanningRole, self.checkSearchGroupByExp) - self.horizontalLayout_2.addLayout(self.formLayout) - spacerItem1 = QtGui.QSpacerItem(423, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_2.addItem(spacerItem1) - self.tabWidget.addTab(self.tabSearch, _fromUtf8("")) self.tabAnki = QtGui.QWidget() self.tabAnki.setObjectName(_fromUtf8("tabAnki")) - self.verticalLayout_5 = QtGui.QVBoxLayout(self.tabAnki) - self.verticalLayout_5.setObjectName(_fromUtf8("verticalLayout_5")) - self.horizontalLayout_4 = QtGui.QHBoxLayout() - self.horizontalLayout_4.setObjectName(_fromUtf8("horizontalLayout_4")) - self.label_13 = QtGui.QLabel(self.tabAnki) - self.label_13.setObjectName(_fromUtf8("label_13")) - self.horizontalLayout_4.addWidget(self.label_13) - self.comboBoxAnkiDeck = QtGui.QComboBox(self.tabAnki) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.comboBoxAnkiDeck.sizePolicy().hasHeightForWidth()) - self.comboBoxAnkiDeck.setSizePolicy(sizePolicy) - self.comboBoxAnkiDeck.setObjectName(_fromUtf8("comboBoxAnkiDeck")) - self.horizontalLayout_4.addWidget(self.comboBoxAnkiDeck) - self.label_12 = QtGui.QLabel(self.tabAnki) - self.label_12.setObjectName(_fromUtf8("label_12")) - self.horizontalLayout_4.addWidget(self.label_12) - self.comboBoxAnkiModel = QtGui.QComboBox(self.tabAnki) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.comboBoxAnkiModel.sizePolicy().hasHeightForWidth()) - self.comboBoxAnkiModel.setSizePolicy(sizePolicy) - self.comboBoxAnkiModel.setObjectName(_fromUtf8("comboBoxAnkiModel")) - self.horizontalLayout_4.addWidget(self.comboBoxAnkiModel) - self.verticalLayout_5.addLayout(self.horizontalLayout_4) - self.label_11 = QtGui.QLabel(self.tabAnki) - self.label_11.setObjectName(_fromUtf8("label_11")) - self.verticalLayout_5.addWidget(self.label_11) + self.verticalLayout_2 = QtGui.QVBoxLayout(self.tabAnki) + self.verticalLayout_2.setObjectName(_fromUtf8("verticalLayout_2")) self.horizontalLayout_3 = QtGui.QHBoxLayout() self.horizontalLayout_3.setObjectName(_fromUtf8("horizontalLayout_3")) - self.tableAnkiFields = QtGui.QTableWidget(self.tabAnki) - self.tableAnkiFields.setObjectName(_fromUtf8("tableAnkiFields")) - self.tableAnkiFields.setColumnCount(2) - self.tableAnkiFields.setRowCount(0) + self.label_13 = QtGui.QLabel(self.tabAnki) + self.label_13.setObjectName(_fromUtf8("label_13")) + self.horizontalLayout_3.addWidget(self.label_13) + self.comboBoxDeck = QtGui.QComboBox(self.tabAnki) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.comboBoxDeck.sizePolicy().hasHeightForWidth()) + self.comboBoxDeck.setSizePolicy(sizePolicy) + self.comboBoxDeck.setObjectName(_fromUtf8("comboBoxDeck")) + self.horizontalLayout_3.addWidget(self.comboBoxDeck) + self.label_12 = QtGui.QLabel(self.tabAnki) + self.label_12.setObjectName(_fromUtf8("label_12")) + self.horizontalLayout_3.addWidget(self.label_12) + self.comboBoxModel = QtGui.QComboBox(self.tabAnki) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.comboBoxModel.sizePolicy().hasHeightForWidth()) + self.comboBoxModel.setSizePolicy(sizePolicy) + self.comboBoxModel.setObjectName(_fromUtf8("comboBoxModel")) + self.horizontalLayout_3.addWidget(self.comboBoxModel) + self.verticalLayout_2.addLayout(self.horizontalLayout_3) + self.label_11 = QtGui.QLabel(self.tabAnki) + self.label_11.setObjectName(_fromUtf8("label_11")) + self.verticalLayout_2.addWidget(self.label_11) + self.tableFields = QtGui.QTableWidget(self.tabAnki) + self.tableFields.setObjectName(_fromUtf8("tableFields")) + self.tableFields.setColumnCount(2) + self.tableFields.setRowCount(0) item = QtGui.QTableWidgetItem() - self.tableAnkiFields.setHorizontalHeaderItem(0, item) + self.tableFields.setHorizontalHeaderItem(0, item) item = QtGui.QTableWidgetItem() - self.tableAnkiFields.setHorizontalHeaderItem(1, item) - self.horizontalLayout_3.addWidget(self.tableAnkiFields) - self.verticalLayout_2 = QtGui.QVBoxLayout() - self.verticalLayout_2.setObjectName(_fromUtf8("verticalLayout_2")) - self.gridLayout = QtGui.QGridLayout() - self.gridLayout.setObjectName(_fromUtf8("gridLayout")) - self.label_7 = QtGui.QLabel(self.tabAnki) - self.label_7.setObjectName(_fromUtf8("label_7")) - self.gridLayout.addWidget(self.label_7, 0, 1, 1, 1) - self.label_2 = QtGui.QLabel(self.tabAnki) - font = QtGui.QFont() - font.setBold(True) - font.setWeight(75) - self.label_2.setFont(font) - self.label_2.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) - self.label_2.setObjectName(_fromUtf8("label_2")) - self.gridLayout.addWidget(self.label_2, 1, 0, 1, 1) - self.label_3 = QtGui.QLabel(self.tabAnki) - font = QtGui.QFont() - font.setBold(True) - font.setWeight(75) - self.label_3.setFont(font) - self.label_3.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) - self.label_3.setObjectName(_fromUtf8("label_3")) - self.gridLayout.addWidget(self.label_3, 2, 0, 1, 1) - self.label_9 = QtGui.QLabel(self.tabAnki) - self.label_9.setObjectName(_fromUtf8("label_9")) - self.gridLayout.addWidget(self.label_9, 2, 1, 1, 1) - self.label_4 = QtGui.QLabel(self.tabAnki) - font = QtGui.QFont() - font.setBold(True) - font.setWeight(75) - self.label_4.setFont(font) - self.label_4.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) - self.label_4.setObjectName(_fromUtf8("label_4")) - self.gridLayout.addWidget(self.label_4, 3, 0, 1, 1) - self.label_10 = QtGui.QLabel(self.tabAnki) - self.label_10.setObjectName(_fromUtf8("label_10")) - self.gridLayout.addWidget(self.label_10, 3, 1, 1, 1) - self.label_8 = QtGui.QLabel(self.tabAnki) - self.label_8.setObjectName(_fromUtf8("label_8")) - self.gridLayout.addWidget(self.label_8, 1, 1, 1, 1) + self.tableFields.setHorizontalHeaderItem(1, item) + self.verticalLayout_2.addWidget(self.tableFields) + self.horizontalLayout_2 = QtGui.QHBoxLayout() + self.horizontalLayout_2.setObjectName(_fromUtf8("horizontalLayout_2")) self.label = QtGui.QLabel(self.tabAnki) - font = QtGui.QFont() - font.setBold(True) - font.setWeight(75) - self.label.setFont(font) - self.label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) self.label.setObjectName(_fromUtf8("label")) - self.gridLayout.addWidget(self.label, 0, 0, 1, 1) - self.verticalLayout_2.addLayout(self.gridLayout) - spacerItem2 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.verticalLayout_2.addItem(spacerItem2) - self.horizontalLayout_3.addLayout(self.verticalLayout_2) - self.verticalLayout_5.addLayout(self.horizontalLayout_3) + self.horizontalLayout_2.addWidget(self.label) + self.radioButtonSettingsVocab = QtGui.QRadioButton(self.tabAnki) + self.radioButtonSettingsVocab.setChecked(True) + self.radioButtonSettingsVocab.setObjectName(_fromUtf8("radioButtonSettingsVocab")) + self.horizontalLayout_2.addWidget(self.radioButtonSettingsVocab) + self.radioButtonSettingsKanji = QtGui.QRadioButton(self.tabAnki) + self.radioButtonSettingsKanji.setObjectName(_fromUtf8("radioButtonSettingsKanji")) + self.horizontalLayout_2.addWidget(self.radioButtonSettingsKanji) + spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_2.addItem(spacerItem) + self.verticalLayout_2.addLayout(self.horizontalLayout_2) self.tabWidget.addTab(self.tabAnki, _fromUtf8("")) self.verticalLayout.addWidget(self.tabWidget) self.buttonBox = QtGui.QDialogButtonBox(DialogPreferences) @@ -212,33 +165,25 @@ class Ui_DialogPreferences(object): def retranslateUi(self, DialogPreferences): DialogPreferences.setWindowTitle(_translate("DialogPreferences", "Preferences", None)) - self.checkGeneralRecentLoad.setText(_translate("DialogPreferences", "Load recent file on startup", None)) - self.checkGeneralReadingsStrip.setText(_translate("DialogPreferences", "Strip readings in from loaded files", None)) - self.checkGeneralFindUpdates.setText(_translate("DialogPreferences", "Check for updates on startup", None)) + self.checkLoadRecentFile.setText(_translate("DialogPreferences", "Load recent file on startup", None)) + self.checkStripReadings.setText(_translate("DialogPreferences", "Strip readings from loaded files", None)) + self.checkCheckForUpdates.setText(_translate("DialogPreferences", "Check for updates on startup", None)) + self.label_14.setText(_translate("DialogPreferences", "Maximum scan length", None)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabGeneral), _translate("DialogPreferences", "General", None)) - self.buttonContentColorFg.setText(_translate("DialogPreferences", "Foreground...", None)) - self.buttonContentColorBg.setText(_translate("DialogPreferences", "Background...", None)) - self.textContentSample.setPlainText(_translate("DialogPreferences", "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam accumsan nisi a leo faucibus ut varius velit fringilla. Cras hendrerit eleifend porttitor. Quisque eu elit quis tellus hendrerit ornare et ac tellus. Nunc id felis ut sapien blandit viverra vel ac est. Ut erat lorem, rutrum at scelerisque sollicitudin, lacinia quis diam. Suspendisse potenti. Integer id justo ac ligula aliquet mattis. Etiam malesuada faucibus risus, vel hendrerit elit consectetur quis. Etiam consectetur ipsum ut odio feugiat suscipit. Etiam a tellus metus. ", None)) + self.buttonColorFg.setText(_translate("DialogPreferences", "Foreground...", None)) + self.buttonColorBg.setText(_translate("DialogPreferences", "Background...", None)) + self.textSample.setPlainText(_translate("DialogPreferences", "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam accumsan nisi a leo faucibus ut varius velit fringilla. Cras hendrerit eleifend porttitor. Quisque eu elit quis tellus hendrerit ornare et ac tellus. Nunc id felis ut sapien blandit viverra vel ac est. Ut erat lorem, rutrum at scelerisque sollicitudin, lacinia quis diam. Suspendisse potenti. Integer id justo ac ligula aliquet mattis. Etiam malesuada faucibus risus, vel hendrerit elit consectetur quis. Etiam consectetur ipsum ut odio feugiat suscipit. Etiam a tellus metus. ", None)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabAppearance), _translate("DialogPreferences", "Appearance", None)) - self.label_5.setText(_translate("DialogPreferences", "Maximum scan length", None)) - self.label_6.setText(_translate("DialogPreferences", "Maximum result count", None)) - self.checkSearchGroupByExp.setText(_translate("DialogPreferences", "Group results by expression", None)) - self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabSearch), _translate("DialogPreferences", "Search", None)) self.label_13.setText(_translate("DialogPreferences", "Deck", None)) self.label_12.setText(_translate("DialogPreferences", "Model", None)) - self.label_11.setText(_translate("DialogPreferences", "Specify how your model fields are populated when adding facts", None)) - item = self.tableAnkiFields.horizontalHeaderItem(0) + self.label_11.setText(_translate("DialogPreferences", "

Specify how your model fields are populated when adding facts.
Allowed tags: {expression}, {reading}, {glossary} and {sentence}

", None)) + item = self.tableFields.horizontalHeaderItem(0) item.setText(_translate("DialogPreferences", "Field", None)) - item = self.tableAnkiFields.horizontalHeaderItem(1) + item = self.tableFields.horizontalHeaderItem(1) item.setText(_translate("DialogPreferences", "Value", None)) - self.label_7.setText(_translate("DialogPreferences", "%e", None)) - self.label_2.setText(_translate("DialogPreferences", "Reading", None)) - self.label_3.setText(_translate("DialogPreferences", "Glossary", None)) - self.label_9.setText(_translate("DialogPreferences", "%g", None)) - self.label_4.setText(_translate("DialogPreferences", "Sentence", None)) - self.label_10.setText(_translate("DialogPreferences", "%s", None)) - self.label_8.setText(_translate("DialogPreferences", "%r", None)) - self.label.setText(_translate("DialogPreferences", "Expression", None)) + self.label.setText(_translate("DialogPreferences", "Show settings for", None)) + self.radioButtonSettingsVocab.setText(_translate("DialogPreferences", "Vocabulary", None)) + self.radioButtonSettingsKanji.setText(_translate("DialogPreferences", "Kanji", None)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabAnki), _translate("DialogPreferences", "Anki", None)) import resources_rc diff --git a/yomi_base/gen/reader_ui.py b/yomi_base/gen/reader_ui.py index 2ec782f..4aa80e1 100644 --- a/yomi_base/gen/reader_ui.py +++ b/yomi_base/gen/reader_ui.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'ui/reader.ui' # -# Created: Mon Feb 4 19:14:33 2013 -# by: PyQt4 UI code generator 4.9.6 +# Created: Sun Nov 10 10:14:42 2013 +# by: PyQt4 UI code generator 4.10 # # WARNING! All changes made in this file will be lost! @@ -33,13 +33,13 @@ class Ui_MainWindowReader(object): MainWindowReader.setWindowIcon(icon) self.centralwidget = QtGui.QWidget(MainWindowReader) self.centralwidget.setObjectName(_fromUtf8("centralwidget")) - self.horizontalLayout = QtGui.QHBoxLayout(self.centralwidget) - self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout")) + self.verticalLayout_4 = QtGui.QVBoxLayout(self.centralwidget) + self.verticalLayout_4.setObjectName(_fromUtf8("verticalLayout_4")) self.textContent = QtGui.QPlainTextEdit(self.centralwidget) self.textContent.setMouseTracking(True) self.textContent.setReadOnly(True) self.textContent.setObjectName(_fromUtf8("textContent")) - self.horizontalLayout.addWidget(self.textContent) + self.verticalLayout_4.addWidget(self.textContent) MainWindowReader.setCentralWidget(self.centralwidget) self.menubar = QtGui.QMenuBar(MainWindowReader) self.menubar.setGeometry(QtCore.QRect(0, 0, 900, 25)) @@ -64,8 +64,8 @@ class Ui_MainWindowReader(object): self.toolBar.setIconSize(QtCore.QSize(16, 16)) self.toolBar.setObjectName(_fromUtf8("toolBar")) MainWindowReader.addToolBar(QtCore.Qt.TopToolBarArea, self.toolBar) - self.dockDefinitions = QtGui.QDockWidget(MainWindowReader) - self.dockDefinitions.setObjectName(_fromUtf8("dockDefinitions")) + self.dockVocab = QtGui.QDockWidget(MainWindowReader) + self.dockVocab.setObjectName(_fromUtf8("dockVocab")) self.dockWidgetContents = QtGui.QWidget() self.dockWidgetContents.setObjectName(_fromUtf8("dockWidgetContents")) self.verticalLayout = QtGui.QVBoxLayout(self.dockWidgetContents) @@ -80,12 +80,12 @@ class Ui_MainWindowReader(object): self.label = QtGui.QLabel(self.dockWidgetContents) self.label.setObjectName(_fromUtf8("label")) self.horizontalLayout_3.addWidget(self.label) - self.textDefinitionSearch = QtGui.QLineEdit(self.dockWidgetContents) - self.textDefinitionSearch.setObjectName(_fromUtf8("textDefinitionSearch")) - self.horizontalLayout_3.addWidget(self.textDefinitionSearch) + self.textVocabSearch = QtGui.QLineEdit(self.dockWidgetContents) + self.textVocabSearch.setObjectName(_fromUtf8("textVocabSearch")) + self.horizontalLayout_3.addWidget(self.textVocabSearch) self.verticalLayout.addLayout(self.horizontalLayout_3) - self.dockDefinitions.setWidget(self.dockWidgetContents) - MainWindowReader.addDockWidget(QtCore.Qt.DockWidgetArea(2), self.dockDefinitions) + self.dockVocab.setWidget(self.dockWidgetContents) + MainWindowReader.addDockWidget(QtCore.Qt.DockWidgetArea(2), self.dockVocab) self.statusBar = QtGui.QStatusBar(MainWindowReader) self.statusBar.setObjectName(_fromUtf8("statusBar")) MainWindowReader.setStatusBar(self.statusBar) @@ -115,6 +115,26 @@ class Ui_MainWindowReader(object): self.verticalLayout_2.addLayout(self.horizontalLayout_2) self.dockAnki.setWidget(self.dockWidgetContents_2) MainWindowReader.addDockWidget(QtCore.Qt.DockWidgetArea(1), self.dockAnki) + self.dockKanji = QtGui.QDockWidget(MainWindowReader) + self.dockKanji.setObjectName(_fromUtf8("dockKanji")) + self.dockWidgetContents_3 = QtGui.QWidget() + self.dockWidgetContents_3.setObjectName(_fromUtf8("dockWidgetContents_3")) + self.verticalLayout_3 = QtGui.QVBoxLayout(self.dockWidgetContents_3) + self.verticalLayout_3.setObjectName(_fromUtf8("verticalLayout_3")) + self.textBrowser = QtGui.QTextBrowser(self.dockWidgetContents_3) + self.textBrowser.setObjectName(_fromUtf8("textBrowser")) + self.verticalLayout_3.addWidget(self.textBrowser) + self.horizontalLayout_4 = QtGui.QHBoxLayout() + self.horizontalLayout_4.setObjectName(_fromUtf8("horizontalLayout_4")) + self.label_2 = QtGui.QLabel(self.dockWidgetContents_3) + self.label_2.setObjectName(_fromUtf8("label_2")) + self.horizontalLayout_4.addWidget(self.label_2) + self.textKanjiSearch = QtGui.QLineEdit(self.dockWidgetContents_3) + self.textKanjiSearch.setObjectName(_fromUtf8("textKanjiSearch")) + self.horizontalLayout_4.addWidget(self.textKanjiSearch) + self.verticalLayout_3.addLayout(self.horizontalLayout_4) + self.dockKanji.setWidget(self.dockWidgetContents_3) + MainWindowReader.addDockWidget(QtCore.Qt.DockWidgetArea(2), self.dockKanji) self.actionOpen = QtGui.QAction(MainWindowReader) icon1 = QtGui.QIcon() icon1.addPixmap(QtGui.QPixmap(_fromUtf8(":/img/img/icon_action_open.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off) @@ -169,9 +189,9 @@ class Ui_MainWindowReader(object): self.actionToggleWrap.setCheckable(True) self.actionToggleWrap.setChecked(True) self.actionToggleWrap.setObjectName(_fromUtf8("actionToggleWrap")) - self.actionToggleDefinitions = QtGui.QAction(MainWindowReader) - self.actionToggleDefinitions.setCheckable(True) - self.actionToggleDefinitions.setObjectName(_fromUtf8("actionToggleDefinitions")) + self.actionToggleVocabulary = QtGui.QAction(MainWindowReader) + self.actionToggleVocabulary.setCheckable(True) + self.actionToggleVocabulary.setObjectName(_fromUtf8("actionToggleVocabulary")) self.actionCopyDefinition = QtGui.QAction(MainWindowReader) icon9 = QtGui.QIcon() icon9.addPixmap(QtGui.QPixmap(_fromUtf8(":/img/img/icon_copy_definition.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off) @@ -196,6 +216,9 @@ class Ui_MainWindowReader(object): icon11.addPixmap(QtGui.QPixmap(_fromUtf8(":/img/img/icon_action_feedback.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.actionFeedback.setIcon(icon11) self.actionFeedback.setObjectName(_fromUtf8("actionFeedback")) + self.actionToggleKanji = QtGui.QAction(MainWindowReader) + self.actionToggleKanji.setCheckable(True) + self.actionToggleKanji.setObjectName(_fromUtf8("actionToggleKanji")) self.menuFile.addAction(self.actionOpen) self.menuFile.addAction(self.menuOpenArchive.menuAction()) self.menuFile.addAction(self.menuOpenRecent.menuAction()) @@ -219,8 +242,9 @@ class Ui_MainWindowReader(object): self.menuTextSize.addAction(self.actionZoomReset) self.menuView.addAction(self.menuTextSize.menuAction()) self.menuView.addSeparator() - self.menuView.addAction(self.actionToggleDefinitions) self.menuView.addAction(self.actionToggleAnki) + self.menuView.addAction(self.actionToggleVocabulary) + self.menuView.addAction(self.actionToggleKanji) self.menuView.addSeparator() self.menuView.addAction(self.actionToggleWrap) self.menubar.addAction(self.menuFile.menuAction()) @@ -236,9 +260,10 @@ class Ui_MainWindowReader(object): self.toolBar.addAction(self.actionFind) self.retranslateUi(MainWindowReader) - QtCore.QObject.connect(self.actionToggleDefinitions, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.dockDefinitions.setVisible) + QtCore.QObject.connect(self.actionToggleVocabulary, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.dockVocab.setVisible) QtCore.QObject.connect(self.actionQuit, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWindowReader.close) QtCore.QObject.connect(self.actionToggleAnki, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.dockAnki.setVisible) + QtCore.QObject.connect(self.actionToggleKanji, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.dockKanji.setVisible) QtCore.QMetaObject.connectSlotsByName(MainWindowReader) def retranslateUi(self, MainWindowReader): @@ -251,10 +276,12 @@ class Ui_MainWindowReader(object): self.menuView.setTitle(_translate("MainWindowReader", "&View", None)) self.menuTextSize.setTitle(_translate("MainWindowReader", "&Zoom", None)) self.toolBar.setWindowTitle(_translate("MainWindowReader", "toolBar", None)) - self.dockDefinitions.setWindowTitle(_translate("MainWindowReader", "Definitions", None)) + self.dockVocab.setWindowTitle(_translate("MainWindowReader", "Vocabulary", None)) self.label.setText(_translate("MainWindowReader", "Search", None)) self.dockAnki.setWindowTitle(_translate("MainWindowReader", "Anki", None)) self.label_3.setText(_translate("MainWindowReader", "Active tag(s)", None)) + self.dockKanji.setWindowTitle(_translate("MainWindowReader", "Kanji", None)) + self.label_2.setText(_translate("MainWindowReader", "Search", None)) self.actionOpen.setText(_translate("MainWindowReader", "&Open...", None)) self.actionOpen.setToolTip(_translate("MainWindowReader", "Open file", None)) self.actionOpen.setShortcut(_translate("MainWindowReader", "Ctrl+O", None)) @@ -281,8 +308,8 @@ class Ui_MainWindowReader(object): self.actionFindNext.setShortcut(_translate("MainWindowReader", "F3", None)) self.actionToggleWrap.setText(_translate("MainWindowReader", "&Word wrap", None)) self.actionToggleWrap.setToolTip(_translate("MainWindowReader", "Toggle word wrap", None)) - self.actionToggleDefinitions.setText(_translate("MainWindowReader", "&Definitions", None)) - self.actionToggleDefinitions.setToolTip(_translate("MainWindowReader", "Toggle definitions", None)) + self.actionToggleVocabulary.setText(_translate("MainWindowReader", "&Vocabulary", None)) + self.actionToggleVocabulary.setToolTip(_translate("MainWindowReader", "Toggle definitions", None)) self.actionCopyDefinition.setText(_translate("MainWindowReader", "Copy &definition", None)) self.actionCopyDefinition.setShortcut(_translate("MainWindowReader", "Ctrl+D", None)) self.actionCopyAllDefinitions.setText(_translate("MainWindowReader", "Copy &all definitions", None)) @@ -292,5 +319,6 @@ class Ui_MainWindowReader(object): self.actionCopySentence.setText(_translate("MainWindowReader", "Copy sen&tence", None)) self.actionCopySentence.setShortcut(_translate("MainWindowReader", "Ctrl+T", None)) self.actionFeedback.setText(_translate("MainWindowReader", "&Feedback...", None)) + self.actionToggleKanji.setText(_translate("MainWindowReader", "&Kanji", None)) import resources_rc diff --git a/yomi_base/gen/resources_rc.py b/yomi_base/gen/resources_rc.py index c9b3b3c..fff3732 100644 --- a/yomi_base/gen/resources_rc.py +++ b/yomi_base/gen/resources_rc.py @@ -2,7 +2,7 @@ # Resource object code # -# Created: Mon Feb 4 19:14:33 2013 +# Created: Sun Nov 10 10:14:42 2013 # by: The Resource Compiler for PyQt (Qt v4.8.4) # # WARNING! All changes made in this file will be lost!