From: Norbert Moutarde <norbert.moutarde@nothing2do.eu>
Date: Fri, 18 Apr 2014 17:16:29 +0000 (+0200)
Subject: fix a missed (easy) bug (collide between menu and menubar)
X-Git-Url: https://git.nothing2do.fr/?a=commitdiff_plain;h=17a4d1711fb85170fdd132e36957eb4a00771e88;p=diary-mobile.git

fix a missed (easy) bug (collide between menu and menubar)
---

diff --git a/mainwindow.cpp b/mainwindow.cpp
index c1f9589..4008b04 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -125,7 +125,8 @@ CLabel* MainWindow::addWidget(const QString &key, const CLabel *a){
 void MainWindow::action(const QString &a){
     qDebug()<<"action("<<a<<")";
     QStringList b=a.split(QString(" "));
-    QString c=a.remove(0,4);
+    QString c=a;
+    c.remove(0,4);
     if (b[0]==QString("set")){
         conf->setValue(b[1], b[2]);
     }
@@ -261,7 +262,7 @@ void MainWindow::firstrun(){
     conf->setValue(QString("db"), QVariant("/data/data/eu.nothing2do.diarymobile/files/db"));
     conf->setValue(QString("selectbuttons"), QVariant("select keyword,label,action from ui;"));
     conf->setValue(QString("selectraw"), QVariant("select date,texte from raw;"));
-    conf->setValue(QString("menu"), QVariant("menuback"));
+    conf->setValue(QString("menuback"), QVariant("menuback"));
 }
 QString &MainWindow::get(int row, int column){
     q->seek(row);
@@ -407,7 +408,7 @@ void MainWindow::RAWsent(){
 }
 void MainWindow::back(){
     flush();
-    getButtons(conf->value(QString("menu")).toString());
+    getButtons(conf->value(QString("menuback")).toString());
     for(int i=0; i<way.size()-1; i++){
         addWidget(QString(way[i]), new CLabel(QString(way[i]), conf->value(QString("button")).toString()));
     }
diff --git a/ui.sql b/ui.sql
index bd33e17..adefdff 100644
--- a/ui.sql
+++ b/ui.sql
@@ -17,5 +17,5 @@ config$start$settext start
 config$DB file$settext db
 config$restore DB$settext restore
 config$selectraw$settext selectraw
-config$menu$settext menu
+config$menu$settext menuback
 main help$action$box action can be : set #1 #2, settext #1, setint #1, setfile #1, box #, quit, # (getbuttons)