← Back to branch summary

~ubuntu-branches/debian/sid/calibre/sid

« back to all changes in this revision

Viewing changes to src/calibre/gui2/dialogs/tag_editor.py

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2014-05-14 18:17:50 UTC
  • mto: This revision was merged to the branch mainline in revision 75.
  • Revision ID: package-import@ubuntu.com-20140514181750-efj1wymey2vb4cao
Tags: upstream-1.36.0+dfsg
Import upstream version 1.36.0+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/calibre/gui2/dialogs/tag_editor.py
3
3
 
4
4
from functools import partial
5
5
 
6
 
from PyQt4.QtCore import SIGNAL, Qt
 
6
from PyQt4.QtCore import Qt
7
7
from PyQt4.QtGui import QDialog
8
8
 
9
9
from calibre.gui2.dialogs.tag_editor_ui import Ui_TagEditor
10
10
from calibre.gui2 import question_dialog, error_dialog, gprefs
11
11
from calibre.constants import islinux
12
 
from calibre.utils.icu import sort_key, primary_find
 
12
from calibre.utils.icu import sort_key, primary_contains
13
13
 
14
14
class TagEditor(QDialog, Ui_TagEditor):
15
15
 
51
51
            if tag not in tags:
52
52
                self.available_tags.addItem(tag)
53
53
 
54
 
        self.connect(self.apply_button,   SIGNAL('clicked()'), self.apply_tags)
55
 
        self.connect(self.unapply_button, SIGNAL('clicked()'), self.unapply_tags)
56
 
        self.connect(self.add_tag_button, SIGNAL('clicked()'), self.add_tag)
57
 
        self.connect(self.delete_button,  SIGNAL('clicked()'), self.delete_tags)
58
 
        self.connect(self.add_tag_input,  SIGNAL('returnPressed()'), self.add_tag)
 
54
        self.apply_button.clicked[()].connect(self.apply_tags)
 
55
        self.unapply_button.clicked[()].connect(self.unapply_tags)
 
56
        self.add_tag_button.clicked[()].connect(self.add_tag)
 
57
        self.delete_button.clicked[()].connect(self.delete_tags)
 
58
        self.add_tag_input.returnPressed[()].connect(self.add_tag)
59
59
        # add the handlers for the filter input clear buttons
60
60
        for x in ('available', 'applied'):
61
61
            getattr(self, '%s_filter_input_clear_btn' % x).clicked.connect(getattr(self, '%s_filter_input' % x).clear)
66
66
        if islinux:
67
67
            self.available_tags.itemDoubleClicked.connect(self.apply_tags)
68
68
        else:
69
 
            self.connect(self.available_tags, SIGNAL('itemActivated(QListWidgetItem*)'), self.apply_tags)
70
 
        self.connect(self.applied_tags,   SIGNAL('itemActivated(QListWidgetItem*)'), self.unapply_tags)
 
69
            self.available_tags.itemActivated.connect(self.apply_tags)
 
70
        self.applied_tags.itemActivated.connect(self.unapply_tags)
71
71
 
72
72
        geom = gprefs.get('tag_editor_geometry', None)
73
73
        if geom is not None:
178
178
        q = icu_lower(unicode(filter_value))
179
179
        for i in xrange(collection.count()):  # on every available tag
180
180
            item = collection.item(i)
181
 
            item.setHidden(bool(q and primary_find(q, unicode(item.text()))[0] == -1))
 
181
            item.setHidden(bool(q and not primary_contains(q, unicode(item.text()))))
182
182
 
183
183
    def accept(self):
184
184
        self.save_state()