From 1d76ccb8b9bbcb6e2c98e4faca31ddd5d02050ce Mon Sep 17 00:00:00 2001
From: Michael Andreen <harv@ruin.nu>
Date: Tue, 17 Sep 2013 21:50:15 +0200
Subject: Improved handling of latitude and longitude.

Coordinates are copied when auto-completing location, they are also
displayed and editable in maintab.

Signed-off-by: Michael Andreen <harv@ruin.nu>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 qt-ui/maintab.ui | 66 ++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 40 insertions(+), 26 deletions(-)

(limited to 'qt-ui/maintab.ui')

diff --git a/qt-ui/maintab.ui b/qt-ui/maintab.ui
index a1f5a718a..967bf133c 100644
--- a/qt-ui/maintab.ui
+++ b/qt-ui/maintab.ui
@@ -21,63 +21,70 @@
     <string>Dive Notes</string>
    </attribute>
    <layout class="QGridLayout" name="gridLayout_3">
-    <item row="1" column="0">
-     <widget class="QLabel" name="LocationLabel">
-      <property name="text">
-       <string>Location</string>
-      </property>
-     </widget>
-    </item>
-    <item row="2" column="0" colspan="2">
-     <widget class="QLineEdit" name="location">
+    <item row="4" column="0" colspan="2">
+     <widget class="QLineEdit" name="coordinates">
       <property name="readOnly">
        <bool>true</bool>
       </property>
      </widget>
     </item>
-    <item row="3" column="0">
-     <widget class="QLabel" name="DivemasterLabel">
-      <property name="text">
-       <string>Divemaster</string>
+    <item row="11" column="0" colspan="2">
+     <widget class="QTextEdit" name="notes">
+      <property name="readOnly">
+       <bool>true</bool>
       </property>
      </widget>
     </item>
-    <item row="3" column="1">
-     <widget class="QLabel" name="BuddyLabel">
+    <item row="1" column="0">
+     <widget class="QLabel" name="LocationLabel">
       <property name="text">
-       <string>Buddy</string>
+       <string>Location</string>
       </property>
      </widget>
     </item>
-    <item row="4" column="0">
+    <item row="6" column="0">
      <widget class="QLineEdit" name="divemaster">
       <property name="readOnly">
        <bool>true</bool>
       </property>
      </widget>
     </item>
-    <item row="6" column="1">
+    <item row="8" column="1">
      <widget class="QLineEdit" name="suit">
       <property name="readOnly">
        <bool>true</bool>
       </property>
      </widget>
     </item>
-    <item row="4" column="1">
+    <item row="6" column="1">
      <widget class="QLineEdit" name="buddy">
       <property name="readOnly">
        <bool>true</bool>
       </property>
      </widget>
     </item>
-    <item row="9" column="0" colspan="2">
-     <widget class="QTextEdit" name="notes">
+    <item row="2" column="0" colspan="2">
+     <widget class="QLineEdit" name="location">
       <property name="readOnly">
        <bool>true</bool>
       </property>
      </widget>
     </item>
     <item row="5" column="0">
+     <widget class="QLabel" name="DivemasterLabel">
+      <property name="text">
+       <string>Divemaster</string>
+      </property>
+     </widget>
+    </item>
+    <item row="5" column="1">
+     <widget class="QLabel" name="BuddyLabel">
+      <property name="text">
+       <string>Buddy</string>
+      </property>
+     </widget>
+    </item>
+    <item row="7" column="0">
      <layout class="QHBoxLayout" name="ratingVisibilityLabels">
       <item>
        <widget class="QLabel" name="RatingLabel">
@@ -95,21 +102,21 @@
       </item>
      </layout>
     </item>
-    <item row="5" column="1">
+    <item row="7" column="1">
      <widget class="QLabel" name="SuitLabel">
       <property name="text">
        <string>Suit</string>
       </property>
      </widget>
     </item>
-    <item row="7" column="0">
+    <item row="9" column="0">
      <widget class="QLabel" name="NotesLabel">
       <property name="text">
        <string>Notes</string>
       </property>
      </widget>
     </item>
-    <item row="6" column="0">
+    <item row="8" column="0">
      <layout class="QHBoxLayout" name="ratingVisibilityWidgets">
       <item>
        <widget class="StarWidget" name="rating" native="true"/>
@@ -119,14 +126,14 @@
       </item>
      </layout>
     </item>
-    <item row="10" column="1">
+    <item row="12" column="1">
      <widget class="QPushButton" name="editReset">
       <property name="text">
        <string>Undo</string>
       </property>
      </widget>
     </item>
-    <item row="10" column="0">
+    <item row="12" column="0">
      <widget class="QPushButton" name="editAccept">
       <property name="text">
        <string>Save</string>
@@ -139,6 +146,13 @@
     <item row="0" column="0" colspan="2">
      <widget class="KMessageWidget" name="diveNotesMessage" native="true"/>
     </item>
+    <item row="3" column="0">
+     <widget class="QLabel" name="CoordinatedLabel">
+      <property name="text">
+       <string>Coordinates</string>
+      </property>
+     </widget>
+    </item>
    </layout>
   </widget>
   <widget class="QWidget" name="equipmentTab">
-- 
cgit v1.2.3-70-g09d2