From 8767dcf7074bd88e8a4fbc7c81ae13da39d59ec7 Mon Sep 17 00:00:00 2001
From: Norbert Moutarde <norbert.moutarde@nothing2do.eu>
Date: Wed, 1 Jan 2014 20:57:18 +0100
Subject: [PATCH] name of start page is now in QSetting and conf is in sql

---
 mainwindow.cpp | 20 ++++++++++----------
 ui.sql         |  1 +
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 8b5c2e5..28f2b98 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -45,7 +45,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 }
 void MainWindow::start(){
     way.clear();
-    getButtons("begin");
+    getButtons(conf->value(QString("start"), QVariant("start")).toString());
 }
 MainWindow::~MainWindow()
 {
@@ -157,7 +157,6 @@ void MainWindow::createMenuBar(){
     FileMenu->addAction(trUtf8("&Quit..."), this, SLOT(quit()),QKeySequence(trUtf8("Ctrl+Q", "Quit")));
     menuBar()->addMenu(FileMenu);
     EditMenu=new QMenu(QString("&Edit"));
-    EditMenu->addAction(trUtf8("Co&nfig"), this, SLOT(lsconfig()), QKeySequence(trUtf8("Ctrl+N", "Edit|Co&nfig")));
     EditMenu->addAction(trUtf8("C&reate database"), this, SLOT(createDB()), QKeySequence(trUtf8("Ctrl+R", "Edit|Database")));
     EditMenu->addAction(trUtf8("A&dd buttons"), this, SLOT(addButtonDB()), QKeySequence(trUtf8("Ctrl+D", "Add buttons")));
     EditMenu->addAction(trUtf8("&Edit buttons"), this, SLOT(editButtonDB()), QKeySequence(trUtf8("Ctrl+E", "Edit|&Edit button")));
@@ -188,7 +187,7 @@ void MainWindow::flush(){
 }
 CLabel::CLabel( const QString& text, const QString & style, QWidget * parent ) : QLabel(parent)
 {
-    SetTextToLabel(text);
+    setText(text);
     setWordWrap(true);
     setLineWidth(5);
     setStyleSheet(style);
@@ -250,6 +249,7 @@ void MainWindow::firstrun(){
     //conf->setValue(QString("update"), QVariant("http://www.nothing2do.eu/ui.sql"));
     conf->setValue(QString("update"), QVariant("https://raw.github.com/Nothing2Do/diary-mobile-android/master/ui.sql"));
     conf->setValue(QString("upload"), QVariant("ftp://<user>:<pass>@<host>/"));
+    conf->setValue(QString("start"), QVariant("begin"));
 }
 QString &MainWindow::get(int row, int column){
     q->seek(row);
@@ -291,8 +291,8 @@ int MainWindow::alias(const QString & a){
 void MainWindow::entry(const QString &a){
     QString time=QDateTime::currentDateTime().toString(QString("yyyy-MM-dd hh:mm:ss")), entry="";
     bool ok=0;
-    entry=QInputDialog::getText(this, QString("nouvelle entrée"), time, QLineEdit::Normal, a, &ok);
-    if((entry=="")||(ok==0))getButtons(way.last());
+    entry=QInputDialog::getText(this, QString("nouvelle entrée"), a, QLineEdit::Normal, "+", &ok);
+    if((entry=="")||(ok==0))return;
     QString c=time+" "+entry;
     QFile fichier(conf->value(QString("file")).toString());
     fichier.open(QIODevice::Append | QIODevice::Text);
@@ -328,13 +328,15 @@ void MainWindow::addButtonDB(){
     if ((a=="")||(ok==0))return;
     cmd.append(a);
     exec(cmd);
-    getButtons(way[way.size()-1]);
+    //getButtons(way[way.size()-1]);
+    return;
 }
 void MainWindow::getButtons(const QString &a){
     qDebug()<<"getButtons("<<a<<")";
     flush();
     QList<QString> tmp({"select label,action from ui where keyword like :word;"});;
-    label->setText(QString::number(way.size()));
+    //label->setText(QString::number(way.size()));
+    label->setText(a);
     way.append(a);
     tmp.append(a);
     exec(tmp);
@@ -390,14 +392,12 @@ void MainWindow::keyReleaseEvent(QKeyEvent *event)
     {
         back();
         accepted=false;// close the app next time when the user press back button
-    }else if(k==Qt::Key_Alt){
-
     }
 
 }
 void CLabel::SetTextToLabel(const QString& text)
 {
-    qDebug()<<"setTextToLabel";
+    //qDebug()<<"setTextToLabel";
     QFontMetrics metrix(font());
     int width = this->width() - 2;
     //qDebug()<<"width()"<<width<<" height() "<<height();
diff --git a/ui.sql b/ui.sql
index bf6be45..3fdeaca 100644
--- a/ui.sql
+++ b/ui.sql
@@ -19,4 +19,5 @@ INSERT INTO "ui" (keyword, label, action) VALUES('config','SQLsettings', 'settex
 INSERT INTO "ui" (keyword, label, action) VALUES('config','button', 'settext button');
 INSERT INTO "ui" (keyword, label, action) VALUES('config','update', 'settext update');
 INSERT INTO "ui" (keyword, label, action) VALUES('config','upload', 'settext update');
+INSERT INTO "ui" (keyword, label, action) VALUES('config','start', 'settext start');
 COMMIT;
-- 
2.45.1