added download()

diff --git a/mainwindow.cpp b/mainwindow.cpp
index a86abc19b1363ccaa6e4867a384e1246c658d956..efe435fd8c2db96d27ffe94b2aab86f4c9f2054e 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -287,7 +287,7 @@ void MainWindow::entry(const QString &a){
     QFile fichier(conf->value(QString("file")).toString());
     fichier.open(QIODevice::Append | QIODevice::Text);
     QTextStream flux(&fichier);
-    flux << time << c << endl;
+    flux << time << " " << c << endl;
     fichier.close();
     QList<QString> d({"INSERT INTO raw (date, texte) VALUES (:date, :txt);", time, c});
     exec(d);
@@ -355,10 +355,10 @@ void MainWindow::editButtonDB(){
     }*/
 }
 void MainWindow::updateUi(){
+    //download(conf->value(QString("download")).toString());
     qDebug()<<"updateUi() : "<<conf->value(QString("download")).toString();
-    QUrl update(conf->value(QString("download")).toString());
-    m = new FileDownloader(update, this);
-    connect(m, SIGNAL(downloaded()), SLOT(writeUpdate()));
+    readButtons(download(conf->value(QString("download")).toString()));
+    //connect(m, SIGNAL(downloaded()), SLOT(writeUpdate()));
 }
 void MainWindow::sendDB(){
     system("su");
@@ -390,14 +390,14 @@ void MainWindow::back(){
 }
 void MainWindow::keyReleaseEvent(QKeyEvent *event)
 {
-    //static bool accepted=true;
-    //event->setAccepted(accepted); // don't close my Top Level Widget !
+    static bool accepted=true;
+    event->setAccepted(accepted); // don't close my Top Level Widget !
     int k=event->key();
     qDebug()<<"key pressed="<<k;
     if (k==Qt::Key_Back)
     {
         back();
-        //accepted=false;// close the app next time when the user press back button
+        accepted=false;// close the app next time when the user press back button
     }
 
 }
@@ -423,6 +423,7 @@ FileDownloader::~FileDownloader()
 void FileDownloader::fileDownloaded(QNetworkReply* pReply)
 {
     m_DownloadedData = pReply->readAll();
+    qDebug()<<"downloaded : "<<m_DownloadedData.size()<<" byte";
     //emit a signal
     pReply->deleteLater();
     emit downloaded();
@@ -432,7 +433,6 @@ QByteArray FileDownloader::downloadedData() const
     return m_DownloadedData;
 }
 void MainWindow::writeUpdate(){
-    qDebug()<<"downloaded : "<<m->downloadedData().size()<<" byte";
     flush();
     // put newly downloaded sql file into database
     q->exec("PRAGMA foreign_keys=OFF;");
@@ -481,3 +481,10 @@ void MainWindow::restoreDB(){
     b.write(rep->readAll());
     system("exit");
 }
+QByteArray MainWindow::download(QString a){
+    qDebug()<<"download() : "<<a;
+    QUrl url(a);
+    m = new FileDownloader(url, this);
+    connect(m, SIGNAL(downloaded()), SLOT(writeUpdate()));
+    return m->downloadedData();
+}

diff --git a/mainwindow.h b/mainwindow.h
index 132c05810bd3343fe6b9cc5b2cd6218159a93d8b..4e6705907cd7068e946941ced61a924179d6ac36 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -122,6 +122,7 @@ private slots:
     void readButtons(const QByteArray &);
     void resetUi();
     void restoreDB();
+    QByteArray download(QString);
 public slots:
 
 signals: