diff options
24 files changed, 253 insertions, 233 deletions
diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.cpp b/src/plugins/coreplugin/actionmanager/commandmappings.cpp index 17c161e2bd..0164ad1a42 100644 --- a/src/plugins/coreplugin/actionmanager/commandmappings.cpp +++ b/src/plugins/coreplugin/actionmanager/commandmappings.cpp @@ -73,7 +73,6 @@ QWidget *CommandMappings::createPage(QWidget *parent) m_page = new Ui_CommandMappings(); QWidget *w = new QWidget(parent); m_page->setupUi(w); - m_page->resetButton->setIcon(QPixmap(Constants::ICON_RESET)); m_page->targetEdit->setAutoHideButton(Utils::FancyLineEdit::Right, true); m_page->targetEdit->installEventFilter(this); diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.ui b/src/plugins/coreplugin/actionmanager/commandmappings.ui index 6bbbdf9f46..8a6cb60746 100644 --- a/src/plugins/coreplugin/actionmanager/commandmappings.ui +++ b/src/plugins/coreplugin/actionmanager/commandmappings.ui @@ -59,8 +59,11 @@ <layout class="QHBoxLayout"> <item> <widget class="QPushButton" name="defaultButton"> + <property name="toolTip"> + <string>Reset all to default</string> + </property> <property name="text"> - <string>Defaults</string> + <string>Reset All</string> </property> </widget> </item> @@ -115,28 +118,18 @@ <widget class="Utils::FilterLineEdit" name="targetEdit"/> </item> <item> - <widget class="QToolButton" name="resetButton"> + <widget class="QPushButton" name="resetButton"> <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> - <size> - <width>27</width> - <height>27</height> - </size> - </property> <property name="toolTip"> - <string>Reset</string> + <string>Reset to default</string> </property> <property name="text"> - <string/> - </property> - <property name="icon"> - <iconset resource="../core.qrc"> - <normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset> + <string>Reset</string> </property> <property name="iconSize"> <size> @@ -162,18 +155,11 @@ </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> <header location="global">utils/filterlineedit.h</header> </customwidget> </customwidgets> - <resources> - <include location="../core.qrc"/> - </resources> + <resources/> <connections/> </ui> diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp index 469cdcec37..17623d445a 100644 --- a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp +++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp @@ -399,9 +399,6 @@ ExternalToolConfig::ExternalToolConfig(QWidget *parent) : connect(ui->modifiesDocumentCheckbox, SIGNAL(clicked()), this, SLOT(updateCurrentItem())); connect(ui->inputText, SIGNAL(textChanged()), this, SLOT(updateCurrentItem())); - ui->addButton->setIcon(QIcon(QLatin1String(Constants::ICON_PLUS))); - ui->removeButton->setIcon(QIcon(QLatin1String(Constants::ICON_MINUS))); - ui->revertButton->setIcon(QIcon(QLatin1String(Constants::ICON_RESET))); connect(ui->revertButton, SIGNAL(clicked()), this, SLOT(revertCurrentItem())); connect(ui->addButton, SIGNAL(clicked()), this, SLOT(add())); connect(ui->removeButton, SIGNAL(clicked()), this, SLOT(removeTool())); diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.ui b/src/plugins/coreplugin/dialogs/externaltoolconfig.ui index 29e90b6f3a..bf48f677e0 100644 --- a/src/plugins/coreplugin/dialogs/externaltoolconfig.ui +++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.ui @@ -35,33 +35,22 @@ <item> <layout class="QHBoxLayout" name="horizontalLayout"> <item> - <widget class="QToolButton" name="addButton"> + <widget class="QPushButton" name="addButton"> <property name="toolTip"> - <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:'Lucida Grande'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Add tool</p></body></html></string> + <string>Add tool</string> </property> <property name="text"> - <string>+</string> - </property> - <property name="popupMode"> - <enum>QToolButton::MenuButtonPopup</enum> + <string>Add</string> </property> </widget> </item> <item> - <widget class="QToolButton" name="removeButton"> + <widget class="QPushButton" name="removeButton"> <property name="toolTip"> - <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:'Lucida Grande'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Remove tool</p></body></html></string> + <string>Remove tool</string> </property> <property name="text"> - <string>-</string> + <string>Remove</string> </property> </widget> </item> @@ -79,16 +68,12 @@ p, li { white-space: pre-wrap; } </spacer> </item> <item> - <widget class="QToolButton" name="revertButton"> + <widget class="QPushButton" name="revertButton"> <property name="toolTip"> - <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:'Lucida Grande'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Revert tool to preset</p></body></html></string> + <string>Revert tool to default</string> </property> <property name="text"> - <string>...</string> + <string>Reset</string> </property> </widget> </item> @@ -153,7 +138,7 @@ p, li { white-space: pre-wrap; } </widget> </item> <item row="3" column="1"> - <widget class="Utils::PathChooser" name="workingDirectory"/> + <widget class="Utils::PathChooser" name="workingDirectory" native="true"/> </item> <item row="4" column="0"> <widget class="QLabel" name="outputLabel"> diff --git a/src/plugins/coreplugin/generalsettings.ui b/src/plugins/coreplugin/generalsettings.ui index 1ede3a8db8..d2766254e9 100644 --- a/src/plugins/coreplugin/generalsettings.ui +++ b/src/plugins/coreplugin/generalsettings.ui @@ -76,16 +76,12 @@ </widget> </item> <item> - <widget class="QToolButton" name="resetButton"> + <widget class="QPushButton" name="resetButton"> <property name="toolTip"> <string>Reset to default</string> </property> <property name="text"> - <string>R</string> - </property> - <property name="icon"> - <iconset resource="core.qrc"> - <normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset> + <string>Reset</string> </property> </widget> </item> @@ -130,20 +126,6 @@ <item row="0" column="1"> <widget class="QLineEdit" name="terminalEdit"/> </item> - <item row="0" column="2"> - <widget class="QToolButton" name="resetTerminalButton"> - <property name="toolTip"> - <string>Reset to default</string> - </property> - <property name="text"> - <string>R</string> - </property> - <property name="icon"> - <iconset resource="core.qrc"> - <normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset> - </property> - </widget> - </item> <item row="1" column="0"> <widget class="QLabel" name="externalFileBrowserLabel"> <property name="text"> @@ -154,20 +136,6 @@ <item row="1" column="1"> <widget class="QLineEdit" name="externalFileBrowserEdit"/> </item> - <item row="1" column="2"> - <widget class="QToolButton" name="resetFileBrowserButton"> - <property name="toolTip"> - <string>Reset to default</string> - </property> - <property name="text"> - <string>R</string> - </property> - <property name="icon"> - <iconset resource="core.qrc"> - <normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset> - </property> - </widget> - </item> <item row="1" column="3"> <widget class="QToolButton" name="helpExternalFileBrowserButton"> <property name="text"> @@ -225,6 +193,26 @@ </item> </layout> </item> + <item row="0" column="2"> + <widget class="QPushButton" name="resetTerminalButton"> + <property name="toolTip"> + <string>Reset to default</string> + </property> + <property name="text"> + <string>Reset</string> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QPushButton" name="resetFileBrowserButton"> + <property name="toolTip"> + <string>Reset to default</string> + </property> + <property name="text"> + <string>Reset</string> + </property> + </widget> + </item> </layout> </widget> </item> diff --git a/src/plugins/cpaster/codepastersettings.cpp b/src/plugins/cpaster/codepastersettings.cpp index 202586c2eb..5d1a6d5d6f 100644 --- a/src/plugins/cpaster/codepastersettings.cpp +++ b/src/plugins/cpaster/codepastersettings.cpp @@ -97,10 +97,10 @@ QWidget *CodePasterSettingsPage::createPage(QWidget *parent) connect(lineEdit, SIGNAL(textChanged(QString)), this, SLOT(serverChanged(QString))); formLayout->addRow(tr("Server:"), lineEdit); outerLayout->addLayout(formLayout); - outerLayout->addSpacerItem(new QSpacerItem(0, 30, QSizePolicy::Ignored, QSizePolicy::Fixed)); + outerLayout->addSpacerItem(new QSpacerItem(0, 3, 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).")); + 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>")); noteLabel->setWordWrap(true); outerLayout->addWidget(noteLabel); diff --git a/src/plugins/cpaster/fileshareprotocolsettingswidget.ui b/src/plugins/cpaster/fileshareprotocolsettingswidget.ui index e36e79f982..fe59dba5de 100644 --- a/src/plugins/cpaster/fileshareprotocolsettingswidget.ui +++ b/src/plugins/cpaster/fileshareprotocolsettingswidget.ui @@ -2,11 +2,48 @@ <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>438</width> + <height>101</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="1" column="0"> + <spacer name="verticalSpacer"> + <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>3</height> + </size> + </property> + </spacer> + </item> + <item row="2" column="0"> <widget class="QLabel" name="pathLabel"> <property name="text"> <string>&Path:</string> @@ -16,10 +53,10 @@ </property> </widget> </item> - <item row="1" column="1"> - <widget class="Utils::PathChooser" name="pathChooser"/> + <item row="2" column="1"> + <widget class="Utils::PathChooser" name="pathChooser" native="true"/> </item> - <item row="2" column="0"> + <item row="3" column="0"> <widget class="QLabel" name="displayCountLabel"> <property name="text"> <string>&Display:</string> @@ -29,7 +66,7 @@ </property> </widget> </item> - <item row="2" column="1"> + <item row="3" column="1"> <widget class="QSpinBox" name="displayCountSpinBox"> <property name="suffix"> <string>entries</string> @@ -45,16 +82,6 @@ </property> </widget> </item> - <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> </layout> </widget> <customwidgets> @@ -62,6 +89,11 @@ <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 73844e4d5e..10b3732eda 100644 --- a/src/plugins/cpaster/pastebindotcomsettings.ui +++ b/src/plugins/cpaster/pastebindotcomsettings.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>549</width> - <height>330</height> + <width>570</width> + <height>129</height> </rect> </property> <property name="windowTitle"> @@ -15,6 +15,29 @@ </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> + </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>3</height> + </size> + </property> + </spacer> + </item> + <item> <layout class="QFormLayout" name="formLayout"> <property name="fieldGrowthPolicy"> <enum>QFormLayout::ExpandingFieldsGrow</enum> @@ -32,27 +55,9 @@ </layout> </item> <item> - <spacer name="explanatoryTextSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Fixed</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>0</width> - <height>30</height> - </size> - </property> - </spacer> - </item> - <item> <widget class="QLabel" name="explanatoryTextLabel"> <property name="text"> - <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> + <string><i>Note: The plugin will use this for posting as well as fetching.</i></string> </property> <property name="textFormat"> <enum>Qt::AutoText</enum> diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp index e208ce88ef..66b17f9d00 100644 --- a/src/plugins/cpptools/cppfilesettingspage.cpp +++ b/src/plugins/cpptools/cppfilesettingspage.cpp @@ -246,7 +246,7 @@ CppFileSettingsWidget::CppFileSettingsWidget(QWidget *parent) : foreach (const QString &suffix, headerMt.suffixes()) m_ui->headerSuffixComboBox->addItem(suffix); 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())); } CppFileSettingsWidget::~CppFileSettingsWidget() diff --git a/src/plugins/debugger/dumperoptionpage.ui b/src/plugins/debugger/dumperoptionpage.ui index e84f1abae1..3dcf247816 100644 --- a/src/plugins/debugger/dumperoptionpage.ui +++ b/src/plugins/debugger/dumperoptionpage.ui @@ -15,8 +15,7 @@ <widget class="QLabel" name="label"> <property name="text"> <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> +<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. It is not strictly necessary for debugging with Qt Creator. </p></body></html></string> </property> <property name="textFormat"> <enum>Qt::AutoText</enum> @@ -27,6 +26,22 @@ </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>3</height> + </size> + </property> + </spacer> + </item> + <item> <widget class="QGroupBox" name="debuggingHelperGroupBox"> <property name="title"> <string>Use Debugging Helper</string> diff --git a/src/plugins/help/docsettingspage.ui b/src/plugins/help/docsettingspage.ui index 25c94a9f55..13ffbcde63 100644 --- a/src/plugins/help/docsettingspage.ui +++ b/src/plugins/help/docsettingspage.ui @@ -41,7 +41,7 @@ <item> <widget class="QPushButton" name="addButton"> <property name="text"> - <string>Add...</string> + <string>Add</string> </property> </widget> </item> diff --git a/src/plugins/help/generalsettingspage.ui b/src/plugins/help/generalsettingspage.ui index 2a49b65982..4726aa030f 100644 --- a/src/plugins/help/generalsettingspage.ui +++ b/src/plugins/help/generalsettingspage.ui @@ -265,8 +265,11 @@ </item> <item> <widget class="QPushButton" name="defaultPageButton"> + <property name="toolTip"> + <string>Reset to default</string> + </property> <property name="text"> - <string>Restore to Default</string> + <string>Reset</string> </property> </widget> </item> diff --git a/src/plugins/help/remotehelpfilter.ui b/src/plugins/help/remotehelpfilter.ui index 1461573b08..f7461cd28e 100644 --- a/src/plugins/help/remotehelpfilter.ui +++ b/src/plugins/help/remotehelpfilter.ui @@ -65,7 +65,7 @@ <item> <layout class="QVBoxLayout" name="verticalLayout"> <item> - <widget class="QToolButton" name="add"> + <widget class="QPushButton" name="add"> <property name="minimumSize"> <size> <width>21</width> @@ -73,12 +73,12 @@ </size> </property> <property name="text"> - <string>+</string> + <string>Add</string> </property> </widget> </item> <item> - <widget class="QToolButton" name="remove"> + <widget class="QPushButton" name="remove"> <property name="minimumSize"> <size> <width>21</width> @@ -86,7 +86,7 @@ </size> </property> <property name="text"> - <string>-</string> + <string>Remove</string> </property> </widget> </item> diff --git a/src/plugins/locator/directoryfilter.ui b/src/plugins/locator/directoryfilter.ui index 2786e0515d..96d50cb59b 100644 --- a/src/plugins/locator/directoryfilter.ui +++ b/src/plugins/locator/directoryfilter.ui @@ -85,14 +85,14 @@ To do this, you type this shortcut and a space in the Locator entry field, and t <item> <widget class="QPushButton" name="addButton"> <property name="text"> - <string>Add...</string> + <string>Add</string> </property> </widget> </item> <item> <widget class="QPushButton" name="editButton"> <property name="text"> - <string>Edit...</string> + <string>Edit</string> </property> </widget> </item> @@ -103,6 +103,19 @@ To do this, you type this shortcut and a space in the Locator entry field, and t </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="1" column="0"> diff --git a/src/plugins/macros/macrooptionswidget.cpp b/src/plugins/macros/macrooptionswidget.cpp index 8a8089d19e..92b572a417 100644 --- a/src/plugins/macros/macrooptionswidget.cpp +++ b/src/plugins/macros/macrooptionswidget.cpp @@ -72,7 +72,6 @@ MacroOptionsWidget::MacroOptionsWidget(QWidget *parent) : m_changingCurrent(false) { m_ui->setupUi(this); - m_ui->removeButton->setIcon(QIcon(Core::Constants::ICON_MINUS)); connect(m_ui->treeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(changeCurrentItem(QTreeWidgetItem*))); diff --git a/src/plugins/macros/macrooptionswidget.ui b/src/plugins/macros/macrooptionswidget.ui index 02e556a539..0f46121c13 100644 --- a/src/plugins/macros/macrooptionswidget.ui +++ b/src/plugins/macros/macrooptionswidget.ui @@ -57,8 +57,21 @@ </column> </widget> </item> + <item row="1" column="1"> + <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> <item row="0" column="1"> - <widget class="QToolButton" name="removeButton"> + <widget class="QPushButton" name="removeButton"> <property name="enabled"> <bool>false</bool> </property> @@ -69,23 +82,10 @@ </size> </property> <property name="text"> - <string>-</string> + <string>Remove</string> </property> </widget> </item> - <item row="1" column="1"> - <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> </item> diff --git a/src/plugins/projectexplorer/toolchainoptionspage.ui b/src/plugins/projectexplorer/toolchainoptionspage.ui index 99fe639da1..5c23b4ae28 100644 --- a/src/plugins/projectexplorer/toolchainoptionspage.ui +++ b/src/plugins/projectexplorer/toolchainoptionspage.ui @@ -32,7 +32,7 @@ <number>0</number> </property> <item> - <widget class="QToolButton" name="addButton"> + <widget class="QPushButton" name="addButton"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -46,19 +46,12 @@ </size> </property> <property name="text"> - <string>+</string> - </property> - <property name="icon"> - <iconset resource="../coreplugin/core.qrc"> - <normaloff>:/core/images/plus.png</normaloff>:/core/images/plus.png</iconset> - </property> - <property name="popupMode"> - <enum>QToolButton::InstantPopup</enum> + <string>Add</string> </property> </widget> </item> <item> - <widget class="QToolButton" name="delButton"> + <widget class="QPushButton" name="delButton"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -72,11 +65,7 @@ </size> </property> <property name="text"> - <string>-</string> - </property> - <property name="icon"> - <iconset resource="../coreplugin/core.qrc"> - <normaloff>:/core/images/minus.png</normaloff>:/core/images/minus.png</iconset> + <string>Remove</string> </property> </widget> </item> @@ -99,8 +88,6 @@ </item> </layout> </widget> - <resources> - <include location="../coreplugin/core.qrc"/> - </resources> + <resources/> <connections/> </ui> diff --git a/src/plugins/qmldesigner/settingspage.ui b/src/plugins/qmldesigner/settingspage.ui index 9a56b1cc31..f66c7db0ac 100644 --- a/src/plugins/qmldesigner/settingspage.ui +++ b/src/plugins/qmldesigner/settingspage.ui @@ -6,49 +6,31 @@ <rect> <x>0</x> <y>0</y> - <width>433</width> - <height>428</height> + <width>296</width> + <height>132</height> </rect> </property> <property name="windowTitle"> <string>Form</string> </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> <widget class="QGroupBox" name="groupBox_3"> <property name="title"> <string>Snapping</string> </property> - <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"> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <layout class="QGridLayout" name="gridLayout"> + <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="2" column="1"> - <widget class="QSpinBox" name="spinItemSpacing"> + <item row="0" column="1"> + <widget class="QSpinBox" name="spinSnapMargin"> <property name="sizePolicy"> <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -56,19 +38,19 @@ </sizepolicy> </property> <property name="maximum"> - <number>50</number> + <number>10</number> </property> </widget> </item> - <item row="0" column="0"> - <widget class="QLabel" name="snapMarginLabel"> + <item row="1" column="0"> + <widget class="QLabel" name="itemSpacingLabel"> <property name="text"> - <string>Snap margin</string> + <string>Item spacing:</string> </property> </widget> </item> - <item row="2" column="0"> - <widget class="QSpinBox" name="spinSnapMargin"> + <item row="1" column="1"> + <widget class="QSpinBox" name="spinItemSpacing"> <property name="sizePolicy"> <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -76,13 +58,13 @@ </sizepolicy> </property> <property name="maximum"> - <number>10</number> + <number>50</number> </property> </widget> </item> </layout> </item> - <item row="0" column="1"> + <item> <spacer name="horizontalSpacer"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -98,7 +80,7 @@ </layout> </widget> </item> - <item row="1" column="0"> + <item> <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 e730e8f8c0..fddcffef6b 100644 --- a/src/plugins/qmljseditor/quicktoolbarsettingspage.ui +++ b/src/plugins/qmljseditor/quicktoolbarsettingspage.ui @@ -19,14 +19,7 @@ <property name="title"> <string>Qt Quick Toolbars</string> </property> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <widget class="QCheckBox" name="textEditHelperCheckBox"> - <property name="text"> - <string>Always show Qt Quick Toolbar</string> - </property> - </widget> - </item> + <layout class="QVBoxLayout" name="verticalLayout"> <item> <widget class="QCheckBox" name="textEditHelperCheckBoxPin"> <property name="toolTip"> @@ -37,6 +30,13 @@ </property> </widget> </item> + <item> + <widget class="QCheckBox" name="textEditHelperCheckBox"> + <property name="text"> + <string>Always show Qt Quick Toolbar</string> + </property> + </widget> + </item> </layout> </widget> </item> diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp index 5163faa0f0..0be75b506e 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp @@ -191,13 +191,9 @@ S60DevicesBaseWidget::S60DevicesBaseWidget(unsigned flags, QWidget *parent) : m_model(new S60DevicesModel(flags & DeviceDefaultCheckable)) { m_ui->setupUi(this); - m_ui->addButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_PLUS))); connect(m_ui->addButton, SIGNAL(clicked()), this, SLOT(addDevice())); - m_ui->removeButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_MINUS))); connect(m_ui->removeButton, SIGNAL(clicked()), this, SLOT(removeDevice())); - m_ui->refreshButton->setIcon(qApp->style()->standardIcon(QStyle::SP_BrowserReload)); connect(m_ui->refreshButton, SIGNAL(clicked()), this, SLOT(refresh())); - m_ui->changeQtButton->setIcon(QIcon(QLatin1String(":/welcome/images/qt_logo.png"))); connect(m_ui->changeQtButton, SIGNAL(clicked()), this, SLOT(changeQtVersion())); m_ui->list->setModel(m_model); diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.ui b/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.ui index 3386098cdf..081924ca2e 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.ui +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.ui @@ -2,6 +2,14 @@ <ui version="4.0"> <class>Qt4ProjectManager::Internal::S60DevicesPreferencePane</class> <widget class="QWidget" name="Qt4ProjectManager::Internal::S60DevicesPreferencePane"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>366</width> + <height>231</height> + </rect> + </property> <property name="windowTitle"> <string>Form</string> </property> @@ -27,30 +35,42 @@ <item> <layout class="QVBoxLayout" name="buttonLayout"> <item> - <widget class="QToolButton" name="refreshButton"> + <widget class="QPushButton" name="refreshButton"> <property name="toolTip"> <string>Refresh</string> </property> + <property name="text"> + <string>Refresh</string> + </property> </widget> </item> <item> - <widget class="QToolButton" name="addButton"> + <widget class="QPushButton" name="addButton"> <property name="toolTip"> <string>Add</string> </property> + <property name="text"> + <string>Add</string> + </property> </widget> </item> <item> - <widget class="QToolButton" name="changeQtButton"> + <widget class="QPushButton" name="removeButton"> <property name="toolTip"> - <string>Change Qt version</string> + <string>Remove</string> + </property> + <property name="text"> + <string>Remove</string> </property> </widget> </item> <item> - <widget class="QToolButton" name="removeButton"> + <widget class="QPushButton" name="changeQtButton"> <property name="toolTip"> - <string>Remove</string> + <string>Change Qt version</string> + </property> + <property name="text"> + <string>Change Qt Version</string> </property> </widget> </item> diff --git a/src/plugins/qt4projectmanager/qtoptionspage.cpp b/src/plugins/qt4projectmanager/qtoptionspage.cpp index 1eea2e3b7a..03af267fa1 100644 --- a/src/plugins/qt4projectmanager/qtoptionspage.cpp +++ b/src/plugins/qt4projectmanager/qtoptionspage.cpp @@ -160,9 +160,6 @@ QtOptionsPageWidget::QtOptionsPageWidget(QWidget *parent, QList<QtVersion *> ver m_ui->debuggingHelperWidget->setWidget(debuggingHelperDetailsWidget); - m_ui->addButton->setIcon(QIcon(Core::Constants::ICON_PLUS)); - m_ui->delButton->setIcon(QIcon(Core::Constants::ICON_MINUS)); - new Utils::TreeWidgetColumnStretcher(m_ui->qtdirList, 1); // setup parent items for auto-detected and manual versions diff --git a/src/plugins/qt4projectmanager/qtversionmanager.ui b/src/plugins/qt4projectmanager/qtversionmanager.ui index 79c85e8b10..626d52587b 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.ui +++ b/src/plugins/qt4projectmanager/qtversionmanager.ui @@ -42,7 +42,7 @@ <number>0</number> </property> <item> - <widget class="QToolButton" name="addButton"> + <widget class="QPushButton" name="addButton"> <property name="minimumSize"> <size> <width>21</width> @@ -50,12 +50,12 @@ </size> </property> <property name="text"> - <string>+</string> + <string>Add</string> </property> </widget> </item> <item> - <widget class="QToolButton" name="delButton"> + <widget class="QPushButton" name="delButton"> <property name="minimumSize"> <size> <width>21</width> @@ -63,7 +63,7 @@ </size> </property> <property name="text"> - <string>-</string> + <string>Remove</string> </property> </widget> </item> diff --git a/src/plugins/texteditor/generichighlighter/highlightersettingspage.ui b/src/plugins/texteditor/generichighlighter/highlightersettingspage.ui index 65f7d43f5e..5ee668f2de 100644 --- a/src/plugins/texteditor/generichighlighter/highlightersettingspage.ui +++ b/src/plugins/texteditor/generichighlighter/highlightersettingspage.ui @@ -41,6 +41,22 @@ </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>3</height> + </size> + </property> + </spacer> + </item> + <item> <widget class="QGroupBox" name="definitionFilesGroupBox"> <property name="title"> <string>Syntax Highlight Definition Files</string> |