Improved options layout and main window layout.

This commit is contained in:
Bastian Kleineidam 2010-11-06 14:02:52 +01:00
parent bee72b712b
commit 2c93319a8e
4 changed files with 87 additions and 20 deletions

View file

@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'ui/main.ui'
#
# Created: Sat Nov 6 13:44:31 2010
# Created: Sat Nov 6 14:00:53 2010
# by: PyQt4 UI code generator 4.7.3
#
# WARNING! All changes made in this file will be lost!
@ -41,6 +41,8 @@ class Ui_MainWindow(object):
self.urlinput.setSizePolicy(sizePolicy)
self.urlinput.setObjectName("urlinput")
self.horizontalLayout_3.addWidget(self.urlinput)
spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.horizontalLayout_3.addItem(spacerItem)
self.controlButton = QtGui.QPushButton(self.centralwidget)
self.controlButton.setStatusTip("")
icon1 = QtGui.QIcon()

View file

@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'ui/options.ui'
#
# Created: Fri Nov 5 00:08:22 2010
# Created: Sat Nov 6 14:00:54 2010
# by: PyQt4 UI code generator 4.7.3
#
# WARNING! All changes made in this file will be lost!
@ -13,16 +13,27 @@ class Ui_Options(object):
def setupUi(self, Options):
Options.setObjectName("Options")
Options.setWindowModality(QtCore.Qt.ApplicationModal)
Options.resize(271, 240)
Options.resize(271, 297)
self.verticalLayout = QtGui.QVBoxLayout(Options)
self.verticalLayout.setObjectName("verticalLayout")
self.tabWidget = QtGui.QTabWidget(Options)
self.tabWidget.setToolTip("")
self.tabWidget.setObjectName("tabWidget")
self.gui_options = QtGui.QWidget()
self.gui_options.setToolTip("")
self.gui_options.setObjectName("gui_options")
self.verticalLayout_3 = QtGui.QVBoxLayout(self.gui_options)
self.verticalLayout_3.setObjectName("verticalLayout_3")
self.label_8 = QtGui.QLabel(self.gui_options)
self.label_8.setTextFormat(QtCore.Qt.AutoText)
self.label_8.setWordWrap(True)
self.label_8.setObjectName("label_8")
self.verticalLayout_3.addWidget(self.label_8)
self.line = QtGui.QFrame(self.gui_options)
self.line.setFrameShape(QtGui.QFrame.HLine)
self.line.setFrameShadow(QtGui.QFrame.Sunken)
self.line.setObjectName("line")
self.verticalLayout_3.addWidget(self.line)
self.frame = QtGui.QFrame(self.gui_options)
self.frame.setFrameShape(QtGui.QFrame.StyledPanel)
self.frame.setFrameShadow(QtGui.QFrame.Raised)
@ -87,9 +98,20 @@ class Ui_Options(object):
self.verticalLayout_3.addWidget(self.widget)
self.tabWidget.addTab(self.gui_options, "")
self.config_options = QtGui.QWidget()
self.config_options.setToolTip("")
self.config_options.setObjectName("config_options")
self.verticalLayout_5 = QtGui.QVBoxLayout(self.config_options)
self.verticalLayout_5.setObjectName("verticalLayout_5")
self.label_9 = QtGui.QLabel(self.config_options)
self.label_9.setTextFormat(QtCore.Qt.AutoText)
self.label_9.setWordWrap(True)
self.label_9.setObjectName("label_9")
self.verticalLayout_5.addWidget(self.label_9)
self.line_2 = QtGui.QFrame(self.config_options)
self.line_2.setFrameShape(QtGui.QFrame.HLine)
self.line_2.setFrameShadow(QtGui.QFrame.Sunken)
self.line_2.setObjectName("line_2")
self.verticalLayout_5.addWidget(self.line_2)
self.frame_2 = QtGui.QFrame(self.config_options)
self.frame_2.setFrameShape(QtGui.QFrame.StyledPanel)
self.frame_2.setFrameShadow(QtGui.QFrame.Raised)
@ -127,12 +149,7 @@ class Ui_Options(object):
def retranslateUi(self, Options):
Options.setWindowTitle(_("Dialog"))
self.tabWidget.setToolTip(QtGui.QApplication.translate("Options", "The most common GUI options are configurable\n"
"directly in a dialog. They override any configuration\n"
"file settings.\n"
"\n"
"The configuration files can be edited with an\n"
"integrated text editor.", None, QtGui.QApplication.UnicodeUTF8))
self.label_8.setText(_("The most common check options are configurable. They override any configuration file settings."))
self.label.setToolTip(_("Check recursively all links up to given depth. A negative depth will enable infinite recursion."))
self.label.setText(_("Recursive depth"))
self.recursionlevel.setToolTip(_("Check recursively all links up to given depth. A negative depth will enable infinite recursion."))
@ -151,11 +168,11 @@ class Ui_Options(object):
self.resetButton.setText(_("Reset"))
self.closeButton.setText(_("Close"))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.gui_options), _("GUI options"))
self.config_options.setToolTip(_("Test"))
self.label_9.setText(_("The configuration files can be edited with an integrated text editor."))
self.label_6.setText(_("System wide configuration file"))
self.sys_config_button.setText(_("Edit"))
self.label_7.setToolTip(_("Overrides system wide configuration file settings."))
self.label_7.setText(_("User specific configuration file"))
self.user_config_button.setText(_("Edit"))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.config_options), _("Config files"))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.config_options), _("Configuration files"))

View file

@ -59,6 +59,19 @@
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="controlButton">
<property name="toolTip">

View file

@ -10,7 +10,7 @@
<x>0</x>
<y>0</y>
<width>271</width>
<height>240</height>
<height>297</height>
</rect>
</property>
<property name="windowTitle">
@ -20,12 +20,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="toolTip">
<string>The most common GUI options are configurable
directly in a dialog. They override any configuration
file settings.
The configuration files can be edited with an
integrated text editor.</string>
<string/>
</property>
<property name="currentIndex">
<number>0</number>
@ -38,6 +33,26 @@ integrated text editor.</string>
<string>GUI options</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QLabel" name="label_8">
<property name="text">
<string>The most common check options are configurable. They override any configuration file settings.</string>
</property>
<property name="textFormat">
<enum>Qt::AutoText</enum>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QFrame" name="frame">
<property name="frameShape">
@ -208,12 +223,32 @@ integrated text editor.</string>
</widget>
<widget class="QWidget" name="config_options">
<property name="toolTip">
<string>Test</string>
<string/>
</property>
<attribute name="title">
<string>Config files</string>
<string>Configuration files</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<widget class="QLabel" name="label_9">
<property name="text">
<string>The configuration files can be edited with an integrated text editor.</string>
</property>
<property name="textFormat">
<enum>Qt::AutoText</enum>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QFrame" name="frame_2">
<property name="frameShape">