few little tweaks (to be a nice coder !)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 5cf9c9d7e08017278f38f9920933e0a1c93860d6..6a35277e8f42b834cdd90b902f744b1f1a77a4dc 100644 (file)
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -47,5 +47,5 @@
 
 <uses-permission android:name="android.permission.SET_DEBUG_APP"/>
 
-<uses-permission android:name="android.permission.CALL_PHONE"/>
+
 </manifest>

diff --git a/diary-mobile.pro b/diary-mobile.pro
index 876daba5650e5528cce66cdb85f22f45d00a789d..31f83034f46969472bb49ac06e5c469abb40c164 100644 (file)
--- a/diary-mobile.pro
+++ b/diary-mobile.pro
@@ -25,7 +25,7 @@ HEADERS  += mainwindow.h \
 
 CONFIG += mobility c++11
 MOBILITY = 
-QMAKE_CXXFLAGS += -fpermissive
+QMAKE_CXXFLAGS += -fpermissive -Wswitch
 TRANSLATIONS = diary-mobile_fr_FR.ts diary-mobile_en_EN.ts
 ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
 

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 6624435f72e82fb35dec65a9d92821a5e71d2bdc..7327cda4438e3c1952efd1281a0171c772b24edd 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -42,7 +42,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 {
     qDebug()<<"begin of MainWindows";
     conf=new QSettings(QString("FwF"), QString("diary-mobile"), this);
-    orienta=0;
+    orienta=1;
     if(conf->allKeys().size()==0){
         qDebug()<<"first";
         firstrun();
@@ -78,18 +78,17 @@ 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
-    orienta=0;
 }
 void MainWindow::start(){
     QString a=conf->value(QString("currenttype")).toString();
-    way=conf->value(QString("start")).toStringList();
+    way=conf->value(QString("start"), conf->value(QString("startdefault"))).toStringList();
     QString b=way.last();
     qDebug()<<"a="<<a<<" b="<<b;
     get(a, b);
 }
 MainWindow::~MainWindow()
 {
-    conf->setValue(QString("start"), way);
+    if(way.size())conf->setValue(QString("start"), way);
     //savButtons();
     db.commit();
     db.close();
@@ -425,6 +424,7 @@ void MainWindow::action(const QString &a){
     }
 }
 void MainWindow::createMenuBar(){
+    qDebug()<<"createMenuBar()";
     FileMenu=new QMenu(trUtf8("&File", "top menu"), this);
     FileMenu->addAction(trUtf8("&Start", "File|Start"), this, SLOT(start()),QKeySequence(trUtf8("Ctrl+S", "File|Start")));
     FileMenu->addAction(trUtf8("&Back", "File|Back"), this, SLOT(back()),QKeySequence(trUtf8("Ctrl+B", "File|Back")));
@@ -541,7 +541,7 @@ void MainWindow::firstrun(){
     conf->setValue(QString("buttons"), QVariant("background-color: red;border-style: outset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 15px;padding: 6px;"));
     conf->setValue(QString("buttonsbefore"), QVariant("background-color: red;"));
     conf->setValue(QString("buttonsafter"), QVariant("background-color: blue;"));
-    conf->setValue(QString("menu"), QVariant(0));
+    conf->setValue(QString("menu"), QVariant(1));
     conf->setValue(QString("download"), QVariant("http://www.nothing2do.eu/"+conf->value(QString("filebuttons")).toString()));
     conf->setValue(QString("init"), QVariant("http://www.nothing2do.eu/init"));
     conf->setValue(QString("userftp"), QVariant("<userftp>"));
@@ -575,6 +575,7 @@ void MainWindow::firstrun(){
     conf->setValue(QString("always"), QVariant("+always"));
     conf->setValue(QString("currenttype"), QVariant("buttons"));
     conf->setValue(QString("multiline"), QVariant(0));
+    conf->setValue(QString("startdefault"), QVariant("begin"));
 
     qDebug()<<"firstrun() finished";
 }
@@ -594,7 +595,7 @@ 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();
+    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;
@@ -786,7 +787,10 @@ void MainWindow::keyReleaseEvent(QKeyEvent *event)
     event->accept();
     int k=event->key();
     qDebug()<<"key pressed="<<k;
-    if(k==Qt::Key_Back){
+    if (k==Qt::Key_Menu){
+        menuBar()->show();
+        }
+    else if(k==Qt::Key_Back){
         back();
         }
     else if(k==Qt::Key_VolumeDown){