Merge branch 'webservices' of github.com:tcanabrava/subsurface

7 files changed, 244 insertions, 61 deletions

diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index 69cf363c3..5a2f872b4 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -252,7 +252,12 @@ void MainWindow::on_actionDownloadDC_triggered()
 
 void MainWindow::on_actionDownloadWeb_triggered()
 {
-	SubsurfaceWebServices::instance()->runDialog();
+	SubsurfaceWebServices::instance()->exec();
+}
+
+void MainWindow::on_actionDivelogs_de_triggered()
+{
+	DivelogsDeWebServices::instance()->exec();
 }
 
 void MainWindow::on_actionEditDeviceNames_triggered()
diff --git a/qt-ui/mainwindow.h b/qt-ui/mainwindow.h
index 5dfae3e98..1c68fc4f7 100644
--- a/qt-ui/mainwindow.h
+++ b/qt-ui/mainwindow.h
@@ -69,6 +69,7 @@ private slots:
 	/* log menu actions */
 	void on_actionDownloadDC_triggered();
 	void on_actionDownloadWeb_triggered();
+	void on_actionDivelogs_de_triggered();
 	void on_actionEditDeviceNames_triggered();
 	void on_actionAddDive_triggered();
 	void on_actionRenumber_triggered();
@@ -120,7 +121,6 @@ private:
 	void redrawProfile();
 	void file_save();
 	void file_save_as();
-	void setupSplitters();
 };
 
 MainWindow *mainWindow();
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>
diff --git a/qt-ui/subsurfacewebservices.cpp b/qt-ui/subsurfacewebservices.cpp
index f2b1b88cc..7ece0a640 100644
--- a/qt-ui/subsurfacewebservices.cpp
+++ b/qt-ui/subsurfacewebservices.cpp
@@ -15,6 +15,33 @@
 struct dive_table gps_location_table;
 static bool merge_locations_into_dives(void);
 
+WebServices::WebServices(QWidget* parent, Qt::WindowFlags f): QDialog(parent, f)
+, reply(0)
+{
+	ui.setupUi(this);
+	connect(ui.buttonBox, SIGNAL(clicked(QAbstractButton*)), this, SLOT(buttonClicked(QAbstractButton*)));
+	connect(ui.download, SIGNAL(clicked(bool)), this, SLOT(startDownload()));
+	ui.buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false);
+
+}
+
+void WebServices::hidePassword()
+{
+	ui.password->hide();
+	ui.passLabel->hide();
+}
+
+void WebServices::hideUpload()
+{
+	ui.upload->hide();
+}
+
+// #
+// #
+// #		Subsurface Web Service Implementation.
+// #
+// #
+
 SubsurfaceWebServices* SubsurfaceWebServices::instance()
 {
 	static SubsurfaceWebServices *self = new SubsurfaceWebServices();
@@ -24,12 +51,10 @@ SubsurfaceWebServices* SubsurfaceWebServices::instance()
 
 SubsurfaceWebServices::SubsurfaceWebServices(QWidget* parent, Qt::WindowFlags f)
 {
-	ui.setupUi(this);
-	connect(ui.buttonBox, SIGNAL(clicked(QAbstractButton*)), this, SLOT(buttonClicked(QAbstractButton*)));
-	connect(ui.download, SIGNAL(clicked(bool)), this, SLOT(startDownload()));
-	ui.buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false);
 	QSettings s;
-	ui.userID->setText(s.value("webservice_uid").toString());
+	ui.userID->setText(s.value("subsurface_webservice_uid").toString());
+	hidePassword();
+	hideUpload();
 }
 
 static void clear_table(struct dive_table *table)
@@ -56,7 +81,7 @@ void SubsurfaceWebServices::buttonClicked(QAbstractButton* button)
 
 			/* store last entered uid in config */
 			QSettings s;
-			s.setValue("webservice_uid", ui.userID->text());
+			s.setValue("subsurface_webservice_uid", ui.userID->text());
 			s.sync();
 			hide();
 			close();
@@ -135,11 +160,6 @@ void SubsurfaceWebServices::setStatusText(int status)
 	ui.status->setText(text);
 }
 
-void SubsurfaceWebServices::runDialog()
-{
-	exec();
-}
-
 /* requires that there is a <download> or <error> tag under the <root> tag */
 void SubsurfaceWebServices::download_dialog_traverse_xml(xmlNodePtr node, unsigned int *download_status)
 {
@@ -240,3 +260,51 @@ static bool merge_locations_into_dives(void)
 	}
 	return changed > 0;
 }
+
+// #
+// #
+// #		Divelogs DE  Web Service Implementation.
+// #
+// #
+
+DivelogsDeWebServices* DivelogsDeWebServices::instance()
+{
+	static DivelogsDeWebServices *self = new DivelogsDeWebServices();
+	self->setAttribute(Qt::WA_QuitOnClose, false);
+	return self;
+}
+
+DivelogsDeWebServices::DivelogsDeWebServices(QWidget* parent, Qt::WindowFlags f): WebServices(parent, f)
+{
+
+}
+
+void DivelogsDeWebServices::startUpload()
+{
+
+}
+
+void DivelogsDeWebServices::startDownload()
+{
+
+}
+
+void DivelogsDeWebServices::downloadFinished()
+{
+
+}
+
+void DivelogsDeWebServices::setStatusText(int status)
+{
+
+}
+
+void DivelogsDeWebServices::downloadError(QNetworkReply::NetworkError error)
+{
+
+}
+
+void DivelogsDeWebServices::buttonClicked(QAbstractButton* button)
+{
+
+}
diff --git a/qt-ui/subsurfacewebservices.h b/qt-ui/subsurfacewebservices.h
index 0719a8f15..515e3fe9c 100644
--- a/qt-ui/subsurfacewebservices.h
+++ b/qt-ui/subsurfacewebservices.h
@@ -5,33 +5,64 @@
 #include <QNetworkReply>
 #include <libxml/tree.h>
 
-#include "ui_subsurfacewebservices.h"
+#include "ui_webservices.h"
 
 class QAbstractButton;
 class QNetworkReply;
 
-class SubsurfaceWebServices : public QDialog {
+class WebServices : public QDialog{
+	Q_OBJECT
+public:
+    explicit WebServices(QWidget* parent = 0, Qt::WindowFlags f = 0);
+	void hidePassword();
+	void hideUpload();
+
+private slots:
+	virtual void startDownload() = 0;
+	virtual void startUpload() = 0;
+	virtual void buttonClicked(QAbstractButton* button) = 0;
+
+protected:
+	Ui::WebServices ui;
+	QNetworkReply *reply;
+	QNetworkAccessManager *manager;
+	QByteArray downloadedData;
+};
+
+class SubsurfaceWebServices : public WebServices {
 	Q_OBJECT
 public:
 	static SubsurfaceWebServices* instance();
-	void runDialog();
-	
+
 private slots:
 	void startDownload();
 	void buttonClicked(QAbstractButton* button);
 	void downloadFinished();
 	void downloadError(QNetworkReply::NetworkError error);
-	
+	void startUpload(){} /*no op*/
 private:
+    explicit SubsurfaceWebServices(QWidget* parent = 0, Qt::WindowFlags f = 0);
 	void setStatusText(int status);
 	void download_dialog_traverse_xml(xmlNodePtr node, unsigned int *download_status);
 	unsigned int download_dialog_parse_response(const QByteArray& length);
+};
 
-	explicit SubsurfaceWebServices(QWidget* parent = 0, Qt::WindowFlags f = 0);
-	Ui::SubsurfaceWebServices ui;
-	QNetworkReply *reply;
-	QNetworkAccessManager *manager;
-	QByteArray downloadedData;
+class DivelogsDeWebServices : public WebServices {
+	Q_OBJECT
+public:
+	static DivelogsDeWebServices * instance();
+
+private slots:
+	void startDownload();
+	void buttonClicked(QAbstractButton* button);
+	void downloadFinished();
+	void downloadError(QNetworkReply::NetworkError error);
+    void startUpload();
+private:
+    explicit DivelogsDeWebServices (QWidget* parent = 0, Qt::WindowFlags f = 0);
+	void setStatusText(int status);
+	void download_dialog_traverse_xml(xmlNodePtr node, unsigned int *download_status);
+	unsigned int download_dialog_parse_response(const QByteArray& length);
 };
 
 #endif
diff --git a/qt-ui/subsurfacewebservices.ui b/qt-ui/webservices.ui
index 899eea909..b190a7980 100644
--- a/qt-ui/subsurfacewebservices.ui
+++ b/qt-ui/webservices.ui
@@ -1,33 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>SubsurfaceWebServices</class>
- <widget class="QDialog" name="SubsurfaceWebServices">
+ <class>WebServices</class>
+ <widget class="QDialog" name="WebServices">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>399</width>
-    <height>104</height>
+    <width>425</width>
+    <height>141</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Download Location Data</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="1" column="0" colspan="3">
-    <widget class="QProgressBar" name="progressBar">
-     <property name="value">
-      <number>0</number>
+   <item row="3" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Status:</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="3">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help</set>
+   <item row="0" column="1">
+    <widget class="QLineEdit" name="userID">
+     <property name="placeholderText">
+      <string>Enter your ID here</string>
      </property>
     </widget>
    </item>
@@ -38,10 +35,20 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="1">
-    <widget class="QLineEdit" name="userID">
-     <property name="placeholderText">
-      <string>Enter your ID here</string>
+   <item row="4" column="0" colspan="3">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help</set>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="3">
+    <widget class="QProgressBar" name="progressBar">
+     <property name="value">
+      <number>0</number>
      </property>
     </widget>
    </item>
@@ -52,17 +59,31 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="label_2">
+   <item row="3" column="1" colspan="2">
+    <widget class="QLabel" name="status">
      <property name="text">
-      <string>Status:</string>
+      <string/>
      </property>
     </widget>
    </item>
-   <item row="2" column="1" colspan="2">
-    <widget class="QLabel" name="status">
+   <item row="1" column="0">
+    <widget class="QLabel" name="passLabel">
      <property name="text">
-      <string/>
+      <string>Password</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QLineEdit" name="password">
+     <property name="echoMode">
+      <enum>QLineEdit::Password</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2">
+    <widget class="QPushButton" name="upload">
+     <property name="text">
+      <string>Upload</string>
      </property>
     </widget>
    </item>
@@ -73,7 +94,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>SubsurfaceWebServices</receiver>
+   <receiver>WebServices</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -89,7 +110,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>SubsurfaceWebServices</receiver>
+   <receiver>WebServices</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/subsurface.pro b/subsurface.pro
index e9927686f..15caa8f99 100644
--- a/subsurface.pro
+++ b/subsurface.pro
@@ -119,7 +119,7 @@ FORMS = \
 	qt-ui/preferences.ui \
 	qt-ui/printoptions.ui \
 	qt-ui/renumber.ui \
-	qt-ui/subsurfacewebservices.ui \
+	qt-ui/webservices.ui \
 	qt-ui/tableview.ui \
     qt-ui/csvimportdialog.ui