From: Norbert Moutarde <norbert.moutarde@nothing2do.eu>
Date: Fri, 2 May 2014 07:11:26 +0000 (+0200)
Subject: added Qtranslator (and a working editbutton)
X-Git-Url: https://git.nothing2do.fr/?a=commitdiff_plain;h=cbb33b8680141b220094de6e27f986c2e2a6f17f;p=diary-mobile.git

added Qtranslator (and a working editbutton)
---

diff --git a/main.cpp b/main.cpp
index 32afd6a..1d927a8 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5,6 +5,10 @@ int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
     QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8"));
+    QString locale = QLocale::system().name().section('_', 0, 0);
+    QTranslator translator;
+    translator.load(QString("qt_") + locale, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+    a.installTranslator(&translator);
     MainWindow w;
     w.show();
 
diff --git a/mainwindow.cpp b/mainwindow.cpp
index a535fe4..021867c 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -157,7 +157,7 @@ void MainWindow::action(const QString &a){
         conf->setValue(b[1], QFileDialog::getSaveFileName(this, QString("get file"), conf->value(b[1]).toString()));
     }
     else if(b[0]==QString("box")){
-        QMessageBox::information(this, "", c);
+        QMessageBox::information(this, QString("box"), c);
     }
     else if(b[0]=="quit"){
         quit();
@@ -166,9 +166,8 @@ void MainWindow::action(const QString &a){
         way.clear();
     }
     else if(b[0]==QString("edit")){
-        //const QString a=QInputDialog::getInt(this, QString("ID"), QString("Entrez l'ID du bouton à éditez"), b[1].toInt());
-        QMessageBox::information(this, QString("edit"), QString("ID : ")+b[1]);
-        editButtonDB(b[1]);
+        const QString a=QInputDialog::getText(this, QString("ID"), QString("Entrez l'ID du bouton à éditez"), QLineEdit::Normal, b[1]);
+        editButtonDB(a);
     }
     else getButtons(a);
 }
@@ -282,8 +281,8 @@ void MainWindow::firstrun(){
     conf->setValue(QString("start"), QVariant("begin"));
     conf->setValue(QString("restore"), QVariant("http://www.abc.de/db"));
     conf->setValue(QString("db"), QVariant("/data/data/eu.nothing2do.diarymobile/files/db"));
-    conf->setValue(QString("selectbuttons"), QVariant("select keyword,label,action from ui order by keyword;"));
-    conf->setValue(QString("selectraw"), QVariant("select date,texte from raw;"));
+    conf->setValue(QString("selectbuttons"), QVariant("select keyword,label,action from ui order by label;"));
+    conf->setValue(QString("selectraw"), QVariant("select date,texte from raw order by date;"));
     conf->setValue(QString("menuback"), QVariant("-menuback"));
     conf->setValue(QString("choosebuttons"), QVariant("select id,label from ui where keyword like ? order by label;"));
     conf->setValue(QString("addbuttons"), QVariant("insert into ui (label, keyword, action) values (:label, :keyword, :action)"));
@@ -305,12 +304,11 @@ int MainWindow::exec(const QList<QString> & a){
         q->bindValue(j-1, a[j]);
         qDebug()<<"bind "<<j-1<<" and"<<a[j];
     }
-    q->exec();
-
+    qDebug()<<"exec():"<<q->exec();
     QSqlError b=q->lastError();
     db.commit();
     if (b.isValid())qDebug()<<"SQL error :"<<b.text();
-    if(q->isSelect())return q->size();
+    if(q->isValid())return 1;
     else return 0;
 }
 void MainWindow::entry(const QString &a){
@@ -392,12 +390,13 @@ void MainWindow::getButtons(const QString &b){
     qDebug()<<"end getButtons : "<<i<<" button(s) way.size()"<<way.size();
 }
 void MainWindow::chooseButtonDB(){
-    const QString a=QInputDialog::getText(this, QString("chooseButtonDB"), QString("Entrez le mots-clé : "), QLineEdit::Normal, way.last());
+    const QString a=QInputDialog::getText(this, QString("chooseButtonDB"), QString("Entrez le mots-clé : "), QLineEdit::Normal, label->text());
     chooseButtonDB(a);
 }
 void MainWindow::chooseButtonDB(const QString & a){
     flush();
     QString b="%"+a+"%";
+    //qDebug()<<"b="<<b;
     qDebug()<<"exec()="<<exec(QList<QString>({conf->value(QString("choosebuttons")).toString(), b}));
     while (q->next()) {
         const QString action="edit "+q->value(0).toString();
@@ -405,8 +404,9 @@ void MainWindow::chooseButtonDB(const QString & a){
     }
 }
 void MainWindow::editButtonDB(const QString & a){
+    qDebug()<<"a="<<a;
     exec(QList<QString>({conf->value(QString("editbuttons")).toString(), a}));
-    q->next();
+    if(q->isSelect())q->first();
     const QString keyword=QInputDialog::getText(this, "keyword", "new keyword", QLineEdit::Normal, q->value(1).toString());
     const QString label=QInputDialog::getText(this, "label", "new label", QLineEdit::Normal, q->value(2).toString());
     const QString action=QInputDialog::getText(this, "action", "new action", QLineEdit::Normal, q->value(3).toString());
diff --git a/mainwindow.h b/mainwindow.h
index 098f152..ad528b1 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -30,6 +30,9 @@
 #include <QNetworkReply>
 //#include <QsKineticScroller.h>
 //#include "sax2.h"
+#include <QTranslator>
+#include <QLocale>
+
 class FileDownloader : public QObject
 {
     Q_OBJECT