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

Merge branch 'master' of https://github.com/cbhaley/calibre

Browse Source
This commit is contained in:
Kovid Goyal 2014-04-04 18:55:00 +05:30
commit c043171f7c
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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