From: Norbert Moutarde <norbert.moutarde@nothing2do.eu>
Date: Wed, 13 Nov 2013 16:09:14 +0000 (+0100)
Subject: It's my first android app ! so it's little bugged
X-Git-Url: https://git.nothing2do.fr/?a=commitdiff_plain;h=4fd27d226837b5b838349bd0d03fef187415ee84;p=diary-mobile.git

It's my first android app ! so it's little bugged
---

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
new file mode 100644
index 0000000..d376bbf
--- /dev/null
+++ b/android/AndroidManifest.xml
@@ -0,0 +1,39 @@
+<?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">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+            <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
+            <meta-data android:name="android.app.repository" android:value="@string/repository"/>
+            <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
+            <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
+            <meta-data android:name="android.app.lib_name" android:value="@string/app_lib_name"/>
+            <!-- Deploy Qt libs as part of package -->
+            <meta-data android:name="android.app.bundle_local_qt_libs" android:value="1"/>
+            <meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
+            <meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/>
+            <!-- Run with local libs -->
+            <meta-data android:name="android.app.use_local_qt_libs" android:value="1"/>
+            <meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
+            <meta-data android:name="android.app.load_local_libs" android:value="@string/local_libs"/>
+            <meta-data android:name="android.app.load_local_jars" android:value="@string/local_jars"/>
+            <meta-data android:name="android.app.static_init_classes" android:value="@string/init_classes"/>
+            <!--  Messages maps -->
+            <meta-data android:name="android.app.ministro_not_found_msg" android:value="@string/ministro_not_found_msg"/>
+            <meta-data android:name="android.app.ministro_needed_msg" android:value="@string/ministro_needed_msg"/>
+            <meta-data android:name="android.app.fatal_error_msg" android:value="@string/fatal_error_msg"/>
+            <!--  Messages maps -->
+            <!-- Splash screen -->
+            <meta-data android:name="android.app.splash_screen" android:resource="@layout/splash"/>
+            <!-- Splash screen -->
+        </activity>
+    </application>
+    <!-- %%INSERT_USES_SDK%% -->
+    <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/mainwindow.cpp b/mainwindow.cpp
index 1c37597..76cbe1b 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,5 +1,5 @@
 #include "mainwindow.h"
-#include "ui_mainwindow.h"
+//#include "ui_mainwindow.h"
 #include "mainwindow.h"
 #include <QtGui>
 #include <QtCore/QCoreApplication>
@@ -171,7 +171,6 @@ CLabel* MainWindow::addWidget(const QString &key, CLabel * a){
 
     widget.insert(key, a);
     a->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
-    //qDebug()<<"a :"<<a->;
     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);
diff --git a/mainwindow.ui b/mainwindow.ui
new file mode 100644
index 0000000..7ebf873
--- /dev/null
+++ b/mainwindow.ui
@@ -0,0 +1,21 @@
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>480</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>MainWindow</string>
+  </property>
+  <widget class="QWidget" name="centralWidget" />
+ </widget>
+ <layoutDefault spacing="6" margin="11" />
+ <pixmapfunction></pixmapfunction>
+ <resources/>
+ <connections/>
+</ui>