From: Norbert Moutarde <norbert.moutarde@nothing2do.eu>
Date: Sat, 7 Mar 2015 10:53:05 +0000 (+0100)
Subject: i restart after a long time away
X-Git-Url: https://git.nothing2do.fr/?a=commitdiff_plain;h=66e1b78c552f58e49667acc4e23d0a75656e032c;p=diary-mobile.git

i restart after a long time away
---

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index e22de71..3754b1e 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -48,4 +48,6 @@
 <uses-permission android:name="android.permission.SET_DEBUG_APP"/>
 
 
+<uses-permission android:name="jackpal.androidterm.permission.RUN_SCRIPT"/>
+<uses-permission android:name="android.permission.INTERACT_ACCROSS_USERS_FULL"/>
 </manifest>
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 79f7463..ca3b5d4 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -45,6 +45,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     orienta=1;
     if(conf->allKeys().size()==0){
         qDebug()<<"first";
+        d.lock();
         firstrun();
         download(QString("http://www.nothing2do.eu/diary-mobile_")+ QLocale::system().name()+ QString(".qm"));
         connect(m, SIGNAL(downloaded()), SLOT(writeTr()));
@@ -60,14 +61,14 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     grid=new QGridLayout(screen);
     grid->setSizeConstraint(QLayout::SetMinAndMaxSize);
     signalmap=new QSignalMapper(this);
-    val=new QHash<QString, QString>;
+    valeur=new QMap<QString, QString>;
     qDebug()<<"1' connect : "<<connect(signalmap, SIGNAL(mapped(const QString &)), this, SLOT(action(const QString &)));
-    qDebug()<<"2' connect : "<<connect(this, SIGNAL(datafilled()), this, SLOT(start()));
+    //qDebug()<<"2' connect : "<<connect(this, SIGNAL(datafilled()), this, SLOT(start()));
     label=new QLabel;
     setCentralWidget(screen);
     createMenuBar();
     connectDB();
-    screen->show();
+    this->showFullScreen();
     if((conf->value(QString("first")).toInt()==1)){
         qDebug()<<"second";
         bool ok;
@@ -78,10 +79,11 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     };
     statusBar()->addPermanentWidget(label);
     menuBar()->setVisible(conf->value(QString("menu")).toBool());
-    //start(); 2' connect will start when data is come
+    d.lock();
+    start();
 }
 void MainWindow::start(){
-    QString a=conf->value(QString("currenttype")).toString();
+    QString a=conf->value(QString("currenttype"), QString("buttons")).toString();
     way=conf->value(QString("start"), conf->value(QString("startdefault"))).toStringList();
     QString b=way.last();
     qDebug()<<"a="<<a<<" b="<<b;
@@ -161,8 +163,8 @@ int unsigned MainWindow::addWidget(const QString &key, const CLabel *a){
     if(key.contains(QString("idem"))){
         key.replace(QString("idem"), a->text());
     }
-    for(QMap<QString, QString>::iterator a=val->begin;a!=val->end;a++){
-        if(key.contains(a.key()))key.replace(a.key(), a.value());
+    for(QMap<QString, QString>::iterator b=valeur->begin();b!=valeur->end();++b){
+        if(key.contains(b.key()))key.replace(b.key(), b.value());
     }
     int c=grid->count(), maxc=conf->value(QString("maxcolumn")).toInt(), maxl=conf->value(QString("maxline")).toInt();
     grid->addWidget(a, c/maxc, c%maxc, 1, 1, Qt::AlignJustify| Qt::AlignVCenter | Qt::AlignHCenter);
@@ -426,8 +428,16 @@ void MainWindow::action(const QString &a){
         qDebug()<<"d : "<<d;
         system(d.toStdString().c_str());
     }
+    else if(b[0]==QString("val")){
+        for(int a=0;a<((bs-1)/2); a++){
+            valeur->insert(b[2*a], b[2*a+1]);
+            qDebug()<<"val.size()=="<<valeur->size()<<endl;
+        }
+    }
+
     else {
         get(conf->value(QString("currenttype")).toString(),a);
+        //a="";
 
     }
 }
@@ -585,7 +595,7 @@ void MainWindow::firstrun(){
     conf->setValue(QString("multiline"), QVariant(0));
     conf->setValue(QString("startdefault"), QVariant("begin"));
     conf->setValue(QString("actionmenu"), QVariant("-menuback"));
-
+    d.unlock();
     qDebug()<<"firstrun() finished";
 }
 QString MainWindow::get(int column){
@@ -595,8 +605,8 @@ QString MainWindow::get2(int column){
     return qq->value(column).toString();
 }
 int MainWindow::exec(const QList<QString> & a){
-    qDebug()<<"exec("<<a[0]<<") size="<<a.size();
-    q->prepare(a[0]);
+    qDebug()<<"exec("<<a[0]<<") size="<<a.size()<<",";
+    qDebug()<<"q->prepare: "<<q->prepare(a[0]);
     for (int j=1; j<a.size(); j++){
         q->bindValue(j-1, a[j]);
         qDebug()<<"bind "<<j-1<<" and"<<a[j];
@@ -604,10 +614,10 @@ int MainWindow::exec(const QList<QString> & a){
     qDebug()<<"exec():"<<q->exec();
     QSqlError b=q->lastError();
     db.commit();
-    if (b.isValid()){qDebug()<<"SQL error :"<<b.text();return -1;}
-    else if(q->isSelect())return q->size();
-    else if (q->isValid()) return 0;
-    else return -1;
+    if (b.isValid()){qDebug()<<"SQL error :"<<b.text();}
+    if(q->isSelect())return q->size();
+    else if(q->isValid()) return 0;
+    return -1;
 }
 int MainWindow::exec2(const QList<QString> & a){
     qDebug()<<"exec("<<a[0]<<") size="<<a.size();
@@ -678,13 +688,14 @@ void MainWindow::get(const QString & d, const QString &b){
     if(b[0]!='+')flush();
     if(updatelocker.tryLock(60000))updatelocker.unlock();
     else{qDebug()<<"updatelocker is locked more than 1mn";}
-    QString c="%"+a+"%", x=conf->value(QString("get")+d).toString();
-    qDebug()<<"x="<<x<<" c="<<c;
+    QString t=QString("get"+d);
+    QString c="%"+a+"%", x=conf->value(t).toString();
+    qDebug()<<"l691 x="<<x<<" c="<<c<<" t="<<t;
     QList<QString> tmp({x, c});
     label->setText(a);
     exec(tmp);
     //while(q->next()){
-        printItem();
+         printItem();
     //}
 }
 void MainWindow::chooseDB(){
@@ -1129,7 +1140,7 @@ bool MainWindow::printItem(){
     int labCol = 0;//r.indexOf("label");
     int actCol = 1;//r.indexOf("action");
     int i=0;
-    qDebug()<<"bcl to add buttons";
+    qDebug()<<"printItem()";
     /*if(page){
         addWidget(QString("prevpage"), new CLabel(trUtf8("Prev."), *conf));
     }*/
@@ -1138,10 +1149,10 @@ bool MainWindow::printItem(){
         //if(tmp==1)return 1;
         i++;
     };
-    grid->update();
+    //grid->update();
     //scroll->updateGeometry();
-    screen->updateGeometry();
-    return 0;
-    qDebug()<<"end getButtons : "<<i<<" button(s) way.size()"<<way.size()<<" page : "<<page;
+    //screen->updateGeometry();
 
+    qDebug()<<"end printItem : "<<i<<" button(s) way.size()"<<way.size()<<" page : "<<page;
+    //return 0;
 }
diff --git a/mainwindow.h b/mainwindow.h
index 5feb4c2..1ec5aa0 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -219,7 +219,7 @@ private:
     unsigned short int deb;
     unsigned int page;
     QVideoWidget * videoWidget;
-    QHash * val;
+    QMap<QString, QString> * valeur;
 };