From ee70abee9bfb177f431a6169bfb703b4e74ef569 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@nokia.com>
Date: Mon, 18 May 2009 12:19:13 +0200
Subject: [PATCH] Polishing Settings Ui: Putting VCS settings into a GroupBox
---
share/qtcreator/translations/qtcreator_de.ts | 5 +
share/qtcreator/translations/qtcreator_it.ts | 5 +
share/qtcreator/translations/qtcreator_ja.ts | 5 +
src/plugins/vcsbase/vcsbasesettingspage.ui | 231 ++++++++++---------
4 files changed, 133 insertions(+), 113 deletions(-)
diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index 0562ffee668..6cefbd28134 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -12114,6 +12114,11 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
<source>Prompt to submit</source>
<translation>Abgabe bestätigen</translation>
</message>
+ <message>
+ <location/>
+ <source>Common</source>
+ <translation>Allgemein</translation>
+ </message>
<message>
<location/>
<source>Wrap submit message at:</source>
diff --git a/share/qtcreator/translations/qtcreator_it.ts b/share/qtcreator/translations/qtcreator_it.ts
index 6b84bfab757..a4d9c23f4c4 100644
--- a/share/qtcreator/translations/qtcreator_it.ts
+++ b/share/qtcreator/translations/qtcreator_it.ts
@@ -11541,6 +11541,11 @@ Queste codifiche dovrebbero andare bene:</translation>
<source>Prompt to submit</source>
<translation>Prompt del submit</translation>
</message>
+ <message>
+ <location/>
+ <source>Common</source>
+ <translation>Comune</translation>
+ </message>
<message>
<location/>
<source>Wrap submit message at:</source>
diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts
index 218bacbb7b1..54b7559898b 100644
--- a/share/qtcreator/translations/qtcreator_ja.ts
+++ b/share/qtcreator/translations/qtcreator_ja.ts
@@ -11297,6 +11297,11 @@ The following encodings are likely to fit:</source>
<source>Form</source>
<translation type="unfinished">フォーム</translation>
</message>
+ <message>
+ <location/>
+ <source>Common</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location/>
<source>Prompt to submit</source>
diff --git a/src/plugins/vcsbase/vcsbasesettingspage.ui b/src/plugins/vcsbase/vcsbasesettingspage.ui
index 0d8b3cd74ab..50aa9cf94bd 100644
--- a/src/plugins/vcsbase/vcsbasesettingspage.ui
+++ b/src/plugins/vcsbase/vcsbasesettingspage.ui
@@ -12,120 +12,125 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QCheckBox" name="promptForSubmitCheckBox">
- <property name="text">
- <string>Prompt to submit</string>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QCheckBox" name="lineWrapCheckBox">
- <property name="text">
- <string>Wrap submit message at:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="lineWrapSpinBox">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="minimum">
- <number>40</number>
- </property>
- <property name="maximum">
- <number>200</number>
- </property>
- <property name="value">
- <number>72</number>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QFormLayout" name="formLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="submitMessageCheckScriptLabel">
- <property name="toolTip">
- <string>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.</string>
- </property>
- <property name="text">
- <string>Submit message check script:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="Core::Utils::PathChooser" name="submitMessageCheckScriptChooser" native="true"/>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="nickNameMailMapLabel">
- <property name="toolTip">
- <string>A file listing user names and email addresses in a 4-column mailmap format:
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Common</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QCheckBox" name="promptForSubmitCheckBox">
+ <property name="text">
+ <string>Prompt to submit</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QCheckBox" name="lineWrapCheckBox">
+ <property name="text">
+ <string>Wrap submit message at:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="lineWrapSpinBox">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="minimum">
+ <number>40</number>
+ </property>
+ <property name="maximum">
+ <number>200</number>
+ </property>
+ <property name="value">
+ <number>72</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QFormLayout" name="formLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="submitMessageCheckScriptLabel">
+ <property name="toolTip">
+ <string>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.</string>
+ </property>
+ <property name="text">
+ <string>Submit message check script:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="Core::Utils::PathChooser" name="submitMessageCheckScriptChooser" native="true"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="nickNameMailMapLabel">
+ <property name="toolTip">
+ <string>A file listing user names and email addresses in a 4-column mailmap format:
name <email> alias <email></string>
- </property>
- <property name="text">
- <string>User/alias configuration file:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="Core::Utils::PathChooser" name="nickNameMailMapChooser" native="true"/>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="nickNameFieldsFileLabel">
- <property name="toolTip">
- <string>A simple file containing lines with field names like "Reviewed-By:" which will be added below the submit editor.</string>
- </property>
- <property name="text">
- <string>User fields configuration file:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="Core::Utils::PathChooser" name="nickNameFieldsFileChooser" native="true"/>
- </item>
- </layout>
- </item>
- </layout>
- </item>
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
+ </property>
+ <property name="text">
+ <string>User/alias configuration file:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="Core::Utils::PathChooser" name="nickNameMailMapChooser" native="true"/>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="nickNameFieldsFileLabel">
+ <property name="toolTip">
+ <string>A simple file containing lines with field names like "Reviewed-By:" which will be added below the submit editor.</string>
+ </property>
+ <property name="text">
+ <string>User fields configuration file:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="Core::Utils::PathChooser" name="nickNameFieldsFileChooser" native="true"/>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
</item>
<item>
<spacer name="verticalSpacer">
--
GitLab