few thing I've forgot

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 218c4937c5e1ad5c205430ffdb35b2cb7c44b64b..80d18f2a88e3b5c3d0eb3bbf5bad875f71d6ca93 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -234,7 +234,7 @@ void MainWindow::firstrun(){
     conf->setValue(QString("servercert"), QVariant("a.pem"));
     conf->setValue(QString("database"), QVariant("db"));
     conf->setValue(QString("password"), QVariant("pass"));
-    conf->setValue(QString("file"), QVariant("diary.txt"));
+    conf->setValue(QString("file"), QVariant("raw"));
     conf->setValue(QString("buttonfile"), QVariant("ui.sql"));
     conf->setValue(QString("maxcolumn"), QVariant(2));
     conf->setValue(QString("maxline"), QVariant(5));
@@ -242,8 +242,8 @@ void MainWindow::firstrun(){
     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("https://raw.github.com/Nothing2Do/diary-mobile-android/master/ui.sql"));
-    conf->setValue(QString("uploadRAW"), QVariant("ftp://<user>:<pass>@<server>/raw"));
-    conf->setValue(QString("uploadUi"), QVariant("ftp://<user>:<pass>@<server>/ui.sql"));
+    conf->setValue(QString("uploadRAW"), QVariant("ftp://<user>:<pass>@<server>/<filename>"));
+    conf->setValue(QString("uploadUi"), QVariant("ftp://<user>:<pass>@<server>/<filename>"));
     conf->setValue(QString("restore"), QVariant("http://www.abc.de/db"));
     conf->setValue(QString("start"), QVariant("begin"));
     conf->setValue(QString("db"), QVariant("/data/data/eu.nothing2do.diarymobile/files/db"));
@@ -289,7 +289,7 @@ void MainWindow::entry(const QString &a){
     if(a=="")c=context+" : "+entry;
     else c=context+", "+a+" : "+entry;
     //qDebug()<<"c="<<c;
-    QFile fichier(conf->value(QString("file"), QVariant("diary.txt")).toString());
+    QFile fichier(conf->value(QString("file"), QVariant("raw")).toString());
     fichier.open(QIODevice::Append | QIODevice::Text);
     QTextStream flux(&fichier);
     flux << time << " " << c << endl;
@@ -302,7 +302,6 @@ void MainWindow::entry(const QString &a){
 void MainWindow::entry(){
     entry(QString(""));
 }
-
 void MainWindow::createDB(){
     qDebug()<<"createDB()";
     exec(QList<QString>({"create table ui(keyword text, label text, action text);"}));
@@ -325,8 +324,6 @@ void MainWindow::addButtonDB(){
     if ((a=="")||(ok==0))return;
     cmd.append(a);
     exec(cmd);
-    //data.append(c).append('$').append(b).append('$').append(a).append('\n');
-    //savButtons();
     return;
 }
 void MainWindow::getButtons(const QString &a){
@@ -375,8 +372,8 @@ void MainWindow::writeUi(){
     m->deleteLater();
 }
 void MainWindow::sendRAW(){
-    exec(QList<QString> ({conf->value(QString("selectraw"), QVariant("select date,texte from raw;")).toString()}));
-    QFile a(conf->value(QString("rawfile"), QVariant("raw")).toString());
+    exec(QList<QString> ({conf->value(QString("selectraw")).toString()}));
+    QFile a(conf->value(QString("file")).toString());
     a.open(QIODevice::WriteOnly|QIODevice::Text);
     QTextStream b(&a);
     while (q->next()) {
@@ -386,10 +383,10 @@ void MainWindow::sendRAW(){
         b<<q->value(1).toString()<<"\n";
     }
     a.close();
-    QMessageBox::information(this, QString("end"), conf->value(QString("rawfile")).toString());
+    QMessageBox::information(this, QString("end"), conf->value(QString("file")).toString());
     qDebug()<<"a.open()="<<a.open(QIODevice::ReadOnly | QIODevice::Text);
 
-    QUrl upload(conf->value(QString("uploadRAW"), QVariant("ftp://<user>:<pass>@<server>/raw")).toString());
+    QUrl upload(conf->value(QString("uploadRAW")).toString());
     net=new QNetworkAccessManager(this);
     //a.open(QIODevice::ReadOnly | QIODevice::Text);
     rep=net->put(QNetworkRequest(upload), a.readAll());
@@ -400,7 +397,6 @@ void MainWindow::RAWsent(){
     qDebug()<<"RAWsent";
     QMessageBox::information(this, "RAWsent", "sendRAW finish");
 }
-
 void MainWindow::back(){
     if(way.size()-1>0){
         flush();
@@ -525,7 +521,7 @@ void MainWindow::savButtons(){
     a.close();
     QMessageBox::information(this, QString("end"), conf->value(QString("buttonfile"), QVariant("ui.sql")).toString());
     qDebug()<<"a.open()="<<a.open(QIODevice::ReadOnly | QIODevice::Text);
-    QUrl upload(conf->value(QString("uploadUi"), QVariant("ftp://<user>:<pass>@<server>/ui.sql")).toString());
+    QUrl upload(conf->value(QString("uploadUi")).toString());
     net=new QNetworkAccessManager(this);
     rep=net->put(QNetworkRequest(upload), a.readAll());
     qDebug()<<"net->put : "<<rep<< " upload : "<<upload.url();

diff --git a/ui.sql b/ui.sql
index 3127682ffa17d584820afce26e7221c99c0b4015..ae07d8114682e56b2e32365666adfeeb3dfe7ae4 100644 (file)
--- a/ui.sql
+++ b/ui.sql
@@ -10,8 +10,9 @@ config$filesave$settext file
 config$SQLsettings$settext SQLsettings
 config$button$settext button
 config$download$settext download
-config$uploadDB$settext uploadDB
+config$uploadDB$settext uploadRAW
 config$uploadUi$settext uploadUi
 config$start$settext start
 config$DB file$settext db
 config$restore DB$settext restore
+config$selectraw$settext selectraw