From 77588dd9ccf8b5badb5d34c2a8fe790572354e65 Mon Sep 17 00:00:00 2001 From: Norbert Moutarde Date: Thu, 2 Jan 2014 11:20:36 +0100 Subject: [PATCH] ... --- mainwindow.cpp | 44 ++++++++++++++++++++------------------------ ui.sql | 10 +++++----- 2 files changed, 25 insertions(+), 29 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index e44ec5f..14688d9 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -10,9 +10,6 @@ #include #include #include -//#define MAXCOLUMN 4 // put this setting in conf -#define MAXLINE 5 // !!! - MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) { @@ -122,16 +119,22 @@ void MainWindow::quit(){ } CLabel* MainWindow::addWidget(const QString &key, const CLabel *a){ qDebug()<<"addWidget("<value(QString("maxcolumn")).toInt(); + int maxl=conf->value(QString("maxline")).toInt(); grid->addWidget(a, grid->count()/maxc, grid->count()%maxc, 1, 1, Qt::AlignVCenter | Qt::AlignHCenter); //QObject::connect(a, SIGNAL(pressed()), signalmap, SLOT(map())); QObject::connect(a, SIGNAL(released()), signalmap, SLOT(map())); - signalmap->setMapping(a, key); + /*if(grid->count()==maxc*maxl){ + grid->addWidget(new CLabel(QString("next")), maxc, maxl, 1, 1, Qt::AlignVCenter | Qt::AlignHCenter); + return NULL; + };*/ return a; } void MainWindow::action(const QString &a){ qDebug()<<"action("<setValue(QString(a.split(QString(" "))[1]), a.split(QString(" "))[2]); } @@ -151,7 +154,7 @@ void MainWindow::action(const QString &a){ else if(a.split(QString(" "))[0]=="setfile"){ conf->setValue(a.split(QString(" "))[1], QFileDialog::getSaveFileName(this, QString("get file"), conf->value(a.split(QString(" "))[1]).toString())); } - getButtons(a); + else getButtons(a); } void MainWindow::createMenuBar(){ FileMenu=new QMenu(QString("&File"), this); @@ -247,11 +250,12 @@ void MainWindow::firstrun(){ conf->setValue(QString("password"), QVariant("pass")); conf->setValue(QString("file"), QVariant("diary.txt")); conf->setValue(QString("maxcolumn"), QVariant(2)); + conf->setValue(QString("maxline"), QVariant(5)); conf->setValue(QString("SQLsettings"), QVariant("requiressl=1 connect_timeout=10000")); 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("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("download"), QVariant("http://www.nothing2do.eu/ui.sql")); + conf->setValue(QString("download"), QVariant("https://raw.github.com/Nothing2Do/diary-mobile-android/master/ui.sql")); conf->setValue(QString("upload"), QVariant("ftp://:@/")); conf->setValue(QString("start"), QVariant("begin")); } @@ -323,23 +327,15 @@ void MainWindow::addButtonDB(){ bool ok=0; 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); + QString a, b=QInputDialog::getText(this, QString("label"), QString("Entrez son label"),QLineEdit::Normal, QString(), &ok); 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, &ok); + a=QInputDialog::getText(this, QString("keyword"), QString("Entrez ses mots clé"), 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, cur+"-"+b); + a=QInputDialog::getText(this, QString("action"), QString("Entrez son action"), QLineEdit::Normal, b, &ok); if ((a=="")||(ok==0))return; - if(a.split(QString(" "))[0]=="new"){ - int nb=a.split(QString(" ")).size(); - for(int i=1;i tmp({"select label,action from ui where keyword like :word;"});; label->setText(QString::number(way.size())); //label->setText(a); - way.append(a); - tmp.append(a); + tmp.append(b); exec(tmp); int labCol = 0;//r.indexOf("label"); int actCol = 1;//r.indexOf("action"); @@ -376,7 +372,7 @@ void MainWindow::editButtonDB(){ } void MainWindow::updateUi(){ qDebug()<<"updateUi() : "<value(QString("update")).toString(); - QUrl update(conf->value(QString("update")).toString()); + QUrl update(conf->value(QString("download")).toString()); m = new FileDownloader(update, this); connect(m, SIGNAL(downloaded()), SLOT(writeUpdate())); start(); @@ -402,7 +398,7 @@ void MainWindow::keyReleaseEvent(QKeyEvent *event) static bool accepted=true; event->setAccepted(accepted); // don't close my Top Level Widget ! int k=event->key(); - qDebug()<<"key="<prepare(m->downloadedData().split('\n').at(i)); q->exec(); } - start(); + //getButtons(way.last()); } diff --git a/ui.sql b/ui.sql index e7447c1..5ebe586 100644 --- a/ui.sql +++ b/ui.sql @@ -5,9 +5,9 @@ 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','config', 'config'); INSERT INTO "ui" (keyword, label, action) VALUES('begin','lieu','lieu'); -INSERT INTO "ui" (keyword, label, action) VALUES('lieu', 'oliver''s pub', 'begi-lie-oliver'); -INSERT INTO "ui" (keyword, label, action) VALUES('begi-lie-oliver fille','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('lieu', 'oliver''s pub', 'oliver''s pub'); +INSERT INTO "ui" (keyword, label, action) VALUES('oliver''s pub fille','audrey',''); +INSERT INTO "ui" (keyword, label, action) VALUES('oliver''s pub fille audrey zanella','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'); @@ -19,7 +19,7 @@ INSERT INTO "ui" (keyword, label, action) VALUES('config','database','settext da INSERT INTO "ui" (keyword, label, action) VALUES('config','filesave','settext file'); 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'); +INSERT INTO "ui" (keyword, label, action) VALUES('config','download', 'settext download'); +INSERT INTO "ui" (keyword, label, action) VALUES('config','upload', 'settext upload'); INSERT INTO "ui" (keyword, label, action) VALUES('config','start', 'settext start'); COMMIT; -- 2.45.1