This commit is contained in:
Kovid Goyal 2011-03-02 16:37:47 -07:00
parent 546995553a
commit 88c185aa67
2 changed files with 13 additions and 7 deletions

View File

@ -6,7 +6,7 @@ __copyright__ = '2010, Kovid Goyal <kovid at kovidgoyal.net>'
import re import re
from functools import partial from functools import partial
from PyQt4.Qt import QDialog, Qt, QListWidgetItem, QVariant, QIcon from PyQt4.Qt import QDialog, Qt, QListWidgetItem, QVariant
from calibre.gui2.preferences.create_custom_column_ui import Ui_QCreateCustomColumn from calibre.gui2.preferences.create_custom_column_ui import Ui_QCreateCustomColumn
from calibre.gui2 import error_dialog from calibre.gui2 import error_dialog
@ -47,7 +47,8 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn):
QDialog.__init__(self, parent) QDialog.__init__(self, parent)
Ui_QCreateCustomColumn.__init__(self) Ui_QCreateCustomColumn.__init__(self)
self.setupUi(self) self.setupUi(self)
self.setWindowIcon(QIcon(I('column.png'))) self.setWindowTitle(_('Create a custom column'))
self.heading_label.setText(_('Create a custom column'))
# Remove help icon on title bar # Remove help icon on title bar
icon = self.windowIcon() icon = self.windowIcon()
self.setWindowFlags(self.windowFlags()&(~Qt.WindowContextHelpButtonHint)) self.setWindowFlags(self.windowFlags()&(~Qt.WindowContextHelpButtonHint))
@ -79,6 +80,8 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn):
self.datatype_changed() self.datatype_changed()
self.exec_() self.exec_()
return return
self.setWindowTitle(_('Edit a custom column'))
self.heading_label.setText(_('Edit a custom column'))
self.shortcuts.setVisible(False) self.shortcuts.setVisible(False)
idx = parent.opt_columns.currentRow() idx = parent.opt_columns.currentRow()
if idx < 0: if idx < 0:

View File

@ -19,8 +19,9 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="windowTitle"> <property name="windowIcon">
<string>Create or edit custom columns</string> <iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/column.png</normaloff>:/images/column.png</iconset>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
@ -252,7 +253,7 @@ four values, the first of them being the empty value.</string>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="heading_label">
<property name="font"> <property name="font">
<font> <font>
<weight>75</weight> <weight>75</weight>
@ -260,7 +261,7 @@ four values, the first of them being the empty value.</string>
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>Create or edit custom columns</string> <string/>
</property> </property>
</widget> </widget>
</item> </item>
@ -300,6 +301,8 @@ four values, the first of them being the empty value.</string>
<tabstop>composite_box</tabstop> <tabstop>composite_box</tabstop>
<tabstop>button_box</tabstop> <tabstop>button_box</tabstop>
</tabstops> </tabstops>
<resources/> <resources>
<include location="../../../../resources/images.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>