attempt to add a scrollarea ...

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index e239b5270a634d243eb6e131f1a452610162b89e..9d16874649221b4295d46c00e129230fe7c6b4ba 100644 (file)
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <manifest package="eu.nothing2do.diarymobile" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.2" android:versionCode="1" android:installLocation="auto">
-    <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="diary-mobile">
+    <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="diary-mobile-android" android:icon="@drawable/icon">
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="@string/app_name" android:screenOrientation="unspecified" android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -34,7 +34,7 @@
             <!-- Splash screen -->
         </activity>
     </application>
-    <uses-sdk android:targetSdkVersion="17"/>
+    <uses-sdk android:targetSdkVersion="17" android:minSdkVersion="17"/>
     <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
 
     <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
@@ -47,4 +47,5 @@
 
 <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
+<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
 </manifest>

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 279e2d015a9d1d37b1dbbbb613d5e1ca26a62b61..7f7320c40fac9507b13579f631d9c361d3a0c50e 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -21,12 +21,13 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
         conf->setValue(QString("first"), 1);
     };
     screen=new QWidget(this);
-    screen->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
-    /*scroll=new QScrollArea;
-    scroll->setWidget(screen);
-    scroll->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
-    scroll->setVerticalScrollBarPolicy(2);*/
+    screen->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+    /*scroll=new QScrollArea(screen);
+    scroll->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+    scroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+    scroll->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);*/
     grid=new QGridLayout(screen);
+    //scroll->show();
     grid->setSizeConstraint(QLayout::SetMinimumSize);
 
 
@@ -370,6 +371,10 @@ void MainWindow::getButtons(const QString &a){
         i++;
     };
     way.append(a);
+    /*grid->update();
+    scroll->updateGeometry();
+    screen->updateGeometry();*/
+
     qDebug()<<"end getButtons : "<<i<<" button(s) way.size()"<<way.size();
 }
 void MainWindow::chooseButtonDB(){