From a0f044fdd7172692b9539bbb5993bad59699dbc3 Mon Sep 17 00:00:00 2001 From: Norbert Moutarde Date: Tue, 23 Dec 2014 13:10:53 +0100 Subject: [PATCH] tweaked for the last revision of Qt (and few little tweaks) --- android/AndroidManifest.xml | 2 +- android/build.gradle | 51 ++++++ android/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 49896 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + android/gradlew | 164 ++++++++++++++++++ android/gradlew.bat | 90 ++++++++++ android/res/values/libs.xml | 25 +++ diary-mobile.pro | 8 + mainwindow.cpp | 24 +-- 9 files changed, 358 insertions(+), 12 deletions(-) create mode 100644 android/build.gradle create mode 100644 android/gradle/wrapper/gradle-wrapper.jar create mode 100644 android/gradle/wrapper/gradle-wrapper.properties create mode 100755 android/gradlew create mode 100644 android/gradlew.bat create mode 100644 android/res/values/libs.xml diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 6a35277..e22de71 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -34,7 +34,7 @@ - + + + + + + + + + + + + + + + + + + diff --git a/diary-mobile.pro b/diary-mobile.pro index 31f8303..77d1cc7 100644 --- a/diary-mobile.pro +++ b/diary-mobile.pro @@ -39,3 +39,11 @@ OTHER_FILES += \ diary-mobile_fr_FR.ts ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android + +DISTFILES += \ + android/gradle/wrapper/gradle-wrapper.jar \ + android/gradlew.bat \ + android/res/values/libs.xml \ + android/build.gradle \ + android/gradle/wrapper/gradle-wrapper.properties \ + android/gradlew diff --git a/mainwindow.cpp b/mainwindow.cpp index 7327cda..5052598 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -150,6 +150,7 @@ void MainWindow::showExpanded() void MainWindow::quit(){ qDebug()<<"quit() way.last()="<finish(); + qq->finish(); this->~MainWindow(); } int unsigned MainWindow::addWidget(const QString &key, const CLabel *a){ @@ -316,20 +317,21 @@ void MainWindow::action(const QString &a){ exec(cmd); } else if(b[0]==QString("edit")){ - QString e; - bool ok; + //QString e; + //bool ok; if(bs==1){ - e=QInputDialog::getText(this, QString("ID"), trUtf8("Enter ID of button to edit"), QLineEdit::Normal, QString(""), &ok); - if(!ok)return; + /*e=QInputDialog::getText(this, QString("ID"), trUtf8("Enter ID of button to edit"), QLineEdit::Normal, QString(""), &ok); + if(!ok)return;*/ + chooseDB(); } else if(bs==2){ - e=b[1]; + editDB(conf->value(QString("currenttype")).toString(),b[1]); } else{ QMessageBox::critical(this, trUtf8("Error","title if action(\"edit\") has too much value"), trUtf8("Too much value in button's action", "text if action(\"edit\") has too much value")); return; } - editDB(conf->value(QString("currenttype")).toString(),e); + //editDB(conf->value(QString("currenttype")).toString(),e); } else if(b[0]==QString("but")){ @@ -576,6 +578,7 @@ void MainWindow::firstrun(){ conf->setValue(QString("currenttype"), QVariant("buttons")); conf->setValue(QString("multiline"), QVariant(0)); conf->setValue(QString("startdefault"), QVariant("begin")); + conf->setValue(QString("actionmenu"), QVariant("-menuback")); qDebug()<<"firstrun() finished"; } @@ -774,11 +777,10 @@ void MainWindow::RAWsent(){ QMessageBox::information(this, trUtf8("RAWsent", "message title when data has been send"), trUtf8("sendRAW finish", "message text when data has been send")); } void MainWindow::back(){ - if(!((video)&&(playlist))){ + if(QString("-")+label->text()!=conf->value(QString("menuback")).toString()){ get(conf->value(QString("currenttype")).toString(),conf->value(QString("menuback")).toString()); - }else if(QString("-")+label->text()==conf->value(QString("menuback")).toString())get(conf->value(QString("currenttype")).toString(),way.takeLast()); - else{ - get(conf->value(QString("currenttype")).toString(), QString("+video")); + }else{ + get(conf->value(QString("currenttype")).toString(),lastprint); } } void MainWindow::keyReleaseEvent(QKeyEvent *event) @@ -788,7 +790,7 @@ void MainWindow::keyReleaseEvent(QKeyEvent *event) int k=event->key(); qDebug()<<"key pressed="<show(); + action(conf->value(QString("actionmenu")).toString()); } else if(k==Qt::Key_Back){ back(); -- 2.45.1