diff options
| author |  Miika Turkia <miika.turkia@gmail.com> | 2014-01-07 22:01:28 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-01-08 05:54:20 +0800 |
| commit | 88fdf1b138afaead559456d1734eae88b4778f83 (patch) | |
| tree | 11fa840c47e78f8cf0691674fd7c32f97be5b38b /qt-ui/divelogimportdialog.ui | |
| parent | 58f6a01a220bcdc25de2aac84a4eb5e49562d739 (diff) | |
| download | subsurface-88fdf1b138afaead559456d1734eae88b4778f83.tar.gz | |
Show import dialog only when needed for CSV config
We do not need any import dialog when importing normal XML based
divelogs. With this they are imported directly after file selection
dialog. However, when CSV files are detected in the import list, the
configuration dialog is displayed and applied for them. (CSV files are
detected by file extension.)
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/divelogimportdialog.ui')
| -rw-r--r-- | qt-ui/divelogimportdialog.ui | 111 |
1 files changed, 22 insertions, 89 deletions
diff --git a/qt-ui/divelogimportdialog.ui b/qt-ui/divelogimportdialog.ui index ac2315636..36f62de54 100644 --- a/qt-ui/divelogimportdialog.ui +++ b/qt-ui/divelogimportdialog.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>515</width> - <height>440</height> + <height>370</height> </rect> </property> <property name="windowTitle"> @@ -33,7 +33,7 @@ <enum>QFrame::NoFrame</enum> </property> <property name="text"> - <string>Import Dive Log File</string> + <string>Import CSV Dive Log Files</string> </property> <property name="alignment"> <set>Qt::AlignCenter</set> @@ -45,82 +45,15 @@ <property name="currentIndex"> <number>0</number> </property> - <widget class="QWidget" name="tab_2"> - <attribute name="title"> - <string>DiveLog</string> - </attribute> - <widget class="QGroupBox" name="groupBox_8"> - <property name="geometry"> - <rect> - <x>10</x> - <y>10</y> - <width>441</width> - <height>65</height> - </rect> - </property> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="title"> - <string>Import File</string> - </property> - <layout class="QHBoxLayout" name="horizontalLayout_8"> - <item> - <widget class="QLineEdit" name="DiveLogFile"/> - </item> - <item> - <widget class="QToolButton" name="DiveLogFileSelector"> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> - </layout> - </widget> - </widget> <widget class="QWidget" name="tab"> <attribute name="title"> - <string>CSV</string> + <string>CSV options</string> </attribute> - <widget class="QGroupBox" name="groupBox"> - <property name="geometry"> - <rect> - <x>10</x> - <y>10</y> - <width>441</width> - <height>65</height> - </rect> - </property> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="title"> - <string>Import File</string> - </property> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <widget class="QLineEdit" name="CSVFile"/> - </item> - <item> - <widget class="QToolButton" name="CSVFileSelector"> - <property name="text"> - <string>...</string> - </property> - </widget> - </item> - </layout> - </widget> <widget class="QGroupBox" name="groupBox_2"> <property name="geometry"> <rect> <x>210</x> - <y>88</y> + <y>10</y> <width>281</width> <height>65</height> </rect> @@ -138,7 +71,7 @@ <property name="geometry"> <rect> <x>210</x> - <y>159</y> + <y>80</y> <width>281</width> <height>65</height> </rect> @@ -165,8 +98,8 @@ <widget class="QGroupBox" name="groupBox_3"> <property name="geometry"> <rect> - <x>16</x> - <y>88</y> + <x>10</x> + <y>10</y> <width>185</width> <height>246</height> </rect> @@ -183,14 +116,14 @@ <layout class="QGridLayout" name="gridLayout"> <item row="3" column="1"> <widget class="QSpinBox" name="CSVpo2"> - <property name="minimum"> - <number>1</number> - </property> <property name="enabled"> <bool>false</bool> </property> + <property name="minimum"> + <number>1</number> + </property> <property name="value"> - <number>0</number> + <number>1</number> </property> </widget> </item> @@ -206,12 +139,12 @@ </item> <item row="2" column="1"> <widget class="QSpinBox" name="CSVTemperature"> - <property name="minimum"> - <number>1</number> - </property> <property name="enabled"> <bool>false</bool> </property> + <property name="minimum"> + <number>1</number> + </property> </widget> </item> <item row="1" column="0"> @@ -223,14 +156,14 @@ </item> <item row="5" column="1"> <widget class="QSpinBox" name="CSVstopdepth"> - <property name="minimum"> - <number>1</number> - </property> <property name="enabled"> <bool>false</bool> </property> + <property name="minimum"> + <number>1</number> + </property> <property name="value"> - <number>0</number> + <number>1</number> </property> </widget> </item> @@ -274,14 +207,14 @@ </item> <item row="4" column="1"> <widget class="QSpinBox" name="CSVcns"> - <property name="minimum"> - <number>1</number> - </property> <property name="enabled"> <bool>false</bool> </property> + <property name="minimum"> + <number>1</number> + </property> <property name="value"> - <number>0</number> + <number>1</number> </property> </widget> </item> |