Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add Kovid's ColorButton to the advanced coloring rule editor

Browse Source
This commit is contained in:
Charles Haley 2014-04-04 15:07:12 +02:00
parent 3346f0af4f
commit cadaab14fe
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/calibre/gui2/__init__.py
View File

@ -1137,6 +1137,7 @@ def build_forms(srcdir, info=None):
dat = dat.replace('import images_rc', '') dat = dat.replace('import images_rc', '')
dat = dat.replace('from library import', 'from calibre.gui2.library import') dat = dat.replace('from library import', 'from calibre.gui2.library import')
dat = dat.replace('from widgets import', 'from calibre.gui2.widgets import') dat = dat.replace('from widgets import', 'from calibre.gui2.widgets import')
dat = dat.replace('from widgets2 import', 'from calibre.gui2.widgets2 import')
dat = dat.replace('from convert.xpath_wizard import', dat = dat.replace('from convert.xpath_wizard import',
'from calibre.gui2.convert.xpath_wizard import') 'from calibre.gui2.convert.xpath_wizard import')
dat = re.sub(r'^ {4}def _translate\(context, text, disambig\):\s+return.*$', ' pass', dat, dat = re.sub(r'^ {4}def _translate\(context, text, disambig\):\s+return.*$', ' pass', dat,

5
src/calibre/gui2/dialogs/template_dialog.py
View File

@ -229,9 +229,6 @@ class TemplateDialog(QDialog, Ui_TemplateDialog):
for n1, k1 in cols: for n1, k1 in cols:
self.colored_field.addItem(n1, k1) self.colored_field.addItem(n1, k1)
self.colored_field.setCurrentIndex(self.colored_field.findData(color_field)) self.colored_field.setCurrentIndex(self.colored_field.findData(color_field))
colors = QColor.colorNames()
colors.sort()
self.color_name.addItems(colors)
elif self.iconing: elif self.iconing:
self.icon_layout.setVisible(True) self.icon_layout.setVisible(True)
for n1, k1 in cols: for n1, k1 in cols:
@ -362,7 +359,7 @@ class TemplateDialog(QDialog, Ui_TemplateDialog):
def color_to_clipboard(self): def color_to_clipboard(self):
app = QApplication.instance() app = QApplication.instance()
c = app.clipboard() c = app.clipboard()
c.setText(unicode(self.color_name.currentText())) c.setText(unicode(self.color_name.color))
def icon_to_clipboard(self): def icon_to_clipboard(self):
app = QApplication.instance() app = QApplication.instance()

9
src/calibre/gui2/dialogs/template_dialog.ui
View File

@ -48,7 +48,7 @@
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QComboBox" name="color_name"> <widget class="ColorButton" name="color_name">
</widget> </widget>
</item> </item>
<item row="1" column="2"> <item row="1" column="2">
@ -246,6 +246,13 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<customwidgets>
<customwidget>
<class>ColorButton</class>
<extends>QPushButton</extends>
<header>widgets2.h</header>
</customwidget>
</customwidgets>
<resources/> <resources/>
<connections> <connections>
<connection> <connection>