aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--qt-ui/mainwindow.cpp2
-rw-r--r--qt-ui/subsurfacewebservices.cpp33
-rw-r--r--qt-ui/subsurfacewebservices.h32
-rw-r--r--qt-ui/webservices.ui (renamed from qt-ui/subsurfacewebservices.ui)75
-rw-r--r--subsurface.pro2
5 files changed, 96 insertions, 48 deletions
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index 69cf363c3..bb21e6625 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -252,7 +252,7 @@ void MainWindow::on_actionDownloadDC_triggered()
void MainWindow::on_actionDownloadWeb_triggered()
{
- SubsurfaceWebServices::instance()->runDialog();
+ SubsurfaceWebServices::instance()->exec();
}
void MainWindow::on_actionEditDeviceNames_triggered()
diff --git a/qt-ui/subsurfacewebservices.cpp b/qt-ui/subsurfacewebservices.cpp
index f2b1b88cc..d9da69287 100644
--- a/qt-ui/subsurfacewebservices.cpp
+++ b/qt-ui/subsurfacewebservices.cpp
@@ -15,6 +15,26 @@
struct dive_table gps_location_table;
static bool merge_locations_into_dives(void);
+WebServices::WebServices(QWidget* parent, Qt::WindowFlags f): QDialog(parent, 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);
+
+}
+
+void WebServices::hidePassword()
+{
+ ui.password->hide();
+ ui.passLabel->hide();
+}
+
+void WebServices::hideUpload()
+{
+ ui.upload->hide();
+}
+
SubsurfaceWebServices* SubsurfaceWebServices::instance()
{
static SubsurfaceWebServices *self = new SubsurfaceWebServices();
@@ -24,12 +44,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());
+ hidePassword();
+ hideUpload();
}
static void clear_table(struct dive_table *table)
@@ -56,7 +74,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 +153,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)
{
diff --git a/qt-ui/subsurfacewebservices.h b/qt-ui/subsurfacewebservices.h
index 0719a8f15..19c3f56c7 100644
--- a/qt-ui/subsurfacewebservices.h
+++ b/qt-ui/subsurfacewebservices.h
@@ -5,16 +5,35 @@
#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 buttonClicked(QAbstractButton* button) = 0;
+ virtual void downloadFinished() = 0;
+ virtual void downloadError(QNetworkReply::NetworkError error) = 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();
@@ -23,15 +42,10 @@ private slots:
void downloadError(QNetworkReply::NetworkError error);
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;
};
#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
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-26 13:49:50 +0000