mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Dirk Hohndel 2013-10-27 03:22:09 +00:00
commit 899f077abd
7 changed files with 258 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

7
qt-ui/mainwindow.cpp
View file

@ -252,7 +252,12 @@ void MainWindow::on_actionDownloadDC_triggered()
void MainWindow::on_actionDownloadWeb_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() void MainWindow::on_actionEditDeviceNames_triggered()

2
qt-ui/mainwindow.h
View file

@ -69,6 +69,7 @@ private slots:
/* log menu actions */ /* log menu actions */
void on_actionDownloadDC_triggered(); void on_actionDownloadDC_triggered();
void on_actionDownloadWeb_triggered(); void on_actionDownloadWeb_triggered();
void on_actionDivelogs_de_triggered();
void on_actionEditDeviceNames_triggered(); void on_actionEditDeviceNames_triggered();
void on_actionAddDive_triggered(); void on_actionAddDive_triggered();
void on_actionRenumber_triggered(); void on_actionRenumber_triggered();
@ -120,7 +121,6 @@ private:
void redrawProfile(); void redrawProfile();
void file_save(); void file_save();
void file_save_as(); void file_save_as();
void setupSplitters();
}; };
MainWindow *mainWindow(); MainWindow *mainWindow();

78
qt-ui/mainwindow.ui
View file

@ -18,7 +18,16 @@
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </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> <number>0</number>
</property> </property>
<item> <item>
@ -39,7 +48,16 @@
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </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> <number>0</number>
</property> </property>
<item> <item>
@ -52,7 +70,16 @@
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </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> <number>0</number>
</property> </property>
<item> <item>
@ -70,7 +97,16 @@
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </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> <number>0</number>
</property> </property>
<item> <item>
@ -83,7 +119,16 @@
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </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> <number>0</number>
</property> </property>
<item> <item>
@ -169,7 +214,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>763</width> <width>763</width>
<height>32</height> <height>18</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuFile"> <widget class="QMenu" name="menuFile">
@ -196,8 +241,15 @@
<property name="title"> <property name="title">
<string>Log</string> <string>Log</string>
</property> </property>
<addaction name="actionDownloadDC"/> <widget class="QMenu" name="menuDownloads">
<addaction name="actionDownloadWeb"/> <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="actionEditDeviceNames"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="actionAddDive"/> <addaction name="actionAddDive"/>
@ -206,6 +258,7 @@
<addaction name="actionAutoGroup"/> <addaction name="actionAutoGroup"/>
<addaction name="actionToggleZoom"/> <addaction name="actionToggleZoom"/>
<addaction name="actionYearlyStatistics"/> <addaction name="actionYearlyStatistics"/>
<addaction name="separator"/>
</widget> </widget>
<widget class="QMenu" name="menuView"> <widget class="QMenu" name="menuView">
<property name="title"> <property name="title">
@ -317,7 +370,7 @@
</action> </action>
<action name="actionDownloadDC"> <action name="actionDownloadDC">
<property name="text"> <property name="text">
<string>Download from Dive computer</string> <string>Dive computer</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string>Ctrl+D</string> <string>Ctrl+D</string>
@ -325,7 +378,7 @@
</action> </action>
<action name="actionDownloadWeb"> <action name="actionDownloadWeb">
<property name="text"> <property name="text">
<string>Download from Web Service</string> <string>Subsurface Service</string>
</property> </property>
</action> </action>
<action name="actionEditDeviceNames"> <action name="actionEditDeviceNames">
@ -453,6 +506,11 @@
<string>Import CSV</string> <string>Import CSV</string>
</property> </property>
</action> </action>
<action name="actionDivelogs_de">
<property name="text">
<string>Divelogs.de</string>
</property>
</action>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>

90
qt-ui/subsurfacewebservices.cpp
View file

@ -15,6 +15,33 @@
struct dive_table gps_location_table; struct dive_table gps_location_table;
static bool merge_locations_into_dives(void); 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() SubsurfaceWebServices* SubsurfaceWebServices::instance()
{ {
static SubsurfaceWebServices *self = new SubsurfaceWebServices(); static SubsurfaceWebServices *self = new SubsurfaceWebServices();
@ -24,12 +51,10 @@ SubsurfaceWebServices* SubsurfaceWebServices::instance()
SubsurfaceWebServices::SubsurfaceWebServices(QWidget* parent, Qt::WindowFlags f) 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; 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) static void clear_table(struct dive_table *table)
@ -56,7 +81,7 @@ void SubsurfaceWebServices::buttonClicked(QAbstractButton* button)
/* store last entered uid in config */ /* store last entered uid in config */
QSettings s; QSettings s;
s.setValue("webservice_uid", ui.userID->text()); s.setValue("subsurface_webservice_uid", ui.userID->text());
s.sync(); s.sync();
hide(); hide();
close(); close();
@ -135,11 +160,6 @@ void SubsurfaceWebServices::setStatusText(int status)
ui.status->setText(text); ui.status->setText(text);
} }
void SubsurfaceWebServices::runDialog()
{
exec();
}
/* requires that there is a <download> or <error> tag under the <root> tag */ /* 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) 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; 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)
{
}

65
qt-ui/subsurfacewebservices.h
View file

@ -5,33 +5,64 @@
#include <QNetworkReply> #include <QNetworkReply>
#include <libxml/tree.h> #include <libxml/tree.h>
#include "ui_subsurfacewebservices.h" #include "ui_webservices.h"
class QAbstractButton; class QAbstractButton;
class QNetworkReply; class QNetworkReply;
class SubsurfaceWebServices : public QDialog { class WebServices : public QDialog{
Q_OBJECT Q_OBJECT
public: public:
static SubsurfaceWebServices* instance(); explicit WebServices(QWidget* parent = 0, Qt::WindowFlags f = 0);
void runDialog(); void hidePassword();
void hideUpload();
private slots:
void startDownload();
void buttonClicked(QAbstractButton* button);
void downloadFinished();
void downloadError(QNetworkReply::NetworkError error);
private:
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); private slots:
Ui::SubsurfaceWebServices ui; virtual void startDownload() = 0;
virtual void startUpload() = 0;
virtual void buttonClicked(QAbstractButton* button) = 0;
protected:
Ui::WebServices ui;
QNetworkReply *reply; QNetworkReply *reply;
QNetworkAccessManager *manager; QNetworkAccessManager *manager;
QByteArray downloadedData; QByteArray downloadedData;
}; };
class SubsurfaceWebServices : public WebServices {
Q_OBJECT
public:
static SubsurfaceWebServices* instance();
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);
};
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 #endif

89
qt-ui/subsurfacewebservices.ui → qt-ui/webservices.ui
View file

@ -1,40 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>SubsurfaceWebServices</class> <class>WebServices</class>
<widget class="QDialog" name="SubsurfaceWebServices"> <widget class="QDialog" name="WebServices">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>399</width> <width>425</width>
<height>104</height> <height>141</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Download Location Data</string> <string>Download Location Data</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="1" column="0" colspan="3"> <item row="3" column="0">
<widget class="QProgressBar" name="progressBar"> <widget class="QLabel" name="label_2">
<property name="value">
<number>0</number>
</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>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="download">
<property name="text"> <property name="text">
<string>Download</string> <string>Status:</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -45,6 +28,30 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2">
<widget class="QPushButton" name="download">
<property name="text">
<string>Download</string>
</property>
</widget>
</item>
<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>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
@ -52,20 +59,34 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="3" column="1" colspan="2">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Status:</string>
</property>
</widget>
</item>
<item row="2" column="1" colspan="2">
<widget class="QLabel" name="status"> <widget class="QLabel" name="status">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0">
<widget class="QLabel" name="passLabel">
<property name="text">
<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>
</layout> </layout>
</widget> </widget>
<resources/> <resources/>
@ -73,7 +94,7 @@
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>
<signal>accepted()</signal> <signal>accepted()</signal>
<receiver>SubsurfaceWebServices</receiver> <receiver>WebServices</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
@ -89,7 +110,7 @@
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>
<signal>rejected()</signal> <signal>rejected()</signal>
<receiver>SubsurfaceWebServices</receiver> <receiver>WebServices</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">

2
subsurface.pro
View file

@ -119,7 +119,7 @@ FORMS = \
qt-ui/preferences.ui \ qt-ui/preferences.ui \
qt-ui/printoptions.ui \ qt-ui/printoptions.ui \
qt-ui/renumber.ui \ qt-ui/renumber.ui \
qt-ui/subsurfacewebservices.ui \ qt-ui/webservices.ui \
qt-ui/tableview.ui \ qt-ui/tableview.ui \
qt-ui/csvimportdialog.ui qt-ui/csvimportdialog.ui