From: Norbert Moutarde <norbert.moutarde@nothing2do.eu>
Date: Sat, 4 Jan 2014 18:43:09 +0000 (+0100)
Subject: upload ?
X-Git-Url: https://git.nothing2do.fr/?a=commitdiff_plain;h=3f6bc4fe9053cbad69a24c0e3dc7ef5a938add01;p=diary-mobile.git

upload ?
---

diff --git a/mainwindow.cpp b/mainwindow.cpp
index c129986..2ad9653 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -164,6 +164,7 @@ void MainWindow::createMenuBar(){
     FileMenu->addAction(trUtf8("&Start..."), this, SLOT(start()),QKeySequence(trUtf8("Ctrl+S", "Start")));
     FileMenu->addAction(trUtf8("&Back"), this, SLOT(back()),QKeySequence(trUtf8("Ctrl+B", "Back")));
     FileMenu->addAction(trUtf8("&Update"), this, SLOT(updateUi()),QKeySequence(trUtf8("Ctrl+U", "Update")));
+    FileMenu->addAction(trUtf8("Up&load"), this, SLOT(sendUi()),QKeySequence(trUtf8("Ctrl+L", "Update")));
     FileMenu->addAction(trUtf8("&Quit..."), this, SLOT(quit()),QKeySequence(trUtf8("Ctrl+Q", "Quit")));
     menuBar()->addMenu(FileMenu);
     EditMenu=new QMenu(QString("&Edit"));
@@ -316,17 +317,18 @@ void MainWindow::addButtonDB(){
     bool ok=0;
     cmd.append("insert into ui (label, keyword, action) values (:label, :keyword, :action)");
     QString cur=way.last();
-    QString a, b=QInputDialog::getText(this, QString("label"), QString("Entrez son label"),QLineEdit::Normal, QString(), &ok);
+    QString a, c, b=QInputDialog::getText(this, QString("label"), QString("Entrez son label"),QLineEdit::Normal, QString(), &ok);
     if ((b=="")||(ok==0))return;
     cmd.append(b);
     a=QInputDialog::getText(this, QString("keyword"), QString("Entrez ses mots clé"), QLineEdit::Normal, cur, &ok);
     if ((a=="")||(ok==0))return;
     cmd.append(a);
     cur.chop(1);
-    a=QInputDialog::getText(this, QString("action"), QString("Entrez son action"), QLineEdit::Normal, b, &ok);
-    if ((a=="")||(ok==0))return;
-    cmd.append(a);
+    c=QInputDialog::getText(this, QString("action"), QString("Entrez son action"), QLineEdit::Normal, b, &ok);
+    if ((c=="")||(ok==0))return;
+    cmd.append(c);
     exec(cmd);
+    data.append(b).append('$').append(a).append('$').append(c).append('\n');
     return;
 }
 void MainWindow::getButtons(const QString &a){
@@ -370,7 +372,8 @@ void MainWindow::updateUi(){
 void MainWindow::sendUi(){
     qDebug()<<"sendUi() : "<<conf->value(QString("upload")).toString();
     QUrl upload(conf->value(QString("upload")).toString());
-    /* I don't know how to use filedownloader class to upload */
+    net=new QNetworkAccessManager(this);
+    net->put(QNetworkRequest(upload),data);
 }
 void MainWindow::back(){
     bool ok;
@@ -406,8 +409,7 @@ void CLabel::SetTextToLabel(const QString& text)
 }
 FileDownloader::FileDownloader(QUrl url, QObject *parent) : QObject(parent)
 {
-    connect(&m_WebCtrl, SIGNAL(finished(QNetworkReply*)),
-                SLOT(fileDownloaded(QNetworkReply*)));
+    connect(&m_WebCtrl, SIGNAL(finished(QNetworkReply*)),SLOT(fileDownloaded(QNetworkReply*)));
 
     QNetworkRequest request(url);
     m_WebCtrl.get(request);
@@ -447,12 +449,8 @@ void MainWindow::writeUpdate(){
         }
         qDebug()<<"q->exec() : "<<q->exec();
     };
-    //qDebug()<<"q->exec() : "<<q->exec();
-    //q->exec(QString("COMMIT;"));
     db.commit();
-    QFile c(conf->value(QString("buttonfile")).toString());
-    c.open(QIODevice::Append);
-    c.write(m->downloadedData());
+    data=m->downloadedData();
     getButtons(conf->value(QString("start"), QVariant("begin")).toString());
 
 }
diff --git a/mainwindow.h b/mainwindow.h
index e490cf3..44b9d62 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -137,6 +137,8 @@ private:
     QSqlQuery *q;
     //QSqlRecord r;
     FileDownloader * m;
+    QNetworkAccessManager *net;
+    QByteArray data;
 };
 
 
diff --git a/ui.sql b/ui.sql
index f2997f4..ee3e08f 100644
--- a/ui.sql
+++ b/ui.sql
@@ -8,6 +8,7 @@ odysseum$subway$odysseum-subway
 oliver's pub$audrey$audrey zanella
 oliver's pub$chloé$chloé EN
 oliver's pub$clochette$
+oliver's pub$valentine$
 audrey zanella$Pourquoi vous me prenez pour un perver ?$begi-olive-audre-perver
 begi-lie-olive-audre-perver$"On ne te prends pas pour un perver."$begi-olive-audre-perve-non
 begi-lie-olive-audre-perve-non$Pourquoi vous refusez qu'on se voit hors d'ici alors ?$begi-olive-audre-perve-non-hors