save the entry with date and hours in a file

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index d376bbf8dd743dff0cd0e25dcfae534673fb6e09..7e4ac63651528562bbcd7bc707f6b89ddfde6a84 100644 (file)
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest package="eu.nothing2do.diary.mobile" android:versionName="0.1" xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1">
-    <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:icon="@drawable/icon" android:label="@string/app_name">
-        <activity android:name="org.qtproject.qt5.android.bindings.QtActivity" android:configChanges="orientation|locale|fontScale|keyboard|keyboardHidden|navigation|screenSize" android:label="@string/app_name" android:screenOrientation="unspecified">
+<manifest package="eu.nothing2do.diary.mobile" android:versionCode="1" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.1.1">
+    <application android:label="@string/app_name" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:icon="@drawable/icon">
+        <activity android:screenOrientation="unspecified" android:label="@string/app_name" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:configChanges="orientation|locale|fontScale|keyboard|keyboardHidden|navigation|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -35,5 +35,4 @@
     <supports-screens android:normalScreens="true" android:smallScreens="true" android:largeScreens="true" android:anyDensity="true"/>
     <uses-sdk android:targetSdkVersion="17" android:minSdkVersion="9"/>
     <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 </manifest>

diff --git a/diary-mobile-android.pro b/diary-mobile-android.pro
index 8e0abedab8ca31f6d4d1f18245c1753077081d58..da46ab03211c80ec3e33204a55f6745ee98a0725 100644 (file)
--- a/diary-mobile-android.pro
+++ b/diary-mobile-android.pro
@@ -17,7 +17,7 @@ SOURCES += main.cpp\
 
 HEADERS  += mainwindow.h
 
-FORMS    += mainwindow.ui
+#FORMS    += mainwindow.ui
 
 CONFIG += mobility
 MOBILITY = 

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 76cbe1b15c4067416ddf3825d47e78a37b6e7dbc..965564effb368b428f5625a5946e2a93fb1d11de 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -2,6 +2,7 @@
 //#include "ui_mainwindow.h"
 #include "mainwindow.h"
 #include <QtGui>
+#include <QFlags>
 #include <QtCore/QCoreApplication>
 #include <QtNetwork/QtNetwork>
 //#include <QtNetwork/QSslSocket>
@@ -23,12 +24,11 @@ MainWindow::MainWindow(QWidget *parent)
     vbox=new QVBoxLayout(screen);
     hbox=new QHBoxLayout();
     grid=new QGridLayout();
-    ok=new CLabel(QString("ok"));
+    ok=new CLabel("ok");
     connect(ok, SIGNAL(clicked()), this, SLOT(entry()));
     hbox->addWidget(texte);
     hbox->addWidget(ok);
     vbox->addLayout(hbox);
-
     vbox->addLayout(grid);
     signalmap=new QSignalMapper(this);
     host=conf->value(QString("host"), QVariant("host")).toString();
@@ -37,25 +37,23 @@ MainWindow::MainWindow(QWidget *parent)
     servercert=conf->value(QString("server-cert"), QVariant("a.pem")).toString();
     database=conf->value(QString("database"), QVariant("db")).toString();
     password=conf->value(QString("password"), QVariant("pass")).toString();
-    conf->value(QString("file"), QVariant("diary.txt"));
+    file=conf->value(QString("file"), QVariant("diary.txt")).toString();
     connect(signalmap, SIGNAL(mapped(const QString &)),
                  this, SLOT(action(const QString &)));
     label=new QLabel("Save locally");
-    grid->setHorizontalSpacing(1);
-    screen->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
-    grid->setSizeConstraint(QLayout::SetMaximumSize);
     setCentralWidget(screen);
     createMenuBar();
     statusBar()->addPermanentWidget(label);
-
+    qDebug()<<grid->expandingDirections();
     start();
 }
 void MainWindow::start(){
     flush();
-    connectdb();
+    //connectdb();
+
     addWidget(QString("select distinct nom from alias order by nom;"), new CLabel("alias"));
-    addWidget(QString("select nom from var;"), new CLabel("var"));
-    addWidget(QString("select distinct word from memo;"), new CLabel("memo"));
+    /*addWidget(QString("select nom from var;"), new CLabel("varr rrr rrr rrr rrr rrr rrr"));
+    addWidget(QString("select distinct word from memo;"), new CLabel("memo dans ton gros culs de chien lymphatique"));*/
     addWidget(QString("port"), new CLabel("port"));
     addWidget(QString("host"), new CLabel("host"));
     addWidget(QString("file"), new CLabel("file"));
@@ -120,6 +118,7 @@ void MainWindow::choosehost(){
     bool ok=0;
     host=QInputDialog::getText(this, QString("Host"), QString("Enter hostname (or ip)"), QLineEdit::Normal, host, &ok);
     if(ok==1)conf->setValue(QString("host"), host);
+    start();
 }
 void MainWindow::chooseuser(){
     bool ok=0;
@@ -145,11 +144,13 @@ void MainWindow::chooseport(){
     }else{
         port=22;
     }
+    start();
 }
 void MainWindow::choosefile(){
-
-    conf->setValue(QString("file"), QFileDialog::getSaveFileName(this, tr("Open file to write into"), "diary.txt"));
-
+    bool ok=0;
+    file=QFileDialog::getSaveFileName(this, tr("Open file to write into"), file);
+    if (ok)conf->setValue(QString("file"), file);
+    start();
 }
 void MainWindow::lsconfig(){
     flush();
@@ -170,7 +171,6 @@ void MainWindow::quit(){
 CLabel* MainWindow::addWidget(const QString &key, CLabel * a){
 
     widget.insert(key, a);
-    a->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
     grid->addWidget(a, grid->count()/MAXCOLUMN, grid->count()%MAXCOLUMN, 1, 1, Qt::AlignVCenter | Qt::AlignHCenter);
     QObject::connect(a, SIGNAL(clicked()), signalmap, SLOT(map()));
     signalmap->setMapping(a, key);
@@ -184,7 +184,7 @@ void MainWindow::remWidget(const QString & a){
 void MainWindow::action(const QString & a){
     qDebug()<<"action("<<a<<")";
     int b;
-    if(!alias(a))b=exec(a);
+    //if(!alias(a))b=exec(a);
     //qDebug()<<"q->size(action)="<<q->size();
     flush();
 
@@ -254,7 +254,7 @@ 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 10px;padding: 6px;");
-    setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 
 
 }
@@ -353,8 +353,14 @@ int MainWindow::alias(const QString & a, int & b){
 int MainWindow::entry(){
     QDateTime v;
     QString a=v.currentDateTime().toString(QString("yyyy-MM-dd hh:mm:ss"))+" "+texte->text();
-    qDebug()<<a;
-    /*q->prepare("INSERT INTO raw (date, texte) VALUES (:date, :texte);");
+    QFile fichier(file);
+    fichier.open(QIODevice::Append | QIODevice::Text);
+    QTextStream flux(&fichier);
+    flux << a << endl;
+    texte->clear();
+    fichier.close();
+
+    /*q->prepare("INSERT INTO "+database+"raw (date, texte) VALUES (:date, :texte);");
     q->bindValue(":date", v.currentDateTime().toString(QString("yyyy-MM-dd hh:mm:ss")));
     q->bindValue(":texte", texte->text());
     q->exec();*/

diff --git a/mainwindow.h b/mainwindow.h
index f57f67ebb5662d50bf917dbc5a3cb4b37747abf9..ace9bb29331cf22549e1c41ab00472287133c162 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -1,6 +1,6 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
-
+#include <QFlags>
 #include <QMainWindow>
 //#include <QtGui> don't work since 5.1 (or 5.2)
 #include <QtNetwork/QtNetwork>
@@ -98,7 +98,7 @@ private:
     QLabel *label;
     QSettings *conf;
     QNetworkAccessManager *net;
-    QString host, user, tmp, password, servercert, database;
+    QString 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
     QSignalMapper *signalmap;