diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.ui b/src/plugins/coreplugin/actionmanager/commandmappings.ui
index cc8cadc3b0053a7daa927389c0cf3fdc7190a274..6bbbdf9f46a229d570665f67b41560fdf58986f7 100644
--- a/src/plugins/coreplugin/actionmanager/commandmappings.ui
+++ b/src/plugins/coreplugin/actionmanager/commandmappings.ui
@@ -58,17 +58,10 @@
<item>
<layout class="QHBoxLayout">
<item>
- <widget class="QToolButton" name="defaultButton">
- <property name="toolTip">
- <string>Reset all to default</string>
- </property>
+ <widget class="QPushButton" name="defaultButton">
<property name="text">
<string>Defaults</string>
</property>
- <property name="icon">
- <iconset resource="../core.qrc">
- <normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset>
- </property>
</widget>
</item>
<item>
@@ -136,7 +129,7 @@
</size>
</property>
<property name="toolTip">
- <string>Reset to default</string>
+ <string>Reset</string>
</property>
<property name="text">
<string/>
@@ -168,6 +161,11 @@
</layout>
</widget>
<customwidgets>
+ <customwidget>
+ <class>Utils::FancyLineEdit</class>
+ <extends>QLineEdit</extends>
+ <header location="global">utils/fancylineedit.h</header>
+ </customwidget>
<customwidget>
<class>Utils::FilterLineEdit</class>
<extends>QLineEdit</extends>
diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc
index 852eb00b0a7afd1182c0819e2d3bfb3a9b4d46d0..a06cdbf3c8985069b97b0c02c672a906beec843e 100644
--- a/src/plugins/coreplugin/core.qrc
+++ b/src/plugins/coreplugin/core.qrc
@@ -65,9 +65,6 @@
<file>images/category_cpp.png</file>
<file>images/category_vcs.png</file>
<file>images/category_qml.png</file>
- <file>images/filtericon.png</file>
- <file>images/plus-16.png</file>
- <file>images/minus-16.png</file>
- <file>images/edit.png</file>
+ <file>images/filtericon.png</file>
</qresource>
</RCC>
diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h
index 341261952c228c10907ceef9d0d47f1a558fe829..cdfc0c06b06430ef191e1d8c9268c570a512c106 100644
--- a/src/plugins/coreplugin/coreconstants.h
+++ b/src/plugins/coreplugin/coreconstants.h
@@ -217,9 +217,8 @@ const char * const G_WINDOW_OTHER = "QtCreator.Group.Window.Other";
const char * const G_HELP_HELP = "QtCreator.Group.Help.Help";
const char * const G_HELP_ABOUT = "QtCreator.Group.Help.About";
-const char * const ICON_MINUS = ":/core/images/minus-16.png";
-const char * const ICON_PLUS = ":/core/images/plus-16.png";
-const char * const ICON_EDIT = ":/core/images/edit.png";
+const char * const ICON_MINUS = ":/core/images/minus.png";
+const char * const ICON_PLUS = ":/core/images/plus.png";
const char * const ICON_NEWFILE = ":/core/images/filenew.png";
const char * const ICON_OPENFILE = ":/core/images/fileopen.png";
const char * const ICON_SAVEFILE = ":/core/images/filesave.png";
diff --git a/src/plugins/coreplugin/images/edit.png b/src/plugins/coreplugin/images/edit.png
deleted file mode 100644
index a5e49adf99d73cdb5f9c03affdb8ec8dfee34cbe..0000000000000000000000000000000000000000
Binary files a/src/plugins/coreplugin/images/edit.png and /dev/null differ
diff --git a/src/plugins/coreplugin/images/minus-16.png b/src/plugins/coreplugin/images/minus-16.png
deleted file mode 100644
index 745b445722b115d6bd6f2c705c845c115ba4365a..0000000000000000000000000000000000000000
Binary files a/src/plugins/coreplugin/images/minus-16.png and /dev/null differ
diff --git a/src/plugins/coreplugin/images/plus-16.png b/src/plugins/coreplugin/images/plus-16.png
deleted file mode 100644
index ef43788e67de85b657f365fbdcbfeb630f64053c..0000000000000000000000000000000000000000
Binary files a/src/plugins/coreplugin/images/plus-16.png and /dev/null differ
diff --git a/src/plugins/cpaster/codepastersettings.cpp b/src/plugins/cpaster/codepastersettings.cpp
index 6d1172f7a46a1b6ede730bfbdc250fd222c0ee1d..202586c2eb6f2ccba9dcfb08eb201f70707407bf 100644
--- a/src/plugins/cpaster/codepastersettings.cpp
+++ b/src/plugins/cpaster/codepastersettings.cpp
@@ -97,8 +97,10 @@ QWidget *CodePasterSettingsPage::createPage(QWidget *parent)
connect(lineEdit, SIGNAL(textChanged(QString)), this, SLOT(serverChanged(QString)));
formLayout->addRow(tr("Server:"), lineEdit);
outerLayout->addLayout(formLayout);
- QLabel *noteLabel = new QLabel(tr("<i>Note: Specify the host name for the CodePaster service "
- "without any protocol prepended (e.g. codepaster.mycompany.com).</i>"));
+ outerLayout->addSpacerItem(new QSpacerItem(0, 30, QSizePolicy::Ignored, QSizePolicy::Fixed));
+
+ QLabel *noteLabel = new QLabel(tr("Note: Specify the host name for the CodePaster service "
+ "without any protocol prepended (e.g. codepaster.mycompany.com)."));
noteLabel->setWordWrap(true);
outerLayout->addWidget(noteLabel);
diff --git a/src/plugins/cpaster/fileshareprotocolsettingswidget.ui b/src/plugins/cpaster/fileshareprotocolsettingswidget.ui
index 5ebf519fb92301669b7f5b488998f5dbdbf11a06..e36e79f9821eec117a8ca97a4a8302700b824c80 100644
--- a/src/plugins/cpaster/fileshareprotocolsettingswidget.ui
+++ b/src/plugins/cpaster/fileshareprotocolsettingswidget.ui
@@ -2,32 +2,11 @@
<ui version="4.0">
<class>CodePaster::FileShareProtocolSettingsWidget</class>
<widget class="QWidget" name="CodePaster::FileShareProtocolSettingsWidget">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>403</width>
- <height>122</height>
- </rect>
- </property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QFormLayout" name="formLayout">
- <property name="fieldGrowthPolicy">
- <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
- </property>
- <item row="0" column="0" colspan="2">
- <widget class="QLabel" name="helpLabel">
- <property name="text">
- <string>The fileshare-based paster protocol allows for sharing code snippets using simple files on a shared network drive. Files are never deleted.</string>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
+ <item row="1" column="0">
<widget class="QLabel" name="pathLabel">
<property name="text">
<string>&Path:</string>
@@ -37,10 +16,10 @@
</property>
</widget>
</item>
- <item row="2" column="1">
- <widget class="Utils::PathChooser" name="pathChooser" native="true"/>
+ <item row="1" column="1">
+ <widget class="Utils::PathChooser" name="pathChooser"/>
</item>
- <item row="3" column="0">
+ <item row="2" column="0">
<widget class="QLabel" name="displayCountLabel">
<property name="text">
<string>&Display:</string>
@@ -50,7 +29,7 @@
</property>
</widget>
</item>
- <item row="3" column="1">
+ <item row="2" column="1">
<widget class="QSpinBox" name="displayCountSpinBox">
<property name="suffix">
<string>entries</string>
@@ -66,18 +45,15 @@
</property>
</widget>
</item>
- <item row="1" column="0">
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
+ <item row="0" column="0" colspan="2">
+ <widget class="QLabel" name="helpLabel">
+ <property name="text">
+ <string>The fileshare-based paster protocol allows for sharing code snippets using simple files on a shared network drive. Files are never deleted.</string>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>5</height>
- </size>
+ <property name="wordWrap">
+ <bool>true</bool>
</property>
- </spacer>
+ </widget>
</item>
</layout>
</widget>
@@ -86,11 +62,6 @@
<class>Utils::PathChooser</class>
<extends>QWidget</extends>
<header location="global">utils/pathchooser.h</header>
- <container>1</container>
- <slots>
- <signal>editingFinished()</signal>
- <signal>browsingFinished()</signal>
- </slots>
</customwidget>
</customwidgets>
<resources/>
diff --git a/src/plugins/cpaster/pastebindotcomsettings.ui b/src/plugins/cpaster/pastebindotcomsettings.ui
index c399812251d37f4de022610c8b5ebecc2cb6576d..73844e4d5ee3f923f96af97facd91397b4d7602a 100644
--- a/src/plugins/cpaster/pastebindotcomsettings.ui
+++ b/src/plugins/cpaster/pastebindotcomsettings.ui
@@ -15,11 +15,21 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
- <widget class="QLabel" name="label">
- <property name="text">
- <string><a href="http://pastebin.com">pastebin.com</a> allows to send posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix.</string>
+ <layout class="QFormLayout" name="formLayout">
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
- </widget>
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="lineEdit"/>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="serverPrefix">
+ <property name="text">
+ <string>Server prefix:</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
<item>
<spacer name="explanatoryTextSpacer">
@@ -32,32 +42,17 @@
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
- <height>5</height>
+ <height>30</height>
</size>
</property>
</spacer>
</item>
- <item>
- <layout class="QFormLayout" name="formLayout">
- <property name="fieldGrowthPolicy">
- <enum>QFormLayout::ExpandingFieldsGrow</enum>
- </property>
- <item row="0" column="0">
- <widget class="QLabel" name="serverPrefix">
- <property name="text">
- <string>Server prefix:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLineEdit" name="lineEdit"/>
- </item>
- </layout>
- </item>
<item>
<widget class="QLabel" name="explanatoryTextLabel">
<property name="text">
- <string><i>Note: The plugin will use this for posting as well as fetching.</i></string>
+ <string><html><head/><body>
+<p><a href="http://pastebin.com">pastebin.com</a> allows to send posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix.</p>
+<p>Note that the plugin will use this for posting as well as fetching.</p></body></html></string>
</property>
<property name="textFormat">
<enum>Qt::AutoText</enum>
diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp
index 1f8a36428f48703efc782514134b547efda5bf68..e208ce88efa1e3b5407ec6c6f8d9213a77950340 100644
--- a/src/plugins/cpptools/cppfilesettingspage.cpp
+++ b/src/plugins/cpptools/cppfilesettingspage.cpp
@@ -37,7 +37,6 @@
#include <coreplugin/icore.h>
#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/coreconstants.h>
#include <coreplugin/mimedatabase.h>
#include <cppeditor/cppeditorconstants.h>
@@ -53,7 +52,6 @@
#include <QtCore/QTextCodec>
#include <QtCore/QTextStream>
-#include <QtGui/QIcon>
#include <QtGui/QFileDialog>
#include <QtGui/QMessageBox>
@@ -249,7 +247,6 @@ CppFileSettingsWidget::CppFileSettingsWidget(QWidget *parent) :
m_ui->headerSuffixComboBox->addItem(suffix);
m_ui->licenseTemplatePathChooser->setExpectedKind(Utils::PathChooser::File);
m_ui->licenseTemplatePathChooser->addButton(tr("Edit..."), this, SLOT(slotEdit()));
- m_ui->licenseTemplatePathChooser->buttonAtIndex(1)->setIcon(QIcon(Core::Constants::ICON_EDIT));
}
CppFileSettingsWidget::~CppFileSettingsWidget()
diff --git a/src/plugins/debugger/dumperoptionpage.ui b/src/plugins/debugger/dumperoptionpage.ui
index bc996eb4e0bc549c4e7046ad0734086001774568..e84f1abae1a8e9b3c385a109d81b58a70b597234 100644
--- a/src/plugins/debugger/dumperoptionpage.ui
+++ b/src/plugins/debugger/dumperoptionpage.ui
@@ -10,15 +10,13 @@
<height>303</height>
</rect>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
+ <layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QLabel" name="label">
<property name="text">
- <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The debugging helper is only used to produce a nice display of objects of certain types like QString or std::map in the &quot;Locals and Watchers&quot; view. It is not strictly necessary for debugging with Qt Creator. </p></body></html></string>
+ <string><html><head/><body>
+<p>The debugging helper is only used to produce a nice display of objects of certain types like QString or std::map in the &quot;Locals and Watchers&quot; view.</p>
+<p> It is not strictly necessary for debugging with Qt Creator. </p></body></html></string>
</property>
<property name="textFormat">
<enum>Qt::AutoText</enum>
@@ -28,22 +26,6 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
- <item>
- <spacer name="verticalSpacer_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>5</height>
- </size>
- </property>
- </spacer>
- </item>
<item>
<widget class="QGroupBox" name="debuggingHelperGroupBox">
<property name="title">
diff --git a/src/plugins/help/docsettingspage.ui b/src/plugins/help/docsettingspage.ui
index 2bc114cfbeeaa52821111b28d50232561ee9df5a..25c94a9f55534a5d88b5cd4da97c7a69871c2d00 100644
--- a/src/plugins/help/docsettingspage.ui
+++ b/src/plugins/help/docsettingspage.ui
@@ -39,25 +39,17 @@
<number>0</number>
</property>
<item>
- <widget class="QToolButton" name="addButton">
+ <widget class="QPushButton" name="addButton">
<property name="text">
<string>Add...</string>
</property>
- <property name="icon">
- <iconset resource="../coreplugin/core.qrc">
- <normaloff>:/core/images/plus-16.png</normaloff>:/core/images/plus-16.png</iconset>
- </property>
</widget>
</item>
<item>
- <widget class="QToolButton" name="removeButton">
+ <widget class="QPushButton" name="removeButton">
<property name="text">
<string>Remove</string>
</property>
- <property name="icon">
- <iconset resource="../coreplugin/core.qrc">
- <normaloff>:/core/images/minus-16.png</normaloff>:/core/images/minus-16.png</iconset>
- </property>
</widget>
</item>
<item>
@@ -80,8 +72,6 @@
</item>
</layout>
</widget>
- <resources>
- <include location="../coreplugin/core.qrc"/>
- </resources>
+ <resources/>
<connections/>
</ui>
diff --git a/src/plugins/help/filtersettingspage.ui b/src/plugins/help/filtersettingspage.ui
index 6d1ded527d961b79f403cc064e72d3cc67ef08a1..fdbaf8e74d618f3d783abfab9d2090deb46a05b5 100644
--- a/src/plugins/help/filtersettingspage.ui
+++ b/src/plugins/help/filtersettingspage.ui
@@ -113,25 +113,17 @@ Add, modify, and remove document filters, which determine the documentation set
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <widget class="QToolButton" name="filterAddButton">
+ <widget class="QPushButton" name="filterAddButton">
<property name="text">
<string>Add</string>
</property>
- <property name="icon">
- <iconset resource="../coreplugin/core.qrc">
- <normaloff>:/core/images/plus-16.png</normaloff>:/core/images/plus-16.png</iconset>
- </property>
</widget>
</item>
<item>
- <widget class="QToolButton" name="filterRemoveButton">
+ <widget class="QPushButton" name="filterRemoveButton">
<property name="text">
<string>Remove</string>
</property>
- <property name="icon">
- <iconset resource="../coreplugin/core.qrc">
- <normaloff>:/core/images/minus-16.png</normaloff>:/core/images/minus-16.png</iconset>
- </property>
</widget>
</item>
<item>
@@ -151,8 +143,6 @@ Add, modify, and remove document filters, which determine the documentation set
</item>
</layout>
</widget>
- <resources>
- <include location="../coreplugin/core.qrc"/>
- </resources>
+ <resources/>
<connections/>
</ui>
diff --git a/src/plugins/help/generalsettingspage.ui b/src/plugins/help/generalsettingspage.ui
index 655c237bc09e8e5e0700623a7b39bcff9fe8ec34..2a49b659828d7e86fba9f17abe3d26ca1ec53285 100644
--- a/src/plugins/help/generalsettingspage.ui
+++ b/src/plugins/help/generalsettingspage.ui
@@ -264,16 +264,9 @@
</widget>
</item>
<item>
- <widget class="QToolButton" name="defaultPageButton">
- <property name="toolTip">
- <string>Reset to default</string>
- </property>
+ <widget class="QPushButton" name="defaultPageButton">
<property name="text">
- <string>Reset to Default</string>
- </property>
- <property name="icon">
- <iconset resource="../coreplugin/core.qrc">
- <normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset>
+ <string>Restore to Default</string>
</property>
</widget>
</item>
@@ -400,8 +393,6 @@
</item>
</layout>
</widget>
- <resources>
- <include location="../coreplugin/core.qrc"/>
- </resources>
+ <resources/>
<connections/>
</ui>
diff --git a/src/plugins/help/remotehelpfilter.ui b/src/plugins/help/remotehelpfilter.ui
index 910adc88867d7cf37098e81c5c9d00c9ba07ec38..1461573b0813f325465b79d9d31f8acf8ffc2470 100644
--- a/src/plugins/help/remotehelpfilter.ui
+++ b/src/plugins/help/remotehelpfilter.ui
@@ -75,10 +75,6 @@
<property name="text">
<string>+</string>
</property>
- <property name="icon">
- <iconset resource="../coreplugin/core.qrc">
- <normaloff>:/core/images/plus-16.png</normaloff>:/core/images/plus-16.png</iconset>
- </property>
</widget>
</item>
<item>
@@ -92,10 +88,6 @@
<property name="text">
<string>-</string>
</property>
- <property name="icon">
- <iconset resource="../coreplugin/core.qrc">
- <normaloff>:/core/images/minus-16.png</normaloff>:/core/images/minus-16.png</iconset>
- </property>
</widget>
</item>
<item>
@@ -127,9 +119,7 @@
</item>
</layout>
</widget>
- <resources>
- <include location="../coreplugin/core.qrc"/>
- </resources>
+ <resources/>
<connections>
<connection>
<sender>buttonBox</sender>
diff --git a/src/plugins/locator/directoryfilter.ui b/src/plugins/locator/directoryfilter.ui
index 74b117cfb00a96b4d855927fb662c7a1a43d9265..2786e0515dc80d7f0ab195ce6da9e6cb928c215e 100644
--- a/src/plugins/locator/directoryfilter.ui
+++ b/src/plugins/locator/directoryfilter.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>387</width>
- <height>285</height>
+ <width>393</width>
+ <height>275</height>
</rect>
</property>
<layout class="QGridLayout">
@@ -23,83 +23,6 @@
<item row="0" column="1" colspan="3">
<widget class="QLineEdit" name="nameEdit"/>
</item>
- <item row="1" column="0">
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Directories:</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item row="1" column="1" colspan="2">
- <widget class="QListWidget" name="directoryList"/>
- </item>
- <item row="1" column="3">
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QToolButton" name="addButton">
- <property name="text">
- <string>Add</string>
- </property>
- <property name="icon">
- <iconset resource="../coreplugin/core.qrc">
- <normaloff>:/core/images/plus-16.png</normaloff>:/core/images/plus-16.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QToolButton" name="editButton">
- <property name="text">
- <string>Edit</string>
- </property>
- <property name="icon">
- <iconset resource="../coreplugin/core.qrc">
- <normaloff>:/core/images/edit.png</normaloff>:/core/images/edit.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QToolButton" name="removeButton">
- <property name="text">
- <string>Remove</string>
- </property>
- <property name="icon">
- <iconset resource="../coreplugin/core.qrc">
- <normaloff>:/core/images/minus-16.png</normaloff>:/core/images/minus-16.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="verticalSpacer_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
@@ -157,6 +80,58 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
</property>
</widget>
</item>
+ <item row="1" column="3">
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QPushButton" name="addButton">
+ <property name="text">
+ <string>Add...</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="editButton">
+ <property name="text">
+ <string>Edit...</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="removeButton">
+ <property name="text">
+ <string>Remove</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="0">
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Directories:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="1" colspan="2">
+ <widget class="QListWidget" name="directoryList"/>
+ </item>
</layout>
</item>
<item row="1" column="0">
@@ -181,9 +156,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
</item>
</layout>
</widget>
- <resources>
- <include location="../coreplugin/core.qrc"/>
- </resources>
+ <resources/>
<connections>
<connection>
<sender>buttonBox</sender>
diff --git a/src/plugins/locator/settingspage.ui b/src/plugins/locator/settingspage.ui
index 32896efa6edcff651af347fdbbb6d69e0fc8720d..6ae70a06f2ce04538b04bfd296584b8a8dbe78b8 100644
--- a/src/plugins/locator/settingspage.ui
+++ b/src/plugins/locator/settingspage.ui
@@ -24,41 +24,29 @@
<item row="0" column="1">
<layout class="QVBoxLayout">
<item>
- <widget class="QToolButton" name="addButton">
+ <widget class="QPushButton" name="addButton">
<property name="text">
<string>Add</string>
</property>
- <property name="icon">
- <iconset resource="../coreplugin/core.qrc">
- <normaloff>:/core/images/plus-16.png</normaloff>:/core/images/plus-16.png</iconset>
- </property>
</widget>
</item>
<item>
- <widget class="QToolButton" name="editButton">
+ <widget class="QPushButton" name="removeButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
- <string>Edit</string>
- </property>
- <property name="icon">
- <iconset resource="../coreplugin/core.qrc">
- <normaloff>:/core/images/edit.png</normaloff>:/core/images/edit.png</iconset>
+ <string>Remove</string>
</property>
</widget>
</item>
<item>
- <widget class="QToolButton" name="removeButton">
+ <widget class="QPushButton" name="editButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
- <string>Remove</string>
- </property>
- <property name="icon">
- <iconset resource="../coreplugin/core.qrc">
- <normaloff>:/core/images/minus-16.png</normaloff>:/core/images/minus-16.png</iconset>
+ <string>Edit</string>
</property>
</widget>
</item>
@@ -125,8 +113,6 @@
</item>
</layout>
</widget>
- <resources>
- <include location="../coreplugin/core.qrc"/>
- </resources>
+ <resources/>
<connections/>
</ui>
diff --git a/src/plugins/projectexplorer/toolchainoptionspage.ui b/src/plugins/projectexplorer/toolchainoptionspage.ui
index 823c1d11e0693e4bf2d52bbda449e390eaddc2a3..99fe639da1e77be33a33e00ddce0bf68ccc087bd 100644
--- a/src/plugins/projectexplorer/toolchainoptionspage.ui
+++ b/src/plugins/projectexplorer/toolchainoptionspage.ui
@@ -50,7 +50,7 @@
</property>
<property name="icon">
<iconset resource="../coreplugin/core.qrc">
- <normaloff>:/core/images/plus-16.png</normaloff>:/core/images/plus-16.png</iconset>
+ <normaloff>:/core/images/plus.png</normaloff>:/core/images/plus.png</iconset>
</property>
<property name="popupMode">
<enum>QToolButton::InstantPopup</enum>
@@ -76,7 +76,7 @@
</property>
<property name="icon">
<iconset resource="../coreplugin/core.qrc">
- <normaloff>:/core/images/minus-16.png</normaloff>:/core/images/minus-16.png</iconset>
+ <normaloff>:/core/images/minus.png</normaloff>:/core/images/minus.png</iconset>
</property>
</widget>
</item>
diff --git a/src/plugins/qmldesigner/settingspage.ui b/src/plugins/qmldesigner/settingspage.ui
index 65de737cbadb898e85edb2db279c0db27890cf42..9a56b1cc3112dd552d1dee5f86eb0055db2080d7 100644
--- a/src/plugins/qmldesigner/settingspage.ui
+++ b/src/plugins/qmldesigner/settingspage.ui
@@ -6,31 +6,49 @@
<rect>
<x>0</x>
<y>0</y>
- <width>435</width>
- <height>240</height>
+ <width>433</width>
+ <height>428</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>Snapping</string>
</property>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="snapMarginLabel">
+ <layout class="QGridLayout" name="gridLayout_6">
+ <property name="margin">
+ <number>9</number>
+ </property>
+ <item row="0" column="0">
+ <layout class="QGridLayout" name="gridLayout_4">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>2</number>
+ </property>
+ <property name="rightMargin">
+ <number>2</number>
+ </property>
+ <property name="bottomMargin">
+ <number>2</number>
+ </property>
+ <property name="horizontalSpacing">
+ <number>20</number>
+ </property>
+ <item row="0" column="1">
+ <widget class="QLabel" name="itemSpacingLabel">
<property name="text">
- <string>Snap margin:</string>
+ <string>Item spacing</string>
</property>
</widget>
</item>
- <item row="0" column="1">
- <widget class="QSpinBox" name="spinSnapMargin">
+ <item row="2" column="1">
+ <widget class="QSpinBox" name="spinItemSpacing">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -38,19 +56,19 @@
</sizepolicy>
</property>
<property name="maximum">
- <number>10</number>
+ <number>50</number>
</property>
</widget>
</item>
- <item row="1" column="0">
- <widget class="QLabel" name="itemSpacingLabel">
+ <item row="0" column="0">
+ <widget class="QLabel" name="snapMarginLabel">
<property name="text">
- <string>Item spacing:</string>
+ <string>Snap margin</string>
</property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="QSpinBox" name="spinItemSpacing">
+ <item row="2" column="0">
+ <widget class="QSpinBox" name="spinSnapMargin">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -58,20 +76,20 @@
</sizepolicy>
</property>
<property name="maximum">
- <number>50</number>
+ <number>10</number>
</property>
</widget>
</item>
</layout>
</item>
- <item>
+ <item row="0" column="1">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>273</width>
+ <width>40</width>
<height>20</height>
</size>
</property>
@@ -80,7 +98,7 @@
</layout>
</widget>
</item>
- <item>
+ <item row="1" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
diff --git a/src/plugins/qmljseditor/quicktoolbarsettingspage.ui b/src/plugins/qmljseditor/quicktoolbarsettingspage.ui
index fddcffef6bf5eca459160e392e738c8c89859a47..e730e8f8c0c40f5f8c8e3abded4c7757ae80f28d 100644
--- a/src/plugins/qmljseditor/quicktoolbarsettingspage.ui
+++ b/src/plugins/qmljseditor/quicktoolbarsettingspage.ui
@@ -19,21 +19,21 @@
<property name="title">
<string>Qt Quick Toolbars</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout">
+ <layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <widget class="QCheckBox" name="textEditHelperCheckBoxPin">
- <property name="toolTip">
- <string>If enabled, the toolbar will remain pinned to an absolute position.</string>
- </property>
+ <widget class="QCheckBox" name="textEditHelperCheckBox">
<property name="text">
- <string>Pin Qt Quick Toolbar</string>
+ <string>Always show Qt Quick Toolbar</string>
</property>
</widget>
</item>
<item>
- <widget class="QCheckBox" name="textEditHelperCheckBox">
+ <widget class="QCheckBox" name="textEditHelperCheckBoxPin">
+ <property name="toolTip">
+ <string>If enabled, the toolbar will remain pinned to an absolute position.</string>
+ </property>
<property name="text">
- <string>Always show Qt Quick Toolbar</string>
+ <string>Pin Qt Quick Toolbar</string>
</property>
</widget>
</item>
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.ui b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.ui
index 850bfedaa974c80892e81663e0de6bdcccb86900..e540158921b996b2e6ea08818fe4fe12636283b3 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.ui
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.ui
@@ -13,9 +13,9 @@
<property name="windowTitle">
<string>Maemo Device Configurations</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_3">
+ <layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <layout class="QHBoxLayout" name="horizontalLayout">
+ <layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
@@ -46,53 +46,6 @@
</item>
</layout>
</item>
- <item>
- <widget class="QToolButton" name="addConfigButton">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="focusPolicy">
- <enum>Qt::StrongFocus</enum>
- </property>
- <property name="text">
- <string>&Add</string>
- </property>
- <property name="icon">
- <iconset resource="../../coreplugin/core.qrc">
- <normaloff>:/core/images/plus-16.png</normaloff>:/core/images/plus-16.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QToolButton" name="removeConfigButton">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="focusPolicy">
- <enum>Qt::StrongFocus</enum>
- </property>
- <property name="text">
- <string>&Remove</string>
- </property>
- <property name="icon">
- <iconset resource="../../coreplugin/core.qrc">
- <normaloff>:/core/images/minus-16.png</normaloff>:/core/images/minus-16.png</iconset>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QFrame" name="frame">
<property name="frameShape">
@@ -102,9 +55,6 @@
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
- <property name="topMargin">
- <number>0</number>
- </property>
<item>
<widget class="QWidget" name="detailsWidget" native="true">
<property name="enabled">
@@ -117,9 +67,6 @@
</sizepolicy>
</property>
<layout class="QFormLayout" name="formLayout_2">
- <property name="topMargin">
- <number>0</number>
- </property>
<item row="0" column="0">
<widget class="QLabel" name="deviceNameLabel">
<property name="text">
@@ -413,99 +360,122 @@
</layout>
</widget>
</item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QPushButton" name="testConfigButton">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="focusPolicy">
- <enum>Qt::StrongFocus</enum>
- </property>
- <property name="toolTip">
- <string>Click here to check whether this device is properly set up to run Maemo projects.</string>
- </property>
- <property name="text">
- <string>&Test</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="generateKeyButton">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="focusPolicy">
- <enum>Qt::StrongFocus</enum>
- </property>
- <property name="toolTip">
- <string>Click here if you do not have an SSH key yet.</string>
- </property>
- <property name="text">
- <string>&Generate SSH Key ...</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="deployKeyButton">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="focusPolicy">
- <enum>Qt::StrongFocus</enum>
- </property>
- <property name="toolTip">
- <string>This will enable you to log into the device without a password.</string>
- </property>
- <property name="text">
- <string>&Deploy Public Key ...</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="remoteProcessesButton">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="focusPolicy">
- <enum>Qt::StrongFocus</enum>
- </property>
- <property name="toolTip">
- <string>Click here to see which processes are running on the device.</string>
- </property>
- <property name="text">
- <string>Remote Processes ...</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="defaultDeviceButton">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="focusPolicy">
- <enum>Qt::StrongFocus</enum>
- </property>
- <property name="text">
- <string>Set As Default</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
+ <widget class="QPushButton" name="addConfigButton">
+ <property name="focusPolicy">
+ <enum>Qt::StrongFocus</enum>
+ </property>
+ <property name="text">
+ <string>&Add</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="removeConfigButton">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="focusPolicy">
+ <enum>Qt::StrongFocus</enum>
+ </property>
+ <property name="text">
+ <string>&Remove</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="testConfigButton">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="focusPolicy">
+ <enum>Qt::StrongFocus</enum>
+ </property>
+ <property name="toolTip">
+ <string>Click here to check whether this device is properly set up to run Maemo projects.</string>
+ </property>
+ <property name="text">
+ <string>&Test</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="generateKeyButton">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="focusPolicy">
+ <enum>Qt::StrongFocus</enum>
+ </property>
+ <property name="toolTip">
+ <string>Click here if you do not have an SSH key yet.</string>
+ </property>
+ <property name="text">
+ <string>&Generate SSH Key ...</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="deployKeyButton">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="focusPolicy">
+ <enum>Qt::StrongFocus</enum>
+ </property>
+ <property name="toolTip">
+ <string>This will enable you to log into the device without a password.</string>
+ </property>
+ <property name="text">
+ <string>&Deploy Public Key ...</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="remoteProcessesButton">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="focusPolicy">
+ <enum>Qt::StrongFocus</enum>
+ </property>
+ <property name="toolTip">
+ <string>Click here to see which processes are running on the device.</string>
+ </property>
+ <property name="text">
+ <string>Remote Processes ...</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="defaultDeviceButton">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="focusPolicy">
+ <enum>Qt::StrongFocus</enum>
+ </property>
+ <property name="text">
+ <string>Set As Default</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
</item>
</layout>
</item>
@@ -523,9 +493,7 @@
</slots>
</customwidget>
</customwidgets>
- <resources>
- <include location="../../coreplugin/core.qrc"/>
- </resources>
+ <resources/>
<connections>
<connection>
<sender>hostLineEdit</sender>
@@ -575,6 +543,38 @@
</hint>
</hints>
</connection>
+ <connection>
+ <sender>addConfigButton</sender>
+ <signal>clicked()</signal>
+ <receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
+ <slot>addConfig()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>465</x>
+ <y>27</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>516</x>
+ <y>118</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>removeConfigButton</sender>
+ <signal>clicked()</signal>
+ <receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
+ <slot>deleteConfig()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>473</x>
+ <y>61</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>513</x>
+ <y>101</y>
+ </hint>
+ </hints>
+ </connection>
<connection>
<sender>passwordButton</sender>
<signal>toggled(bool)</signal>
diff --git a/src/plugins/texteditor/fontsettingspage.ui b/src/plugins/texteditor/fontsettingspage.ui
index c1d82eee29e9775ec8bfb1c45f0c2ba458cd0fbc..4e27fc00a6450a4fb2caeaafd59e0b610ff353ae 100644
--- a/src/plugins/texteditor/fontsettingspage.ui
+++ b/src/plugins/texteditor/fontsettingspage.ui
@@ -170,20 +170,13 @@
</widget>
</item>
<item>
- <widget class="QToolButton" name="deleteButton">
+ <widget class="QPushButton" name="deleteButton">
<property name="enabled">
<bool>false</bool>
</property>
- <property name="toolTip">
- <string>Delete</string>
- </property>
<property name="text">
<string>Delete</string>
</property>
- <property name="icon">
- <iconset resource="../coreplugin/core.qrc">
- <normaloff>:/core/images/minus-16.png</normaloff>:/core/images/minus-16.png</iconset>
- </property>
</widget>
</item>
</layout>
@@ -211,8 +204,6 @@
<container>1</container>
</customwidget>
</customwidgets>
- <resources>
- <include location="../coreplugin/core.qrc"/>
- </resources>
+ <resources/>
<connections/>
</ui>
diff --git a/src/plugins/texteditor/generichighlighter/highlightersettingspage.ui b/src/plugins/texteditor/generichighlighter/highlightersettingspage.ui
index dd66fb004ba3047a8d389e952e1592b10f56820b..65f7d43f5e713452b6640b06019794ddb5ef5db3 100644
--- a/src/plugins/texteditor/generichighlighter/highlightersettingspage.ui
+++ b/src/plugins/texteditor/generichighlighter/highlightersettingspage.ui
@@ -40,22 +40,6 @@
</property>
</widget>
</item>
- <item>
- <spacer name="verticalSpacer_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>5</height>
- </size>
- </property>
- </spacer>
- </item>
<item>
<widget class="QGroupBox" name="definitionFilesGroupBox">
<property name="title">
diff --git a/src/plugins/texteditor/snippets/snippetssettingspage.ui b/src/plugins/texteditor/snippets/snippetssettingspage.ui
index b885093fd8d001662ba1d3cbff9c10d567360a1c..e95fa7afc7ce939fe65e5e76e00bd342cddd618a 100644
--- a/src/plugins/texteditor/snippets/snippetssettingspage.ui
+++ b/src/plugins/texteditor/snippets/snippetssettingspage.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>618</width>
- <height>413</height>
+ <width>684</width>
+ <height>554</height>
</rect>
</property>
<property name="windowTitle">
@@ -42,7 +42,7 @@
</layout>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
@@ -65,73 +65,22 @@
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
- <property name="sizeConstraint">
- <enum>QLayout::SetMaximumSize</enum>
- </property>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="QToolButton" name="addButton">
- <property name="text">
- <string>Add</string>
- </property>
- <property name="icon">
- <iconset resource="../../coreplugin/core.qrc">
- <normaloff>:/core/images/plus-16.png</normaloff>:/core/images/plus-16.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QToolButton" name="removeButton">
- <property name="text">
- <string>Remove</string>
- </property>
- <property name="icon">
- <iconset resource="../../coreplugin/core.qrc">
- <normaloff>:/core/images/minus-16.png</normaloff>:/core/images/minus-16.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Preferred</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>60</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QToolButton" name="resetAllButton">
- <property name="toolTip">
- <string>Reset</string>
- </property>
- <property name="text">
- <string>Reset All</string>
- </property>
- <property name="icon">
- <iconset resource="../../coreplugin/core.qrc">
- <normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset>
- </property>
- </widget>
- </item>
- </layout>
+ <widget class="QPushButton" name="addButton">
+ <property name="text">
+ <string>Add</string>
+ </property>
+ </widget>
</item>
<item>
- <widget class="QPushButton" name="revertButton">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <widget class="QPushButton" name="removeButton">
+ <property name="text">
+ <string>Remove</string>
</property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="revertButton">
<property name="text">
<string>Revert Built-in</string>
</property>
@@ -139,17 +88,18 @@
</item>
<item>
<widget class="QPushButton" name="restoreRemovedButton">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
<property name="text">
<string>Restore Removed Built-ins</string>
</property>
</widget>
</item>
+ <item>
+ <widget class="QPushButton" name="resetAllButton">
+ <property name="text">
+ <string>Reset All</string>
+ </property>
+ </widget>
+ </item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
@@ -175,8 +125,6 @@
<tabstop>removeButton</tabstop>
<tabstop>snippetsTable</tabstop>
</tabstops>
- <resources>
- <include location="../../coreplugin/core.qrc"/>
- </resources>
+ <resources/>
<connections/>
</ui>