From: Norbert Moutarde <norbert.moutarde@nothing2do.eu>
Date: Sat, 5 Apr 2014 09:32:35 +0000 (+0200)
Subject: I've added "box" into action to show a text in a box
X-Git-Url: https://git.nothing2do.fr/?a=commitdiff_plain;h=b6813f447137a32bcc951e89c59e716571ac93e4;p=diary-mobile.git

I've added "box" into action to show a text in a box
---

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 80d18f2..057caee 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -121,22 +121,27 @@ CLabel* MainWindow::addWidget(const QString &key, const CLabel *a){
 }
 void MainWindow::action(const QString &a){
     qDebug()<<"action("<<a<<")";
-    if (a.split(QString(" "))[0]==QString("set")){
-        conf->setValue(QString(a.split(QString(" "))[1]), a.split(QString(" "))[2]);
+    QStringList b=a.split(QString(" "));
+    if (b[0]==QString("set")){
+        conf->setValue(b[1], b[2]);
     }
-    else if(a.split(QString(" "))[0]==QString("settext")){
-        conf->setValue(a.split(QString(" "))[1], QInputDialog::getText(this, "setText", a.split(QString(" "))[1], QLineEdit::Normal, conf->value(a.split(QString(" "))[1]).toString()));
+    else if(b[0]==QString("settext")){
+        conf->setValue(b[1], QInputDialog::getText(this, "setText", b[1], QLineEdit::Normal, conf->value(b[1]).toString()));
     }
-    else if(a.split(QString(" "))[0]==QString("setint")){
-        conf->setValue(a.split(QString(" "))[1], QInputDialog::getInt(this, "setInt", a.split(QString(" "))[1] , conf->value(QString(a.split(QString(" "))[1])).toInt()));
+    else if(b[0]==QString("setint")){
+        conf->setValue(b[1], QInputDialog::getInt(this, "setInt", b[1] , conf->value(QString(b[1])).toInt()));
     }
-    else if(a.split(QString(" "))[0]=="new"){
+    else if(b[0]=="new"){
         QString b=a.remove(0,4);
         entry(b);
     }
     else if(a=="nothing")return;
-    else if(a.split(QString(" "))[0]=="setfile"){
-        conf->setValue(a.split(QString(" "))[1], QFileDialog::getSaveFileName(this, QString("get file"), conf->value(a.split(QString(" "))[1]).toString()));
+    else if(b[0]=="setfile"){
+        conf->setValue(b[1], QFileDialog::getSaveFileName(this, QString("get file"), conf->value(b[1]).toString()));
+    }
+    else if(b[0]==QString("box")){
+        a.remove(0, 4);
+        QMessageBox::information(this, "", a);
     }
     else getButtons(a);
 }
@@ -242,8 +247,8 @@ void MainWindow::firstrun(){
     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"));
-    conf->setValue(QString("uploadRAW"), QVariant("ftp://<user>:<pass>@<server>/<filename>"));
-    conf->setValue(QString("uploadUi"), QVariant("ftp://<user>:<pass>@<server>/<filename>"));
+    conf->setValue(QString("uploadRAW"), QVariant("ftp://<user>:<pass>@<server>/raw"));
+    conf->setValue(QString("uploadUi"), QVariant("ftp://<user>:<pass>@<server>/ui.sql"));
     conf->setValue(QString("restore"), QVariant("http://www.abc.de/db"));
     conf->setValue(QString("start"), QVariant("begin"));
     conf->setValue(QString("db"), QVariant("/data/data/eu.nothing2do.diarymobile/files/db"));
@@ -406,7 +411,7 @@ void MainWindow::back(){
     }
     else {
         flush();
-        getButtons(conf->value(QString("start"), QVariant("begin")).toString());
+        getButtons(conf->value(QString("start")).toString());
         //QMessageBox::information(this, QString("Erreur"), QString("Vous êtes déja au départ."));
     }
 
@@ -529,7 +534,7 @@ void MainWindow::savButtons(){
 }
 void MainWindow::Uisent(){
     qDebug()<<"Uisend";
-    QString texte="savbuttons finish";
+    //QString texte="savbuttons finish";
     //texte=texte+conf->value(QString("uploadUi")).toString();
-    QMessageBox::information(this, "Uisent", texte);
+    QMessageBox::information(this, "Uisent", "savbuttons finish");
 }