mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Merge branch 'master' of https://github.com/cbhaley/calibre
This commit is contained in:
commit
c043171f7c
@ -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()
|
||||||
|
@ -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>calibre/gui2/widgets2.h</header>
|
||||||
|
</customwidget>
|
||||||
|
</customwidgets>
|
||||||
<resources/>
|
<resources/>
|
||||||
<connections>
|
<connections>
|
||||||
<connection>
|
<connection>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user