diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp index 739a3ac6624..0ef46a5f647 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp @@ -266,14 +266,11 @@ QIcon CMakeSettingsPage::categoryIcon() const QWidget *CMakeSettingsPage::createPage(QWidget *parent) { QWidget *outerWidget = new QWidget(parent); - QVBoxLayout *outerLayout = new QVBoxLayout(outerWidget); - QGroupBox *groupBox = new QGroupBox; - outerLayout->addWidget(groupBox); - outerLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::MinimumExpanding)); - QFormLayout *formLayout = new QFormLayout(groupBox); + QFormLayout *formLayout = new QFormLayout(outerWidget); m_pathchooser = new Utils::PathChooser; m_pathchooser->setExpectedKind(Utils::PathChooser::Command); formLayout->addRow(tr("Executable:"), m_pathchooser); + formLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::MinimumExpanding)); m_pathchooser->setPath(cmakeExecutable()); return outerWidget; } diff --git a/src/plugins/cpaster/codepastersettings.cpp b/src/plugins/cpaster/codepastersettings.cpp index 1a5d9b98ba3..7c6b4d62df0 100644 --- a/src/plugins/cpaster/codepastersettings.cpp +++ b/src/plugins/cpaster/codepastersettings.cpp @@ -84,24 +84,22 @@ QIcon CodePasterSettingsPage::categoryIcon() const QWidget *CodePasterSettingsPage::createPage(QWidget *parent) { - QGroupBox *groupBox = new QGroupBox(); - QVBoxLayout *groupBoxLayout = new QVBoxLayout(groupBox); + QWidget *outerWidget = new QWidget(parent); + QVBoxLayout *outerLayout = new QVBoxLayout(outerWidget); + QFormLayout *formLayout = new QFormLayout; formLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow); - QLineEdit *lineedit = new QLineEdit(m_host); - connect(lineedit, SIGNAL(textChanged(QString)), this, SLOT(serverChanged(QString))); - formLayout->addRow(tr("Server:"), lineedit); - groupBoxLayout->addLayout(formLayout); - groupBoxLayout->addSpacerItem(new QSpacerItem(0, 60, QSizePolicy::Ignored, QSizePolicy::Fixed)); + QLineEdit *lineEdit = new QLineEdit(m_host); + 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)); 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); - groupBoxLayout->addWidget(noteLabel); + outerLayout->addWidget(noteLabel); - QWidget *outerWidget = new QWidget(parent); - QVBoxLayout *outerLayout = new QVBoxLayout(outerWidget); - outerLayout->addWidget(groupBox); outerLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::MinimumExpanding)); return outerWidget; } diff --git a/src/plugins/cpaster/pastebindotcomsettings.ui b/src/plugins/cpaster/pastebindotcomsettings.ui index a62fe137651..15d86897c57 100644 --- a/src/plugins/cpaster/pastebindotcomsettings.ui +++ b/src/plugins/cpaster/pastebindotcomsettings.ui @@ -6,8 +6,8 @@ 0 0 - 520 - 475 + 549 + 330 @@ -15,57 +15,51 @@ - - - - - - QFormLayout::ExpandingFieldsGrow - - - - - Server Prefix: - - - - - - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 0 - 60 - - - - - - - - <html><head/><body> + + + QFormLayout::ExpandingFieldsGrow + + + + + + + + Server Prefix: + + + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 0 + 30 + + + + + + + + <html><head/><body> <p><a href="http://pastebin.com">pastebin.com</a> allows to send posts to custom subdomains (eg. qtcreator.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> - - - Qt::RichText - - - true - - - - + + + Qt::RichText + + + true + diff --git a/src/plugins/cpaster/settingspage.ui b/src/plugins/cpaster/settingspage.ui index 8284013ae44..e4566d219e9 100644 --- a/src/plugins/cpaster/settingspage.ui +++ b/src/plugins/cpaster/settingspage.ui @@ -2,54 +2,16 @@ CodePaster::SettingsPage - - - - - - 0 - 0 - - - - - - - Default Protocol: - - - - - - - - - - Username: - - - - - - - - - - Copy Paste URL to clipboard - - - - - - - Display Output Pane after sending a post - - - - - - - + + + 0 + 0 + 281 + 229 + + + + Qt::Vertical @@ -62,6 +24,40 @@ + + + + Display Output Pane after sending a post + + + + + + + Copy Paste URL to clipboard + + + + + + + + + + Username: + + + + + + + + + + Default protocol: + + + diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp index 34de7008856..db982c6ee81 100644 --- a/src/plugins/cpptools/cppfilesettingspage.cpp +++ b/src/plugins/cpptools/cppfilesettingspage.cpp @@ -351,6 +351,5 @@ bool CppFileSettingsPage::matches(const QString &s) const return m_searchKeywords.contains(s, Qt::CaseInsensitive); } -} -} - +} // namespace Internal +} // namespace CppTools diff --git a/src/plugins/cpptools/cppfilesettingspage.h b/src/plugins/cpptools/cppfilesettingspage.h index 236cd3abdb6..6ee51051656 100644 --- a/src/plugins/cpptools/cppfilesettingspage.h +++ b/src/plugins/cpptools/cppfilesettingspage.h @@ -45,7 +45,8 @@ QT_END_NAMESPACE namespace CppTools { namespace Internal { -struct CppFileSettings { +struct CppFileSettings +{ CppFileSettings(); QString headerSuffix; @@ -61,15 +62,16 @@ struct CppFileSettings { // Currently made public in static QString licenseTemplate(); - bool equals(const CppFileSettings &rhs) const; }; inline bool operator==(const CppFileSettings &s1, const CppFileSettings &s2) { return s1.equals(s2); } inline bool operator!=(const CppFileSettings &s1, const CppFileSettings &s2) { return !s1.equals(s2); } -class CppFileSettingsWidget : public QWidget { +class CppFileSettingsWidget : public QWidget +{ Q_OBJECT + public: explicit CppFileSettingsWidget(QWidget *parent = 0); virtual ~CppFileSettingsWidget(); @@ -92,6 +94,7 @@ private: class CppFileSettingsPage : public Core::IOptionsPage { Q_DISABLE_COPY(CppFileSettingsPage) + public: explicit CppFileSettingsPage(QSharedPointer &settings, QObject *parent = 0); diff --git a/src/plugins/cpptools/cppfilesettingspage.ui b/src/plugins/cpptools/cppfilesettingspage.ui index 02261b47f1d..a6dc2ba0f28 100644 --- a/src/plugins/cpptools/cppfilesettingspage.ui +++ b/src/plugins/cpptools/cppfilesettingspage.ui @@ -6,77 +6,93 @@ 0 0 - 441 - 503 + 283 + 142 - - - - - - 0 - 0 - + + + QFormLayout::ExpandingFieldsGrow + + + + + Header suffix: - - - QFormLayout::ExpandingFieldsGrow - - - - - Header suffix: - - - - - - - - - - Source suffix: - - - - - - - - - - Lower case file names - - - - - - - License Template: - - - - - - - - + + + + + + + Source suffix: + + + + + + + + + + Lower case file names + + + + + + + License Template: + + + + + + + Qt::Vertical - 20 - 430 + 0 + 20 + licenseTemplatePathChooser + sourceSuffixLabel + headerSuffixLabel + lowerCaseFileNamesCheckBox + headerSuffixComboBox + sourceSuffixComboBox + licenseTemplateLabel + licenseTemplatePathChooser + sourceSuffixLabel + headerSuffixLabel + lowerCaseFileNamesCheckBox + headerSuffixComboBox + sourceSuffixComboBox + licenseTemplateLabel + licenseTemplatePathChooser + sourceSuffixLabel + headerSuffixLabel + lowerCaseFileNamesCheckBox + headerSuffixComboBox + sourceSuffixComboBox + licenseTemplateLabel + licenseTemplatePathChooser + sourceSuffixLabel + headerSuffixLabel + lowerCaseFileNamesCheckBox + headerSuffixComboBox + sourceSuffixComboBox + licenseTemplateLabel diff --git a/src/plugins/locator/locatorfiltersfilter.h b/src/plugins/locator/locatorfiltersfilter.h index 86b48bfd800..ea7d5d75aa1 100644 --- a/src/plugins/locator/locatorfiltersfilter.h +++ b/src/plugins/locator/locatorfiltersfilter.h @@ -50,7 +50,7 @@ class LocatorFiltersFilter : public ILocatorFilter public: LocatorFiltersFilter(LocatorPlugin *plugin, - LocatorWidget *locatorWidget); + LocatorWidget *locatorWidget); // ILocatorFilter QString displayName() const; diff --git a/src/plugins/locator/settingspage.ui b/src/plugins/locator/settingspage.ui index 3fdc38b88a9..b6c27d30569 100644 --- a/src/plugins/locator/settingspage.ui +++ b/src/plugins/locator/settingspage.ui @@ -6,72 +6,66 @@ 0 0 - 460 - 353 + 367 + 242 Configure Filters - - - - - - - - - - - - - - - - - Add - - - - - - - false - - - Remove - - - - - - - false - - - Edit - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - + + + + + + - + + + + + + Add + + + + + + + false + + + Remove + + + + + + + false + + + Edit + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.ui b/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.ui index 3333a752ea3..6841bd023b1 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.ui +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.ui @@ -6,89 +6,86 @@ 0 0 - 282 - 296 + 274 + 264 Form - + - - - - - - 0 - - - false - - - true - - - 2 - - - true - - - - SDK Location - - - - - Qt Location - - - - - - - - background-color: red; - - - Error - - - true - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Refresh - - - - - - + + + 0 + + + false + + + true + + + 2 + + + true + + + true + + + + SDK Location + + + + + Qt Location + + + + + + color: red; + + + Error + + + true + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Refresh + + + + + diff --git a/src/plugins/qt4projectmanager/qtoptionspage.cpp b/src/plugins/qt4projectmanager/qtoptionspage.cpp index 91a9e8aca02..ed2a1669e49 100644 --- a/src/plugins/qt4projectmanager/qtoptionspage.cpp +++ b/src/plugins/qt4projectmanager/qtoptionspage.cpp @@ -744,8 +744,7 @@ QString QtOptionsPageWidget::searchKeywords() const << ' ' << m_ui->msvcLabel->text() << ' ' << m_ui->gcceLabel->text() << ' ' << m_ui->mwcLabel->text() - << ' ' << m_ui->debuggingHelperLabel->text() - << ' ' << m_ui->versionListGroupBox->title(); + << ' ' << m_ui->debuggingHelperLabel->text(); rc.remove(QLatin1Char('&')); return rc; } diff --git a/src/plugins/qt4projectmanager/qtversionmanager.ui b/src/plugins/qt4projectmanager/qtversionmanager.ui index b1c3ca224dc..4ab4480a794 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.ui +++ b/src/plugins/qt4projectmanager/qtversionmanager.ui @@ -6,244 +6,235 @@ 0 0 - 431 - 474 + 400 + 424 - - - Qt versions - - - - - - - - true - - - 3 - - - - Name - - - - - qmake Location - - - - - Debugging Helper - - - - - - - - 6 - - - 0 - - - - - - 21 - 23 - - - - + - - - - - - - - 21 - 23 - - - - - - - - - - - - Qt::Vertical - - - - 10 - 40 - - - - - - - - - - - - - - Version Name: - - - - - - - - - - qmake Location: - - - - - - - - - - MinGW Directory: - - - - - - - - - - Toolchain: - - - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + + + + + true + + + 3 + + + + Name + + + + + qmake Location + + + + + Debugging Helper + + + + + + + + 6 + + + 0 + + + + + + 21 + 23 + + + + + + + + + + + + + 21 + 23 + + + + - + + + + + + + Qt::Vertical + + + + 10 + 40 + + + + + + + + + + + + + + Version Name: + + + + + + + + + + qmake Location: + + + + + + + + + + MinGW Directory: + + + + + + + + + + Toolchain: + + + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + <!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:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#ff0000;">Unable to detect MSVC version.</span></p></body></html> - - - - - - - - - S60 SDK: - - - - - - - - - - CSL/GCCE Directory: - - - - - - - - - - Carbide Directory: - - - - - - - - - - Debugging Helper: - - - - - - - - - - 0 - 0 - - - - - - - - - - - Show &Log - - - - - - - &Rebuild - - - - - - - - - - - - - - - - + + + + + + + + + S60 SDK: + + + + + + + + + + CSL/GCCE Directory: + + + + + + + + + + Carbide Directory: + + + + + + + + + + Debugging Helper: + + + + + + + + + + 0 + 0 + + + + + + + + + + + Show &Log + + + + + + + &Rebuild + + + + + + + + + + + + + diff --git a/src/plugins/vcsbase/commonsettingspage.ui b/src/plugins/vcsbase/commonsettingspage.ui index e1ff7cb6529..16065aa48f8 100644 --- a/src/plugins/vcsbase/commonsettingspage.ui +++ b/src/plugins/vcsbase/commonsettingspage.ui @@ -6,100 +6,91 @@ 0 0 - 408 - 148 + 359 + 105 - - - - - Common Settings + + + + + Wrap submit message at: - - - - - Wrap submit message at: - - - - - - - false - - - characters - - - 40 - - - 200 - - - 72 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - An executable which is called with the submit message in a temporary file as first argument. It should return with an exit != 0 and a message on standard error to indicate failure. - - - Submit message check script: - - - - - - - - - - A file listing user names and email addresses in a 4-column mailmap format: -name <email> alias <email> - - - User/alias configuration file: - - - - - - - - - - A simple file containing lines with field names like "Reviewed-By:" which will be added below the submit editor. - - - User fields configuration file: - - - - - - - - + + + + false + + + characters + + + 40 + + + 200 + + + 72 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + An executable which is called with the submit message in a temporary file as first argument. It should return with an exit != 0 and a message on standard error to indicate failure. + + + Submit message check script: + + + + + + + + + + A file listing user names and email addresses in a 4-column mailmap format: +name <email> alias <email> + + + User/alias configuration file: + + + + + + + + + + A simple file containing lines with field names like "Reviewed-By:" which will be added below the submit editor. + + + User fields configuration file: + + + + + + + Qt::Vertical @@ -134,12 +125,12 @@ name <email> alias <email> setEnabled(bool) - 195 - 46 + 175 + 21 - 240 - 45 + 216 + 21