From b84edad59766e5f59f6c3dcf5bb3a2ec24fc3eec Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Sun, 28 Dec 2014 21:43:38 -0200 Subject: [PATCH] Facebook integration: Add an interface to select the stuff that's sent Generate the stub message that will go on the Facebook picture upload. Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- qt-ui/socialnetworks.cpp | 67 ++++++++++++++++++++++++++++----- qt-ui/socialnetworks.h | 16 ++++++++ qt-ui/socialnetworksdialog.ui | 71 ++++++++++++++++++++++------------- subsurface.pro | 3 +- 4 files changed, 120 insertions(+), 37 deletions(-) diff --git a/qt-ui/socialnetworks.cpp b/qt-ui/socialnetworks.cpp index b722c34c5..8d24b2269 100644 --- a/qt-ui/socialnetworks.cpp +++ b/qt-ui/socialnetworks.cpp @@ -18,6 +18,7 @@ #include "mainwindow.h" #include "profile/profilewidget2.h" #include "pref.h" +#include "ui_socialnetworksdialog.h" #define GET_TXT(name, field) \ v = s.value(QString(name)); \ @@ -191,13 +192,12 @@ void FacebookManager::setDesiredAlbumName(const QString& a) * and send erroniously *all* of them to facebook. */ void FacebookManager::sendDive() { - bool ok; - albumName = QInputDialog::getText(qApp->activeWindow(), tr("Enter Facebook Album"), - tr("Facebook Album:"), QLineEdit::Normal, - "Subsurface", &ok); - if (!ok) + SocialNetworkDialog dialog(qApp->activeWindow()); + if (dialog.exec() != QDialog::Accepted) return; + + setDesiredAlbumName(dialog.album()); requestAlbumId(); ProfileWidget2 *profile = MainWindow::instance()->graphics(); @@ -210,7 +210,7 @@ void FacebookManager::sendDive() QUrl url("https://graph.facebook.com/v2.2/" + QString(prefs.facebook.album_id) + "/photos?" + "&access_token=" + QString(prefs.facebook.access_token) + "&source=image" + - "&message=" + QString(d->notes).toHtmlEscaped()); + "&message=" + dialog.text()); QNetworkAccessManager *am = new QNetworkAccessManager(this); @@ -237,11 +237,60 @@ void FacebookManager::sendDive() connect(reply, SIGNAL(finished()), &loop, SLOT(quit())); loop.exec(); - QJsonDocument jsonDoc = QJsonDocument::fromJson(reply->readAll()); + QByteArray response = reply->readAll(); + QJsonDocument jsonDoc = QJsonDocument::fromJson(response); QJsonObject obj = jsonDoc.object(); if (obj.keys().contains("id")){ - QMessageBox:: + QMessageBox::information(qApp->activeWindow(), + tr("Photo Upload Sucessfull"), + tr("Your dive profile was updated to facebook."), + QMessageBox::Ok); } else { - + QMessageBox::information(qApp->activeWindow(), + tr("Photo Upload Failed"), + tr("Your dive profile was not updated to facebook, \n " + "please send the following to the developer. \n" + + response), + QMessageBox::Ok); } } + +SocialNetworkDialog::SocialNetworkDialog(QWidget *parent) : QDialog(parent) + , ui( new Ui::SocialnetworksDialog()) +{ + ui->setupUi(this); + connect(ui->date, SIGNAL(clicked()), this, SLOT(selectionChanged())); + connect(ui->Buddy, SIGNAL(clicked()), this, SLOT(selectionChanged())); + connect(ui->Divemaster, SIGNAL(clicked()), this, SLOT(selectionChanged())); + connect(ui->Location, SIGNAL(clicked()), this, SLOT(selectionChanged())); + connect(ui->Notes, SIGNAL(clicked()), this, SLOT(selectionChanged())); +} + +void SocialNetworkDialog::selectionChanged() { + struct dive *d = current_dive; + QString fullText; + if (ui->date->isChecked()) { + fullText += tr("Dive Date: %1 \n").arg(d->when); + } + if (ui->Buddy->isChecked()) { + fullText += tr("Buddy: %1 \n").arg(d->buddy); + } + if (ui->Divemaster->isChecked()) { + fullText += tr("Divemaster: %1 \n").arg(d->divemaster); + } + if (ui->Location->isChecked()) { + fullText += tr("Dive Location: %1 \n").arg(d->location); + } + if (ui->Notes->isChecked()) { + fullText += tr("\n %1").arg(d->notes); + } + ui->text->setPlainText(fullText); +} + +QString SocialNetworkDialog::text() const { + return ui->text->toPlainText().toHtmlEscaped(); +} + +QString SocialNetworkDialog::album() const { + return ui->album->text().toHtmlEscaped(); +} diff --git a/qt-ui/socialnetworks.h b/qt-ui/socialnetworks.h index 66a95f22a..1a5a2a0ba 100644 --- a/qt-ui/socialnetworks.h +++ b/qt-ui/socialnetworks.h @@ -3,6 +3,7 @@ #include #include +#include class FacebookManager : public QObject { @@ -29,4 +30,19 @@ private: QString albumName; }; +namespace Ui { + class SocialnetworksDialog; +} + +class SocialNetworkDialog : public QDialog { + Q_OBJECT +public: + SocialNetworkDialog(QWidget *parent); + QString text() const; + QString album() const; +public slots: + void selectionChanged(); +private: + Ui::SocialnetworksDialog *ui; +}; #endif // FACEBOOKMANAGER_H diff --git a/qt-ui/socialnetworksdialog.ui b/qt-ui/socialnetworksdialog.ui index 2c7702293..1b88c1b1a 100644 --- a/qt-ui/socialnetworksdialog.ui +++ b/qt-ui/socialnetworksdialog.ui @@ -1,7 +1,7 @@ - Dialog - + SocialnetworksDialog + 0 @@ -14,61 +14,61 @@ Dialog - + + + + + + + Folder + + + + - + Time - + Location - + Divemaster - + Buddy - - - - Notes - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - + date + + + + Notes + + + @@ -76,6 +76,23 @@ + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + Include + + + @@ -83,7 +100,7 @@ buttonBox accepted() - Dialog + SocialnetworksDialog accept() @@ -99,7 +116,7 @@ buttonBox rejected() - Dialog + SocialnetworksDialog reject() diff --git a/subsurface.pro b/subsurface.pro index 02a416e88..ec8b0fd51 100644 --- a/subsurface.pro +++ b/subsurface.pro @@ -237,7 +237,8 @@ FORMS = \ qt-ui/configuredivecomputerdialog.ui \ qt-ui/listfilter.ui \ qt-ui/diveshareexportdialog.ui \ - qt-ui/filterwidget.ui + qt-ui/filterwidget.ui \ + qt-ui/socialnetworksdialog.ui # Nether usermanual or printing is supported on android right now android: FORMS -= qt-ui/printoptions.ui