back from the dead, and Qt has made some update (mostly cosmetic)

minor upgrade

diff --git a/Makefile b/Makefile
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/README.md b/README.md
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/android/build.gradle b/android/build.gradle
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/android/gradlew.bat b/android/gradlew.bat
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/android/res/values/libs.xml b/android/res/values/libs.xml
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/diary-mobile.pro b/diary-mobile.pro
old mode 100644 (file)
new mode 100755 (executable)
index c85e13e..4edd30f
--- a/diary-mobile.pro
+++ b/diary-mobile.pro
@@ -4,7 +4,7 @@
 #
 #-------------------------------------------------
 
-QT       += core gui network sql xml multimedia multimediawidgets
+QT       += core gui network sql xml #multimedia multimediawidgets
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
@@ -27,7 +27,7 @@ CONFIG += mobility c++11
 MOBILITY =
 QMAKE_CXXFLAGS += -fpermissive -Wswitch
 TRANSLATIONS = diary-mobile_fr_FR.ts diary-mobile_en_EN.ts
-#ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
+ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
 
 OTHER_FILES += \
     android/AndroidManifest.xml \

diff --git a/diary-mobile_en_EN.ts b/diary-mobile_en_EN.ts
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/diary-mobile_fr_FR.ts b/diary-mobile_fr_FR.ts
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/jean_victor_balin_book.png b/jean_victor_balin_book.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/main.cpp b/main.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 54cc987..6d6bff1
--- a/main.cpp
+++ b/main.cpp
@@ -29,7 +29,7 @@
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
-    QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8"));
+    //QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8"));
     QString locale = QLocale::system().name();//.section('_', 0, 0)
     qDebug()<<"local="<<locale;
     QTranslator translator;

diff --git a/mainwindow.cpp b/mainwindow.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 26b2047..ad716ca
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -37,6 +37,7 @@
 #include <QFileDialog>
 #include <QScrollArea>
 #include <QSslConfiguration>
+#include <QTime>
 
 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 {
@@ -342,7 +343,9 @@ void MainWindow::action(const QString &a){
         //if (value){
             for(int d=1; d<=value; d++){
                 bool ok;
-                QString e=QInputDialog::getText(this, tr("set"), c+" : "+d, QLineEdit::Normal, QString(""), &ok);
+                QString tmp;
+                tmp=QString::number(d);
+                QString e=QInputDialog::getText(this, tr("set"), c+" : "+tmp, QLineEdit::Normal, QString(""), &ok);
                 if(ok)cmd.append(e);
                 else break;// in case of break, exec complain about cmd size
             }
@@ -400,9 +403,9 @@ void MainWindow::action(const QString &a){
     else if(b[0]==QString("play")){
 
     }
-    else if(b[0]==QString("vid")){
+    /*else if(b[0]==QString("vid")){
         addMedia(c);
-    }
+    }*/
     else if(b[0]==QString("-hist")){
         flush();
         QString wi;
@@ -487,18 +490,18 @@ void MainWindow::action(const QString &a){
                 else old="";
                 int tkc=tmpkeys.count(b[1]);
                 for(int t=1;t<tkc;t++){
-                    old=old+" "+valeur->values(b[1])[t];
+                    old=old+" "+valeur->value(b[1])[t];
                 }
                 QString tmp=QInputDialog::getText(this, QString("val"), b[1], QLineEdit::Normal, old, &ok);
                 if((ok)&&(tmp!=valeur->value(b[1]))){
                     valeur->remove(b[1]);
-                    valeur->insertMulti(b[1], tmp);
+                    valeur->insert(b[1], tmp);
                 }
             }else if((bs==3)&&(b[2]==QString("?"))){
                 QString val,tmp="Enter value for "+b[1];
                 val=QInputDialog::getText(this, "val", tmp, QLineEdit::Normal, QString(""), &ok);
                 //if(ok)action(QString("val "+b[1]+" "+val));// ERROR
-                if(ok)valeur->insertMulti(b[1],val);//good
+                if(ok)valeur->insert(b[1],val);//good
                 if((deb)&&(ok))QMessageBox::information(this, QString("val"), QString("val("+b[1]+")=="+val));
             }else{//if (bs=>3)&&(b[2]!="?")
                 int t=aa.size()-(b[1].size())-5;//5==val+2 space
@@ -507,14 +510,14 @@ void MainWindow::action(const QString &a){
                 else old="";
                 int tkc=tmpkeys.count(b[1]);
                 for(int t=1;t<tkc;t++){
-                    if(old==QString(""))old=valeur->values(b[1])[t];
-                    else old=old+" "+valeur->values(b[1])[t];
+                    if(old==QString(""))old=valeur->value(b[1])[t];
+                    else old=old+" "+valeur->value(b[1])[t];
                 }
-                qDebug()<<"aa.size()=="<<aa.size()<<" b[1].size()=="<<b[1].size()<<" t=="<<t<<" old.size()="<<old.size()<<endl;
+                qDebug()<<"aa.size()=="<<aa.size()<<" b[1].size()=="<<b[1].size()<<" t=="<<t<<" old.size()="<<old.size()<<Qt::endl;
                 QString tmp=old+" "+aa.right(t);
                 qDebug()<<"tmp="<<tmp;
                 valeur->remove(b[1]);
-                valeur->insertMulti(b[1], tmp);
+                valeur->insert(b[1], tmp);
                 if(deb)QMessageBox::information(this, QString("val"), QString("val("+b[1]+")=="+tmp));
             }
         }else{
@@ -598,7 +601,7 @@ CLabel::~CLabel()
 }
 void CLabel::mousePressEvent (QMouseEvent * event )
 {
-    t.start();
+    //t.currentTime();
     QString a=settings->value(QString("currenttype")).toString();
     QString bb=settings->value(a+QString("before")).toString();
     QString ba=settings->value(a+QString("after")).toString();
@@ -609,7 +612,7 @@ void CLabel::mousePressEvent (QMouseEvent * event )
 }
 void CLabel::mouseReleaseEvent( QMouseEvent * event )
 {
-    int c=t.elapsed();
+    //int c=t.start();
     QString a=settings->value(QString("currenttype")).toString();
     QString bb=settings->value(a+QString("before")).toString();
     QString ba=settings->value(a+QString("after")).toString();
@@ -617,8 +620,9 @@ void CLabel::mouseReleaseEvent( QMouseEvent * event )
     switch(event->button()){
         case Qt::LeftButton:
             setStyleSheet(m_style.replace(ba, bb));
-            if(c>2000)emit longpress();
-            else emit released();
+            //if(c>2000)emit longpress();
+            //else
+            emit released();
         break;
         //case Qt::LeftButton:setStyleSheet(m_style.replace(setting->value(setting->value(QString("currenttype")).toString()+"after").toString(), setting->value(QString("currenttype")).toString()+"before"));emit released();break;
 
@@ -993,7 +997,7 @@ FileDownloader::FileDownloader(QUrl url, QObject *parent) : QObject(parent)
 
     QNetworkRequest request(url);
     QSslConfiguration ssl;
-    ssl.setProtocol(QSsl::TlsV1SslV3);
+    ssl.setProtocol(QSsl::TlsV1_3);
     request.setSslConfiguration(ssl);
     m_WebCtrl.get(request);
 
@@ -1097,7 +1101,7 @@ void MainWindow::sav(const QString & a){
     b.open(QIODevice::ReadOnly);
     QNetworkRequest * rq= new QNetworkRequest(upload);
     QSslConfiguration ssl;
-    ssl.setProtocol(QSsl::TlsV1SslV3);
+    ssl.setProtocol(QSsl::TlsV1_3);
     rq->setSslConfiguration(ssl);
     //rq->setSslConfiguration(QSslConfiguration::defaultConfiguration());
     rep=net->put(*rq, b.readAll());
@@ -1187,7 +1191,7 @@ void MainWindow::writeFile(){
     m->disconnect();
     d.unlock();
 }
-void MainWindow::addMedia(const QString & a){
+/*void MainWindow::addMedia(const QString & a){
     if((video)&&(playlist)){
         playlist->addMedia(QUrl(a));
     }else{
@@ -1210,7 +1214,7 @@ void MainWindow::addMedia(const QString & a){
 }
 void MainWindow::play(){
     video->play();
-}
+}*/
 void MainWindow::resizeEvent(/*QResizeEvent *event*/)
 {
     //QSize size = event->size();

diff --git a/mainwindow.h b/mainwindow.h
old mode 100644 (file)
new mode 100755 (executable)
index 7e9487d..5649d30
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -54,11 +54,12 @@
 //#include "sax2.h"
 #include <QTranslator>
 #include <QLocale>
-#include <QtMultimedia/QMediaPlayer>
+/*#include <QtMultimedia/QMediaPlayer>
 #include <QtMultimedia/QMediaPlaylist>
 #include <QtMultimediaWidgets/QVideoWidget>
-//#include <QProcess>
-
+//#include <QProcess>*/
+//#include <QTextCodec>
+#include <QTime>
 
 #ifndef FILEDOWNLOADER_H
 #define FILEDOWNLOADER_H
@@ -134,7 +135,7 @@ private slots:
     void readSQL();
     void tmpdown();
     void readData();
-    void play();
+    //void play();
     void datasent();
     void back();
     void start();
@@ -162,7 +163,7 @@ private slots:
     void chooseDB();
     void chooseDB(const QString &);
     void chooseDB(const QString &,const QString &);
-    void addMedia(const QString &);
+    //void addMedia(const QString &);
     void editDB(const QString &, const QString &);
     void get(const QString &, const QString &);
     void get2(const QString &, const QString &);
@@ -192,8 +193,8 @@ private:
     //QsKineticScroller * ks;
     //QScrollArea * scroll;
     //a desperated attempt to get the output of my cmd, i've try Qprocess (but don't get it)QProcess *shell;
-    QMediaPlayer *video;
-    QMediaPlaylist *playlist;
+    //QMediaPlayer *video;
+    //QMediaPlaylist *playlist;
     QMutex sql,updatelocker,d,Msav;
     QWidget *screen;
     QGridLayout *grid;
@@ -212,7 +213,7 @@ private:
     bool np, orienta;//0=portrait 1=paysage (size.width() > size.height())
     unsigned short int deb;
     unsigned int page;
-    QVideoWidget * videoWidget;
+    //QVideoWidget * videoWidget;
     QMap<QString, QString> * valeur;
 };