From: Norbert Moutarde <norbert.moutarde@nothing2do.eu>
Date: Thu, 1 May 2014 08:55:01 +0000 (+0200)
Subject: add editButtonById() and surrender on sax2 !!!
X-Git-Url: https://git.nothing2do.fr/?a=commitdiff_plain;h=13e3eb99e2e3d5fe3247509109ed218a5cd58d2a;p=diary-mobile.git

add editButtonById() and surrender on sax2 !!!
---

diff --git a/diary-mobile-android.pro b/diary-mobile-android.pro
index 25fde5e..70f019a 100644
--- a/diary-mobile-android.pro
+++ b/diary-mobile-android.pro
@@ -15,10 +15,10 @@ TEMPLATE = app
 SOURCES += main.cpp\
         mainwindow.cpp \
 #    QsKineticScroller.cpp
-    sax2.cpp
+#    sax2.cpp
 
 HEADERS  += mainwindow.h \
-    sax2.h
+#    sax2.h
 #    QsKineticScroller.h
 
 #FORMS    += mainwindow.ui
diff --git a/mainwindow.cpp b/mainwindow.cpp
index c025bd5..a535fe4 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -166,6 +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]);
     }
     else getButtons(a);
@@ -181,11 +183,12 @@ void MainWindow::createMenuBar(){
     FileMenu->addAction(trUtf8("Reset RAW"), this, SLOT(resetRAW()));
     FileMenu->addAction(trUtf8("&Quit..."), this, SLOT(quit()),QKeySequence(trUtf8("Ctrl+Q", "File|Quit")));
     menuBar()->addMenu(FileMenu);
-    EditMenu=new QMenu(QString("&Buttons"));
 
+    EditMenu=new QMenu(QString("&Buttons"));
     EditMenu->addAction(trUtf8("A&dd buttons"), this, SLOT(addButtonDB()), QKeySequence(trUtf8("Ctrl+D", "Buttons|Add")));
     EditMenu->addAction(trUtf8("Sa&v buttons"), this, SLOT(savButtons()), QKeySequence(trUtf8("Ctrl+V", "Buttons|Save")));
     EditMenu->addAction(trUtf8("&Edit buttons"), this, SLOT(chooseButtonDB()), QKeySequence(trUtf8("Ctrl+E", "Buttons|&Edit")));
+    EditMenu->addAction(trUtf8("&Edit buttons by ID"), this, SLOT(editButtonById()), QKeySequence(trUtf8("Ctrl+I", "Buttons|Edit by &id")));
     EditMenu->addAction(trUtf8("&View/Hide menu"), this, SLOT(toggleMenu()), QKeySequence(trUtf8("Ctrl+T", "Buttons|View menu")));
     menuBar()->addMenu(EditMenu);
     HelpMenu=new QMenu(QString("&Help"));
@@ -282,7 +285,7 @@ void MainWindow::firstrun(){
     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("menuback"), QVariant("-menuback"));
-    conf->setValue(QString("choosebuttons"), QVariant("select id,label from ui where keyword like ? order by id;"));
+    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)"));
     conf->setValue(QString("getbuttons"), QVariant("select label,action from ui where keyword like ? order by label;"));
     conf->setValue(QString("editbuttons"), QVariant("select id,keyword,label,action from ui where id=?;"));
@@ -414,6 +417,10 @@ void MainWindow::editButtonDB(const QString & a){
     exec(QList<QString>({conf->value(QString("updatebuttons")).toString(), keyword, label, action, a}));
 
 }
+void MainWindow::editButtonById(){
+    const QString a=QInputDialog::getText(this, QString("editButtonById"), QString("Entrez l'ID : "));
+    editButtonDB(a);
+}
 void MainWindow::downloadUi(){
     qDebug()<<"updateUi() : "<<conf->value(QString("download")).toString();
     download(conf->value(QString("download")).toString());
@@ -511,7 +518,7 @@ QByteArray FileDownloader::downloadedData() const
     return m_DownloadedData;
 }
 void MainWindow::readButtons(const QByteArray &in){
-    /*int a=in.count('\n');
+    int a=in.count('\n');
     QString d=in.split('\n').at(0);
     conf->setValue(QString("firstline"), d);
     qDebug()<<"first line : "<<d;
@@ -525,9 +532,9 @@ void MainWindow::readButtons(const QByteArray &in){
         }
         qDebug()<<"q->exec() : "<<q->exec()<<" lastError()="<<q->lastError();
 
-    };*/
-    bool ok = sax2.parse(in);
-    if (!ok)qDebug() << "Parsing failed.\n";
+    };
+    /*bool ok = xml.parse(*in);
+    if (!ok)qDebug() << "Parsing failed.\n";*/
     db.commit();
     flush();
     emit datafilled();
diff --git a/mainwindow.h b/mainwindow.h
index b04c9bc..098f152 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -29,6 +29,7 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 //#include <QsKineticScroller.h>
+//#include "sax2.h"
 class FileDownloader : public QObject
 {
     Q_OBJECT
@@ -53,7 +54,7 @@ private:
     QByteArray m_DownloadedData;
 
 };
-#include "sax2.h"
+
 #endif // FILEDOWNLOADER_H
 
 
@@ -117,6 +118,7 @@ private slots:
     void writeDB();
     void chooseButtonDB();
     void chooseButtonDB(const QString &);
+    void editButtonById();
     void editButtonDB(const QString &);
     void getButtons(const QString &);
     void getButtons();
@@ -135,7 +137,7 @@ public slots:
 signals:
     void datafilled();
 private:
-
+    //sax2 xml;
     //QsKineticScroller * ks;
     //QScrollArea * scroll;
     QMutex sql,updatelocker;
diff --git a/sax2.cpp b/sax2.cpp
index ea0efeb..738676f 100644
--- a/sax2.cpp
+++ b/sax2.cpp
@@ -1,14 +1,14 @@
 #include "sax2.h"
 
-sax2::sax2(QObject *parent) :
-    QXmlSimpleReader(parent)
+sax2::sax2() :
+    QXmlSimpleReader()
 {
     reader.setContentHandler(&handler);
     reader.setErrorHandler(&handler);
 
 }
-sax2::parse(const QXmlInputSource *input){
-    source = new QXmlInputSource(input);
+bool sax2::parse(const QByteArray &input){
+
 
 
 }
diff --git a/sax2.h b/sax2.h
index 1522bea..f146750 100644
--- a/sax2.h
+++ b/sax2.h
@@ -13,8 +13,8 @@ class sax2 : public QXmlSimpleReader
 
 
 public:
-    explicit sax2(QObject *parent = 0);
-    int parse(const QXmlInputSource *input);
+    explicit sax2();
+    bool parse(const QByteArray &input);
 signals:
 
 public slots: