diff options
| author | 2015-05-12 16:19:47 -0400 | |
|---|---|---|
| committer | 2015-05-12 16:19:47 -0400 | |
| commit | 6ce5ee411d1e6093b68b1b4eca5dc6c12b927a96 (patch) | |
| tree | 1a98416041b39765c1c42ffbeab6da9fd40e181b /SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.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/functionseditor.ui')
| -rw-r--r-- | SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.ui | 82 |
1 files changed, 47 insertions, 35 deletions
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.ui b/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.ui index 45d291d..b99efe1 100644 --- a/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.ui +++ b/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.ui @@ -145,37 +145,7 @@ <property name="bottomMargin"> <number>0</number> </property> - <item row="0" column="0"> - <widget class="QLabel" name="nameLabel"> - <property name="text"> - <string>Function name:</string> - </property> - </widget> - </item> - <item row="2" column="2"> - <widget class="QComboBox" name="typeCombo"/> - </item> - <item row="0" column="3"> - <widget class="QLabel" name="langLabel"> - <property name="text"> - <string>Implementation language:</string> - </property> - </widget> - </item> - <item row="2" column="0" colspan="2"> - <widget class="QLineEdit" name="nameEdit"/> - </item> - <item row="0" column="2"> - <widget class="QLabel" name="typeLabel"> - <property name="text"> - <string>Type:</string> - </property> - </widget> - </item> - <item row="2" column="3"> - <widget class="QComboBox" name="langCombo"/> - </item> - <item row="4" column="0"> + <item row="5" column="0"> <widget class="QGroupBox" name="argsGroup"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> @@ -223,7 +193,7 @@ </layout> </widget> </item> - <item row="4" column="1" colspan="3"> + <item row="5" column="1" colspan="3"> <widget class="QGroupBox" name="databasesGroup"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> @@ -265,6 +235,51 @@ </layout> </widget> </item> + <item row="0" column="0" colspan="4"> + <widget class="QWidget" name="widget" native="true"> + <layout class="QGridLayout" name="gridLayout_3"> + <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="1"> + <widget class="QLabel" name="typeLabel"> + <property name="text"> + <string>Type:</string> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="nameLabel"> + <property name="text"> + <string>Function name:</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLineEdit" name="nameEdit"/> + </item> + <item row="1" column="1"> + <widget class="QComboBox" name="typeCombo"/> + </item> + <item row="0" column="2"> + <widget class="QLabel" name="langLabel"> + <property name="text"> + <string>Implementation language:</string> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QComboBox" name="langCombo"/> + </item> + </layout> + </widget> + </item> </layout> </widget> <widget class="QGroupBox" name="initCodeGroup"> @@ -329,9 +344,6 @@ <tabstops> <tabstop>functionFilterEdit</tabstop> <tabstop>list</tabstop> - <tabstop>nameEdit</tabstop> - <tabstop>typeCombo</tabstop> - <tabstop>langCombo</tabstop> <tabstop>undefArgsCheck</tabstop> <tabstop>argsList</tabstop> <tabstop>allDatabasesRadio</tabstop> |
