From 2aef8b8e0301ce9563fd005a3700d980c2e8333f Mon Sep 17 00:00:00 2001 From: Norbert Moutarde Date: Wed, 28 May 2014 11:16:36 +0200 Subject: [PATCH] mistake again ... --- README.md | 2 +- android/AndroidManifest.xml | 48 +++++++++++++++++++++++ diary-mobile.pro | 4 +- jean_victor_balin_book.png | Bin 0 -> 26216 bytes mainwindow.cpp | 76 ++++-------------------------------- 5 files changed, 60 insertions(+), 70 deletions(-) create mode 100644 android/AndroidManifest.xml create mode 100644 jean_victor_balin_book.png diff --git a/README.md b/README.md index 5ab6559..cd3e00b 100644 --- a/README.md +++ b/README.md @@ -12,4 +12,4 @@ ftp://[user]:[pass]@[hostname]/[filename] todo : -add autoupdate feature, buttons in action, and ... +add autoupdate feature, and ... diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml new file mode 100644 index 0000000..e4b8cda --- /dev/null +++ b/android/AndroidManifest.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/diary-mobile.pro b/diary-mobile.pro index 8979512..c683f3e 100644 --- a/diary-mobile.pro +++ b/diary-mobile.pro @@ -32,6 +32,8 @@ ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android OTHER_FILES += \ android/AndroidManifest.xml \ ui.sql \ - README.md + README.md \ + android/AndroidManifest.xml \ + jean_victor_balin_book.png ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android diff --git a/jean_victor_balin_book.png b/jean_victor_balin_book.png new file mode 100644 index 0000000000000000000000000000000000000000..e8902f5505966bcb4d1671e2486c4fe7c7d71ae2 GIT binary patch literal 26216 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 literal 0 HcmV?d00001 diff --git a/mainwindow.cpp b/mainwindow.cpp index 6919dd7..3e7515c 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -350,12 +350,12 @@ void MainWindow::firstrun(){ conf->setValue(QString("maxcolumn"), QVariant(2)); conf->setValue(QString("maxline"), QVariant(5)); conf->setValue(QString("SQLsettings"), QVariant("connect_timeout=10000")); - conf->setValue(QString("button"), QVariant("background-color: yellow;border-style: outset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 15px;padding: 6px;")); + conf->setValue(QString("button"), QVariant("background-color: red;border-style: outset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 15px;padding: 6px;")); conf->setValue(QString("menu"), QVariant(1)); - conf->setValue(QString("download"), QVariant("http://gaby:sha1sum@www.nothing2do.eu/diary/ui.sql")); - conf->setValue(QString("uploadRAW"), QVariant("ftp://nothing2do.eu_diary:200386@ftp.alwaysdata.com/raw")); - conf->setValue(QString("uploadUi"), QVariant("ftp://nothing2do.eu_diary:200386@ftp.alwaysdata.com/ui.sql")); - conf->setValue(QString("start"), QVariant("Montpellier")); + conf->setValue(QString("download"), QVariant("http://www.nothing2do.eu/ui.sql")); + conf->setValue(QString("uploadRAW"), QVariant("ftp://:@/raw")); + conf->setValue(QString("uploadUi"), QVariant("ftp://:@/ui.sql")); + 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 label;")); @@ -369,11 +369,7 @@ void MainWindow::firstrun(){ conf->setValue(QString("deletebutton"), QVariant("delete from ui where id=?")); conf->setValue(QString("testbuttons"), QVariant("select id,keyword from ui where label=? and action=?;")); conf->setValue(QString("volumdown"), QVariant("back")); -<<<<<<< HEAD conf->setValue(QString("volumup"), QVariant("Montpellier")); -======= - conf->setValue(QString("volumup"), QVariant("begin")); ->>>>>>> 388baafb8a2a686f467cd1605a7ba5037fb1fe0c qDebug()<<"firstrun() finished"; } QString &MainWindow::get(int row, int column){ @@ -434,7 +430,7 @@ void MainWindow::addButtonDB(){ if ((b=="")||(ok==0))return; a=QInputDialog::getText(this, QString("action"), QString("Entrez son action"), QLineEdit::Normal, c, &ok); if ((a=="")||(ok==0))return; - insertbutton(b, c, a); + insertButton(b, c, a); return; } void MainWindow::getButtons(const QString &b){ @@ -491,7 +487,7 @@ void MainWindow::editButtonDB(const QString & a){ if(!ok)return; if((keyword=="")||(label=="")||(action=="")){ //exec(QList({conf->value(QString("deletebuttons")).toString(), a})); - removebutton(keyword, label, action); + removeButton(keyword, label, action); return; } exec(QList({conf->value(QString("updatebuttons")).toString(), keyword, label, action, a})); @@ -609,42 +605,6 @@ void MainWindow::readButtons(const QByteArray &in){ qDebug()<<"q->exec() : "<exec()<<" lastError()="<lastError(); }; -<<<<<<< HEAD -======= - - /*QDomDocument a("buttons"); - if (!a.setContent(in)){ - qDebug()<<"a.setcontent failed"; - return; - } - QDomElement root = a.documentElement(); - QDomNode n = root.firstChild(); - QList cmd; - while(!n.isNull()) { - QDomNode e = n.firstChild(); - //if((cmd.size()<1)&&(n.isText()))e.toText().nodeValue(); - qDebug()<<"n.nodeName()="< tmp; - tmp.append(conf->value(QString("testbuttons")).toString()); - tmp.append(label); - tmp.append(action); - exec(tmp); - q->first(); - int count=0; - QString key=keyword, id=q->value(0).toString(); - while(q->isValid()){ - count++; - QString cur=q->value(1).toString(); - if(key!=cur)key=key+" "+cur; - q->next(); - } - if(count==1)exec(QList({conf->value(QString("deletebuttons")).toString(), id})); - else{exec(QList({conf->value(QString("updatebuttons")).toString(), key, label, action, id})); - - } -} -- 2.45.1