From: Norbert Moutarde <norbert.moutarde@nothing2do.eu>
Date: Sun, 16 Mar 2014 13:27:10 +0000 (+0100)
Subject: add "setfile db in ui.sql
X-Git-Url: https://git.nothing2do.fr/?a=commitdiff_plain;h=b8221f20a75190425d029d5efb629d2034bb6780;p=diary-mobile.git

add "setfile db in ui.sql
---

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 631e436..ce8ea67 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -37,12 +37,6 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
         updateUi();
         conf->setValue(QString("first"), 2);
     };
-    QFile sav(conf->value(QString("buttonfile")).toString());
-    if((sav.exists())&&(conf->value(QString("first")).toInt()!=1)){
-        sav.open(QIODevice::ReadOnly);
-        data=sav.readAll();
-        sav.close();
-    }
     statusBar()->addPermanentWidget(label);
     menuBar()->setVisible(conf->value(QString("menu")).toBool());
     start();
@@ -241,7 +235,7 @@ void MainWindow::firstrun(){
     conf->setValue(QString("buttonfile"), QVariant("ui.sql"));
     conf->setValue(QString("maxcolumn"), QVariant(2));
     conf->setValue(QString("maxline"), QVariant(5));
-    conf->setValue(QString("SQLsettings"), QVariant("requiressl=1 connect_timeout=10000"));
+    conf->setValue(QString("SQLsettings"), QVariant("connect_timeout=10000"));
     conf->setValue(QString("button"), QVariant("background-color: red;border-style: outset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 15px;padding: 6px;"));
     conf->setValue(QString("menu"), QVariant(1));
     conf->setValue(QString("download"), QVariant("https://raw.github.com/Nothing2Do/diary-mobile-android/master/ui.sql"));
@@ -290,9 +284,9 @@ void MainWindow::entry(const QString &a){
     QFile fichier(conf->value(QString("file")).toString());
     fichier.open(QIODevice::Append | QIODevice::Text);
     QTextStream flux(&fichier);
-    flux << label << entry << endl;
+    flux << time << c << endl;
     fichier.close();
-    QList<QString> d({"INSERT INTO raw (date, texte) VALUES (:date, :txt);", time, entry});
+    QList<QString> d({"INSERT INTO raw (date, texte) VALUES (:date, :txt);", time, c});
     exec(d);
     QSqlError b=q->lastError();
     if (b.isValid())qDebug()<<"q->lastError():"<<b.text();
@@ -319,7 +313,7 @@ void MainWindow::addButtonDB(){
     if ((a=="")||(ok==0))return;
     cmd.append(a);
     exec(cmd);
-    data.append(c).append('$').append(b).append('$').append(a).append('\n');
+    //data.append(c).append('$').append(b).append('$').append(a).append('\n');
     //savButtons();
     return;
 }
@@ -369,8 +363,9 @@ void MainWindow::sendDB(){
     net=new QNetworkAccessManager(this);
     QFile b(conf->value(QString("database")).toString());
     b.open(QIODevice::ReadOnly);
+    //QDataStream c(b.readAll());
     rep=net->put(QNetworkRequest(upload), b.readAll());
-    qDebug()<<"net->put : "<<rep;
+    qDebug()<<"net->put : "<<rep<< " upload : "<<upload.url();
     //rep=net->put(QNetworkRequest(upload),data);
     connect(rep, SIGNAL(finished()), this, SLOT(datasend()));
 }
@@ -455,13 +450,12 @@ void MainWindow::readButtons(const QByteArray &in){
 
     };
     db.commit();
-    data=in;
     emit datafilled();
 }
 void MainWindow::datasend(){
     qDebug()<<"datasend";
-    QString texte="Upload finish"/*, s=m->downloadedData().size()*/;
-    //texte=texte+s.toInt()+" byte)";
+    QString texte="Upload finish : ";
+    texte=texte+conf->value(QString("upload")).toString();
     qDebug()<<"texte : "<<texte;
 
     QMessageBox::information(this, "upload", texte);
diff --git a/mainwindow.h b/mainwindow.h
index a3d08ee..84c61fb 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -143,7 +143,6 @@ private:
     FileDownloader * m;
     QNetworkAccessManager *net;
     QNetworkReply * rep;
-    QByteArray data;
 };
 
 
diff --git a/ui.sql b/ui.sql
index b06d483..56a1110 100644
--- a/ui.sql
+++ b/ui.sql
@@ -12,3 +12,4 @@ config$button$settext button
 config$download$settext download
 config$upload$settext upload
 config$start$settext start
+config$DB file$setfile db