From 80f26912b070328806436fbd3d1d4a37a56e4bb6 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Wed, 1 Jul 2015 15:38:08 -0700
Subject: Notes pane: move the location taxonomy to a better spot

And display it smaller, marked as "tags".

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 qt-ui/maintab.cpp |  2 ++
 qt-ui/maintab.ui  | 37 ++++++++++++++++++++++---------------
 2 files changed, 24 insertions(+), 15 deletions(-)

(limited to 'qt-ui')

diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp
index b5981c977..688927cb6 100644
--- a/qt-ui/maintab.cpp
+++ b/qt-ui/maintab.cpp
@@ -501,6 +501,7 @@ void MainTab::updateDiveInfo(bool clear)
 			// construct the location tags
 			QString locationTag;
 			if (ds->taxonomy.nr) {
+				locationTag = "<small><small>(tags: ";
 				QString connector = "";
 				for (int i = 0; i < 3; i++) {
 					qDebug() << "looking for category" << prefs.geocoding.category[i];
@@ -513,6 +514,7 @@ void MainTab::updateDiveInfo(bool clear)
 						}
 					}
 				}
+				locationTag += ")</small></small>";
 			}
 			ui.location->setText(ds->name);
 			ui.locationTags->setText(locationTag);
diff --git a/qt-ui/maintab.ui b/qt-ui/maintab.ui
index 7ac703076..c7801666f 100644
--- a/qt-ui/maintab.ui
+++ b/qt-ui/maintab.ui
@@ -171,21 +171,28 @@
            <number>0</number>
           </property>
           <item>
-           <widget class="QLabel" name="LocationLabel">
-            <property name="text">
-             <string>Location</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="locationTags">
-            <property name="text">
-             <string/>
-            </property>
-           </widget>
+           <layout class="QHBoxLayout" name="LocationLayout" stretch="0,1">
+            <item>
+             <widget class="QLabel" name="LocationLabel">
+              <property name="text">
+               <string>Location</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="locationTags">
+              <property name="text">
+               <string/>
+              </property>
+              <property name="textFormat">
+               <enum>Qt::RichText</enum>
+              </property>
+             </widget>
+            </item>
+           </layout>
           </item>
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout_2">
-- 
cgit v1.2.3-70-g09d2