From: Norbert Moutarde <norbert.moutarde@nothing2do.eu>
Date: Sun, 24 Sep 2017 06:44:43 +0000 (+0200)
Subject: maintenance
X-Git-Url: https://git.nothing2do.fr/?a=commitdiff_plain;h=4b654249bf4ed7da42c9c002d0580ce9c782d540;p=diary-mobile.git

maintenance
---

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 587e8e9..274d695 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -41,13 +41,14 @@
 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 {
     qDebug()<<"begin of MainWindows";
+    qDebug()<< QSslSocket::supportsSsl()<<"!\n";
     conf=new QSettings(QString("FwF"), QString("diary-mobile"), this);
     orienta=1;
     if(conf->allKeys().size()==0){
         qDebug()<<"first";
         d.lock();
         firstrun();
-        download(QString("http://www.nothing2do.eu/diary-mobile_")+ QLocale::system().name()+ QString(".qm"));
+        download(QString("http://www.nothing2do.eu/diary-mobile_")+ QLocale::system().name()+QString(".qm"));
         connect(m, SIGNAL(downloaded()), SLOT(writeTr()));
 
         conf->setValue(QString("first"), 1);
@@ -83,8 +84,9 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     };
     statusBar()->addPermanentWidget(label);
     menuBar()->setVisible(conf->value(QString("menu")).toBool());
-    //d.lock();
-    start();
+    //menuBar()->setVisible(true);
+    d.lock();
+    //start();
 }
 void MainWindow::start(){
     QString a=conf->value(QString("currenttype"), QString("buttons")).toString();
@@ -364,7 +366,11 @@ void MainWindow::action(const QString &a){
 
     }
     else if(b[0]==QString("but")){
-        download(c);
+        if(c!=""){
+            download(c);
+        }else{
+            downloadData();
+        };
         connect(m, SIGNAL(downloaded()), SLOT(writeData()));
     }
     else if(b[0]==QString("down")){
@@ -545,8 +551,8 @@ void MainWindow::createMenuBar(){
     HackMenu->addAction(trUtf8("About Qt", "Hack|About Qt"), qApp, SLOT(aboutQt()), QKeySequence(trUtf8("ctrl+H", "Help|About Qt")));
     //HackMenu->addAction(trUtf8("C&reate Database", "Hack|Create"), this, SLOT(createDB()), QKeySequence(trUtf8("Ctrl+R", "Help|CreateDB")));
     HackMenu->addAction(trUtf8("Download sql", "Hack|download sql"), this, SLOT(tmpdown()));
-
     menuBar()->addMenu(HackMenu);
+    menuBar()->show();
 }
 void MainWindow::toggleMenu(){
     if (menuBar()->isVisible()){
@@ -639,25 +645,25 @@ void MainWindow::firstrun(){
     conf->setValue(QString("port"),QVariant(5432));
     conf->setValue(QString("user"), QVariant("user"));
     conf->setValue(QString("servercert"), QVariant("a.pem"));
-    conf->setValue(QString("database"), QVariant("db"));
+    conf->setValue(QString("database"), QVariant("db.db"));
     conf->setValue(QString("password"), QVariant("pass"));
     conf->setValue(QString("fileraw"), QVariant("raw"));
     conf->setValue(QString("filebuttons"), QVariant("ui.sql+"));
     conf->setValue(QString("maxcolumn"), QVariant(3));
     conf->setValue(QString("maxline"), QVariant(3));
     conf->setValue(QString("SQLsettings"), QVariant("connect_timeout=10000"));
-    conf->setValue(QString("buttons"), QVariant("background-color: red;border-style: outset;border-width: 15px;border-radius: 10px;border-color: beige;font-size: 30px;padding: 6px;"));
+    conf->setValue(QString("buttons"), QVariant("background-color: red;border-style: outset;border-width: 15px;border-radius: 10px;border-color: beige;font-size: 50px;padding: 6px;"));
     conf->setValue(QString("buttonsbefore"), QVariant("background-color: red;"));
     conf->setValue(QString("buttonsafter"), QVariant("background-color: blue;"));
     conf->setValue(QString("menu"), QVariant(1));
-    conf->setValue(QString("download"), QVariant("http://<user>:<pass>@<site>/<dir>/"+conf->value(QString("filebuttons")).toString()));
-    conf->setValue(QString("downloaduser"), QVariant("<user>"));
-    conf->setValue(QString("downloadpass"), QVariant("<pass>"));
+    conf->setValue(QString("download"), QVariant("http://<server>/<dir>/"+conf->value(QString("filebuttons")).toString()));
+    conf->setValue(QString("downloaduser"), QVariant("<downloaduser>"));
+    conf->setValue(QString("downloadpass"), QVariant("<downloadpass>"));
 
     conf->setValue(QString("init"), QVariant("http://www.nothing2do.eu/init"));
-    conf->setValue(QString("userftp"), QVariant("<user>"));
-    conf->setValue(QString("hostftp"), QVariant("<host>"));
-    conf->setValue(QString("passftp"), QVariant("<pass>"));
+    conf->setValue(QString("userftp"), QVariant("<userftp>"));
+    conf->setValue(QString("hostftp"), QVariant("<hostftp>"));
+    conf->setValue(QString("passftp"), QVariant("<passftp>"));
     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"));
@@ -687,7 +693,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"));
+    conf->setValue(QString("actionmenu"), QVariant("Montpellier"));
     //conf->setValue(QString("process"), QVariant(0));
     d.unlock();
     qDebug()<<"firstrun() finished";