From 6cf875ed92d1d526fa91f3712109a19bd754c6d2 Mon Sep 17 00:00:00 2001
From: Tomaz Canabrava <tcanabrava@kde.org>
Date: Thu, 24 Oct 2013 22:57:43 -0200
Subject: Reorganized the downlads menu for the inclusion of more webservices.

This patch moves around a few items on the menu to a new submenu
downloads/uploads. I think it's not the best way, but it already
fives a bit more of 'unverbosity', because the old menu had
'Download from Dive Computer', 'Download from Webservices', and
now we would introduce a new 'Download from Divelogs.de'
I tougth it was better to have a 'parent' named 'Download' and
put all children inside. this can grow quite big as soon as I implement
the plugin system for that.

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
---
 qt-ui/mainwindow.ui | 78 ++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 68 insertions(+), 10 deletions(-)

diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui
index ffe55c1f9..2ea6df354 100644
--- a/qt-ui/mainwindow.ui
+++ b/qt-ui/mainwindow.ui
@@ -18,7 +18,16 @@
     <property name="spacing">
      <number>0</number>
     </property>
-    <property name="margin">
+    <property name="leftMargin">
+     <number>0</number>
+    </property>
+    <property name="topMargin">
+     <number>0</number>
+    </property>
+    <property name="rightMargin">
+     <number>0</number>
+    </property>
+    <property name="bottomMargin">
      <number>0</number>
     </property>
     <item>
@@ -39,7 +48,16 @@
           <property name="spacing">
            <number>0</number>
           </property>
-          <property name="margin">
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
            <number>0</number>
           </property>
           <item>
@@ -52,7 +70,16 @@
           <property name="spacing">
            <number>0</number>
           </property>
-          <property name="margin">
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
            <number>0</number>
           </property>
           <item>
@@ -70,7 +97,16 @@
           <property name="spacing">
            <number>0</number>
           </property>
-          <property name="margin">
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
            <number>0</number>
           </property>
           <item>
@@ -83,7 +119,16 @@
           <property name="spacing">
            <number>0</number>
           </property>
-          <property name="margin">
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
            <number>0</number>
           </property>
           <item>
@@ -169,7 +214,7 @@
      <x>0</x>
      <y>0</y>
      <width>763</width>
-     <height>32</height>
+     <height>18</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -196,8 +241,15 @@
     <property name="title">
      <string>Log</string>
     </property>
-    <addaction name="actionDownloadDC"/>
-    <addaction name="actionDownloadWeb"/>
+    <widget class="QMenu" name="menuDownloads">
+     <property name="title">
+      <string>Downloads/Uploads</string>
+     </property>
+     <addaction name="actionDownloadDC"/>
+     <addaction name="actionDownloadWeb"/>
+     <addaction name="actionDivelogs_de"/>
+    </widget>
+    <addaction name="menuDownloads"/>
     <addaction name="actionEditDeviceNames"/>
     <addaction name="separator"/>
     <addaction name="actionAddDive"/>
@@ -206,6 +258,7 @@
     <addaction name="actionAutoGroup"/>
     <addaction name="actionToggleZoom"/>
     <addaction name="actionYearlyStatistics"/>
+    <addaction name="separator"/>
    </widget>
    <widget class="QMenu" name="menuView">
     <property name="title">
@@ -317,7 +370,7 @@
   </action>
   <action name="actionDownloadDC">
    <property name="text">
-    <string>Download from Dive computer</string>
+    <string>Dive computer</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+D</string>
@@ -325,7 +378,7 @@
   </action>
   <action name="actionDownloadWeb">
    <property name="text">
-    <string>Download from Web Service</string>
+    <string>Subsurface Service</string>
    </property>
   </action>
   <action name="actionEditDeviceNames">
@@ -453,6 +506,11 @@
     <string>Import CSV</string>
    </property>
   </action>
+  <action name="actionDivelogs_de">
+   <property name="text">
+    <string>Divelogs.de</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
-- 
cgit v1.2.3-70-g09d2