added a function who reset raw data (as name say : resetRAW()) and one

gettext asl for URL to download the irst ui.sql

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 057caee828df6bf834b9c253b889721cceda8600..35a2c92623a649e5b58a0bcb2e8998ee1b717ed7 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -33,6 +33,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 
     if((conf->value(QString("first")).toInt()==1)){
         qDebug()<<"second";
+        QString ser=QInputDialog::getText(this, "fichier initial", "Entrez l'adresse du serveur où télécharger les premier boutons", QLineEdit::Normal, conf->value(QString("download")).toString());
+        if(ser!="")conf->setValue(QString("download"), ser);
         createDB();
         downloadUi();
         conf->setValue(QString("first"), 2);
@@ -153,6 +155,7 @@ void MainWindow::createMenuBar(){
     FileMenu->addAction(trUtf8("sendRAW"), this, SLOT(sendRAW()),QKeySequence(trUtf8("Ctrl+L", "File|Upload")));
     //FileMenu->addAction(trUtf8("Rest&ore"), this, SLOT(restoreDB()),QKeySequence(trUtf8("Ctrl+O", "File|Restore")));
     FileMenu->addAction(trUtf8("Reset Ui"), this, SLOT(resetUi()), QKeySequence(trUtf8("Ctrl+Z", "File|ResetUi")));
+    FileMenu->addAction(trUtf8("Reset RAW"), this, SLOT(resetRAW()));
     FileMenu->addAction(trUtf8("&Quit..."), this, SLOT(quit()),QKeySequence(trUtf8("Ctrl+Q", "File|Quit")));
     menuBar()->addMenu(FileMenu);
     EditMenu=new QMenu(QString("&Buttons"));
@@ -367,7 +370,7 @@ void MainWindow::editButtonDB(){
 }
 void MainWindow::downloadUi(){
     qDebug()<<"updateUi() : "<<conf->value(QString("download"), QVariant("https://raw.github.com/Nothing2Do/diary-mobile-android/master/ui.sql")).toString();
-    download(conf->value(QString("download"), QVariant("https://raw.github.com/Nothing2Do/diary-mobile-android/master/ui.sql")).toString());
+    download(conf->value(QString("download")).toString());
     connect(m, SIGNAL(downloaded()), SLOT(writeUi()));
 }
 void MainWindow::writeUi(){
@@ -403,14 +406,13 @@ void MainWindow::RAWsent(){
     QMessageBox::information(this, "RAWsent", "sendRAW finish");
 }
 void MainWindow::back(){
+    flush();
     if(way.size()-1>0){
-        flush();
         for(int i=0; i<way.size(); i++){
-            addWidget(QString(way[i]), new CLabel(QString(way[i])));
+            addWidget(QString(way[i]), new CLabel(QString(way[i]), conf->value(QString("button")).toString()));
         }
     }
     else {
-        flush();
         getButtons(conf->value(QString("start")).toString());
         //QMessageBox::information(this, QString("Erreur"), QString("Vous êtes déja au départ."));
     }
@@ -419,6 +421,7 @@ void MainWindow::back(){
 void MainWindow::keyReleaseEvent(QKeyEvent *event)
 {
     static bool accepted=true;
+    if(accepted==false)quit();
     event->setAccepted(accepted); // don't close my Top Level Widget !
     int k=event->key();
     qDebug()<<"key pressed="<<k;
@@ -500,7 +503,7 @@ void MainWindow::downloadDB(){
 void MainWindow::writeDB(){
     system("su");
     disconnect(m, SIGNAL(downloaded()));
-    QFile a(conf->value(QString("db"), QVariant("/data/data/eu.nothing2do.diarymobile/files/db")).toString());
+    QFile a(conf->value(QString("db")).toString());
     a.open(QIODevice::WriteOnly | QIODevice::Text);
     QDataStream b(&a);
     b<<m->downloadedData();
@@ -534,7 +537,8 @@ void MainWindow::savButtons(){
 }
 void MainWindow::Uisent(){
     qDebug()<<"Uisend";
-    //QString texte="savbuttons finish";
-    //texte=texte+conf->value(QString("uploadUi")).toString();
     QMessageBox::information(this, "Uisent", "savbuttons finish");
 }
+void MainWindow::resetRAW(){
+    exec(QList<QString>({"delete from raw;"}));
+}

diff --git a/mainwindow.h b/mainwindow.h
index a3986b72225db8cc649bb51456cef10c8a2cd784..2be71a8236f5944619d36965cf07dde58c3984d0 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -63,7 +63,7 @@ Q_OBJECT
     QString m_style;
 
 public:
-    explicit CLabel(const QString& text ="default",const QString &style="background-color: red;border-style: outset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 15px;padding: 6px;",QWidget * parent = 0 );
+    explicit CLabel(const QString& text,const QString &style,QWidget * parent = 0 );
     ~CLabel();
     void SetTextToLabel(const QString &);
 signals:
@@ -100,7 +100,7 @@ private slots:
     void back();
     void start();
     void quit();
-
+    void resetRAW();
     void action(const QString &);
     void createMenuBar();
     void toggleMenu();