Merge pull request #47 from neochapay/master

Update code
nemomobile-ux · Dec 6, 2016 · 967d93c · 967d93c
2 parents fdad8f2 + 10a82b8
commit 967d93c
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 18 deletions.
diff --git a/src/qml/AppLauncher.qml b/src/qml/AppLauncher.qml
@@ -91,7 +91,7 @@ GridView {
         id: launcherItem
         width: gridview.cellWidth
         height: gridview.cellHeight
-        source: model.object.iconId == "" ? ":/images/icons/apps.png" : (model.object.iconId.indexOf("/") == 0 ? "file://" : "image://theme/") + model.object.iconId
+        source: model.object.iconId == "" ? "/usr/share/lipstick-glacier-home-qt5/qml/theme/default_icon.png" : (model.object.iconId.indexOf("/") == 0 ? "file://" : "image://theme/") + model.object.iconId
         iconCaption: model.object.title
     }
 }
diff --git a/src/qml/CloseButton.qml b/src/qml/CloseButton.qml
@@ -27,7 +27,7 @@ Image {
     id: closeButton
     signal clicked()
 
-    source: 'qrc:/qml/theme/icon-m-framework-close-thumbnail.png'
+    source: '/usr/share/lipstick-glacier-home-qt5/qml/theme/icon-m-framework-close-thumbnail.png'
 
     MouseArea {
         anchors.fill: parent

diff --git a/src/qml/Lockscreen.qml b/src/qml/Lockscreen.qml
@@ -12,7 +12,7 @@ Image {
     ConfigurationValue{
         id: lockScreenWallpaper
         key: "/home/glacier/lockScreen/wallpaperImage"
-        defaultValue: "qrc:/qml/images/graphics-wallpaper-home.jpg"
+        defaultValue: "/usr/share/lipstick-glacier-home-qt5/qml/images/graphics-wallpaper-home.jpg"
     }
 
     LockscreenClock {

diff --git a/src/qml/MainScreen.qml b/src/qml/MainScreen.qml
@@ -53,7 +53,7 @@ Page {
     ConfigurationValue {
         id: wallpaperSource
         key: desktop.isPortrait ? "/desktop/meego/background/portrait/picture_filename" : "/desktop/meego/background/landscape/picture_filename"
-        defaultValue: "qrc:/qml/images/graphics-wallpaper-home.jpg"
+        defaultValue: "/usr/share/lipstick-glacier-home-qt5/qml/images/graphics-wallpaper-home.jpg"
     }
     id: desktop
     property alias lockscreen: lockScreen
@@ -145,7 +145,7 @@ Page {
     }
     Image {
         id:wallpaper
-        source: "qrc:/qml/images/wallpaper-portrait-bubbles.png"
+        source: "/usr/share/lipstick-glacier-home-qt5/qml/images/wallpaper-portrait-bubbles.png"
         anchors.fill: parent
         fillMode: Image.PreserveAspectCrop
         z: -100

diff --git a/src/qml/NotificationPreview.qml b/src/qml/NotificationPreview.qml
@@ -137,7 +137,7 @@ Item {
                 }
                 width: notificationArea.notificationIconSize
                 height: width
-                source: "qrc:/qml/images/notification-circle.png"
+                source: "/usr/share/lipstick-glacier-home-qt5/qml/images/notification-circle.png"
             }
 
             Text {

diff --git a/src/qml/Statusbar.qml b/src/qml/Statusbar.qml
@@ -34,6 +34,7 @@ import QtQuick.Controls.Nemo 1.0
 import QtQuick.Controls.Styles.Nemo 1.0
 import org.freedesktop.contextkit 1.0
 import MeeGo.Connman 0.2
+import org.nemomobile.lipstick 0.1
 
 Item {
     id: root
@@ -134,6 +135,17 @@ Item {
         StatusbarItem {
             iconSize: root.height/2
             source: (cellularSignalBars.value > 0) ? "image://theme/icon_cell" + cellularSignalBars.value : "image://theme/icon_cell1"
+
+            MouseArea{
+                anchors.fill: parent
+                onPressAndHold: {
+                    var screenShotPath = "/home/nemo/Pictures/Screenshots/"
+                    var file = "glacier-screenshot-"+Qt.formatDateTime(new Date, "yyMMdd_hhmmss")+".png"
+
+                    Lipstick.takeScreenshot(screenShotPath + file);
+                }
+            }
+
         }
 
         StatusbarItem {
@@ -226,21 +238,21 @@ Item {
             panel: BatteryPanel {}
             source: {
                 if(batteryChargePercentage.value > 85) {
-                    return "qrc:/qml/images/battery6.png"
+                    return "/usr/share/lipstick-glacier-home-qt5/qml/images/battery6.png"
                 } else if (batteryChargePercentage.value <= 5) {
-                    return "qrc:/qml/images/battery0.png"
+                    return "/usr/share/lipstick-glacier-home-qt5/qml/images/battery0.png"
                 } else if (batteryChargePercentage.value <= 10) {
-                    return "qrc:/qml/images/battery1.png"
+                    return "/usr/share/lipstick-glacier-home-qt5/qml/images/battery1.png"
                 } else if (batteryChargePercentage.value <= 25) {
-                    return "qrc:/qml/images/battery2.png"
+                    return "/usr/share/lipstick-glacier-home-qt5/qml/images/battery2.png"
                 } else if (batteryChargePercentage.value <= 40) {
-                    return "qrc:/qml/images/battery3.png"
+                    return "/usr/share/lipstick-glacier-home-qt5/qml/imagesbattery3.png"
                 } else if (batteryChargePercentage.value <= 65) {
-                    return "qrc:/qml/images/battery4.png"
+                    return "/usr/share/lipstick-glacier-home-qt5/qml/images/battery4.png"
                 } else if (batteryChargePercentage.value <= 80) {
-                    return "qrc:/qml/images/battery5.png"
+                    return "/usr/share/lipstick-glacier-home-qt5/qml/images/battery5.png"
                 } else {
-                    return "qrc:/qml/images/battery6.png"
+                    return "/usr/share/lipstick-glacier-home-qt5/qml/images/battery6.png"
                 }
             }
         }

diff --git a/src/qml/theme/default_icon.png b/src/qml/theme/default_icon.png
diff --git a/src/src.pro b/src/src.pro
@@ -11,6 +11,13 @@ target.path = /usr/bin
 styles.path = /usr/share/lipstick-glacier-home-qt5
 styles.files = nemovars.conf
 
+images.path = /usr/share/lipstick-glacier-home-qt5/qml/images
+images.files = qml/images/*.png \
+               qml/images/*.jpg
+
+theme.path = /usr/share/lipstick-glacier-home-qt5/qml/theme
+theme.files = qml/theme/*.png
+
 qml.path = /usr/share/lipstick-glacier-home-qt5/qml
 qml.files = qml/MainScreen.qml \
     qml/compositor.qml \
@@ -60,7 +67,7 @@ connectivity.files = qml/USBModeSelector.qml
 notifications.path = /usr/share/lipstick-glacier-home-qt5/qml/notifications
 notifications.files = qml/NotificationPreview.qml
 
-INSTALLS += styles qml qmlcompositor scripts system volumecontrol connectivity notifications
+INSTALLS += styles images theme qml qmlcompositor scripts system volumecontrol connectivity notifications
 
 CONFIG += qt link_pkgconfig
 QT += quick compositor
@@ -74,9 +81,6 @@ SOURCES += \
     main.cpp \
     glacierwindowmodel.cpp
 
-RESOURCES += \
-    resources-qml.qrc
-
 PKGCONFIG += lipstick-qt5
 
 OTHER_FILES += qml/*.qml \