now, you can make "cancel" without consequences

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 0956420f7378c3c83e4be0b2b3410846f79d1b2d..8b5c2e5052016356b1dea7e3e61bc31fba4b4adc 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -249,7 +249,7 @@ void MainWindow::firstrun(){
     conf->setValue(QString("menu"), QVariant(1));
     //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(""));
+    conf->setValue(QString("upload"), QVariant("ftp://<user>:<pass>@<host>/"));
 }
 QString &MainWindow::get(int row, int column){
     q->seek(row);
@@ -318,12 +318,14 @@ void MainWindow::addButtonDB(){
     cmd.append("insert into ui (label, keyword, action) values (:label, :keyword, :action)");
     QString cur=way.last();
     QString a, b=QInputDialog::getText(this, QString("label"), QString("Entrez le label"),QLineEdit::Normal, QString(), &ok);
-    if ((b=="")||(ok==0))b="default";
+    if ((b=="")||(ok==0))return;
     cmd.append(b);
-    a=QInputDialog::getText(this, QString("keyword"), QString("Entrez le nom de la page où il siègera"), QLineEdit::Normal, cur);
+    a=QInputDialog::getText(this, QString("keyword"), QString("Entrez le nom de la page où il siègera"), QLineEdit::Normal, cur, &ok);
+    if ((a=="")||(ok==0))return;
     cmd.append(a);
     cur.chop(1);
-    a=QInputDialog::getText(this, QString("action"), QString("Entrez l'action"), QLineEdit::Normal, a+"-"+b);
+    a=QInputDialog::getText(this, QString("action"), QString("Entrez l'action"), QLineEdit::Normal, cur+"-"+b);
+    if ((a=="")||(ok==0))return;
     cmd.append(a);
     exec(cmd);
     getButtons(way[way.size()-1]);
@@ -395,8 +397,11 @@ void MainWindow::keyReleaseEvent(QKeyEvent *event)
 }
 void CLabel::SetTextToLabel(const QString& text)
 {
+    qDebug()<<"setTextToLabel";
     QFontMetrics metrix(font());
     int width = this->width() - 2;
+    //qDebug()<<"width()"<<width<<" height() "<<height();
+    //font().setPointSize(width);
     QString clippedText = metrix.elidedText(text, Qt::ElideRight, width);
     setText(clippedText);
 }

diff --git a/ui.sql b/ui.sql
index 53cf8df8102faab43905b73748483acaccac3c0c..bf6be457c82a16d9ddc439ef193af3bbe3e9aaa0 100644 (file)
--- a/ui.sql
+++ b/ui.sql
@@ -2,28 +2,12 @@ PRAGMA foreign_keys=OFF;
 BEGIN TRANSACTION;
 delete from ui;
 INSERT INTO "ui" (keyword, label, action) VALUES('begin','new', 'new');
-INSERT INTO "ui" (keyword, label, action) VALUES('begin','fille','fille');
 INSERT INTO "ui" (keyword, label, action) VALUES('begin','lieu','lieu');
-INSERT INTO "ui" (keyword, label, action) VALUES('begin','oliver'' s','begi-oliver');
-INSERT INTO "ui" (keyword, label, action) VALUES('begin','config','config');
-INSERT INTO "ui" (keyword, label, action) VALUES('fille','aurelie','f-aurelie');
-INSERT INTO "ui" (keyword, label, action) VALUES('fill-aurelie','discours','f-a-discours');
-INSERT INTO "ui" (keyword, label, action) VALUES('fill-aureli-discours','discours un peu plus long que la moyenne pour voir se qui va se passer','begin');
-INSERT INTO "ui" (keyword, label, action) VALUES('fille','audrey','f-audrey');
-INSERT INTO "ui" (keyword, label, action) VALUES('fill-audrey','elle se moque de moi, méchante ;-)','begin');
-
-INSERT INTO "ui" (keyword, label, action) VALUES('lieu','odysseum','lie-odysseum');
-INSERT INTO "ui" (keyword, label, action) VALUES('lie-odysseum','subway','lieu-odysseu-subway');
-INSERT INTO "ui" (keyword, label, action) VALUES('lie-odysseu-subway','julie','lie-odysseu-subwa-julie');
-INSERT INTO "ui" (keyword, label, action) VALUES('lie-odysseum','oliver''s pub','lie-odysseu-oliver');
-INSERT INTO "ui" (keyword, label, action) VALUES('lie-odysseu-oliver','valentine','l-o-opub-val');
-INSERT INTO "ui" (keyword, label, action) VALUES('lie-odysseu-opub-val','s''enerve quand je lui demande ce qu''elle veut','begin');
-
-INSERT INTO "ui" (keyword, label, action) VALUES('begi-oliver','audrey','begi-olive-audrey');
-INSERT INTO "ui" (keyword, label, action) VALUES('begi-olive-audrey','Pourquoi vous me prenez pour un perver ?','begi-olive-audre-perver');
-INSERT INTO "ui" (keyword, label, action) VALUES('begi-olive-audre-perver','"On ne te prends pas pour un perver."','begi-olive-audre-perve-non');
-INSERT INTO "ui" (keyword, label, action) VALUES('begi-olive-audre-perve-non','Pourquoi vous refusez qu''on se voit hors d''ici alors ?','begi-olive-audre-perve-non-hors');
-
+INSERT INTO "ui" (keyword, label, action) VALUES('lieu', 'oliver''s pub', 'begi-lie-oliver');
+INSERT INTO "ui" (keyword, label, action) VALUES('begi-lie-oliver','audrey','begi-olive-audrey');
+INSERT INTO "ui" (keyword, label, action) VALUES('begi-lie-olive-audrey','Pourquoi vous me prenez pour un perver ?','begi-olive-audre-perver');
+INSERT INTO "ui" (keyword, label, action) VALUES('begi-lie-olive-audre-perver','"On ne te prends pas pour un perver."','begi-olive-audre-perve-non');
+INSERT INTO "ui" (keyword, label, action) VALUES('begi-lie-olive-audre-perve-non','Pourquoi vous refusez qu''on se voit hors d''ici alors ?','begi-olive-audre-perve-non-hors');
 INSERT INTO "ui" (keyword, label, action) VALUES('config','max column','setint maxcolumn');
 INSERT INTO "ui" (keyword, label, action) VALUES('config','host','settext host ');
 INSERT INTO "ui" (keyword, label, action) VALUES('config','port','setint port');
@@ -34,4 +18,5 @@ INSERT INTO "ui" (keyword, label, action) VALUES('config','filesave','settext fi
 INSERT INTO "ui" (keyword, label, action) VALUES('config','SQLsettings', 'settext SQLsettings');
 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');
 COMMIT;