diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2015-04-04 14:41:10 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2015-04-04 14:41:10 -0400 |
| commit | b5f93b05578293d1d233b4920a28a5c2fd826f94 (patch) | |
| tree | 82332679f647e9c76e331206786d07a58dcfa9b8 /SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.ui | |
| parent | af8a7a3e3dccf9c9ad257e3952173d180c8a7421 (diff) | |
| parent | a5b034d4a9c44f9bc1e83b01de82530f8fc63013 (diff) | |
Merge tag 'upstream/3.0.4'
Upstream version 3.0.4
# gpg: Signature made Sat 04 Apr 2015 02:41:09 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/dialogs/dbdialog.ui')
| -rw-r--r-- | SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.ui | 255 |
1 files changed, 123 insertions, 132 deletions
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.ui b/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.ui index fb53428..6f35079 100644 --- a/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.ui +++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>455</width> - <height>200</height> + <height>365</height> </rect> </property> <property name="minimumSize"> @@ -21,127 +21,124 @@ </property> <layout class="QVBoxLayout" name="verticalLayout"> <item> - <layout class="QGridLayout" name="gridLayout"> - <item row="2" column="1"> - <layout class="QHBoxLayout" name="horizontalLayout"> - <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> - <item> - <widget class="QComboBox" name="typeCombo"> - <property name="toolTip"> - <string>Database driver</string> - </property> - </widget> - </item> - </layout> - </item> - <item row="1" column="1"> - <widget class="QLineEdit" name="nameEdit"> - <property name="readOnly"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="nameLabel"> - <property name="text"> - <string>Name</string> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="typeLabel"> - <property name="text"> - <string>Type</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QLineEdit" name="fileEdit"/> - </item> - <item row="0" column="2"> - <layout class="QHBoxLayout" name="horizontalLayout_3"> - <item> - <widget class="QToolButton" name="browseButton"> - <property name="toolTip"> - <string>Browse for database file on local computer</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - </layout> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="fileLabel"> - <property name="text"> - <string>File</string> - </property> - </widget> - </item> - <item row="1" column="2"> - <widget class="QCheckBox" name="generateCheckBox"> - <property name="toolTip"> - <string>Generate name basing on file path</string> - </property> - <property name="text"> - <string/> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Permanent</string> - </property> - </widget> - </item> - <item row="3" column="1"> - <layout class="QHBoxLayout" name="horizontalLayout_4"> - <item> - <spacer name="horizontalSpacer_3"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QCheckBox" name="permamentCheckBox"> - <property name="toolTip"> - <string extracomment="aasfd"><p>Enable this if you want the database to be stored in configuration file and restored every time SQLiteStudio is started.</p></string> - </property> - <property name="text"> - <string/> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - </layout> - </item> - </layout> + <widget class="QGroupBox" name="typeGroup"> + <property name="title"> + <string>Database type</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QComboBox" name="typeCombo"> + <property name="toolTip"> + <string>Database driver</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="pathGroup"> + <property name="title"> + <string>File</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_5"> + <item> + <widget class="QLineEdit" name="fileEdit"/> + </item> + <item> + <widget class="QToolButton" name="browseCreateButton"> + <property name="toolTip"> + <string>Create new database file</string> + </property> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="../icons.qrc"> + <normaloff>:/icons/img/plus.png</normaloff>:/icons/img/plus.png</iconset> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="browseOpenButton"> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="../icons.qrc"> + <normaloff>:/icons/img/open_sql_file.png</normaloff>:/icons/img/open_sql_file.png</iconset> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="nameGroup"> + <property name="title"> + <string>Name (on the list)</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_6"> + <item> + <widget class="QLineEdit" name="nameEdit"> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="generateCheckBox"> + <property name="toolTip"> + <string>Generate name basing on file path</string> + </property> + <property name="text"> + <string>Generate automatically</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="optionsGroup"> + <property name="title"> + <string>Options</string> + </property> + <layout class="QGridLayout" name="optionsGrid"> + <item row="0" column="0" colspan="2"> + <widget class="QCheckBox" name="permamentCheckBox"> + <property name="toolTip"> + <string extracomment="aasfd"><p>Enable this if you want the database to be stored in configuration file and restored every time SQLiteStudio is started.</p></string> + </property> + <property name="text"> + <string>Permanent (keep it in configuration)</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Fixed</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>360</width> + <height>1</height> + </size> + </property> + </spacer> </item> <item> <widget class="QWidget" name="bottomWidget" native="true"> @@ -161,7 +158,7 @@ <item> <widget class="QPushButton" name="testConnButton"> <property name="text"> - <string>Test database connection</string> + <string>Test connection</string> </property> </widget> </item> @@ -190,15 +187,9 @@ </item> </layout> </widget> - <tabstops> - <tabstop>fileEdit</tabstop> - <tabstop>browseButton</tabstop> - <tabstop>nameEdit</tabstop> - <tabstop>generateCheckBox</tabstop> - <tabstop>typeCombo</tabstop> - <tabstop>permamentCheckBox</tabstop> - </tabstops> - <resources/> + <resources> + <include location="../icons.qrc"/> + </resources> <connections> <connection> <sender>buttonBox</sender> |