incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject [13/26] qt commit: Small visual fixes for harmattan
Date Fri, 24 Feb 2012 20:52:11 GMT
Small visual fixes for harmattan


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-qt/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-qt/commit/b5ec34ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-qt/tree/b5ec34ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-qt/diff/b5ec34ac

Branch: refs/heads/master
Commit: b5ec34ac009251fef5a90a626a8f84aebc4c0583
Parents: ac50804
Author: Denis Kormalev <dkormalev@ics.com>
Authored: Mon Feb 20 13:59:41 2012 +0400
Committer: Denis Kormalev <dkormalev@ics.com>
Committed: Mon Feb 20 13:59:41 2012 +0400

----------------------------------------------------------------------
 main.cpp               |    3 ++-
 qml/main_harmattan.qml |    7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-qt/blob/b5ec34ac/main.cpp
----------------------------------------------------------------------
diff --git a/main.cpp b/main.cpp
index 3e5c9eb..a9d33ea 100644
--- a/main.cpp
+++ b/main.cpp
@@ -39,10 +39,11 @@ int main(int argc, char *argv[])
     view.rootContext()->setContextProperty("cordova", Cordova::instance());
 #ifdef MEEGO_EDITION_HARMATTAN
     view.setSource(QUrl(QString("%1/qml/main_harmattan.qml").arg(Cordova::instance()->workingDir())));
+    view.showFullScreen();
 #else
     view.setSource(QUrl(QString("%1/qml/main.qml").arg(Cordova::instance()->workingDir())));
-#endif
     view.show();
+#endif
 #else
     QQuickView view;
     view.setResizeMode(QQuickView::SizeRootObjectToView);

http://git-wip-us.apache.org/repos/asf/incubator-cordova-qt/blob/b5ec34ac/qml/main_harmattan.qml
----------------------------------------------------------------------
diff --git a/qml/main_harmattan.qml b/qml/main_harmattan.qml
index 1f6060d..888b5f7 100644
--- a/qml/main_harmattan.qml
+++ b/qml/main_harmattan.qml
@@ -1,8 +1,10 @@
 import QtQuick 1.1
-import com.nokia.meego 1.0
+import com.nokia.meego 1.1
 import QtWebKit 1.0
 import "cordova_wrapper.js" as CordovaWrapper
 
+
+
 PageStackWindow {
     id: appWindow
     initialPage: mainPage
@@ -15,8 +17,7 @@ PageStackWindow {
 
             id: webView
             anchors.fill: parent
-            //TODO: remove it later when toolbar problem will be fixed
-            anchors.topMargin: 16
+
             url: cordova.mainUrl
             settings.javascriptEnabled: true
             settings.localStorageDatabaseEnabled: true


Mime
View raw message