diff --git a/src/plugins/coreplugin/generalsettings.ui b/src/plugins/coreplugin/generalsettings.ui index 0365ae1a66f25eb77e6492f209db77c269edfc6e..73fb6764fb12c9bdbd1eccff9d9ac3207754eb36 100644 --- a/src/plugins/coreplugin/generalsettings.ui +++ b/src/plugins/coreplugin/generalsettings.ui @@ -77,14 +77,7 @@ </item> </layout> </item> - <item row="1" column="0"> - <widget class="QLabel" name="languageLabel"> - <property name="text"> - <string>Language:</string> - </property> - </widget> - </item> - <item row="1" column="1" rowspan="2"> + <item row="2" column="1"> <layout class="QHBoxLayout" name="horizontalLayout_3"> <item> <widget class="QComboBox" name="languageBox"> @@ -111,10 +104,10 @@ </item> </layout> </item> - <item row="2" column="0" rowspan="2"> + <item row="3" column="0"> <widget class="QLabel" name="encodingLabel"> <property name="text"> - <string>Default File Encoding: </string> + <string>Default file encoding: </string> </property> </widget> </item> @@ -151,6 +144,13 @@ </item> </layout> </item> + <item row="2" column="0"> + <widget class="QLabel" name="languageLabel"> + <property name="text"> + <string>Language:</string> + </property> + </widget> + </item> </layout> </widget> </item> diff --git a/src/plugins/cpaster/pastebindotcomsettings.ui b/src/plugins/cpaster/pastebindotcomsettings.ui index 15d86897c576a5fc84bb4caf1fc6ab43cc007542..3f2fd6c773c7528b869c2ea2de5b486bb415f6bc 100644 --- a/src/plugins/cpaster/pastebindotcomsettings.ui +++ b/src/plugins/cpaster/pastebindotcomsettings.ui @@ -25,7 +25,7 @@ <item row="0" column="0"> <widget class="QLabel" name="serverPrefix"> <property name="text"> - <string>Server Prefix:</string> + <string>Server prefix:</string> </property> </widget> </item> diff --git a/src/plugins/cpptools/cppfilesettingspage.ui b/src/plugins/cpptools/cppfilesettingspage.ui index a6dc2ba0f284f6ef658d343c20a56ccfcb33110d..312454c5677eb784749866df64ef0cfaeb53ef43 100644 --- a/src/plugins/cpptools/cppfilesettingspage.ui +++ b/src/plugins/cpptools/cppfilesettingspage.ui @@ -44,7 +44,7 @@ <item row="3" column="0"> <widget class="QLabel" name="licenseTemplateLabel"> <property name="text"> - <string>License Template:</string> + <string>License template:</string> </property> </widget> </item> @@ -72,27 +72,6 @@ <zorder>headerSuffixComboBox</zorder> <zorder>sourceSuffixComboBox</zorder> <zorder>licenseTemplateLabel</zorder> - <zorder>licenseTemplatePathChooser</zorder> - <zorder>sourceSuffixLabel</zorder> - <zorder>headerSuffixLabel</zorder> - <zorder>lowerCaseFileNamesCheckBox</zorder> - <zorder>headerSuffixComboBox</zorder> - <zorder>sourceSuffixComboBox</zorder> - <zorder>licenseTemplateLabel</zorder> - <zorder>licenseTemplatePathChooser</zorder> - <zorder>sourceSuffixLabel</zorder> - <zorder>headerSuffixLabel</zorder> - <zorder>lowerCaseFileNamesCheckBox</zorder> - <zorder>headerSuffixComboBox</zorder> - <zorder>sourceSuffixComboBox</zorder> - <zorder>licenseTemplateLabel</zorder> - <zorder>licenseTemplatePathChooser</zorder> - <zorder>sourceSuffixLabel</zorder> - <zorder>headerSuffixLabel</zorder> - <zorder>lowerCaseFileNamesCheckBox</zorder> - <zorder>headerSuffixComboBox</zorder> - <zorder>sourceSuffixComboBox</zorder> - <zorder>licenseTemplateLabel</zorder> </widget> <customwidgets> <customwidget> diff --git a/src/plugins/cvs/settingspage.ui b/src/plugins/cvs/settingspage.ui index 601e9d28fcf6ee0b3aafacd0c90ea3f3e30f027a..17edd2a71f43575b81e893fee1802e0c9ef40846 100644 --- a/src/plugins/cvs/settingspage.ui +++ b/src/plugins/cvs/settingspage.ui @@ -20,7 +20,7 @@ <item row="0" column="0"> <widget class="QLabel" name="commandLabel"> <property name="text"> - <string>CVS Command:</string> + <string>CVS command:</string> </property> </widget> </item> @@ -30,7 +30,7 @@ <item row="1" column="0"> <widget class="QLabel" name="rootLabel"> <property name="text"> - <string>CVS Root:</string> + <string>CVS root:</string> </property> </widget> </item> @@ -49,7 +49,7 @@ <item row="1" column="0"> <widget class="QLabel" name="diffOptionsLabel"> <property name="text"> - <string>Diff Options:</string> + <string>Diff options:</string> </property> </widget> </item> @@ -117,6 +117,10 @@ <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/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index c90cd5cca01183cef20e7347320d29a0abf3af0b..ecee113d3b4123cf0ad6f8f1a2084b3219534036 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -310,7 +310,7 @@ QWidget *FakeVimExCommandsPage::createPage(QWidget *parent) QWidget *w = CommandMappings::createPage(parent); setPageTitle(tr("Ex Command Mapping")); setTargetHeader(tr("Ex Trigger Expression")); - setTargetLabelText(tr("Regular Expression:")); + setTargetLabelText(tr("Regular expression:")); setTargetEditTitle(tr("Ex Command")); setImportExportEnabled(false); diff --git a/src/plugins/help/generalsettingspage.ui b/src/plugins/help/generalsettingspage.ui index 8d55f9b0e171feab704940dcb6650f02cf195a30..d70d419fe65aaea3250fcb15e76a294253b0093c 100644 --- a/src/plugins/help/generalsettingspage.ui +++ b/src/plugins/help/generalsettingspage.ui @@ -212,7 +212,7 @@ <item row="2" column="0"> <widget class="QLabel" name="homePageLabel"> <property name="text"> - <string>Home Page:</string> + <string>Home page:</string> </property> </widget> </item> diff --git a/src/plugins/locator/settingspage.ui b/src/plugins/locator/settingspage.ui index b6c27d305694845b840158786ade41e53a0c6f9a..6ae70a06f2ce04538b04bfd296584b8a8dbe78b8 100644 --- a/src/plugins/locator/settingspage.ui +++ b/src/plugins/locator/settingspage.ui @@ -70,7 +70,7 @@ <item> <widget class="QLabel" name="refreshIntervalLabel"> <property name="text"> - <string>Refresh Interval:</string> + <string>Refresh interval:</string> </property> </widget> </item> diff --git a/src/plugins/perforce/settingspage.ui b/src/plugins/perforce/settingspage.ui index dcdd04c0833e6112b611e7f477373464198e2485..40fb16b72c599aacfee37c44e4cbdaf2dec40b76 100644 --- a/src/plugins/perforce/settingspage.ui +++ b/src/plugins/perforce/settingspage.ui @@ -20,7 +20,7 @@ <item row="0" column="0"> <widget class="QLabel" name="commandLabel"> <property name="text"> - <string>P4 Command:</string> + <string>P4 command:</string> </property> </widget> </item> @@ -57,21 +57,21 @@ <item row="1" column="0"> <widget class="QLabel" name="clientLabel"> <property name="text"> - <string>P4 Client:</string> + <string>P4 client:</string> </property> </widget> </item> <item row="2" column="0"> <widget class="QLabel" name="userLabel"> <property name="text"> - <string>P4 User:</string> + <string>P4 user:</string> </property> </widget> </item> <item row="0" column="0"> <widget class="QLabel" name="portLabel"> <property name="text"> - <string>P4 Port:</string> + <string>P4 port:</string> </property> </widget> </item> @@ -205,6 +205,10 @@ <extends>QWidget</extends> <header location="global">utils/pathchooser.h</header> <container>1</container> + <slots> + <signal>editingFinished()</signal> + <signal>browsingFinished()</signal> + </slots> </customwidget> </customwidgets> <tabstops> diff --git a/src/plugins/projectexplorer/editorsettingspropertiespage.ui b/src/plugins/projectexplorer/editorsettingspropertiespage.ui index 1f97ce0f0b75e61ffd5b1852395fe90c69a8afe8..da7c45c2627599d5df09d4f335452d9d2f9f7090 100644 --- a/src/plugins/projectexplorer/editorsettingspropertiespage.ui +++ b/src/plugins/projectexplorer/editorsettingspropertiespage.ui @@ -20,7 +20,7 @@ <item> <widget class="QLabel" name="encodingLabel"> <property name="text"> - <string>Default File Encoding:</string> + <string>Default file encoding:</string> </property> </widget> </item> diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.ui b/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.ui index 021a0c94558aef4d9817f265b503576e0efacee0..3c07b9023cff07eb6b6600753d027ee472d9af8c 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.ui +++ b/src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>448</width> - <height>307</height> + <width>550</width> + <height>350</height> </rect> </property> <property name="windowTitle"> @@ -139,14 +139,14 @@ <item> <widget class="QRadioButton" name="deviceButton"> <property name="text"> - <string>Remote Device</string> + <string>Remote device</string> </property> </widget> </item> <item> <widget class="QRadioButton" name="simulatorButton"> <property name="text"> - <string>Local Simulator</string> + <string>Local simulator</string> </property> </widget> </item> @@ -186,7 +186,7 @@ <item row="3" column="0"> <widget class="QLabel" name="hostNameLabel"> <property name="text"> - <string>Host Name:</string> + <string>Host name:</string> </property> </widget> </item> @@ -248,7 +248,7 @@ <item row="5" column="0"> <widget class="QLabel" name="connectionTimeoutLabel"> <property name="text"> - <string>Connection Timeout:</string> + <string>Connection timeout:</string> </property> </widget> </item> @@ -262,7 +262,7 @@ <item row="6" column="0"> <widget class="QLabel" name="userNameLabel"> <property name="text"> - <string>User Name:</string> + <string>User name:</string> </property> </widget> </item> diff --git a/src/plugins/qt4projectmanager/qtversionmanager.ui b/src/plugins/qt4projectmanager/qtversionmanager.ui index 4ab4480a794d0bd2a4bb21b52db8ddc58e167ffa..bb75e9ba5695d66bade43b8810e01861a1877dd5 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.ui +++ b/src/plugins/qt4projectmanager/qtversionmanager.ui @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>400</width> + <width>406</width> <height>424</height> </rect> </property> @@ -94,7 +94,7 @@ <item row="0" column="0"> <widget class="QLabel" name="versionNameLabel"> <property name="text"> - <string>Version Name:</string> + <string>Version name:</string> </property> </widget> </item> @@ -104,7 +104,7 @@ <item row="1" column="0"> <widget class="QLabel" name="pathLabel"> <property name="text"> - <string>qmake Location:</string> + <string>qmake location:</string> </property> </widget> </item> @@ -114,7 +114,7 @@ <item row="2" column="0"> <widget class="QLabel" name="mingwLabel"> <property name="text"> - <string>MinGW Directory:</string> + <string>MinGW directory:</string> </property> </widget> </item> @@ -172,7 +172,7 @@ p, li { white-space: pre-wrap; } <item row="5" column="0"> <widget class="QLabel" name="gcceLabel"> <property name="text"> - <string>CSL/GCCE Directory:</string> + <string>CSL/GCCE directory:</string> </property> </widget> </item> @@ -182,7 +182,7 @@ p, li { white-space: pre-wrap; } <item row="6" column="0"> <widget class="QLabel" name="mwcLabel"> <property name="text"> - <string>Carbide Directory:</string> + <string>Carbide directory:</string> </property> </widget> </item> @@ -192,7 +192,7 @@ p, li { white-space: pre-wrap; } <item row="7" column="0"> <widget class="QLabel" name="debuggingHelperLabel"> <property name="text"> - <string>Debugging Helper:</string> + <string>Debugging helper:</string> </property> </widget> </item> @@ -244,6 +244,10 @@ p, li { white-space: pre-wrap; } <extends>QWidget</extends> <header location="global">utils/pathchooser.h</header> <container>1</container> + <slots> + <signal>editingFinished()</signal> + <signal>browsingFinished()</signal> + </slots> </customwidget> </customwidgets> <tabstops> diff --git a/src/plugins/subversion/settingspage.ui b/src/plugins/subversion/settingspage.ui index 861f81902f6d862bf8fe96daa7fba32b854ef001..249ad3fef2f9ca8d711dca5e196dc3bcf3844a6d 100644 --- a/src/plugins/subversion/settingspage.ui +++ b/src/plugins/subversion/settingspage.ui @@ -12,7 +12,7 @@ <item row="0" column="0"> <widget class="QLabel" name="commandLabel"> <property name="text"> - <string>Subversion Command:</string> + <string>Subversion command:</string> </property> </widget> </item> @@ -139,6 +139,10 @@ <extends>QWidget</extends> <header location="global">utils/pathchooser.h</header> <container>1</container> + <slots> + <signal>editingFinished()</signal> + <signal>browsingFinished()</signal> + </slots> </customwidget> </customwidgets> <resources/>