From b052b790dfe1cddccebf1ea52197c6781eeaf775 Mon Sep 17 00:00:00 2001
From: Miika Turkia <miika.turkia@gmail.com>
Date: Sun, 29 Dec 2013 18:11:20 +0200
Subject: Refactoring import to DiveLogImportDialog

Changing the import stuff to DiveLogImport. Now we should have one
import function/dialog for importing divelogs instead of multiple menu
entries.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 qt-ui/mainwindow.ui | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

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

diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui
index 60aa787e4..85896de75 100644
--- a/qt-ui/mainwindow.ui
+++ b/qt-ui/mainwindow.ui
@@ -197,8 +197,7 @@
      <string>&amp;Import</string>
     </property>
     <addaction name="actionDownloadDC"/>
-    <addaction name="actionImport"/>
-    <addaction name="actionImportCSV"/>
+    <addaction name="actionImportDiveLog"/>
     <addaction name="actionDownloadWeb"/>
     <addaction name="actionDivelogs_de"/>
    </widget>
@@ -264,17 +263,6 @@
     <string>Ctrl+W</string>
    </property>
   </action>
-  <action name="actionImport">
-   <property name="text">
-    <string>Import Files</string>
-   </property>
-   <property name="toolTip">
-    <string>Import Files</string>
-   </property>
-   <property name="shortcut">
-    <string>Ctrl+I</string>
-   </property>
-  </action>
   <action name="actionExportUDDF">
    <property name="text">
     <string>Export &amp;UDDF</string>
@@ -461,12 +449,15 @@
     <string>Ctrl+L</string>
    </property>
   </action>
-  <action name="actionImportCSV">
+  <action name="actionImportDiveLog">
    <property name="text">
-    <string>Import CSV</string>
+    <string>Import Files</string>
    </property>
    <property name="toolTip">
-    <string>Import CS&amp;V</string>
+    <string>Import Files</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+I</string>
    </property>
   </action>
   <action name="actionDivelogs_de">
-- 
cgit v1.2.3-70-g09d2