feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	src/plugins/debugger/gdb/gdboptionspage.cpp
	src/plugins/fakevim/fakevimoptions.ui
	src/share/share.qbs

Change-Id: Ic45b68ba7b1cc1b780be4271ba4ee939e6055b80
This commit is contained in:
Eike Ziller
2012-12-18 17:42:04 +01:00
parent aa0dc33d32 4510d1ef84
commit 03717cf7ef
37 changed files with 372 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/help/generalsettingspage.cpp
View File

@@ -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('&'));
}

231
src/plugins/help/generalsettingspage.ui
View File

@@ -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"/>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLineEdit" name="homePageLineEdit"/>
</item>
<item>
<widget class="QPushButton" name="currentPageButton">
<property name="text">
<string>Use &amp;Current Page</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="blankPageButton">
<property name="text">
<string>Use &amp;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>
<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 &amp;Current Page</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="blankPageButton">
<property name="text">
<string>Use &amp;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>
</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>
@@ -392,6 +301,78 @@
</layout>
</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">