From: Norbert Moutarde Date: Tue, 17 Dec 2013 07:13:42 +0000 (+0100) Subject: forgetting X-Git-Url: https://git.nothing2do.fr/?a=commitdiff_plain;h=cd9caec72d00ddd04b92ea81a4569072cd0da4a5;p=diary-mobile.git forgetting --- diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 1f3b5fe..2b4b76a 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -1,39 +1,43 @@ - - - + + + - + - + - + - - - - - + + + + + - - - + + + - + + + + + diff --git a/diary-mobile-android.pro b/diary-mobile-android.pro index 627c759..62f5c95 100644 --- a/diary-mobile-android.pro +++ b/diary-mobile-android.pro @@ -27,7 +27,6 @@ ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android OTHER_FILES += \ android/AndroidManifest.xml \ - ui.sql \ - android/AndroidManifest.xml + ui.sql ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android diff --git a/mainwindow.cpp b/mainwindow.cpp index c9a217b..83a74d7 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -22,11 +22,11 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) first=1; firstrun(); } - texte=new QLineEdit(); screen=new QWidget(this); + grid=new QGridLayout(); + texte=new QLineEdit(); vbox=new QVBoxLayout(screen); hbox=new QHBoxLayout(); - grid=new QGridLayout(); ok=new CLabel("ok"); ok->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); connect(ok, SIGNAL(released()), this, SLOT(entry())); @@ -41,9 +41,9 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) setCentralWidget(screen); createMenuBar(); connectDB(); - if(first)createDB(); + //createDB(); statusBar()->addPermanentWidget(label); - menuBar()->hide(); + menuBar()->show(); start(); } void MainWindow::start(){ @@ -123,28 +123,30 @@ void MainWindow::quit(){ qApp->quit(); } CLabel* MainWindow::addWidget(const QString &key, CLabel * a){ - + qDebug()<<"addWidget("<value(QString("maxcolumn")).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); return a; } -/*void MainWindow::remWidget(const QString & a){ - QObject::disconnect(widget.value(a), SIGNAL(released()), signalmap, SLOT(map())); - grid->removeWidget(widget.value(a)); - //widget.remove(a); -}*/ void MainWindow::action(const QString & a){ qDebug()<<"action("<setText(a); flush(); if (a.split(QString(" "))[0]==QString("set")){ conf->setValue(QString(a.split(QString(" "))[1]), a.split(QString(" "))[2]); + start(); } else if(a.split(QString(" "))[0]==QString("sql")){ exec(a.mid(4)); + start(); + } + else if(a.split(QString(" "))[0]==QString("edit")){ + } else getButtons(a); } @@ -188,7 +190,8 @@ CLabel::CLabel( const QString& text, QWidget * parent ) : QLabel(parent) setWordWrap(true); setLineWidth(5); setStyleSheet("background-color: red;border-style: outset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 15px;padding: 6px;"); - setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum); + } CLabel::~CLabel() @@ -197,13 +200,13 @@ CLabel::~CLabel() void CLabel::mousePressEvent ( QMouseEvent * event ) { switch(event->button()){ - case Qt::LeftButton:setStyleSheet("background-color: red;border-style: inset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 10px;padding: 6px;");emit pressed();break; + case Qt::LeftButton:setStyleSheet("background-color: red;border-style: inset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 15px;padding: 6px;");emit pressed();break; } } void CLabel::mouseReleaseEvent( QMouseEvent * event ) { switch(event->button()){ - case Qt::LeftButton:setStyleSheet("background-color: red;border-style: outset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 10px;padding: 6px;");emit released();break; + case Qt::LeftButton:setStyleSheet("background-color: red;border-style: outset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 15px;padding: 6px;");emit released();break; } } @@ -239,7 +242,7 @@ void MainWindow::firstrun(){ conf->setValue(QString("password"), QVariant("pass")); conf->setValue(QString("file"), QVariant("diary.txt")); conf->setValue(QString("maxcolumn"), QVariant(4)); - conf->setValue(QString("SQLsettings"), QVariant("requiressl=1 connect_timeout=10000)")); + 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;")); } QString &MainWindow::get(int row, int column){ @@ -248,9 +251,8 @@ QString &MainWindow::get(int row, int column){ return tmp; } int MainWindow::exec(const QString & a){ - qDebug()<<"exec("<prepare(a); - q->exec(); + qDebug()<<"exec("<exec(); QSqlError b=q->lastError(); if (b.isValid())qDebug()<<"SQL error->exec() :"<size(); @@ -295,10 +297,14 @@ void MainWindow::entry(){ void MainWindow::createDB(){ exec(QString("create table ui(keyword text, label text, action text);")); exec(QString("create table raw(date timestamp, texte text);")); - + exec(QString("INSERT INTO 'ui' (keyword, label, action) VALUES('begin','fille','fille');")); + exec(QString("INSERT INTO 'ui' (keyword, label, action) VALUES('fille','aurelie','f-aurelie');")); + exec(QString("INSERT INTO 'ui' (keyword, label, action) VALUES('f-aurelie','discours','f-a-discours');")); + exec(QString("INSERT INTO 'ui' (keyword, label, action) VALUES('f-a-discours','discours un peu plus long que la moyenne pour voir se qui va se passer','begin');")); } void MainWindow::addButtonDB(){ - QString cmd="insert into ui (keyword, label, action) values ('", cur=(label->text()); + qDebug()<<"addButtonDB()"; + QString cmd="insert into ui (keyword, label, action) values ('", cur=label->text(); QString view=QInputDialog::getText(this, QString("label"), QString("Entrez le label")); if (view=="")view="default"; QString key=QInputDialog::getText(this, QString("keyword"), QString("Entrez le nom de la page"), QLineEdit::Normal, cur); @@ -307,26 +313,28 @@ void MainWindow::addButtonDB(){ QString a=cmd+key+"', '"+view+"', '"+action+"');"; exec(a); + flush(); getButtons(label->text()); } void MainWindow::getButtons(const QString &a){ - QString tmp("select label,action from ui where keyword like '%"+a+"%';"); + QString tmp="select label,action from ui where keyword like '%"+a+"%';"; exec(tmp); - //r=q->record(); - //qDebug()<<"nmb of col : "<first(); while(q->next()){ addWidget(q->value(actCol).toString(), new CLabel(q->value(labCol).toString())); - } + }; } void MainWindow::editButtonDB(){ flush(); - exec(QString("select distinct keyword from ui")); + exec(QString("select label from ui where keyword like '"+label->text())+"';"); while (q->next()) { - QString key=QString("sql select label from ui where keyword='"+q->value(0).toString()+"';"); + //QString key=QString("sql select keyword,label,action from ui where keyword like '"+q->value(0).toString()+"';"); + qDebug()<value(0).toString(); + addWidget(QString("sql select keyword,label,action from ui where keyword like '"+q->value(0).toString()+"';"), new CLabel(q->value(0).toString())); + } + flush(); + while (q->next()){ - addWidget(key, new CLabel(q->value(0).toString())); } }