rename project "diary-mobile", and few tweaks

diff --git a/diary-mobile-android.pro b/diary-mobile.pro
similarity index 100%
rename from diary-mobile-android.pro
rename to diary-mobile.pro

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 2d80c930f97895ee932b6e8aa0bbf0f0cc51f03a..dc4eebdd7173f1363d70108f5d066d51f91aca9b 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -28,10 +28,10 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     scroll->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
     scroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     scroll->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    scroll->setWidgetResizable(1);*/
+    scroll->setWidgetResizable(0);*/
     grid=new QGridLayout(screen);
     //scroll->show();
-    grid->setSizeConstraint(QLayout::SetMinimumSize);
+    grid->setSizeConstraint(QLayout::SetMinAndMaxSize);
     /*ks=new QsKineticScroller(scroll);
     ks->enableKineticScrollFor(scroll);*/
     signalmap=new QSignalMapper(this);
@@ -99,7 +99,7 @@ void MainWindow::setOrientation(ScreenOrientation orientation)
     case ScreenOrientationAuto:
         //attribute = Qt::WA_AutoOrientation;
         break;
-#endif // QT_VERSION < 0x040702
+#endif // QT_VERSION > 0x040702
     };
     //setAttribute(attribute, true);
 }
@@ -115,14 +115,13 @@ void MainWindow::showExpanded()
 }
 void MainWindow::quit(){
     qDebug()<<"quit()";
-    conf->setValue(QString("menu"), menuBar()->isVisible());
     conf->setValue(QString("start"), way.last());
     //savButtons();
     db.commit();
     db.close();
     qApp->quit();
 }
-CLabel* MainWindow::addWidget(const QString &key, const CLabel *a){
+const CLabel* MainWindow::addWidget(const QString &key, const CLabel *a){
     qDebug()<<"addWidget("<<key<<")";
     int maxc=conf->value(QString("maxcolumn")).toInt();
     int maxl=conf->value(QString("maxline")).toInt();
@@ -236,8 +235,10 @@ void MainWindow::createMenuBar(){
 void MainWindow::toggleMenu(){
     if (menuBar()->isVisible()){
         menuBar()->hide();
+        conf->setValue(QString("menu"), 0);
     }else{
         menuBar()->show();
+        conf->setValue(QString("menu"), 1);
     }
 
 }
@@ -358,7 +359,7 @@ void MainWindow::entry(const QString &a){
         context.append(way[b]);
         context.append(" ");
     }
-    context.append(way[way.size()-1]);
+    context.append(way.last());
     if(a=="")label=context+" : ";
     else label=context+", "+a+" : ";
     entry=QInputDialog::getText(this, QString("nouvelle entrée"), label, QLineEdit::Normal, "", &ok);
@@ -367,7 +368,7 @@ void MainWindow::entry(const QString &a){
     if(a=="")c=context+" : "+entry;
     else c=context+", "+a+" : "+entry;
     QList<QString> d({"INSERT INTO raw (date, texte) VALUES (:date, :txt);", time, c});
-    exec(d);
+    if(!exec(d))qDebug()<<"exec don't works (l370)";
     QSqlError b=q->lastError();
     if (b.isValid())qDebug()<<"q->lastError():"<<b.text();
 }
@@ -376,8 +377,8 @@ void MainWindow::entry(){
 }
 void MainWindow::createDB(){
     qDebug()<<"createDB()";
-    exec(QList<QString>({"create table ui(id INTEGER PRIMARY KEY AUTOINCREMENT,keyword text, label text, action text);"}));
-    exec(QList<QString>({"create table raw(date timestamp, texte text);"}));
+    exec(QList<QString>({"create table ui(id INTEGER PRIMARY KEY AUTOINCREMENT, keyword text, label text, action text);"}));
+    exec(QList<QString>({"create table raw(id INTEGER PRIMARY KEY AUTOINCREMENT, date timestamp, texte text);"}));
 }
 void MainWindow::addButtonDB(){
     qDebug()<<"addButtonDB()";

diff --git a/mainwindow.h b/mainwindow.h
index ac7caa7def6b8207dee927c3e6301e36df0632e1..f074195fd3d46264b415720e25ed1a145eb11557 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -98,7 +98,7 @@ public:
     void setOrientation(ScreenOrientation orientation);
 
     void showExpanded();
-    CLabel* addWidget(const QString &, const CLabel *);
+    const CLabel* addWidget(const QString &, const CLabel *);
 private slots:
     void datasent();
     void back();