From 875ff3352f43533567d481a38916a404691db9df Mon Sep 17 00:00:00 2001 From: Norbert Moutarde Date: Sat, 7 Dec 2013 17:38:08 +0100 Subject: [PATCH] some cosmetic modification --- android/AndroidManifest.xml | 39 ------------------------------------- diary-mobile-android.pro | 30 ++-------------------------- mainwindow.cpp | 19 +++++++++--------- mainwindow.h | 6 +++--- 4 files changed, 15 insertions(+), 79 deletions(-) delete mode 100644 android/AndroidManifest.xml diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml deleted file mode 100644 index 324fdf4..0000000 --- a/android/AndroidManifest.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/diary-mobile-android.pro b/diary-mobile-android.pro index f535fa8..b040e4c 100644 --- a/diary-mobile-android.pro +++ b/diary-mobile-android.pro @@ -23,34 +23,8 @@ CONFIG += mobility MOBILITY = QMAKE_CXXFLAGS += -fpermissive -ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android +#ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android OTHER_FILES += \ - android/AndroidManifest.xml \ +# android/AndroidManifest.xml \ ui.sql \ - android/src/org/qtproject/qt5/android/bindings/QtActivity.java \ - android/src/org/qtproject/qt5/android/bindings/QtApplication.java \ - android/src/org/kde/necessitas/ministro/IMinistro.aidl \ - android/src/org/kde/necessitas/ministro/IMinistroCallback.aidl \ - android/res/values-zh-rTW/strings.xml \ - android/res/layout/splash.xml \ - android/res/values-pt-rBR/strings.xml \ - android/res/values-de/strings.xml \ - android/res/values-ru/strings.xml \ - android/res/values-ms/strings.xml \ - android/res/values-et/strings.xml \ - android/res/values-rs/strings.xml \ - android/res/values-fa/strings.xml \ - android/res/values/strings.xml \ - android/res/values-nl/strings.xml \ - android/res/values-id/strings.xml \ - android/res/values-nb/strings.xml \ - android/res/values-ja/strings.xml \ - android/res/values-pl/strings.xml \ - android/res/values-ro/strings.xml \ - android/res/values-zh-rCN/strings.xml \ - android/res/values-it/strings.xml \ - android/res/values-es/strings.xml \ - android/res/values-fr/strings.xml \ - android/res/values-el/strings.xml \ - android/version.xml diff --git a/mainwindow.cpp b/mainwindow.cpp index 9e1b212..2134c5a 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -44,7 +44,7 @@ MainWindow::MainWindow(QWidget *parent) label=new QLabel("Save locally"); setCentralWidget(screen); createMenuBar(); - connectdb(); + connectDB(); statusBar()->addPermanentWidget(label); toggleMenu(); start(); @@ -161,6 +161,7 @@ void MainWindow::lsconfig(){ } void MainWindow::quit(){ + qDebug()<<"quit()"; conf->sync(); db.commit(); db.close(); @@ -201,13 +202,13 @@ void MainWindow::action(const QString & a){ void MainWindow::createMenuBar(){ FileMenu=new QMenu(QString("&File"), this); FileMenu->addAction(tr("&Start..."), this, SLOT(start()),QKeySequence(tr("Ctrl+S", "Start"))); - FileMenu->addAction(tr("&Connect"), this, SLOT(connectdb()),QKeySequence(tr("Ctrl+C", "Connect"))); + FileMenu->addAction(tr("&Connect"), this, SLOT(connectDB()),QKeySequence(tr("Ctrl+C", "Connect"))); FileMenu->addAction(tr("&Quit..."), this, SLOT(quit()),QKeySequence(tr("Ctrl+Q", "Quit"))); menuBar()->addMenu(FileMenu); EditMenu=new QMenu(QString("&Edit")); EditMenu->addAction(tr("Co&nfig"), this, SLOT(lsconfig()), QKeySequence(tr("Ctrl+N", "Edit|Co&nfig"))); - EditMenu->addAction(tr("C&reate database"), this, SLOT(createdb()), QKeySequence(tr("Ctrl+R", "Edit|Database"))); - EditMenu->addAction(tr("A&dd buttons"), this, SLOT(addButton()), QKeySequence(tr("Ctrl+D", "Add buttons"))); + EditMenu->addAction(tr("C&reate database"), this, SLOT(createDB()), QKeySequence(tr("Ctrl+R", "Edit|Database"))); + EditMenu->addAction(tr("A&dd buttons"), this, SLOT(addButtonDB()), QKeySequence(tr("Ctrl+D", "Add buttons"))); menuBar()->addMenu(EditMenu); HelpMenu=new QMenu(QString("&Help")); HelpMenu->addAction(tr("About Qt"), qApp, SLOT(aboutQt()), QKeySequence(tr("ctrl+H", "About Qt"))); @@ -291,7 +292,7 @@ void MainWindow::TCPerrors(QAbstractSocket::SocketError a){ QString MainWindow::getText(const QString &a){ return widget.value(a)->text(); } -void MainWindow::connectdb(){ +void MainWindow::connectDB(){ db = QSqlDatabase::addDatabase("QSQLITE"); //db = QSqlDatabase::addDatabase("QPSQL"); //db.setHostName(host); useless with SQLite @@ -313,7 +314,7 @@ void MainWindow::firstrun(){ conf->setValue(QString("database"), QVariant("db")); conf->setValue(QString("password"), QVariant("pass")); conf->setValue(QString("file"), QVariant("diary.txt")); - createdb(); + createDB(); } QString &MainWindow::get(int row, int column){ q->seek(row); @@ -368,14 +369,14 @@ int MainWindow::entry(){ if (b.isValid())qDebug()<<"q->lastError():"<clear(); } -int MainWindow::createdb(){ +int 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');")); } -void MainWindow::addButton(){ +void MainWindow::addButtonDB(){ QString cmd="insert into ui (keyword, label, action) values ('"; QString key=QInputDialog::getText(this, QString("keyword"), QString("Entrez votre mot clé")); if (key=="")key="default"; @@ -386,7 +387,7 @@ void MainWindow::addButton(){ QString a=cmd+key+"', '"+label+"', '"+action+"');"; qDebug()<<"exec("<