examples/QMLPlayer: less and larger buttons

jjsz · Feb 21, 2016 · f821da2 · f821da2
1 parent ab851f9
commit f821da2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 19 deletions.
diff --git a/examples/QMLPlayer/qml/QMLPlayer/ControlPanel.qml b/examples/QMLPlayer/qml/QMLPlayer/ControlPanel.qml
@@ -328,7 +328,7 @@ Rectangle {
         /*
         Button {
             id: backwardBtn
-            anchors.right: playBtn.left
+            anchors.right: stopBtn.left
             anchors.verticalCenter: playBtn.verticalCenter
             bgColor: "transparent"
             bgColorSelected: "transparent"
@@ -353,7 +353,8 @@ Rectangle {
                 //player.stop()
                 stop()
             }
-        }/*
+        }
+        /*
         Button {
             id: forwardBtn
             anchors.left: playBtn.right
@@ -377,8 +378,8 @@ Rectangle {
             checked: false
             bgColor: "transparent"
             bgColorSelected: "transparent"
-            width: Utils.scaled(25)
-            height: Utils.scaled(25)
+            width: Utils.scaled(30)
+            height: Utils.scaled(30)
             icon: Utils.resurl("theme/default/fullscreen.svg")
             iconChecked: Utils.resurl("theme/default/fullscreen.svg")
             visible: true
@@ -397,8 +398,8 @@ Rectangle {
             checked: false
             bgColor: "transparent"
             bgColorSelected: "transparent"
-            width: Utils.scaled(25)
-            height: Utils.scaled(25)
+            width: Utils.scaled(30)
+            height: Utils.scaled(30)
             icon: Utils.resurl("theme/default/volume.svg")
             iconChecked: Utils.resurl("theme/default/mute.svg")
             onHoveredChanged: {
@@ -411,35 +412,36 @@ Rectangle {
             anchors.right: parent.right
             anchors.rightMargin: Utils.scaled(50)
             anchors.verticalCenter: parent.verticalCenter
+            /*
             Button {
                 id: infoBtn
                 bgColor: "transparent"
                 bgColorSelected: "transparent"
-                width: Utils.scaled(25)
-                height: Utils.scaled(25)
+                width: Utils.scaled(30)
+                height: Utils.scaled(30)
                 icon: Utils.resurl("theme/default/info.svg")
                 visible: true
                 onClicked: showInfo()
-            }
+            }*/
             Button {
                 id: openFileBtn
                 bgColor: "transparent"
                 bgColorSelected: "transparent"
-                width: Utils.scaled(25)
-                height: Utils.scaled(25)
+                width: Utils.scaled(30)
+                height: Utils.scaled(30)
                 icon: Utils.resurl("theme/default/open.svg")
                 onClicked: openFile()
                 onPressAndHold: openUrl()
-            }
+            } /*
             Button {
                 id: helpBtn
                 bgColor: "transparent"
                 bgColorSelected: "transparent"
-                width: Utils.scaled(25)
-                height: Utils.scaled(25)
+                width: Utils.scaled(30)
+                height: Utils.scaled(30)
                 icon: Utils.resurl("theme/default/help.svg")
                 onClicked: showHelp()
-            }
+            }*/
         }
     }
 

diff --git a/examples/QMLPlayer/qml/QMLPlayer/main.qml b/examples/QMLPlayer/qml/QMLPlayer/main.qml
@@ -409,7 +409,7 @@ Rectangle {
             right: parent.right
             bottom: control.top
         }
-        width: Utils.scaled(140)
+        width: Utils.scaled(100)
         onClicked: {
             pageLoader.source = selectedUrl
             if (pageLoader.item)

diff --git a/examples/common/common.cpp b/examples/common/common.cpp
@@ -99,9 +99,9 @@ QOptions get_common_options()
             ("language", QLatin1String("system"), QLatin1String("language on UI. can be 'system', 'none' and locale name e.g. zh_CN"))
             ("log", QString(), QLatin1String("log level. can be 'off', 'fatal', 'critical', 'warning', 'debug', 'all'"))
             ("logfile"
-#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
+#if defined(Q_OS_IOS)
              , appDataDir().append(QString::fromLatin1("/log-%1.txt"))
-#elif defined(Q_OS_WINRT)
+#elif defined(Q_OS_WINRT) || defined(Q_OS_ANDROID)
              , QString()
 #else
              , QString::fromLatin1("log-%1.txt")
@@ -136,7 +136,7 @@ void do_common_options(const QOptions &options, const QString& appName)
     }
     // has no effect if qInstallMessageHandler() called
     //qSetMessagePattern("%{function} @%{line}: %{message}");
-#if !defined(Q_OS_WINRT)
+#if !defined(Q_OS_WINRT) && !defined(Q_OS_ANDROID)
     QString app(appName);
     if (app.isEmpty() && qApp)
         app = qApp->applicationName();