[PATCH 1/3] GUI change to specify duration on CSV import
Miika Turkia
miika.turkia at gmail.com
Wed Dec 31 08:27:29 PST 2014
Signed-off-by: Miika Turkia <miika.turkia at gmail.com>
---
qt-ui/divelogimportdialog.ui | 205 ++++++++++++++++++++++++++++++++++++-------
1 file changed, 172 insertions(+), 33 deletions(-)
diff --git a/qt-ui/divelogimportdialog.ui b/qt-ui/divelogimportdialog.ui
index 141ba0a..7b4e909 100644
--- a/qt-ui/divelogimportdialog.ui
+++ b/qt-ui/divelogimportdialog.ui
@@ -298,26 +298,20 @@
<string>Manual dives</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_4">
- <item row="1" column="1">
- <widget class="QGroupBox" name="groupBox_5">
+ <item row="3" column="1">
+ <widget class="QGroupBox" name="groupBox_8">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="title">
- <string>Field separator</string>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>70</height>
+ </size>
</property>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QComboBox" name="ManualSeparator"/>
- </item>
- </layout>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="QGroupBox" name="groupBox_8">
<property name="toolTip">
<string>Choose day, month and year order for date format. The field separator can be any of the characters .-/.</string>
</property>
@@ -329,7 +323,7 @@
<rect>
<x>20</x>
<y>40</y>
- <width>131</width>
+ <width>100</width>
<height>27</height>
</rect>
</property>
@@ -351,7 +345,42 @@
</widget>
</widget>
</item>
- <item row="0" column="0" rowspan="4">
+ <item row="2" column="1">
+ <widget class="QGroupBox" name="groupBox_6">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>70</height>
+ </size>
+ </property>
+ <property name="title">
+ <string>Units</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <item>
+ <widget class="QComboBox" name="Units">
+ <item>
+ <property name="text">
+ <string>Metric</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Imperial</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="0" column="0" rowspan="7">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Field configuration</string>
@@ -641,7 +670,6 @@
</property>
</widget>
</item>
-
<item row="9" column="0">
<widget class="QCheckBox" name="EndPressureCheck">
<property name="text">
@@ -693,35 +721,76 @@
</property>
</widget>
</item>
-
</layout>
</widget>
</item>
- <item row="2" column="1">
- <widget class="QGroupBox" name="groupBox_6">
+ <item row="4" column="1">
+ <widget class="QGroupBox" name="groupBox_9">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>70</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Choose duration format.</string>
+ </property>
<property name="title">
- <string>Units</string>
+ <string>Duration format</string>
</property>
- <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <widget class="QComboBox" name="DurationFormat">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>40</y>
+ <width>100</width>
+ <height>27</height>
+ </rect>
+ </property>
<item>
- <widget class="QComboBox" name="Units">
- <item>
- <property name="text">
- <string>Metric</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Imperial</string>
- </property>
- </item>
- </widget>
+ <property name="text">
+ <string>Seconds</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Minutes</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Minutes:seconds</string>
+ </property>
+ </item>
+ </widget>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QGroupBox" name="groupBox_5">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>70</height>
+ </size>
+ </property>
+ <property name="title">
+ <string>Field separator</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QComboBox" name="ManualSeparator"/>
</item>
</layout>
</widget>
@@ -1089,42 +1158,112 @@
<signal>clicked(bool)</signal>
<receiver>CylinderSize</receiver>
<slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>20</x>
+ <y>20</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>20</x>
+ <y>20</y>
+ </hint>
+ </hints>
</connection>
<connection>
<sender>StartPressureCheck</sender>
<signal>clicked(bool)</signal>
<receiver>StartPressure</receiver>
<slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>20</x>
+ <y>20</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>20</x>
+ <y>20</y>
+ </hint>
+ </hints>
</connection>
<connection>
<sender>EndPressureCheck</sender>
<signal>clicked(bool)</signal>
<receiver>EndPressure</receiver>
<slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>20</x>
+ <y>20</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>20</x>
+ <y>20</y>
+ </hint>
+ </hints>
</connection>
<connection>
<sender>O2Check</sender>
<signal>clicked(bool)</signal>
<receiver>O2</receiver>
<slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>20</x>
+ <y>20</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>20</x>
+ <y>20</y>
+ </hint>
+ </hints>
</connection>
<connection>
<sender>HeCheck</sender>
<signal>clicked(bool)</signal>
<receiver>He</receiver>
<slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>20</x>
+ <y>20</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>20</x>
+ <y>20</y>
+ </hint>
+ </hints>
</connection>
<connection>
<sender>AirTempCheck</sender>
<signal>clicked(bool)</signal>
<receiver>AirTemp</receiver>
<slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>20</x>
+ <y>20</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>20</x>
+ <y>20</y>
+ </hint>
+ </hints>
</connection>
<connection>
<sender>WaterTempCheck</sender>
<signal>clicked(bool)</signal>
<receiver>WaterTemp</receiver>
<slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>20</x>
+ <y>20</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>20</x>
+ <y>20</y>
+ </hint>
+ </hints>
</connection>
</connections>
</ui>
--
1.9.1
More information about the subsurface
mailing list