diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-06-28 08:07:59 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-06-28 08:07:59 -0700 |
| commit | d25e31525ca5050a955c17c1b7d54201d81a6186 (patch) | |
| tree | cb1a53449b1e78a490fa8c04fa2014f68d8bb941 /qt-ui/diveplanner.ui | |
| parent | 20e0aba0b49b6b496b473d08c1559217bb60a108 (diff) | |
| parent | 06a8002a2de0dc731f0ecd5ec87cf210ec2b9c2c (diff) | |
| download | subsurface-d25e31525ca5050a955c17c1b7d54201d81a6186.tar.gz | |
Merge branch 'fixPlannerStartTime'
Diffstat (limited to 'qt-ui/diveplanner.ui')
| -rw-r--r-- | qt-ui/diveplanner.ui | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/qt-ui/diveplanner.ui b/qt-ui/diveplanner.ui index fffed0d99..5441c2a38 100644 --- a/qt-ui/diveplanner.ui +++ b/qt-ui/diveplanner.ui @@ -95,13 +95,12 @@ <height>50</height> </size> </property> - <zorder>label_2</zorder> </widget> </item> <item row="0" column="0"> <widget class="QLabel" name="label"> <property name="text"> - <string>Start Time</string> + <string>Planned Dive Time</string> </property> </widget> </item> @@ -113,7 +112,18 @@ </widget> </item> <item row="1" column="0"> - <widget class="QTimeEdit" name="startTime"/> + <layout class="QHBoxLayout" name="dateAndTime"> + <item> + <widget class="DateWidget" name="dateEdit" native="true"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + </widget> + </item> + <item> + <widget class="QTimeEdit" name="startTime"/> + </item> + </layout> </item> <item row="2" column="0"> <widget class="QLabel" name="label_7"> @@ -165,6 +175,12 @@ <header>tableview.h</header> <container>1</container> </customwidget> + <customwidget> + <class>DateWidget</class> + <extends>QWidget</extends> + <header>simplewidgets.h</header> + <container>1</container> + </customwidget> </customwidgets> <tabstops> <tabstop>startTime</tabstop> |