Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/rpm/lipstick-glacier-home-qt5.spec b/rpm/lipstick-glacier-home-qt5.spec
- index d54cc97..d14e5b8 100644
- --- a/rpm/lipstick-glacier-home-qt5.spec
- +++ b/rpm/lipstick-glacier-home-qt5.spec
- @@ -9,7 +9,7 @@ Name: lipstick-glacier-home-qt5
- # << macros
- Summary: A nice homescreen for Glacier experience
- -Version: 0.15
- +Version: 0.16
- Release: 1
- Group: System/GUI/Other
- License: BSD
- diff --git a/rpm/lipstick-glacier-home-qt5.yaml b/rpm/lipstick-glacier-home-qt5.yaml
- index e7f9443..6f5f7f6 100644
- --- a/rpm/lipstick-glacier-home-qt5.yaml
- +++ b/rpm/lipstick-glacier-home-qt5.yaml
- @@ -1,6 +1,6 @@
- Name: lipstick-glacier-home-qt5
- Summary: A nice homescreen for Glacier experience
- -Version: 0.15
- +Version: 0.16
- Release: 1
- Group: System/GUI/Other
- License: BSD
- diff --git a/src/main.cpp b/src/main.cpp
- index 377f4c2..d4efe27 100644
- --- a/src/main.cpp
- +++ b/src/main.cpp
- @@ -32,10 +32,13 @@
- int main(int argc, char **argv)
- {
- QmlPath::append("/usr/share/lipstick-glacier-home-qt5/qml");
- - HomeApplication app(argc, argv, QString());
- + HomeApplication app(argc, argv, QString());
- QGuiApplication::setFont(QFont("Open Sans"));
- app.setCompositorPath("/usr/share/lipstick-glacier-home-qt5/qml/compositor.qml");
- + QByteArray v = qgetenv("GLACIER_NATIVEORIENTATION_PORTRAIT");
- + bool value = !v.isEmpty() && v != "0" && v != "false";
- + app.engine()->rootContext()->setContextProperty("nativeOrientation", value);
- qmlRegisterType<GlacierWindowModel>("org.nemomobile.glacier", 1, 0 ,"GlacierWindowModel");
- app.setQmlPath("/usr/share/lipstick-glacier-home-qt5/qml/MainScreen.qml");
- // Give these to the environment inside the lipstick homescreen
- diff --git a/src/qml/MainScreen.qml b/src/qml/MainScreen.qml
- index 679abef..b923d3a 100644
- --- a/src/qml/MainScreen.qml
- +++ b/src/qml/MainScreen.qml
- @@ -37,6 +37,7 @@ import QtQuick.Window 2.1
- import org.nemomobile.time 1.0
- import org.nemomobile.configuration 1.0
- import "scripts/desktop.js" as Desktop
- +import "scripts/compositor.js" as LipstickCompositor
- Page {
- @@ -69,8 +70,20 @@ Page {
- id: statusbar
- }
- + Text {
- + id: orientationTxt
- + text: LipstickCompositor.instance.screenOrientation
- + }
- +
- + signal sensorOrientationSignal()
- +
- + onSensorOrientationSignal: {
- + LipstickCompositor.instance.screenOrientation = LipstickCompositor.instance.sensorOrientation
- + }
- +
- Component.onCompleted: {
- Desktop.instance = desktop
- + LipstickCompositor.instance.onSensorOrientationChanged.connect(sensorOrientationSignal)
- }
- function lockscreenVisible() {
- diff --git a/src/qml/compositor.qml b/src/qml/compositor.qml
- index 4be7a4c..7299311 100644
- --- a/src/qml/compositor.qml
- +++ b/src/qml/compositor.qml
- @@ -26,6 +26,7 @@ import org.nemomobile.lipstick 0.1
- import "compositor"
- import "scripts/desktop.js" as Desktop
- +import "scripts/compositor.js" as LipstickCompositor
- Compositor {
- id: root
- @@ -363,4 +364,8 @@ Compositor {
- if (window.userData)
- window.userData.destroy()
- }
- +
- + Component.onCompleted: {
- + LipstickCompositor.instance = root
- + }
- }
- diff --git a/src/src.pro b/src/src.pro
- index fddf30f..5f7bffe 100644
- --- a/src/src.pro
- +++ b/src/src.pro
- @@ -43,7 +43,8 @@ qmlcompositor.files = qml/compositor/WindowWrapperMystic.qml \
- qml/compositor/ScreenGestureArea.qml
- scripts.path = /usr/share/lipstick-glacier-home-qt5/qml/scripts
- -scripts.files = qml/scripts/desktop.js
- +scripts.files = qml/scripts/desktop.js \
- + qml/scripts/compositor.js
- system.path = /usr/share/lipstick-glacier-home-qt5/qml/system
- system.files = qml/ShutdownScreen.qml
- @@ -93,6 +94,7 @@ OTHER_FILES += qml/*.qml \
- qml/compositor/ScreenGestureArea.qml \
- qml/NotificationPreview.qml \
- qml/scripts/desktop.js \
- + qml/scripts/compositor.js \
- qml/FeedsPage.qml \
- qml/Statusbar.qml \
- qml/StatusbarItem.qml \
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement