added a scrollarea, and some minor modification

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 6b675beeecf76558954602e3271ad12a39e9d138..d020cf975214f7a89690b6e7f10774f1e36f7e27 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -10,7 +10,7 @@
 #include <QKeySequence>
 #include <QDateTime>
 #include <QFileDialog>
-
+#include <QScrollArea>
 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 {
     qDebug()<<"begin of MainWindows";
@@ -21,7 +21,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
         conf->setValue(QString("first"), 1);
     };
     screen=new QWidget(this);
-    grid=new QGridLayout(screen);
+    scroll=new QScrollArea(screen);
+    grid=new QGridLayout(scroll);
     screen->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
     signalmap=new QSignalMapper(this);
     connect(signalmap, SIGNAL(mapped(const QString &)), this, SLOT(action(const QString &)));
@@ -263,13 +264,13 @@ void MainWindow::firstrun(){
     conf->setValue(QString("SQLsettings"), QVariant("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;"));
     conf->setValue(QString("menu"), QVariant(1));
-    conf->setValue(QString("download"), QVariant("https://raw.github.com/Nothing2Do/diary-mobile-android/master/ui.sql"));
+    conf->setValue(QString("download"), QVariant("http://www.nothing2do.eu/ui.sql"));
     conf->setValue(QString("uploadRAW"), QVariant("ftp://<user>:<pass>@<server>/raw"));
     conf->setValue(QString("uploadUi"), QVariant("ftp://<user>:<pass>@<server>/ui.sql"));
     conf->setValue(QString("restore"), QVariant("http://www.abc.de/db"));
     conf->setValue(QString("start"), QVariant("begin"));
     conf->setValue(QString("db"), QVariant("/data/data/eu.nothing2do.diarymobile/files/db"));
-    conf->setValue(QString("selectbuttons"), QVariant("select keyword,label,action from ui;"));
+    conf->setValue(QString("selectbuttons"), QVariant("select keyword,label,action from ui order by label;"));
     conf->setValue(QString("selectraw"), QVariant("select date,texte from raw;"));
     conf->setValue(QString("menuback"), QVariant("menuback"));
 }

diff --git a/mainwindow.h b/mainwindow.h
index 84fa400c6605797cacb7880f46c22a954cd9a41a..198c1e9a3e66982ecdd05d87c0551ece695a5210 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -19,7 +19,7 @@
 #include <QMessageBox>
 //#include <QTableWidget>
 #include <QTextEdit>
-
+#include <QScrollArea>
 #ifndef FILEDOWNLOADER_H
 #define FILEDOWNLOADER_H
 
@@ -135,6 +135,7 @@ public slots:
 signals:
     void datafilled();
 private:
+    QScrollArea * scroll;
     QMutex sql,updatelocker;
     QWidget *screen;
     QGridLayout *grid;

diff --git a/ui.sql b/ui.sql
index e4beea6eb0db93faefd848af6bd2f26b40bc8f27..5183a0cb7a0fa0a3e868cb31d766de40bda94ceb 100644 (file)
--- a/ui.sql
+++ b/ui.sql
@@ -1,5 +1,4 @@
 INSERT INTO ui (keyword,label,action) VALUES(?,?,?);
-begin$config$config
 menuback$config$config
 menuback$help$main help
 config$max column$setint maxcolumn