some very little tweak

diff --git a/mainwindow.cpp b/mainwindow.cpp
index ca3b5d479bfc059e954364d7f5c3a1ca0c9eb75a..959920c7ffefd67a0af9d364a0d648a13cdd1814 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -68,7 +68,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     setCentralWidget(screen);
     createMenuBar();
     connectDB();
-    this->showFullScreen();
+    showFullScreen();
     if((conf->value(QString("first")).toInt()==1)){
         qDebug()<<"second";
         bool ok;
@@ -79,16 +79,18 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     };
     statusBar()->addPermanentWidget(label);
     menuBar()->setVisible(conf->value(QString("menu")).toBool());
-    d.lock();
-    start();
+
+    //d.lock();
+    //start();
 }
 void MainWindow::start(){
     QString a=conf->value(QString("currenttype"), QString("buttons")).toString();
     way=conf->value(QString("start"), conf->value(QString("startdefault"))).toStringList();
     QString b=way.last();
     qDebug()<<"a="<<a<<" b="<<b;
-    get(a, b);
     lastprint=b;
+    get(a, b);
+
 
 }
 MainWindow::~MainWindow()
@@ -127,7 +129,7 @@ void MainWindow::setOrientation(ScreenOrientation orientation)
     case ScreenOrientationAuto:
         attribute = static_cast<Qt::WidgetAttribute>(130);
         break;
-#else // QT_VERSION < 0x040702
+#else // QT_VERSION > 0x040702
     case ScreenOrientationLockPortrait:
         //attribute = Qt::WA_LockPortraitOrientation;
         break;
@@ -159,7 +161,7 @@ void MainWindow::quit(){
     this->~MainWindow();
 }
 int unsigned MainWindow::addWidget(const QString &key, const CLabel *a){
-    qDebug()<<"addWidget("<<key<<")";
+    qDebug()<<"addWidget("<<a->text()<<", "<<key<<")";
     if(key.contains(QString("idem"))){
         key.replace(QString("idem"), a->text());
     }
@@ -556,15 +558,15 @@ void MainWindow::firstrun(){
     conf->setValue(QString("maxcolumn"), QVariant(3));
     conf->setValue(QString("maxline"), QVariant(3));
     conf->setValue(QString("SQLsettings"), QVariant("connect_timeout=10000"));
-    conf->setValue(QString("buttons"), QVariant("background-color: red;border-style: outset;border-width: 7px;border-radius: 10px;border-color: beige;font: bold 15px;padding: 6px;"));
+    conf->setValue(QString("buttons"), QVariant("background-color: red;border-style: outset;border-width: 15px;border-radius: 10px;border-color: beige;font: bold 15px;padding: 6px;"));
     conf->setValue(QString("buttonsbefore"), QVariant("background-color: red;"));
     conf->setValue(QString("buttonsafter"), QVariant("background-color: blue;"));
     conf->setValue(QString("menu"), QVariant(1));
     conf->setValue(QString("download"), QVariant("http://www.nothing2do.eu/"+conf->value(QString("filebuttons")).toString()));
     conf->setValue(QString("init"), QVariant("http://www.nothing2do.eu/init"));
-    conf->setValue(QString("userftp"), QVariant("<userftp>"));
-    conf->setValue(QString("hostftp"), QVariant("<hostftp>"));
-    conf->setValue(QString("passftp"), QVariant("<passftp>"));
+    conf->setValue(QString("userftp"), QVariant("<user>"));
+    conf->setValue(QString("hostftp"), QVariant("<host>"));
+    conf->setValue(QString("passftp"), QVariant("<pass>"));
     conf->setValue(QString("start"), QVariant("begin"));
     conf->setValue(QString("restore"), QVariant("http://www.abc.de/db"));
     conf->setValue(QString("db"), QVariant("/data/data/eu.nothing2do.diarymobile/files/db"));
@@ -605,8 +607,7 @@ QString MainWindow::get2(int column){
     return qq->value(column).toString();
 }
 int MainWindow::exec(const QList<QString> & a){
-    qDebug()<<"exec("<<a[0]<<") size="<<a.size()<<",";
-    qDebug()<<"q->prepare: "<<q->prepare(a[0]);
+    qDebug()<<"exec("<<a[0]<<") size="<<a.size()<<", q->prepare: "<<q->prepare(a[0]);
     for (int j=1; j<a.size(); j++){
         q->bindValue(j-1, a[j]);
         qDebug()<<"bind "<<j-1<<" and"<<a[j];
@@ -1006,6 +1007,7 @@ void MainWindow::writeTr(){
     tmp.open(QIODevice::WriteOnly);
     tmp.write(m->downloadedData());
     tmp.close();
+    d.unlock();
 }
 void MainWindow::writeFile(){
     QFile tmp(file);
@@ -1041,9 +1043,10 @@ void MainWindow::addMedia(const QString & a){
 void MainWindow::play(){
     video->play();
 }
-void MainWindow::resizeEvent(QResizeEvent *event)
+void MainWindow::resizeEvent(/*QResizeEvent *event*/)
 {
-    QSize size = event->size();
+    //QSize size = event->size();
+    QSize size = this->size();
     bool isLandscape = size.width() > size.height();
     if (isLandscape!=orienta){
         size.transpose();

diff --git a/mainwindow.h b/mainwindow.h
index 1ec5aa044451c5ae9ecb9c0cd3c2601297e514b6..cd1eea2dfb745ec1603314bc081d998feefd08a0 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -133,7 +133,7 @@ public:
     QSettings & getSettings();
     void showExpanded();
     unsigned int addWidget(const QString &, const CLabel *);
-    void resizeEvent(QResizeEvent *);
+    void resizeEvent();
     void sav(const QString &);
     void mass(const QString &, const QString &, const QString &, const  QString &);
     void downSQL(const QString &);