|
[-]
[+]
|
Changed |
_service:tar_git:lipstick-glacier-home-qt5.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:lipstick-glacier-home-qt5.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -6,7 +6,7 @@
<service name="tar_git">
<param name="url">https://github.com/nemomobile-ux/glacier-home.git</param>
<param name="branch">master</param>
- <param name="revision">4622bc51889a8b50b7af0b9601304276ca0e44f3</param>
+ <param name="revision">5a825cb43c94dd0c2a784f7ed67e955eca1731c4</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:lipstick-glacier-home-qt5-0.27.5.tar.bz2/src/main.cpp
^
|
| @@ -30,7 +30,6 @@
#include "glacierwindowmodel.h"
#include <QScreen>
-
int main(int argc, char **argv)
{
HomeApplication app(argc, argv, QString());
|
|
[-]
[+]
|
Changed |
_service:tar_git:lipstick-glacier-home-qt5-0.27.5.tar.bz2/src/qml/FeedsPage.qml
^
|
| @@ -36,6 +36,23 @@
clip: true
contentHeight: rootitem.height
contentWidth: parent.width
+
+ Rectangle{
+ id: bg
+ width: desktop.width
+ height: desktop.height-statusbar.height
+ color: "black"
+ opacity: 0.6
+ }
+
+ onXChanged: {
+ if(x < 0){
+ bg.opacity = 0.6*(desktop.width+x)/desktop.width
+ }else{
+ bg.opacity = 0.6*(desktop.width-x)/desktop.width
+ }
+ }
+
Item {
id: rootitem
width: parent.width
|
|
[-]
[+]
|
Changed |
_service:tar_git:lipstick-glacier-home-qt5-0.27.5.tar.bz2/src/qml/Lockscreen.qml
^
|
| @@ -5,7 +5,6 @@
import org.nemomobile.configuration 1.0
import "notifications"
-
Image {
id: lockScreen
source: lockScreenWallpaper.value
@@ -13,11 +12,18 @@
property bool displayOn
+ ConfigurationValue {
+ id: differentWallpaper
+ key: "/home/glacier/differentWallpaper"
+ defaultValue: true
+ }
+
ConfigurationValue{
id: lockScreenWallpaper
- key: "/home/glacier/lockScreen/wallpaperImage"
+ key: (differentWallpaper.value == true) ? "/home/glacier/lockScreen/wallpaperImage" : "/home/glacier/homeScreen/wallpaperImage"
defaultValue: "/usr/share/lipstick-glacier-home-qt5/qml/images/graphics-wallpaper-home.jpg"
}
+
LockscreenClock {
id: clock
anchors {
|
|
[-]
[+]
|
Changed |
_service:tar_git:lipstick-glacier-home-qt5-0.27.5.tar.bz2/src/qml/MainScreen.qml
^
|
| @@ -60,8 +60,8 @@
// This is used in the lock screen
ConfigurationValue {
id: wallpaperSource
- key: desktop.isPortrait ? "/desktop/meego/background/portrait/picture_filename" : "/desktop/meego/background/landscape/picture_filename"
- defaultValue: "/usr/share/lipstick-glacier-home-qt5/qml/images/graphics-wallpaper-home.jpg"
+ key: "/home/glacier/homeScreen/wallpaperImage"
+ defaultValue: "/usr/share/lipstick-glacier-home-qt5/qml/images/wallpaper-portrait-bubbles.png"
}
id: desktop
property alias lockscreen: lockScreen
@@ -157,7 +157,7 @@
}
Image {
id:wallpaper
- source: "/usr/share/lipstick-glacier-home-qt5/qml/images/wallpaper-portrait-bubbles.png"
+ source: wallpaperSource.value
anchors.fill: parent
fillMode: Image.PreserveAspectCrop
z: -100
|
|
[-]
[+]
|
Changed |
_service:tar_git:lipstick-glacier-home-qt5-0.27.5.tar.bz2/src/qml/VolumeControl.qml
^
|
| @@ -42,6 +42,8 @@
maximumValue: volumeControl.maximumVolume
property bool shouldbevisible
+ property int pressedKey
+
opacity: volumeSlider.shouldbevisible ? 1 : 0
Behavior on opacity {
NumberAnimation {
@@ -49,6 +51,7 @@
onRunningChanged: if (!running && volumeSlider.opacity == 0) volumeControl.windowVisible = false
}
}
+
Timer {
id: voltimer
interval: 2000
@@ -58,30 +61,25 @@
Connections {
target: volumeControl
onVolumeKeyPressed: {
- if(key == Qt.Key_VolumeUp)
- {
- //up volume
- if(volumeControl.volume < maximumValue)
- {
- volumeControl.volume = volumeControl.volume+1
- }
- }
- else
- {
- //down volume
- if(volumeControl.volume > 0)
- {
- volumeControl.volume = volumeControl.volume-1
- }
- }
+ volumeSlider.pressedKey = key;
volumeControl.windowVisible = true
- volumeSlider.value = volumeControl.volume
+ volumeChange()
+ keyPressTimer.start()
+ maxMinTimer.start()
+
if (volumeControl.windowVisible) {
- voltimer.restart()
+ voltimer.restart()
}
}
+
+ onVolumeKeyReleased: {
+ keyPressTimer.stop()
+ maxMinTimer.stop()
+ volumeSlider.pressedKey = ""
+ }
+
onWindowVisibleChanged: {
if (volumeControl.windowVisible) {
volumeSlider.shouldbevisible = true
@@ -89,4 +87,59 @@
}
}
}
+
+ PropertyAnimation {
+ id: volumeChangeAinmation
+ target: volumeSlider
+ property: "value"
+ to: volumeControl.volume
+ duration: 100
+ }
+
+ Timer{
+ id: keyPressTimer
+ interval: 500
+ onTriggered: {
+ volumeChange()
+ voltimer.restart()
+ }
+ repeat: true
+ }
+
+ Timer{
+ id: maxMinTimer
+ interval: 1900
+ onTriggered: {
+ if(volumeSlider.pressedKey == Qt.Key_VolumeUp)
+ {
+ volumeControl.volume = volumeSlider.maximumValue
+ }
+ else if(volumeSlider.pressedKey == Qt.Key_VolumeDown)
+ {
+ volumeControl.volume = 0
+ }
+ volumeChangeAinmation.start()
+ }
+ }
+
+ function volumeChange()
+ {
+ if(volumeSlider.pressedKey == Qt.Key_VolumeUp)
+ {
+ //up volume
+ if(volumeControl.volume < maximumValue)
+ {
+ volumeControl.volume = volumeControl.volume+1
+ }
+ }
+ else if(volumeSlider.pressedKey == Qt.Key_VolumeDown)
+ {
+ //down volume
+ if(volumeControl.volume > 0)
+ {
+ volumeControl.volume = volumeControl.volume-1
+ }
+ }
+ volumeChangeAinmation.start()
+ }
}
|
|
[-]
[+]
|
Added |
_service:tar_git:lipstick-glacier-home-qt5-0.27.5.tar.bz2/src/settings-plugins/wallpaper/selectImage.qml
^
|
| @@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2018 Chupligin Sergey <neochapay@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+import QtQuick 2.6
+
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Nemo 1.0
+import QtQuick.Controls.Styles.Nemo 1.0
+
+import org.nemomobile.configuration 1.0
+import org.nemomobile.gallery 1.0
+
+import "../../components"
+
+Page {
+ id: wallpaperSelectPage
+
+ headerTools: HeaderToolsLayout { showBackButton: true; title: qsTr("Select wallpaper")}
+
+ property string valueKey: ""
+
+ ConfigurationValue {
+ id: wallpaper
+ key: wallpaperSelectPage.valueKey
+ }
+
+ GalleryView {
+ anchors{
+ fill: parent
+ topMargin: Theme.itemSpacingLarge
+ }
+ baseThumbnailSize: (parent.height>parent.width) ? parent.width/4 : parent.height/4
+ model: GalleryModel {
+ id: gallery
+ }
+
+ delegate: GalleryDelegate {
+ MouseArea {
+ anchors.fill: parent
+ onPressAndHold: {
+ wallpaper.value = url
+ pageStack.pop();
+ }
+ }
+ }
+ }
+
+ Component.onCompleted: {
+ gallery.createFilter(gallery, "imagesfilter", "GalleryStartsWithFilter", "mimeType", "image/")
+ }
+}
|
|
[-]
[+]
|
Added |
_service:tar_git:lipstick-glacier-home-qt5-0.27.5.tar.bz2/src/settings-plugins/wallpaper/wallpaper.json
^
|
| @@ -0,0 +1,5 @@
+{
+ "path": "wallpaper",
+ "category": "Personalization",
+ "title": "Wallpaper"
+}
|
|
[-]
[+]
|
Added |
_service:tar_git:lipstick-glacier-home-qt5-0.27.5.tar.bz2/src/settings-plugins/wallpaper/wallpaper.qml
^
|
| @@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2018 Chupligin Sergey <neochapay@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+import QtQuick 2.6
+
+import QtQuick.Controls 1.0
+import QtQuick.Controls.Nemo 1.0
+import QtQuick.Controls.Styles.Nemo 1.0
+
+import org.nemomobile.configuration 1.0
+
+import "../../components"
+
+Page {
+ id: wallpaperSettingsPage
+
+ headerTools: HeaderToolsLayout { showBackButton: true; title: qsTr("Wallpapers")}
+
+ ConfigurationValue {
+ id: differentWallpaper
+ key: "/home/glacier/differentWallpaper"
+ defaultValue: true
+ }
+
+ ConfigurationValue {
+ id: homeWallpaperImage
+ key: "/home/glacier/homeScreen/wallpaperImage"
+ defaultValue: "/usr/share/lipstick-glacier-home-qt5/qml/images/wallpaper-portrait-bubbles.png"
+ }
+
+ ConfigurationValue{
+ id: lockScreenWallpaperImage
+ key: "/home/glacier/lockScreen/wallpaperImage"
+ defaultValue: "/usr/share/lipstick-glacier-home-qt5/qml/images/graphics-wallpaper-home.jpg"
+ }
+
+ SettingsColumn{
+ id: differentImagesSettings
+
+ Rectangle{
+ id: differentImages
+ width: parent.width
+ height: childrenRect.height
+
+ color: "transparent"
+
+ Label{
+ id: differentImagesLabel
+ text: qsTr("Use different images for lockscreen and home screen");
+ anchors{
+ left: parent.left
+ top: parent.top
+ }
+ width: parent.width-differentImagesCheck.width
+ wrapMode: Text.WordWrap
+ }
+
+ CheckBox{
+ id: differentImagesCheck
+ checked: differentWallpaper.value
+ anchors{
+ right: parent.right
+ verticalCenter: differentImagesLabel.verticalCenter
+ }
+ onClicked: differentWallpaper.value = checked
+ }
+ }
+
+ Rectangle{
+ id: homeWallpaper
+ width: parent.width
+ height: width/4
+
+ color: "transparent"
+
+ Image{
+ anchors.fill: parent
+ fillMode: Image.PreserveAspectCrop
+ source: homeWallpaperImage.value
+
+ Text{
+ text: (differentWallpaper.value == true) ? qsTr("Homescreen wallpaper") : qsTr("Wallpaper")
+ color: Theme.textColor
+ styleColor: Theme.backgroundColor
+ style: Text.Outline;
+ anchors.centerIn: parent
+ font.pixelSize: Theme.fontSizeLarge
+ }
+
+ MouseArea{
+ anchors.fill: parent
+ onClicked: pageStack.push("/usr/share/glacier-settings/qml/plugins/wallpaper/selectImage.qml",{valueKey: "/home/glacier/homeScreen/wallpaperImage"})
+ }
+ }
+ }
+
+ Rectangle{
+ id: lockScreenWallpaper
+ width: parent.width
+ height: width/4
+
+ color: "transparent"
+ visible: differentWallpaper.value == true
+
+ Image{
+ anchors.fill: parent
+ fillMode: Image.PreserveAspectCrop
+ source: lockScreenWallpaperImage.value
+
+ Text{
+ text: qsTr("Lockscreen wallpaper")
+ color: Theme.textColor
+ styleColor: Theme.backgroundColor
+ style: Text.Outline;
+ anchors.centerIn: parent
+ font.pixelSize: Theme.fontSizeLarge
+ }
+ }
+
+ MouseArea{
+ anchors.fill: parent
+ onClicked: pageStack.push("/usr/share/glacier-settings/qml/plugins/wallpaper/selectImage.qml",{valueKey: "/home/glacier/lockScreen/wallpaperImage"})
+ }
+ }
+ }
+}
+
|
|
[-]
[+]
|
Added |
_service:tar_git:lipstick-glacier-home-qt5-0.27.5.tar.bz2/src/settings-plugins/wallpaper/wallpaper.svg
^
|
| @@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="2048" height="1792" viewBox="0 0 2048 1792" xmlns="http://www.w3.org/2000/svg"><path d="M704 576q0 80-56 136t-136 56-136-56-56-136 56-136 136-56 136 56 56 136zm1024 384v448h-1408v-192l320-320 160 160 512-512zm96-704h-1600q-13 0-22.5 9.5t-9.5 22.5v1216q0 13 9.5 22.5t22.5 9.5h1600q13 0 22.5-9.5t9.5-22.5v-1216q0-13-9.5-22.5t-22.5-9.5zm160 32v1216q0 66-47 113t-113 47h-1600q-66 0-113-47t-47-113v-1216q0-66 47-113t113-47h1600q66 0 113 47t47 113z" fill="#fff"/></svg>
\ No newline at end of file
|
|
[-]
[+]
|
Changed |
_service:tar_git:lipstick-glacier-home-qt5-0.27.5.tar.bz2/src/src.pro
^
|
| @@ -83,6 +83,15 @@
qml/statusbar/NumButton.qml \
qml/statusbar/MediaController.qml
+settingsplugin.files = settings-plugins/wallpaper/wallpaper.qml \
+ settings-plugins/wallpaper/selectImage.qml \
+ settings-plugins/wallpaper/wallpaper.svg
+
+settingsplugin.path = /usr/share/glacier-settings/qml/plugins/wallpaper
+
+settingspluginconfig.files = settings-plugins/wallpaper/wallpaper.json
+settingspluginconfig.path = /usr/share/glacier-settings/plugins
+
INSTALLS += styles \
images \
theme \
@@ -93,7 +102,9 @@
volumecontrol\
connectivity\
notifications\
- statusbar
+ statusbar\
+ settingsplugin\
+ settingspluginconfig
CONFIG += qt link_pkgconfig
QT += quick compositor
@@ -146,4 +157,5 @@
DISTFILES += \
i18n/glacer-home.ts \
qml/connectivity/ConnectionSelector.qml \
- qml/statusbar/BatteryIndicator.qml
+ qml/statusbar/BatteryIndicator.qml \
+ settings-plugins/wallpaper/selectImage.qml
|
