diff options
| author |  Tomaz Canabrava <tomaz.canabrava@intel.com> | 2014-06-19 13:52:34 -0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-06-20 15:41:42 -0700 |
| commit | 0223ebf5105a6a4b50d1fd2d852f979f9bc409bd (patch) | |
| tree | 2bc9bac906a93972c0b88ad6f23c7d15bd11e5f9 /qt-ui/maintab.ui | |
| parent | a08d4ec790328248e2f9408ff074f530b502419a (diff) | |
| download | subsurface-0223ebf5105a6a4b50d1fd2d852f979f9bc409bd.tar.gz | |
Added the new Date Widget on the MainTab.
the new date widget still needs a bit of work, but the
design is working already.
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/maintab.ui')
| -rw-r--r-- | qt-ui/maintab.ui | 44 |
1 files changed, 20 insertions, 24 deletions
diff --git a/qt-ui/maintab.ui b/qt-ui/maintab.ui index eb9333ab0..ad654581e 100644 --- a/qt-ui/maintab.ui +++ b/qt-ui/maintab.ui @@ -19,7 +19,9 @@ </attribute> <layout class="QGridLayout" name="gridLayout_3"> <item row="2" column="1"> - <widget class="KMessageWidget" name="diveNotesMessage" native="true"/> + <widget class="KMessageWidget" name="diveNotesMessage" native="true"> + <zorder>scrollArea</zorder> + </widget> </item> <item row="3" column="1"> <widget class="QScrollArea" name="scrollArea"> @@ -37,8 +39,8 @@ <rect> <x>0</x> <y>0</y> - <width>668</width> - <height>658</height> + <width>662</width> + <height>642</height> </rect> </property> <layout class="QGridLayout" name="gridLayout_2"> @@ -57,13 +59,6 @@ <property name="spacing"> <number>2</number> </property> - <item row="1" column="0"> - <widget class="QLabel" name="DateTimeLabel"> - <property name="text"> - <string>Start time</string> - </property> - </widget> - </item> <item row="1" column="1"> <layout class="QHBoxLayout" name="temperatureLabels"> <item> @@ -82,13 +77,6 @@ </item> </layout> </item> - <item row="2" column="0"> - <widget class="QDateTimeEdit" name="dateTimeEdit"> - <property name="calendarPopup"> - <bool>true</bool> - </property> - </widget> - </item> <item row="2" column="1"> <layout class="QHBoxLayout" name="airWaterTempLayout"> <item> @@ -259,6 +247,9 @@ </property> </widget> </item> + <item row="1" column="0" rowspan="2"> + <widget class="DateWidget" name="dateEdit" native="true"/> + </item> </layout> </widget> </widget> @@ -289,8 +280,8 @@ <rect> <x>0</x> <y>0</y> - <width>100</width> - <height>30</height> + <width>662</width> + <height>642</height> </rect> </property> <layout class="QGridLayout" name="gridLayout_5"> @@ -369,8 +360,8 @@ <rect> <x>0</x> <y>0</y> - <width>387</width> - <height>285</height> + <width>662</width> + <height>642</height> </rect> </property> <layout class="QGridLayout" name="gridLayout_6"> @@ -679,8 +670,8 @@ <rect> <x>0</x> <y>0</y> - <width>668</width> - <height>658</height> + <width>662</width> + <height>642</height> </rect> </property> <layout class="QGridLayout" name="gridLayout_7"> @@ -923,10 +914,15 @@ <extends>QListView</extends> <header>divepicturewidget.h</header> </customwidget> + <customwidget> + <class>DateWidget</class> + <extends>QWidget</extends> + <header>simplewidgets.h</header> + <container>1</container> + </customwidget> </customwidgets> <tabstops> <tabstop>scrollArea</tabstop> - <tabstop>dateTimeEdit</tabstop> <tabstop>airtemp</tabstop> <tabstop>watertemp</tabstop> <tabstop>location</tabstop> |