From 5eb2cc4594ab2181ccc3b09a2540af3fb615468e Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Thu, 24 Oct 2013 22:30:21 -0200 Subject: [PATCH] Created a 'WebService' dialog that will handle download and upload. Created a WebService dialog that will handle download and upload from all child based webservices. Also, ported the currently - only - one webservice to use the new dialog. Signed-off-by: Tomaz Canabrava --- qt-ui/mainwindow.cpp | 2 +- qt-ui/subsurfacewebservices.cpp | 33 ++++--- qt-ui/subsurfacewebservices.h | 32 +++++-- ...ubsurfacewebservices.ui => webservices.ui} | 89 ++++++++++++------- subsurface.pro | 2 +- 5 files changed, 103 insertions(+), 55 deletions(-) rename qt-ui/{subsurfacewebservices.ui => webservices.ui} (71%) 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 or tag under the 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 #include -#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 similarity index 71% rename from qt-ui/subsurfacewebservices.ui rename to qt-ui/webservices.ui index 899eea909..b190a7980 100644 --- a/qt-ui/subsurfacewebservices.ui +++ b/qt-ui/webservices.ui @@ -1,40 +1,23 @@ - SubsurfaceWebServices - + WebServices + 0 0 - 399 - 104 + 425 + 141 Download Location Data - - - - 0 - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help - - - - - + + - Download + Status: @@ -45,6 +28,30 @@ + + + + Download + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help + + + + + + + 0 + + + @@ -52,20 +59,34 @@ - - - - Status: - - - - + + + + + Password + + + + + + + QLineEdit::Password + + + + + + + Upload + + + @@ -73,7 +94,7 @@ buttonBox accepted() - SubsurfaceWebServices + WebServices accept() @@ -89,7 +110,7 @@ buttonBox rejected() - SubsurfaceWebServices + WebServices reject() 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