From: Norbert Moutarde Date: Sun, 29 Dec 2013 19:27:28 +0000 (+0100) Subject: clean'd up ... X-Git-Url: https://git.nothing2do.fr/?a=commitdiff_plain;h=2f2492699ee4fa4d91af48548483bcf0fb0a243d;p=diary-mobile.git clean'd up ... --- diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 2b4b76a..863c908 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -1,6 +1,6 @@ - + diff --git a/mainwindow.cpp b/mainwindow.cpp index aa92d04..df63948 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -36,6 +36,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) if(conf->value(QString("first")).toInt()==1){ qDebug()<<"second"; createDB(); + updateUi(); conf->setValue(QString("first"), 2); }; statusBar()->addPermanentWidget(label); @@ -119,7 +120,7 @@ void MainWindow::quit(){ db.close(); qApp->quit(); } -CLabel* MainWindow::addWidget(const QString &key, CLabel * a){ +CLabel* MainWindow::addWidget(const QString &key, const CLabel *a){ qDebug()<<"addWidget("<value(QString("maxcolumn")).toInt(); grid->addWidget(a, grid->count()/maxc, grid->count()%maxc, 1, 1, Qt::AlignVCenter | Qt::AlignHCenter); @@ -134,14 +135,16 @@ void MainWindow::action(const QString &a){ if (a.split(QString(" "))[0]==QString("set")){ conf->setValue(QString(a.split(QString(" "))[1]), a.split(QString(" "))[2]); getButtons(way.last()); + } else if(a.split(QString(" "))[0]==QString("settext")){ conf->setValue(a.split(QString(" "))[1], QInputDialog::getText(this, "setText", a.split(QString(" "))[1], QLineEdit::Normal, conf->value(QString(a.split(QString(" "))[1])).toString()));//conf->value(QString(a.split(QString(" ")).mid(2))) getButtons(way.last()); } else if(a.split(QString(" "))[0]==QString("setint")){ - conf->setValue(a.split(QString(" "))[1], QInputDialog::getInt(this, "setInt", a.split(QString(" "))[2] , conf->value(QString(a.split(QString(" "))[1])).toInt())); + conf->setValue(a.split(QString(" "))[1], QInputDialog::getInt(this, "setInt", a.split(QString(" "))[1] , conf->value(QString(a.split(QString(" "))[1])).toInt())); getButtons(way.last()); + } else if(a.split(QString(" "))[0]=="new"){ entry(a.remove(0, 4)); @@ -154,7 +157,6 @@ void MainWindow::action(const QString &a){ else getButtons(a); } void MainWindow::createMenuBar(){ - FileMenu=new QMenu(QString("&File"), this); FileMenu->addAction(trUtf8("&Start..."), this, SLOT(start()),QKeySequence(trUtf8("Ctrl+S", "Start"))); FileMenu->addAction(trUtf8("&Back"), this, SLOT(back()),QKeySequence(trUtf8("Ctrl+B", "Back"))); @@ -185,7 +187,7 @@ void MainWindow::toggleMenu(){ } void MainWindow::flush(){ QLayoutItem *child; - while ((child = grid->takeAt(0)) != 0) {// c'est inutile de mettre "!= 0", non ? + while ((child = grid->takeAt(0))) {// c'est inutile de mettre "!= 0", non ? delete child->widget(); delete child; } @@ -193,7 +195,7 @@ void MainWindow::flush(){ } CLabel::CLabel( const QString& text, const QString & style, QWidget * parent ) : QLabel(parent) { - setText(text); + SetTextToLabel(text); setWordWrap(true); setLineWidth(5); setStyleSheet(style); @@ -248,14 +250,14 @@ void MainWindow::firstrun(){ conf->setValue(QString("database"), QVariant("db")); conf->setValue(QString("password"), QVariant("pass")); conf->setValue(QString("file"), QVariant("diary.txt")); - conf->setValue(QString("maxcolumn"), QVariant(4)); + conf->setValue(QString("maxcolumn"), QVariant(2)); 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("sqlfile"), QVariant("ui.sql")); - conf->setValue(QString("getsql"), QVariant("wget --no-check-certificate https://github.com/Nothing2Do/diary-mobile-android/raw/master/ui.sql")); + //conf->setValue(QString("getsql"), QVariant("wget --no-check-certificate https://github.com/Nothing2Do/diary-mobile-android/raw/master/ui.sql")); + //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")); - } QString &MainWindow::get(int row, int column){ q->seek(row); @@ -271,7 +273,7 @@ int MainWindow::exec(const QList & a){ } q->exec(); QSqlError b=q->lastError(); - + db.commit(); if (b.isValid())qDebug()<<"SQL error->exec() :"<isSelect())return q->size(); else return 0; @@ -323,14 +325,14 @@ void MainWindow::addButtonDB(){ bool ok=0; cmd.append("insert into ui (label, keyword, action) values (:label, :keyword, :action)"); QString cur=way.last(); - QString view=QInputDialog::getText(this, QString("label"), QString("Entrez le label"),QLineEdit::Normal, QString(), &ok); - if ((view=="")||(ok==0))view="default"; - QString key=QInputDialog::getText(this, QString("keyword"), QString("Entrez le nom de la page où il siègera"), QLineEdit::Normal, cur); + QString a=QInputDialog::getText(this, QString("label"), QString("Entrez le label"),QLineEdit::Normal, QString(), &ok); + if ((a=="")||(ok==0))a="default"; + cmd.append(a); + a=QInputDialog::getText(this, QString("keyword"), QString("Entrez le nom de la page où il siègera"), QLineEdit::Normal, cur); + cmd.append(a); cur.chop(1); - QString action=QInputDialog::getText(this, QString("action"), QString("Entrez l'action"), QLineEdit::Normal, cur+"_"+view); - cmd.append(view); - cmd.append(key); - cmd.append(action); + a=QInputDialog::getText(this, QString("action"), QString("Entrez l'action"), QLineEdit::Normal, cur+" "+a); + cmd.append(a); exec(cmd); getButtons(way[way.size()-1]); } @@ -394,12 +396,12 @@ void MainWindow::keyReleaseEvent(QKeyEvent *event) } } -static void SetTextToLabel(QLabel *label, QString text) +void CLabel::SetTextToLabel(const QString& text) { - QFontMetrics metrix(label->font()); - int width = label->width() - 2; + QFontMetrics metrix(font()); + int width = this->width() - 2; QString clippedText = metrix.elidedText(text, Qt::ElideRight, width); - label->setText(clippedText); + setText(clippedText); } FileDownloader::FileDownloader(QUrl url, QObject *parent) : QObject(parent) { @@ -427,9 +429,12 @@ QByteArray FileDownloader::downloadedData() const void MainWindow::writeUpdate(){ qDebug()<<"downloaded : "<downloadedData().size()<<" byte"; /* put newly downloaded sql file into database */ - int a=m->downloadedData().count(';'); + int a=m->downloadedData().count('\n'); + q->prepare(QString("delete from ui;")); + q->exec(); for(int i=0; iprepare("<prepare(m->downloadedData().split(';').at(i)); + /*qDebug()<<"q->prepare("<prepare(m->downloadedData().split('\n').at(i)); q->exec(); } + start(); } diff --git a/mainwindow.h b/mainwindow.h index 27640a1..f0b7347 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -65,6 +65,7 @@ Q_OBJECT public: explicit CLabel(const QString& text ="default", const QString &style="background-color: red;border-style: outset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 15px;padding: 6px;", QWidget * parent = 0 ); ~CLabel(); + void SetTextToLabel(const QString &); signals: void clicked(); void pressed(); @@ -93,7 +94,7 @@ public: void setOrientation(ScreenOrientation orientation); void showExpanded(); - CLabel* addWidget(const QString &, CLabel *); + CLabel* addWidget(const QString &, const CLabel *); //void remWidget(const QString &); private slots: void back(); @@ -121,19 +122,20 @@ private slots: //void getButtons(); void updateUi(); void writeUpdate(); + public slots: signals: private: - bool first; + //bool first; QWidget *screen; QGridLayout *grid; QLabel *label; QSettings *conf; QString tmp;//host, user, tmp, password, servercert,database, file; QMenu *FileMenu, *EditMenu, *HelpMenu; - unsigned short int port;// j'ai lu les docs sur internet et 0<="unsigned short int"<65536 + //unsigned short int port;// j'ai lu les docs sur internet et 0<="unsigned short int"<65536 QSignalMapper *signalmap; //QMap widget; QList way; diff --git a/ui.sql b/ui.sql index 088aaf7..16b8faf 100644 --- a/ui.sql +++ b/ui.sql @@ -2,25 +2,28 @@ PRAGMA foreign_keys=OFF; BEGIN TRANSACTION; 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('begin','lieu','lieu'); +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('begin','oliver'' s','begi-oliver '); + 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('begin','config','config'); -INSERT INTO "ui" (keyword, label, action) VALUES('config','max column','setint maxc'); + +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'); INSERT INTO "ui" (keyword, label, action) VALUES('config','user','settext user');