only 10 fields when screen size < 7 inch

yoktobit · Jan 31, 2014 · f3b2773 · f3b2773
1 parent 347084c
commit f3b2773
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest android:versionCode="7" xmlns:android="http://schemas.android.com/apk/res/android" package="de.yoktobit.morzyn" android:versionName="0.7.15" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="de.yoktobit.morzyn" android:versionCode="8" android:installLocation="auto" android:versionName="0.7.15">
     <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:icon="@drawable/icon" android:label="Morzyn">
-        <activity android:name="org.qtproject.qt5.android.bindings.QtActivity" android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation" android:screenOrientation="sensorLandscape" android:label="@string/app_name">
+        <activity android:screenOrientation="sensorLandscape" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="@string/app_name" android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -32,7 +32,7 @@
         </activity>
     </application>
     <uses-sdk android:targetSdkVersion="14" android:minSdkVersion="9"/>
-    <supports-screens android:anyDensity="true" android:normalScreens="true" android:smallScreens="true" android:largeScreens="true"/>
+    <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:anyDensity="true"/>
     <!-- %%INSERT_PERMISSIONS -->
     <!-- %%INSERT_FEATURES -->
     <uses-permission android:name="android.permission.INTERNET"/>

diff --git a/cpp/desktopandroid/main.cpp b/cpp/desktopandroid/main.cpp
@@ -14,6 +14,7 @@
 #include <time.h>
 #include <QTranslator>
 #include <QSettings>
+#include <QScreen>
 
 void myMessageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg)
 {
@@ -71,10 +72,18 @@ int main(int argc, char *argv[])
 
     qsrand ( time(NULL) );
 
+    double minHorizontalSize = 150.0;
+    double minVerticalSize = 90.0;
+    //double minHorizontalSize = 300.0;
+    //double minVerticalSize = 200.0;
+
+    QScreen* screen = app.primaryScreen();
+    QSizeF screenSize = screen->physicalSize();
+    qDebug() << "screen width:" << screenSize.width() << "screen height:" << screenSize.height();
     QString locale = QLocale::system().name();
 
     QTranslator translator;
-    translator.load(QString("morzyn_") + locale, "translations");
+    translator.load(QString("morzyn_") + locale.left(2).toLower(), "translations");
     app.installTranslator(&translator);
 
     QtQuick2ApplicationViewer viewer;
@@ -92,6 +101,12 @@ int main(int argc, char *argv[])
     gs.setSettings(&settings);
     gs.viewer = &viewer;
 
+    if (screenSize.width() < minHorizontalSize || screenSize.height() < minVerticalSize)
+    {
+        c.HCOUNT = 10;
+        c.VCOUNT = 10;
+    }
+
 #ifndef Q_OS_ANDROID
     viewer.setIcon(QIcon("qml/morzyn/images/morzyn.png"));
 #endif

diff --git a/qml/main.qml b/qml/main.qml
@@ -45,7 +45,7 @@ Rectangle {
         autoLoad: true
         loops: Audio.Infinite
         Behavior on volume {
-            enabled: isBehaviourEnabled
+            enabled: titleSound.isBehaviourEnabled
             PropertyAnimation {
                 duration: 2000
                 onRunningChanged: {