diff --git a/src/calibre/gui2/dialogs/config.py b/src/calibre/gui2/dialogs/config.py index a7b9ef004c..f94706e7cc 100644 --- a/src/calibre/gui2/dialogs/config.py +++ b/src/calibre/gui2/dialogs/config.py @@ -2,7 +2,7 @@ __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal ' import os -from PyQt4.QtGui import QDialog, QMessageBox, QListWidgetItem +from PyQt4.QtGui import QDialog, QMessageBox, QListWidgetItem, QIcon from PyQt4.QtCore import QVariant, SIGNAL, QStringList, QTimer, Qt, QSize from calibre import islinux, Settings @@ -19,7 +19,8 @@ class ConfigDialog(QDialog, Ui_Dialog): Ui_Dialog.__init__(self) self.ICON_SIZES = {0:QSize(48, 48), 1:QSize(32,32), 2:QSize(24,24)} self.setupUi(self) - + self.item1 = QListWidgetItem(QIcon(':/images/metadata.svg'), _('Basic'), self.category_list) + self.item2 = QListWidgetItem(QIcon(':/images/view.svg'), _('Advanced'), self.category_list) self.db = db self.current_cols = columns settings = Settings() diff --git a/src/calibre/gui2/dialogs/config.ui b/src/calibre/gui2/dialogs/config.ui index 30c114deed..f6b3957f34 100644 --- a/src/calibre/gui2/dialogs/config.ui +++ b/src/calibre/gui2/dialogs/config.ui @@ -20,7 +20,7 @@ - + 0 @@ -69,26 +69,6 @@ -1 - - - Basic - - - - :/images/metadata.svg - :/images/metadata.svg:/images/metadata.svg - - - - - Advanced - - - - :/images/view.svg - :/images/view.svg:/images/view.svg - - @@ -504,7 +484,7 @@ - listWidget + category_list currentRowChanged(int) stackedWidget setCurrentIndex(int) diff --git a/src/calibre/gui2/dialogs/lrf_single.py b/src/calibre/gui2/dialogs/lrf_single.py index ccddf47ba7..036570902f 100644 --- a/src/calibre/gui2/dialogs/lrf_single.py +++ b/src/calibre/gui2/dialogs/lrf_single.py @@ -4,7 +4,7 @@ import os, cPickle, codecs from PyQt4.QtCore import QObject, SIGNAL, Qt, QVariant, QByteArray from PyQt4.QtGui import QAbstractSpinBox, QLineEdit, QCheckBox, QDialog, \ - QPixmap, QTextEdit + QPixmap, QTextEdit, QListWidgetItem, QIcon from calibre.gui2.dialogs.lrf_single_ui import Ui_LRFSingleDialog from calibre.gui2.dialogs.choose_format import ChooseFormatDialog @@ -52,6 +52,10 @@ class LRFSingleDialog(QDialog, Ui_LRFSingleDialog): QDialog.__init__(self, window) Ui_LRFSingleDialog.__init__(self) self.setupUi(self) + self.item1 = QListWidgetItem(QIcon(':/images/dialog_information.svg'), _("Metadata"), self.categoryList) + self.item2 = QListWidgetItem(QIcon(':/images/lookfeel.svg'), _('Look & Feel'), self.categoryList) + self.item3 = QListWidgetItem(QIcon(':/images/page.svg'), _('Page Setup'), self.categoryList) + self.item4 = QListWidgetItem(QIcon(':/images/chapters.svg'), _('Chapter Detection'), self.categoryList) self.categoryList.setCurrentRow(0) QObject.connect(self.categoryList, SIGNAL('itemEntered(QListWidgetItem *)'), self.show_category_help) diff --git a/src/calibre/gui2/dialogs/lrf_single.ui b/src/calibre/gui2/dialogs/lrf_single.ui index 0a8d6b6669..cf27b2fd7d 100644 --- a/src/calibre/gui2/dialogs/lrf_single.ui +++ b/src/calibre/gui2/dialogs/lrf_single.ui @@ -91,48 +91,9 @@ -1 - - - Metadata - - - - :/images/metadata.svg - :/images/dialog_information.svg:/images/metadata.svg - - - - - Look & Feel - - - - :/images/lookfeel.svg - :/images/chapters.svg:/images/lookfeel.svg - - - - - Page Setup - - - - :/images/page.svg:/images/page.svg - - - - - Chapter Detection - - - - :/images/chapters.svg:/images/chapters.svg - - - categoryList