Renamed to harbour-prefix for Jolla store, removed old qt components …

…files.
vranki · Dec 20, 2013 · 73788ec · 73788ec
1 parent 925b717
commit 73788ec
Show file tree

Hide file tree

Showing 32 changed files with 18 additions and 1,190 deletions.
diff --git a/debian/rules b/debian/rules
diff --git a/siilihai-mobile.desktop → harbour-siilihai-mobile.desktop b/siilihai-mobile.desktop → harbour-siilihai-mobile.desktop
@@ -2,5 +2,5 @@
 Type=Application
 X-Nemo-Application-Type=no-invoker
 Name=Siilihai
-Icon=siilihai-mobile
-Exec=siilihai-mobile
+Icon=harbour-siilihai-mobile
+Exec=harbour-siilihai-mobile
diff --git a/siilihai-mobile.png → harbour-siilihai-mobile.png b/siilihai-mobile.png → harbour-siilihai-mobile.png
diff --git a/main.cpp b/main.cpp
@@ -17,23 +17,20 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
     app.setQuitOnLastWindowClosed(false);
     app.connect(&viewer, SIGNAL(closing(QQuickCloseEvent*)), &shm, SLOT(haltSiilihai()));
 
-#ifdef use_components
-    viewer.setMainQmlFile(QStringLiteral("qrc:/qml/siilihai-mobile/main.qml"));
-#else
     // Find the main.qml to use..
     QFile mainQml("../siilihai-mobile/qml/siilihai-mobile-nocomponents/main.qml");
     if(mainQml.exists()) {
         viewer.setMainQmlFile(mainQml.fileName());
     } else {
-        mainQml.setFileName("/usr/share/siilihai-mobile/qml/siilihai-mobile-nocomponents/main.qml");
+        mainQml.setFileName("/usr/share/harbour-siilihai-mobile/qml/siilihai-mobile-nocomponents/main.qml");
         if(mainQml.exists()) {
             viewer.setMainQmlFile(mainQml.fileName());
         } else {
             qDebug() << Q_FUNC_INFO << "Cannot open main.qml!";
             return -1;
         }
     }
-#endif
+
     // viewer.setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
     shm.setContextProperties(); // Root ctx may change when loading, so redo this
     //viewer.showExpanded();

diff --git a/qml/siilihai-mobile-nocomponents/HideEffect.qml b/qml/siilihai-mobile-nocomponents/HideEffect.qml
@@ -1,6 +1,11 @@
 import QtQuick 2.0
-import QtGraphicalEffects 1.0
+// Disabled until QGE are allowed
+//import QtGraphicalEffects 1.0
 
+Item {
+
+}
+/*
 RecursiveBlur {
     anchors.fill: parent
     source: parent
@@ -10,3 +15,4 @@ RecursiveBlur {
     visible: opacity > 0
     Behavior on opacity { SmoothedAnimation { velocity: 5 } }
 }
+*/
diff --git a/qml/siilihai-mobile-nocomponents/widgets/BusyIndicator.qml b/qml/siilihai-mobile-nocomponents/widgets/BusyIndicator.qml
@@ -11,7 +11,7 @@ Rectangle {
         height: parent.height
         width: height*2
         SequentialAnimation on x {
-             running: enabled
+             running: enabled && Qt.application.active
              loops: Animation.Infinite
              NumberAnimation { from: 0; to: busyindicator.width; duration: 500; easing.type: Easing.InOutQuad }
              NumberAnimation { from: busyindicator.width; to: 0; duration: 500; easing.type: Easing.InOutQuad }

diff --git a/qml/siilihai-mobile/AccountlessRegistration.qml b/qml/siilihai-mobile/AccountlessRegistration.qml
diff --git a/qml/siilihai-mobile/ButtonWithUnreadCount.qml b/qml/siilihai-mobile/ButtonWithUnreadCount.qml
diff --git a/qml/siilihai-mobile/ConfirmUnsubscribe.qml b/qml/siilihai-mobile/ConfirmUnsubscribe.qml
diff --git a/qml/siilihai-mobile/CredentialsDialogPage.qml b/qml/siilihai-mobile/CredentialsDialogPage.qml
diff --git a/qml/siilihai-mobile/ForumCredentialsPage.qml b/qml/siilihai-mobile/ForumCredentialsPage.qml