diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2015-05-12 16:19:47 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2015-05-12 16:19:47 -0400 |
| commit | 6ce5ee411d1e6093b68b1b4eca5dc6c12b927a96 (patch) | |
| tree | 1a98416041b39765c1c42ffbeab6da9fd40e181b /SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.ui | |
| parent | 1fc9d1a4a1af320e39810cee21bed1201e2bddfd (diff) | |
| parent | 9618f0ebbf4b88045247c01ce8c8f58203508ebf (diff) | |
Merge tag 'upstream/3.0.6'
Upstream version 3.0.6
# gpg: Signature made Tue 12 May 2015 04:19:45 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg: aka "Unit 193 <unit193@ninthfloor.org>"
# gpg: aka "Unit 193 <unit193@ubuntu.com>"
# gpg: aka "Unit 193 <unit193@ninthfloor.com>"
Diffstat (limited to 'SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.ui')
| -rw-r--r-- | SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.ui | 57 |
1 files changed, 36 insertions, 21 deletions
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.ui b/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.ui index 98e7ddb..97c4e0a 100644 --- a/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.ui +++ b/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.ui @@ -101,27 +101,7 @@ <property name="bottomMargin"> <number>0</number> </property> - <item row="1" column="0"> - <widget class="QLineEdit" name="nameEdit"/> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="nameLabel"> - <property name="text"> - <string>Collation name:</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QComboBox" name="langCombo"/> - </item> - <item row="0" column="1"> - <widget class="QLabel" name="langLabel"> - <property name="text"> - <string>Implementation language:</string> - </property> - </widget> - </item> - <item row="2" column="0" colspan="2"> + <item row="3" column="0" colspan="2"> <widget class="QWidget" name="rightBottomWidget" native="true"> <layout class="QVBoxLayout" name="verticalLayout_5"> <property name="leftMargin"> @@ -196,6 +176,41 @@ </layout> </widget> </item> + <item row="0" column="0" colspan="2"> + <widget class="QWidget" name="widget" native="true"> + <layout class="QGridLayout" name="gridLayout_2"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item row="0" column="0"> + <widget class="QLabel" name="nameLabel"> + <property name="text"> + <string>Collation name:</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLineEdit" name="nameEdit"/> + </item> + <item row="0" column="1"> + <widget class="QLabel" name="langLabel"> + <property name="text"> + <string>Implementation language:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QComboBox" name="langCombo"/> + </item> + </layout> + </widget> + </item> </layout> </widget> </widget> |