diff options
author | Eike Ziller <eike.ziller@digia.com> | 2012-12-14 12:17:30 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@digia.com> | 2012-12-17 08:48:21 +0100 |
commit | 2013223a664fc6d8c0d6e2e6329942a1d128a64a (patch) | |
tree | 8dbba8346541488d1cc2bf7451c1de65d0a6e845 /src | |
parent | a57895c6a5bff5008694dbbe872bd3a845f54d02 (diff) |
Smaller general help options page.
Task-number: QTCREATORBUG-8345
Change-Id: I83308e07fede50b74e4c806ea970953518269967
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/help/generalsettingspage.cpp | 3 | ||||
-rw-r--r-- | src/plugins/help/generalsettingspage.ui | 231 |
2 files changed, 107 insertions, 127 deletions
diff --git a/src/plugins/help/generalsettingspage.cpp b/src/plugins/help/generalsettingspage.cpp index cb0e4b09ee2..26fdbb07140 100644 --- a/src/plugins/help/generalsettingspage.cpp +++ b/src/plugins/help/generalsettingspage.cpp @@ -116,8 +116,7 @@ QWidget *GeneralSettingsPage::createPage(QWidget *parent) if (m_searchKeywords.isEmpty()) { QTextStream(&m_searchKeywords) << ' ' << m_ui->contextHelpLabel->text() - << ' ' << m_ui->startPageLabel->text() << ' ' << m_ui->homePageLabel->text() - << ' ' << m_ui->bookmarkGroupBox->title(); + << ' ' << m_ui->startPageLabel->text() << ' ' << m_ui->homePageLabel->text(); m_searchKeywords.remove(QLatin1Char('&')); } diff --git a/src/plugins/help/generalsettingspage.ui b/src/plugins/help/generalsettingspage.ui index 1b2326fc8b1..9bd1e2e92d3 100644 --- a/src/plugins/help/generalsettingspage.ui +++ b/src/plugins/help/generalsettingspage.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>595</width> - <height>407</height> + <width>695</width> + <height>472</height> </rect> </property> <property name="windowTitle"> @@ -155,6 +155,9 @@ <layout class="QVBoxLayout" name="verticalLayout"> <item> <layout class="QFormLayout" name="startupFormLayout"> + <property name="fieldGrowthPolicy"> + <enum>QFormLayout::FieldsStayAtSizeHint</enum> + </property> <item row="0" column="0"> <widget class="QLabel" name="contextHelpLabel"> <property name="sizePolicy"> @@ -244,132 +247,38 @@ </widget> </item> <item row="2" column="1"> - <widget class="QLineEdit" name="homePageLineEdit"/> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <spacer name="spacer4"> - <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="currentPageButton"> - <property name="text"> - <string>Use &Current Page</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="blankPageButton"> - <property name="text"> - <string>Use &Blank Page</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="defaultPageButton"> - <property name="toolTip"> - <string>Reset to default</string> - </property> - <property name="text"> - <string>Reset</string> - </property> - </widget> - </item> - </layout> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QGroupBox" name="bookmarkGroupBox"> - <property name="title"> - <string>Help Bookmarks</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout_2"> - <item> - <layout class="QHBoxLayout" name="bookmarkHorizontalLayout"> - <item> - <spacer name="spacer5"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>244</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QPushButton" name="importButton"> - <property name="text"> - <string>Import...</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="exportButton"> - <property name="text"> - <string>Export...</string> - </property> - </widget> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLineEdit" name="homePageLineEdit"/> + </item> + <item> + <widget class="QPushButton" name="currentPageButton"> + <property name="text"> + <string>Use &Current Page</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="blankPageButton"> + <property name="text"> + <string>Use &Blank Page</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="defaultPageButton"> + <property name="toolTip"> + <string>Reset to default</string> + </property> + <property name="text"> + <string>Reset</string> + </property> + </widget> + </item> + </layout> </item> </layout> </item> - <item> - <widget class="QLabel" name="errorLabel"> - <property name="palette"> - <palette> - <active> - <colorrole role="Text"> - <brush brushstyle="SolidPattern"> - <color alpha="255"> - <red>255</red> - <green>0</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - </active> - <inactive> - <colorrole role="Text"> - <brush brushstyle="SolidPattern"> - <color alpha="255"> - <red>255</red> - <green>0</green> - <blue>0</blue> - </color> - </brush> - </colorrole> - </inactive> - <disabled> - <colorrole role="Text"> - <brush brushstyle="SolidPattern"> - <color alpha="255"> - <red>120</red> - <green>120</green> - <blue>120</blue> - </color> - </brush> - </colorrole> - </disabled> - </palette> - </property> - </widget> - </item> </layout> </widget> </item> @@ -393,6 +302,78 @@ </widget> </item> <item> + <layout class="QHBoxLayout" name="bookmarkHorizontalLayout"> + <item> + <spacer name="spacer5"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>244</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QLabel" name="errorLabel"> + <property name="palette"> + <palette> + <active> + <colorrole role="Text"> + <brush brushstyle="SolidPattern"> + <color alpha="255"> + <red>255</red> + <green>0</green> + <blue>0</blue> + </color> + </brush> + </colorrole> + </active> + <inactive> + <colorrole role="Text"> + <brush brushstyle="SolidPattern"> + <color alpha="255"> + <red>255</red> + <green>0</green> + <blue>0</blue> + </color> + </brush> + </colorrole> + </inactive> + <disabled> + <colorrole role="Text"> + <brush brushstyle="SolidPattern"> + <color alpha="255"> + <red>120</red> + <green>120</green> + <blue>120</blue> + </color> + </brush> + </colorrole> + </disabled> + </palette> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="importButton"> + <property name="text"> + <string>Import Bookmarks...</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="exportButton"> + <property name="text"> + <string>Export Bookmarks...</string> + </property> + </widget> + </item> + </layout> + </item> + <item> <spacer name="spacer6"> <property name="orientation"> <enum>Qt::Vertical</enum> |