diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py index 9cd2ec6bbc..4574ed83f8 100644 --- a/src/calibre/__init__.py +++ b/src/calibre/__init__.py @@ -1,7 +1,7 @@ ''' E-book management software''' __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal ' -__version__ = '0.4.69' +__version__ = '0.4.70' __docformat__ = "epytext" __author__ = "Kovid Goyal " __appname__ = 'calibre' diff --git a/src/calibre/gui2/dialogs/lrf_single.py b/src/calibre/gui2/dialogs/lrf_single.py index 543942f4e1..1929282770 100644 --- a/src/calibre/gui2/dialogs/lrf_single.py +++ b/src/calibre/gui2/dialogs/lrf_single.py @@ -50,12 +50,17 @@ class LRFSingleDialog(QDialog, Ui_LRFSingleDialog): def __init__(self, window, db, row): QDialog.__init__(self, window) - Ui_LRFSingleDialog.__init__(self) + 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.__w = [] + self.__w.append(QIcon(':/images/dialog_information.svg')) + self.item1 = QListWidgetItem(self.__w[-1], _("Metadata"), self.categoryList) + self.__w.append(QIcon(':/images/lookfeel.svg')) + self.item2 = QListWidgetItem(self.__w[-1], _('Look & Feel'), self.categoryList) + self.__w.append(QIcon(':/images/page.svg')) + self.item3 = QListWidgetItem(self.__w[-1], _('Page Setup'), self.categoryList) + self.__w.append(QIcon(':/images/chapters.svg')) + self.item4 = QListWidgetItem(self.__w[-1], _('Chapter Detection'), self.categoryList) self.categoryList.setCurrentRow(0) QObject.connect(self.categoryList, SIGNAL('itemEntered(QListWidgetItem *)'), self.show_category_help) @@ -70,7 +75,6 @@ class LRFSingleDialog(QDialog, Ui_LRFSingleDialog): self.cpixmap = None self.changed = False - if db: self.id = self.db.id(self.row) self.read_saved_options() @@ -82,7 +86,7 @@ class LRFSingleDialog(QDialog, Ui_LRFSingleDialog): except ValueError: pass if not formats: - d = error_dialog(window, _('No available formats'), + d = error_dialog(window, _('No available formats'), _('Cannot convert %s as this book has no supported formats')%(self.gui_title.text())) d.exec_() diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py index 0bfec9a8a6..9affbdf793 100644 --- a/src/calibre/gui2/main.py +++ b/src/calibre/gui2/main.py @@ -423,10 +423,10 @@ class Main(MainWindow, Ui_MainWindow): def add_filesystem_book(self, path): if os.access(path, os.R_OK): books = [os.path.abspath(path)] - to_device = self.stack.currentIndex() != 0 - self._add_books(books, to_device) - if to_device: - self.status_bar.showMessage(_('Uploading books to device.'), 2000) + to_device = self.stack.currentIndex() != 0 + self._add_books(books, to_device) + if to_device: + self.status_bar.showMessage(_('Uploading books to device.'), 2000) def add_books(self, checked): ''' @@ -1152,7 +1152,7 @@ class Main(MainWindow, Ui_MainWindow): self.vanity.update() s = Settings() if s.get('update to version %s'%version, True): - d = question_dialog(self, _('Update available'), _('%s has been updated to version %s. Visit the download page?')%(__appname__, version)) + d = question_dialog(self, _('Update available'), _('%s has been updated to version %s. See the new features. Visit the download page?')%(__appname__, version)) if d.exec_() == QMessageBox.Yes: url = 'http://calibre.kovidgoyal.net/download_'+('windows' if iswindows else 'osx' if isosx else 'linux') QDesktopServices.openUrl(QUrl(url))