Skip to content
Snippets Groups Projects
Commit a5977bc8 authored by Leandro Melo's avatar Leandro Melo
Browse files

Revert "Make our options dialog a bit more uniform" 

This reverts commit 561f87fc.
parent f4c25ad5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 169 additions and 290 deletions
src/plugins/coreplugin/actionmanager/commandmappings.ui
+ 7
− 9
View file @ a5977bc8
...@@ -58,17 +58,10 @@ ...@@ -58,17 +58,10 @@
<item> <item>
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<item> <item>
<widget class="QToolButton" name="defaultButton"> <widget class="QPushButton" name="defaultButton">
<property name="toolTip">
<string>Reset all to default</string>
</property>
<property name="text"> <property name="text">
<string>Defaults</string> <string>Defaults</string>
</property> </property>
<property name="icon">
<iconset resource="../core.qrc">
<normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset>
</property>
</widget> </widget>
</item> </item>
<item> <item>
...@@ -136,7 +129,7 @@ ...@@ -136,7 +129,7 @@
</size> </size>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Reset to default</string> <string>Reset</string>
</property> </property>
<property name="text"> <property name="text">
<string/> <string/>
...@@ -168,6 +161,11 @@ ...@@ -168,6 +161,11 @@
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>Utils::FancyLineEdit</class>
<extends>QLineEdit</extends>
<header location="global">utils/fancylineedit.h</header>
</customwidget>
<customwidget> <customwidget>
<class>Utils::FilterLineEdit</class> <class>Utils::FilterLineEdit</class>
<extends>QLineEdit</extends> <extends>QLineEdit</extends>
......
src/plugins/coreplugin/core.qrc
+ 1
− 4
View file @ a5977bc8
...@@ -65,9 +65,6 @@ ...@@ -65,9 +65,6 @@
<file>images/category_cpp.png</file> <file>images/category_cpp.png</file>
<file>images/category_vcs.png</file> <file>images/category_vcs.png</file>
<file>images/category_qml.png</file> <file>images/category_qml.png</file>
<file>images/filtericon.png</file> <file>images/filtericon.png</file>
<file>images/plus-16.png</file>
<file>images/minus-16.png</file>
<file>images/edit.png</file>
</qresource> </qresource>
</RCC> </RCC>
src/plugins/coreplugin/coreconstants.h
+ 2
− 3
View file @ a5977bc8
...@@ -217,9 +217,8 @@ const char * const G_WINDOW_OTHER = "QtCreator.Group.Window.Other"; ...@@ -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_HELP = "QtCreator.Group.Help.Help";
const char * const G_HELP_ABOUT = "QtCreator.Group.Help.About"; const char * const G_HELP_ABOUT = "QtCreator.Group.Help.About";
const char * const ICON_MINUS = ":/core/images/minus-16.png"; const char * const ICON_MINUS = ":/core/images/minus.png";
const char * const ICON_PLUS = ":/core/images/plus-16.png"; const char * const ICON_PLUS = ":/core/images/plus.png";
const char * const ICON_EDIT = ":/core/images/edit.png";
const char * const ICON_NEWFILE = ":/core/images/filenew.png"; const char * const ICON_NEWFILE = ":/core/images/filenew.png";
const char * const ICON_OPENFILE = ":/core/images/fileopen.png"; const char * const ICON_OPENFILE = ":/core/images/fileopen.png";
const char * const ICON_SAVEFILE = ":/core/images/filesave.png"; const char * const ICON_SAVEFILE = ":/core/images/filesave.png";
......
src/plugins/coreplugin/images/edit.png deleted 100644 → 0
+ 0
− 0
View file @ f4c25ad5
src/plugins/coreplugin/images/edit.png

929 B

src/plugins/coreplugin/images/minus-16.png deleted 100644 → 0
+ 0
− 0
View file @ f4c25ad5
src/plugins/coreplugin/images/minus-16.png

296 B

src/plugins/coreplugin/images/plus-16.png deleted 100644 → 0
+ 0
− 0
View file @ f4c25ad5
src/plugins/coreplugin/images/plus-16.png

383 B

src/plugins/cpaster/codepastersettings.cpp
+ 4
− 2
View file @ a5977bc8
...@@ -97,8 +97,10 @@ QWidget *CodePasterSettingsPage::createPage(QWidget *parent) ...@@ -97,8 +97,10 @@ QWidget *CodePasterSettingsPage::createPage(QWidget *parent)
connect(lineEdit, SIGNAL(textChanged(QString)), this, SLOT(serverChanged(QString))); connect(lineEdit, SIGNAL(textChanged(QString)), this, SLOT(serverChanged(QString)));
formLayout->addRow(tr("Server:"), lineEdit); formLayout->addRow(tr("Server:"), lineEdit);
outerLayout->addLayout(formLayout); outerLayout->addLayout(formLayout);
QLabel *noteLabel = new QLabel(tr("<i>Note: Specify the host name for the CodePaster service " outerLayout->addSpacerItem(new QSpacerItem(0, 30, QSizePolicy::Ignored, QSizePolicy::Fixed));
"without any protocol prepended (e.g. codepaster.mycompany.com).</i>"));
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); noteLabel->setWordWrap(true);
outerLayout->addWidget(noteLabel); outerLayout->addWidget(noteLabel);
......
src/plugins/cpaster/fileshareprotocolsettingswidget.ui
+ 12
− 41
View file @ a5977bc8
...@@ -2,32 +2,11 @@ ...@@ -2,32 +2,11 @@
<ui version="4.0"> <ui version="4.0">
<class>CodePaster::FileShareProtocolSettingsWidget</class> <class>CodePaster::FileShareProtocolSettingsWidget</class>
<widget class="QWidget" name="CodePaster::FileShareProtocolSettingsWidget"> <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"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy"> <item row="1" column="0">
<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">
<widget class="QLabel" name="pathLabel"> <widget class="QLabel" name="pathLabel">
<property name="text"> <property name="text">
<string>&amp;Path:</string> <string>&amp;Path:</string>
...@@ -37,10 +16,10 @@ ...@@ -37,10 +16,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="1" column="1">
<widget class="Utils::PathChooser" name="pathChooser" native="true"/> <widget class="Utils::PathChooser" name="pathChooser"/>
</item> </item>
<item row="3" column="0"> <item row="2" column="0">
<widget class="QLabel" name="displayCountLabel"> <widget class="QLabel" name="displayCountLabel">
<property name="text"> <property name="text">
<string>&amp;Display:</string> <string>&amp;Display:</string>
...@@ -50,7 +29,7 @@ ...@@ -50,7 +29,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="2" column="1">
<widget class="QSpinBox" name="displayCountSpinBox"> <widget class="QSpinBox" name="displayCountSpinBox">
<property name="suffix"> <property name="suffix">
<string>entries</string> <string>entries</string>
...@@ -66,18 +45,15 @@ ...@@ -66,18 +45,15 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="0" column="0" colspan="2">
<spacer name="verticalSpacer"> <widget class="QLabel" name="helpLabel">
<property name="orientation"> <property name="text">
<enum>Qt::Vertical</enum> <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>
<property name="sizeHint" stdset="0"> <property name="wordWrap">
<size> <bool>true</bool>
<width>20</width>
<height>5</height>
</size>
</property> </property>
</spacer> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
...@@ -86,11 +62,6 @@ ...@@ -86,11 +62,6 @@
<class>Utils::PathChooser</class> <class>Utils::PathChooser</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header location="global">utils/pathchooser.h</header> <header location="global">utils/pathchooser.h</header>
<container>1</container>
<slots>
<signal>editingFinished()</signal>
<signal>browsingFinished()</signal>
</slots>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>
......
src/plugins/cpaster/pastebindotcomsettings.ui
+ 18
− 23
View file @ a5977bc8
...@@ -15,11 +15,21 @@ ...@@ -15,11 +15,21 @@
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<widget class="QLabel" name="label"> <layout class="QFormLayout" name="formLayout">
<property name="text"> <property name="fieldGrowthPolicy">
<string>&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; allows to send posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix.</string> <enum>QFormLayout::ExpandingFieldsGrow</enum>
</property> </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>
<item> <item>
<spacer name="explanatoryTextSpacer"> <spacer name="explanatoryTextSpacer">
...@@ -32,32 +42,17 @@ ...@@ -32,32 +42,17 @@
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>0</width> <width>0</width>
<height>5</height> <height>30</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </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> <item>
<widget class="QLabel" name="explanatoryTextLabel"> <widget class="QLabel" name="explanatoryTextLabel">
<property name="text"> <property name="text">
<string>&lt;i&gt;Note: The plugin will use this for posting as well as fetching.&lt;/i&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
&lt;p&gt;&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; allows to send posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix.&lt;/p&gt;
&lt;p&gt;Note that the plugin will use this for posting as well as fetching.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="textFormat"> <property name="textFormat">
<enum>Qt::AutoText</enum> <enum>Qt::AutoText</enum>
......
src/plugins/cpptools/cppfilesettingspage.cpp
+ 0
− 3
View file @ a5977bc8
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/mimedatabase.h> #include <coreplugin/mimedatabase.h>
#include <cppeditor/cppeditorconstants.h> #include <cppeditor/cppeditorconstants.h>
...@@ -53,7 +52,6 @@ ...@@ -53,7 +52,6 @@
#include <QtCore/QTextCodec> #include <QtCore/QTextCodec>
#include <QtCore/QTextStream> #include <QtCore/QTextStream>
#include <QtGui/QIcon>
#include <QtGui/QFileDialog> #include <QtGui/QFileDialog>
#include <QtGui/QMessageBox> #include <QtGui/QMessageBox>
...@@ -249,7 +247,6 @@ CppFileSettingsWidget::CppFileSettingsWidget(QWidget *parent) : ...@@ -249,7 +247,6 @@ CppFileSettingsWidget::CppFileSettingsWidget(QWidget *parent) :
m_ui->headerSuffixComboBox->addItem(suffix); m_ui->headerSuffixComboBox->addItem(suffix);
m_ui->licenseTemplatePathChooser->setExpectedKind(Utils::PathChooser::File); m_ui->licenseTemplatePathChooser->setExpectedKind(Utils::PathChooser::File);
m_ui->licenseTemplatePathChooser->addButton(tr("Edit..."), this, SLOT(slotEdit())); m_ui->licenseTemplatePathChooser->addButton(tr("Edit..."), this, SLOT(slotEdit()));
m_ui->licenseTemplatePathChooser->buttonAtIndex(1)->setIcon(QIcon(Core::Constants::ICON_EDIT));
} }
CppFileSettingsWidget::~CppFileSettingsWidget() CppFileSettingsWidget::~CppFileSettingsWidget()
......
src/plugins/debugger/dumperoptionpage.ui
+ 4
− 22
View file @ a5977bc8
...@@ -10,15 +10,13 @@ ...@@ -10,15 +10,13 @@
<height>303</height> <height>303</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_3">
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;p&gt;The debugging helper is only used to produce a nice display of objects of certain types like QString or std::map in the &amp;quot;Locals and Watchers&amp;quot; view.&lt;/p&gt;
p, li { white-space: pre-wrap; } &lt;p&gt; It is not strictly necessary for debugging with Qt Creator. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;The debugging helper is only used to produce a nice display of objects of certain types like QString or std::map in the &amp;quot;Locals and Watchers&amp;quot; view. It is not strictly necessary for debugging with Qt Creator. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="textFormat"> <property name="textFormat">
<enum>Qt::AutoText</enum> <enum>Qt::AutoText</enum>
...@@ -28,22 +26,6 @@ p, li { white-space: pre-wrap; } ...@@ -28,22 +26,6 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </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> <item>
<widget class="QGroupBox" name="debuggingHelperGroupBox"> <widget class="QGroupBox" name="debuggingHelperGroupBox">
<property name="title"> <property name="title">
......
src/plugins/help/docsettingspage.ui
+ 3
− 13
View file @ a5977bc8
...@@ -39,25 +39,17 @@ ...@@ -39,25 +39,17 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QToolButton" name="addButton"> <widget class="QPushButton" name="addButton">
<property name="text"> <property name="text">
<string>Add...</string> <string>Add...</string>
</property> </property>
<property name="icon">
<iconset resource="../coreplugin/core.qrc">
<normaloff>:/core/images/plus-16.png</normaloff>:/core/images/plus-16.png</iconset>
</property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="removeButton"> <widget class="QPushButton" name="removeButton">
<property name="text"> <property name="text">
<string>Remove</string> <string>Remove</string>
</property> </property>
<property name="icon">
<iconset resource="../coreplugin/core.qrc">
<normaloff>:/core/images/minus-16.png</normaloff>:/core/images/minus-16.png</iconset>
</property>
</widget> </widget>
</item> </item>
<item> <item>
...@@ -80,8 +72,6 @@ ...@@ -80,8 +72,6 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<resources> <resources/>
<include location="../coreplugin/core.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>
src/plugins/help/filtersettingspage.ui
+ 3
− 13
View file @ a5977bc8
...@@ -113,25 +113,17 @@ Add, modify, and remove document filters, which determine the documentation set ...@@ -113,25 +113,17 @@ Add, modify, and remove document filters, which determine the documentation set
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QToolButton" name="filterAddButton"> <widget class="QPushButton" name="filterAddButton">
<property name="text"> <property name="text">
<string>Add</string> <string>Add</string>
</property> </property>
<property name="icon">
<iconset resource="../coreplugin/core.qrc">
<normaloff>:/core/images/plus-16.png</normaloff>:/core/images/plus-16.png</iconset>
</property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="filterRemoveButton"> <widget class="QPushButton" name="filterRemoveButton">
<property name="text"> <property name="text">
<string>Remove</string> <string>Remove</string>
</property> </property>
<property name="icon">
<iconset resource="../coreplugin/core.qrc">
<normaloff>:/core/images/minus-16.png</normaloff>:/core/images/minus-16.png</iconset>
</property>
</widget> </widget>
</item> </item>
<item> <item>
...@@ -151,8 +143,6 @@ Add, modify, and remove document filters, which determine the documentation set ...@@ -151,8 +143,6 @@ Add, modify, and remove document filters, which determine the documentation set
</item> </item>
</layout> </layout>
</widget> </widget>
<resources> <resources/>
<include location="../coreplugin/core.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>
src/plugins/help/generalsettingspage.ui
+ 3
− 12
View file @ a5977bc8
...@@ -264,16 +264,9 @@ ...@@ -264,16 +264,9 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="defaultPageButton"> <widget class="QPushButton" name="defaultPageButton">
<property name="toolTip">
<string>Reset to default</string>
</property>
<property name="text"> <property name="text">
<string>Reset to Default</string> <string>Restore to Default</string>
</property>
<property name="icon">
<iconset resource="../coreplugin/core.qrc">
<normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -400,8 +393,6 @@ ...@@ -400,8 +393,6 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<resources> <resources/>
<include location="../coreplugin/core.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>
src/plugins/help/remotehelpfilter.ui
+ 1
− 11
View file @ a5977bc8
...@@ -75,10 +75,6 @@ ...@@ -75,10 +75,6 @@
<property name="text"> <property name="text">
<string>+</string> <string>+</string>
</property> </property>
<property name="icon">
<iconset resource="../coreplugin/core.qrc">
<normaloff>:/core/images/plus-16.png</normaloff>:/core/images/plus-16.png</iconset>
</property>
</widget> </widget>
</item> </item>
<item> <item>
...@@ -92,10 +88,6 @@ ...@@ -92,10 +88,6 @@
<property name="text"> <property name="text">
<string>-</string> <string>-</string>
</property> </property>
<property name="icon">
<iconset resource="../coreplugin/core.qrc">
<normaloff>:/core/images/minus-16.png</normaloff>:/core/images/minus-16.png</iconset>
</property>
</widget> </widget>
</item> </item>
<item> <item>
...@@ -127,9 +119,7 @@ ...@@ -127,9 +119,7 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<resources> <resources/>
<include location="../coreplugin/core.qrc"/>
</resources>
<connections> <connections>
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>
......
src/plugins/locator/directoryfilter.ui
+ 55
− 82
View file @ a5977bc8
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>387</width> <width>393</width>
<height>285</height> <height>275</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout">
...@@ -23,83 +23,6 @@ ...@@ -23,83 +23,6 @@
<item row="0" column="1" colspan="3"> <item row="0" column="1" colspan="3">
<widget class="QLineEdit" name="nameEdit"/> <widget class="QLineEdit" name="nameEdit"/>
</item> </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"> <item row="2" column="0">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
...@@ -157,6 +80,58 @@ To do this, you type this shortcut and a space in the Locator entry field, and t ...@@ -157,6 +80,58 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
</property> </property>
</widget> </widget>
</item> </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> </layout>
</item> </item>
<item row="1" column="0"> <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 ...@@ -181,9 +156,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
</item> </item>
</layout> </layout>
</widget> </widget>
<resources> <resources/>
<include location="../coreplugin/core.qrc"/>
</resources>
<connections> <connections>
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>
......
src/plugins/locator/settingspage.ui
+ 6
− 20
View file @ a5977bc8
...@@ -24,41 +24,29 @@ ...@@ -24,41 +24,29 @@
<item row="0" column="1"> <item row="0" column="1">
<layout class="QVBoxLayout"> <layout class="QVBoxLayout">
<item> <item>
<widget class="QToolButton" name="addButton"> <widget class="QPushButton" name="addButton">
<property name="text"> <property name="text">
<string>Add</string> <string>Add</string>
</property> </property>
<property name="icon">
<iconset resource="../coreplugin/core.qrc">
<normaloff>:/core/images/plus-16.png</normaloff>:/core/images/plus-16.png</iconset>
</property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="editButton"> <widget class="QPushButton" name="removeButton">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="text"> <property name="text">
<string>Edit</string> <string>Remove</string>
</property>
<property name="icon">
<iconset resource="../coreplugin/core.qrc">
<normaloff>:/core/images/edit.png</normaloff>:/core/images/edit.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="removeButton"> <widget class="QPushButton" name="editButton">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="text"> <property name="text">
<string>Remove</string> <string>Edit</string>
</property>
<property name="icon">
<iconset resource="../coreplugin/core.qrc">
<normaloff>:/core/images/minus-16.png</normaloff>:/core/images/minus-16.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -125,8 +113,6 @@ ...@@ -125,8 +113,6 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<resources> <resources/>
<include location="../coreplugin/core.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>
src/plugins/projectexplorer/toolchainoptionspage.ui
+ 2
− 2
View file @ a5977bc8
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../coreplugin/core.qrc"> <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>
<property name="popupMode"> <property name="popupMode">
<enum>QToolButton::InstantPopup</enum> <enum>QToolButton::InstantPopup</enum>
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../coreplugin/core.qrc"> <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> </property>
</widget> </widget>
</item> </item>
......
src/plugins/qmldesigner/settingspage.ui
+ 40
− 22
View file @ a5977bc8
...@@ -6,31 +6,49 @@ ...@@ -6,31 +6,49 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>435</width> <width>433</width>
<height>240</height> <height>428</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QGridLayout" name="gridLayout">
<item> <item row="0" column="0">
<widget class="QGroupBox" name="groupBox_3"> <widget class="QGroupBox" name="groupBox_3">
<property name="title"> <property name="title">
<string>Snapping</string> <string>Snapping</string>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QGridLayout" name="gridLayout_6">
<item> <property name="margin">
<layout class="QGridLayout" name="gridLayout"> <number>9</number>
<item row="0" column="0"> </property>
<widget class="QLabel" name="snapMarginLabel"> <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"> <property name="text">
<string>Snap margin:</string> <string>Item spacing</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="2" column="1">
<widget class="QSpinBox" name="spinSnapMargin"> <widget class="QSpinBox" name="spinItemSpacing">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
...@@ -38,19 +56,19 @@ ...@@ -38,19 +56,19 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>10</number> <number>50</number>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="0" column="0">
<widget class="QLabel" name="itemSpacingLabel"> <widget class="QLabel" name="snapMarginLabel">
<property name="text"> <property name="text">
<string>Item spacing:</string> <string>Snap margin</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="2" column="0">
<widget class="QSpinBox" name="spinItemSpacing"> <widget class="QSpinBox" name="spinSnapMargin">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
...@@ -58,20 +76,20 @@ ...@@ -58,20 +76,20 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>50</number> <number>10</number>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
<item> <item row="0" column="1">
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>273</width> <width>40</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
...@@ -80,7 +98,7 @@ ...@@ -80,7 +98,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item row="1" column="0">
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
......
src/plugins/qmljseditor/quicktoolbarsettingspage.ui
+ 8
− 8
View file @ a5977bc8
...@@ -19,21 +19,21 @@ ...@@ -19,21 +19,21 @@
<property name="title"> <property name="title">
<string>Qt Quick Toolbars</string> <string>Qt Quick Toolbars</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QCheckBox" name="textEditHelperCheckBoxPin"> <widget class="QCheckBox" name="textEditHelperCheckBox">
<property name="toolTip">
<string>If enabled, the toolbar will remain pinned to an absolute position.</string>
</property>
<property name="text"> <property name="text">
<string>Pin Qt Quick Toolbar</string> <string>Always show Qt Quick Toolbar</string>
</property> </property>
</widget> </widget>
</item> </item>
<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"> <property name="text">
<string>Always show Qt Quick Toolbar</string> <string>Pin Qt Quick Toolbar</string>
</property> </property>
</widget> </widget>
</item> </item>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment