From f80f6cc2975f6a7789a4c480d8d84c9fe2f38b16 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 8 Jan 2010 12:09:48 -0700 Subject: [PATCH] On linux, in the tag editor don't apply tags when items are activated as item activation can be done by single clicks under KDE --- src/calibre/gui2/__init__.py | 3 +-- src/calibre/gui2/dialogs/tag_editor.py | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py index 86ce225a5f..db4bb5c754 100644 --- a/src/calibre/gui2/__init__.py +++ b/src/calibre/gui2/__init__.py @@ -605,8 +605,7 @@ def build_forms(srcdir, info=None): if form.endswith('viewer%smain.ui'%os.sep): info('\t\tPromoting WebView') dat = dat.replace('self.view = QtWebKit.QWebView(', 'self.view = DocumentView(') - if iswindows: - dat = dat.replace('self.view = QWebView(', 'self.view = DocumentView(') + dat = dat.replace('self.view = QWebView(', 'self.view = DocumentView(') dat = dat.replace('from QtWebKit.QWebView import QWebView', 'from PyQt4 import QtWebKit\nfrom PyQt4.QtWebKit import QWebView') dat += '\n\nfrom calibre.gui2.viewer.documentview import DocumentView' diff --git a/src/calibre/gui2/dialogs/tag_editor.py b/src/calibre/gui2/dialogs/tag_editor.py index 56781d6317..573316fa0f 100644 --- a/src/calibre/gui2/dialogs/tag_editor.py +++ b/src/calibre/gui2/dialogs/tag_editor.py @@ -6,6 +6,7 @@ from PyQt4.QtGui import QDialog from calibre.gui2.dialogs.tag_editor_ui import Ui_TagEditor from calibre.gui2 import qstring_to_unicode from calibre.gui2 import question_dialog, error_dialog +from calibre.constants import islinux class TagEditor(QDialog, Ui_TagEditor): @@ -42,7 +43,8 @@ class TagEditor(QDialog, Ui_TagEditor): self.connect(self.add_tag_button, SIGNAL('clicked()'), self.add_tag) self.connect(self.delete_button, SIGNAL('clicked()'), self.delete_tags) self.connect(self.add_tag_input, SIGNAL('returnPressed()'), self.add_tag) - self.connect(self.available_tags, SIGNAL('itemActivated(QListWidgetItem*)'), self.apply_tags) + if not islinux: + self.connect(self.available_tags, SIGNAL('itemActivated(QListWidgetItem*)'), self.apply_tags) self.connect(self.applied_tags, SIGNAL('itemActivated(QListWidgetItem*)'), self.unapply_tags)