Skip to content

G
glacier-home
Commit 807b9751 authored by eetu's avatar eetu Committed by GitHub
Browse files
Options

Merge branch 'master' into applauncher_fixes

parents 61263bc7 4dd1e103
Show whitespace changes
Inline Side-by-side
Showing with 308 additions and 103 deletions
src/i18n/glacer-home-nl.ts 0 → 100644
View file @ 807b9751
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1">
<context>
<name>AppLauncher</name>
<message>
<location filename="../qml/AppLauncher.qml" line="67"/>
<source>Remove</source>
<translation>Verwijderen</translation>
</message>
<message>
<location filename="../qml/AppLauncher.qml" line="82"/>
<source>Uninstall</source>
<translation>Verwijderen</translation>
</message>
</context>
<context>
<name>AppSwitcher</name>
<message>
<location filename="../qml/AppSwitcher.qml" line="173"/>
<source>Close
All</source>
<translation>Alles sluiten</translation>
</message>
<message>
<location filename="../qml/AppSwitcher.qml" line="187"/>
<source>No apps open</source>
<translation>Geen open apps</translation>
</message>
</context>
<context>
<name>BatteryPanel</name>
<message>
<location filename="../qml/BatteryPanel.qml" line="39"/>
<source>Battery level</source>
<translation>Batterijniveau</translation>
</message>
</context>
<context>
<name>CommonPanel</name>
<message>
<location filename="../qml/CommonPanel.qml" line="42"/>
<source>Close</source>
<translation>Sluiten</translation>
</message>
</context>
<context>
<name>LauncherItemDelegate</name>
<message>
<location filename="../qml/LauncherItemDelegate.qml" line="147"/>
<source>Remove</source>
<translation>Verwijderen</translation>
</message>
<message>
<location filename="../qml/LauncherItemDelegate.qml" line="148"/>
<source>Uninstall</source>
<translation>Verwijderen</translation>
</message>
<message>
<location filename="../qml/LauncherItemDelegate.qml" line="170"/>
<source>Removing</source>
<translation>Verwijderen</translation>
</message>
<message>
<location filename="../qml/LauncherItemDelegate.qml" line="172"/>
<source>Uninstalling</source>
<translation>Verwijderen</translation>
</message>
</context>
<context>
<name>SimPanel</name>
<message>
<location filename="../qml/SimPanel.qml" line="76"/>
<source>OK</source>
<translation>Oké</translation>
</message>
<message>
<location filename="../qml/SimPanel.qml" line="87"/>
<source>Clear</source>
<translation>Wissen</translation>
</message>
<message>
<location filename="../qml/SimPanel.qml" line="135"/>
<source>No pin required!</source>
<translation>Geen PIN-code nodig!</translation>
</message>
</context>
<context>
<name>USBModeSelector</name>
<message>
<location filename="../qml/USBModeSelector.qml" line="82"/>
<source>Current mode: Charging only</source>
<translation>Huidige modus: alleen opladen</translation>
</message>
<message>
<location filename="../qml/USBModeSelector.qml" line="98"/>
<source>MTP Mode</source>
<translation>MTP-modus</translation>
</message>
<message>
<location filename="../qml/USBModeSelector.qml" line="118"/>
<source>Mass Storage Mode</source>
<translation>Massaopslagmodus</translation>
</message>
<message>
<location filename="../qml/USBModeSelector.qml" line="138"/>
<source>Developer Mode</source>
<translation>Ontwikkelaarsmodus</translation>
</message>
</context>
</TS>
src/qml/AppLauncher.qml
View file @ 807b9751
...@@ -34,17 +34,20 @@ import QtQuick.Controls.Styles.Nemo 1.0 ...@@ -34,17 +34,20 @@ import QtQuick.Controls.Styles.Nemo 1.0
GridView { GridView {
id: gridview id: gridview
cellWidth: cellSize width: cellWidth * columns
cellHeight: cellSize
width: parent.width
cacheBuffer: gridview.contentHeight cacheBuffer: gridview.contentHeight
property Item reorderItem property Item reorderItem
property bool onUninstall property bool onUninstall
property alias deleter: deleter property alias deleter: deleter
property var switcher: null property var switcher: null
property string searchString property string searchString
property int minCellSize: Theme.iconSizeLauncher + Theme.itemSpacingHuge
property int rows: Math.floor(parent.height / minCellSize)
property int columns: Math.floor(parent.width / minCellSize)
cellWidth: parent.width / columns
cellHeight: Math.round(parent.height / rows)
property int cellSize: Math.min(parent.width,parent.height)/4
property int folderIndex: -1 property int folderIndex: -1
property bool isRootFolder:true property bool isRootFolder:true
property bool newFolderActive property bool newFolderActive
...@@ -232,7 +235,7 @@ GridView { ...@@ -232,7 +235,7 @@ GridView {
height: parent.height height: parent.height
width: parent.width - (removeIcon.visible ? removeIcon.width : 0) width: parent.width - (removeIcon.visible ? removeIcon.width : 0)
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
font.pixelSize: Theme.fontSizeLarge font.pixelSize: Theme.fontSizeSmall
elide:Text.ElideRight elide:Text.ElideRight
horizontalAlignment:Text.AlignHCenter horizontalAlignment:Text.AlignHCenter
verticalAlignment:Text.AlignVCenter verticalAlignment:Text.AlignVCenter
...@@ -266,14 +269,13 @@ GridView { ...@@ -266,14 +269,13 @@ GridView {
source: "image://theme/trash" source: "image://theme/trash"
visible: deleter.state != "uninstall" visible: deleter.state != "uninstall"
} }
Label { Label {
id: uninstallLabel id: uninstallLabel
height: parent.height height: parent.height
width: parent.width - (trashIcon.visible ? trashIcon.width : 0) width: parent.width - (trashIcon.visible ? trashIcon.width : 0)
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
text: qsTr("Uninstall") text: qsTr("Uninstall")
font.pixelSize: Theme.fontSizeLarge font.pixelSize: Theme.fontSizeSmall
elide:Text.ElideRight elide:Text.ElideRight
horizontalAlignment:Text.AlignHCenter horizontalAlignment:Text.AlignHCenter
verticalAlignment:Text.AlignVCenter verticalAlignment:Text.AlignVCenter
...@@ -288,12 +290,11 @@ GridView { ...@@ -288,12 +290,11 @@ GridView {
//Using loader that in the future we can also have widgets as delegate //Using loader that in the future we can also have widgets as delegate
delegate: Loader { delegate: Loader {
id:loader id:loader
width: cellSize width: cellWidth
height: cellSize height: cellHeight
onXChanged: item.x = x onXChanged: item.x = x
onYChanged: item.y = y onYChanged: item.y = y
property QtObject modelData : model property QtObject modelData : model
property int cellSize: gridview.cellHeight
property int cellIndex: index property int cellIndex: index
sourceComponent: object.type == LauncherModel.Folder ? folder : app sourceComponent: object.type == LauncherModel.Folder ? folder : app
} }
......
src/qml/AppSwitcher.qml
View file @ 807b9751
...@@ -68,7 +68,7 @@ Item { ...@@ -68,7 +68,7 @@ Item {
left: parent.left left: parent.left
} }
font.weight: Font.Light font.weight: Font.Light
font.pixelSize: Theme.fontSizeExtraLarge font.pixelSize: Theme.fontSizeLarge
} }
} }
Flickable { Flickable {
......
src/qml/DeviceLockUI.qml
View file @ 807b9751
...@@ -14,6 +14,8 @@ Item { ...@@ -14,6 +14,8 @@ Item {
property bool shouldAuthenticate: Lipstick.compositor.visible property bool shouldAuthenticate: Lipstick.compositor.visible
&& authenticator.availableMethods !== 0 && authenticator.availableMethods !== 0
property int remainingAttempts
onShouldAuthenticateChanged: { onShouldAuthenticateChanged: {
if (shouldAuthenticate) { if (shouldAuthenticate) {
DeviceLock.authorization.requestChallenge() DeviceLock.authorization.requestChallenge()
...@@ -36,32 +38,50 @@ Item { ...@@ -36,32 +38,50 @@ Item {
} }
} }
Authenticator { Authenticator {
id: authenticator id: authenticator
onAuthenticated: { onAuthenticated: {
DeviceLock.unlock(authenticationToken) DeviceLock.unlock(authenticationToken)
Desktop.instance.setLockScreen(false) Desktop.instance.setLockScreen(false)
Desktop.instance.codepadVisible = false Desktop.instance.codepadVisible = false
remainingAttempts = 0
} }
onFeedback: { onFeedback: {
console.log('### still locked', feedback, attemptsRemaining) console.log('### still locked', feedback, attemptsRemaining)
remainingAttempts = attemptsRemaining
animation.start()
} }
} }
ColumnLayout { ColumnLayout {
anchors.fill: parent anchors.fill: parent
spacing: Theme.itemSpacingLarge spacing: Theme.itemSpacingExtraSmall
SequentialAnimation {
id: animation;
SequentialAnimation {
loops: 4
NumberAnimation { target: codePad; property: "anchors.horizontalCenterOffset"; to: 55; duration: 50 }
NumberAnimation { target: codePad; property: "anchors.horizontalCenterOffset"; to: 0; duration: 50 }
}
NumberAnimation { target: codePad; property: "anchors.horizontalCenterOffset"; to: 0; duration: 100 }
}
Label {
font.pixelSize: Theme.fontSizeMedium
width: parent.width
text: remainingAttempts > 0 ? qsTr("Attempts remaining:") + " " + remainingAttempts : ""
anchors.horizontalCenter: parent.horizontalCenter
}
TextField { TextField {
id: lockCodeField id: lockCodeField
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
readOnly: true readOnly: true
echoMode: TextInput.PasswordEchoOnEdit echoMode: TextInput.PasswordEchoOnEdit
font.pixelSize: Theme.fontSizeExtraLarge font.pixelSize: Theme.fontSizeMedium
} }
GridLayout { GridLayout {
id: codePad
height: parent.height height: parent.height
width: parent.width width: parent.width
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
...@@ -70,27 +90,19 @@ Item { ...@@ -70,27 +90,19 @@ Item {
model: ["1","2","3","4","5","6","7","8","9","Ca","0","OK"] model: ["1","2","3","4","5","6","7","8","9","Ca","0","OK"]
delegate: delegate:
Button { Button {
height: Theme.itemHeightHuge id:button
width: Theme.itemHeightHuge Layout.maximumWidth: Theme.itemWidthSmall
Layout.maximumWidth: Theme.itemHeightHuge * 1.5 Layout.maximumHeight: Theme.itemHeightHuge * 2
Layout.maximumHeight: Theme.itemHeightHuge * 1.5 Layout.minimumHeight: Theme.itemHeightHuge * 1.5
Label {
id: btnLabel
text: modelData text: modelData
font.pixelSize: Theme.fontSizeExtraLarge * 1.5
anchors {
centerIn: parent
}
}
onClicked: { onClicked: {
if (btnLabel.text !== "Ca" && btnLabel.text !== "OK") { if (button.text !== "Ca" && button.text !== "OK") {
lockCodeField.insert(lockCodeField.cursorPosition, btnLabel.text) lockCodeField.insert(lockCodeField.cursorPosition, button.text)
} else { } else {
if (btnLabel.text === "OK") { if (button.text === "OK") {
authenticator.enterLockCode(lockCodeField.text) authenticator.enterLockCode(lockCodeField.text)
lockCodeField.text = "" lockCodeField.text = ""
} else if (btnLabel.text === "Ca"){ } else if (button.text === "Ca"){
lockCodeField.text = "" lockCodeField.text = ""
} }
} }
......
src/qml/FeedsPage.qml
View file @ 807b9751
...@@ -59,7 +59,7 @@ Flickable { ...@@ -59,7 +59,7 @@ Flickable {
id: displayDayOfWeek id: displayDayOfWeek
text: Qt.formatDateTime(wallClock.time, "dddd") text: Qt.formatDateTime(wallClock.time, "dddd")
color: Theme.textColor color: Theme.textColor
font.pixelSize: Theme.fontSizeExtraLarge font.pixelSize: Theme.fontSizeLarge
font.weight: Font.Bold font.weight: Font.Bold
anchors { anchors {
top: parent.top top: parent.top
...@@ -71,7 +71,7 @@ Flickable { ...@@ -71,7 +71,7 @@ Flickable {
Label { Label {
id: displayCurrentDate id: displayCurrentDate
text: Qt.formatDate(wallClock.time, "d MMMM yyyy") text: Qt.formatDate(wallClock.time, "d MMMM yyyy")
font.pixelSize: Theme.fontSizeExtraLarge font.pixelSize: Theme.fontSizeLarge
color: Theme.textColor color: Theme.textColor
font.weight: Font.Light font.weight: Font.Light
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
......
src/qml/LauncherItemDelegate.qml
View file @ 807b9751
...@@ -67,19 +67,18 @@ Item { ...@@ -67,19 +67,18 @@ Item {
Item { Item {
id: iconWrapper id: iconWrapper
width: parent.width -parent.width/10 height: parent.height - iconText.height
height: width - iconText.height width: parent.width
anchors.centerIn: parent anchors.horizontalCenter: parent.horizontalCenter
y: Math.round((parent.height - (height + iconText.height)) / 2)
Image { Image {
id: iconImage id: iconImage
anchors { anchors.centerIn: parent
// centerIn: launcherItem.n.otNemoIcon ? parent : undefined sourceSize.width: Theme.iconSizeLauncher
horizontalCenter: /* launcherItemnotNemoIcon ? undefined : */parent.horizontalCenter sourceSize.height: Theme.iconSizeLauncher
top: parent.top height: Theme.iconSizeLauncher
//topMargin: Theme.itemSpacingExtraSmall width: height
}
width:/*launcherItem.notNemoIcon ? parent.width-parent.width/3 : */parent.width - parent.width/4
height: width
asynchronous: true asynchronous: true
onStatusChanged: { onStatusChanged: {
if (iconImage.status == Image.Error) { if (iconImage.status == Image.Error) {
...@@ -89,11 +88,7 @@ Item { ...@@ -89,11 +88,7 @@ Item {
} }
Spinner { Spinner {
id: spinnerr id: spinnerr
anchors { anchors.centerIn: iconImage
centerIn: iconImage
top: iconImage.top
topMargin: Theme.itemSpacingExtraSmall
}
width: iconWrapper.width width: iconWrapper.width
height: width height: width
enabled: (modelData.object.type === LauncherModel.Application) ? modelData.object.isLaunching ? switcher.switchModel.getWindowIdForTitle(modelData.object.title) == 0 : false : false enabled: (modelData.object.type === LauncherModel.Application) ? modelData.object.isLaunching ? switcher.switchModel.getWindowIdForTitle(modelData.object.title) == 0 : false : false
...@@ -116,13 +111,13 @@ Item { ...@@ -116,13 +111,13 @@ Item {
width: iconWrapper.width width: iconWrapper.width
elide: Text.ElideRight elide: Text.ElideRight
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeTiny
color: Theme.textColor color: Theme.textColor
//https://bugreports.qt.io/browse/QTBUG-56052
y: -contentHeight + font.pixelSize + iconWrapper.y + iconWrapper.height
anchors { anchors {
left: parent.left left: parent.left
right: parent.right right: parent.right
bottom: parent.bottom
topMargin: Theme.itemSpacingExtraSmall
} }
} }
} }
......
src/qml/LauncherItemFolder.qml
View file @ 807b9751
...@@ -73,10 +73,11 @@ Item { ...@@ -73,10 +73,11 @@ Item {
} }
Item { Item {
id:folderIconStack id:folderIconStack
width: size width: parent.width
height: size height: parent.height - iconText.height
property int size: parent.width -parent.width/10 anchors.horizontalCenter: parent.horizontalCenter
property int iconSize: (/*launcherItem.notNemoIcon ? size-size/3 : */ (size - size/4)) * 0.9 y: Math.round((parent.height - (height + iconText.height)) / 2)
property int iconSize: Theme.iconSizeLauncher * 0.9
property real transparency: 0.6 property real transparency: 0.6
property int iconCount: 4 property int iconCount: 4
property var icons: addIcons() property var icons: addIcons()
...@@ -146,13 +147,13 @@ Item { ...@@ -146,13 +147,13 @@ Item {
width: launcherItem.width width: launcherItem.width
elide: Text.ElideRight elide: Text.ElideRight
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeTiny
color: Theme.textColor color: Theme.textColor
//https://bugreports.qt.io/browse/QTBUG-56052
y: -contentHeight + font.pixelSize + folderIconStack.y + folderIconStack.height
anchors { anchors {
left: parent.left left: parent.left
right: parent.right right: parent.right
bottom: parent.bottom
topMargin: Theme.itemSpacingExtraSmall
} }
} }
...@@ -173,15 +174,16 @@ Item { ...@@ -173,15 +174,16 @@ Item {
id: folderLoader id: folderLoader
property Item reorderItem property Item reorderItem
property bool isRootFolder:false property bool isRootFolder:false
property int folderIndex: -1
cacheBuffer: folderLoader.contentHeight cacheBuffer: folderLoader.contentHeight
parent: gridview.contentItem parent: gridview.contentItem
y: wrapper.y + wrapper.width y: wrapper.y + wrapper.width
x: 0 x: 0
z: wrapper.z + 100 z: wrapper.z + 100
width: gridview.width width: gridview.width
height: count == 0 ? 0 : (Math.floor((count*wrapper.height-1)/width) + 1) * wrapper.height height: count == 0 ? 0 : (Math.floor((count*wrapper.width-1)/width) + 1) * wrapper.height
cellWidth: wrapper.width cellWidth: wrapper.width
cellHeight: wrapper.width cellHeight: wrapper.height
onReorderItemChanged: if(reorderItem == null) folderIconStack.icons=folderIconStack.addIcons() onReorderItemChanged: if(reorderItem == null) folderIconStack.icons=folderIconStack.addIcons()
Rectangle { Rectangle {
......
src/qml/LauncherItemWrapper.qml
View file @ 807b9751
...@@ -89,9 +89,11 @@ MouseArea { ...@@ -89,9 +89,11 @@ MouseArea {
drag.target = null drag.target = null
parentItem.reorderItem = null parentItem.reorderItem = null
pager.interactive = true pager.interactive = true
if(parentItem.onUninstall){
parentItem.onUninstall = false parentItem.onUninstall = false
deleteState="basic" deleteState="basic"
deleter.uninstalling(deleteState) deleter.uninstalling(deleteState)
}
parentItem.folderIndex = -1 parentItem.folderIndex = -1
reparent(parentItem.contentItem) reparent(parentItem.contentItem)
z = parent.z z = parent.z
...@@ -188,7 +190,7 @@ MouseArea { ...@@ -188,7 +190,7 @@ MouseArea {
} }
Timer {//Just placeholder to get visual feedback Timer {//Just placeholder to get visual feedback
id:deleteTimer id:deleteTimer
interval: 5000 interval: 3000
onTriggered: { onTriggered: {
iconWrapper.opacity=1.0 iconWrapper.opacity=1.0
enabled = true enabled = true
......
src/qml/Lockscreen.qml
View file @ 807b9751
import QtQuick 2.0 import QtQuick 2.6
import org.nemomobile.lipstick 0.1 import org.nemomobile.lipstick 0.1
import org.nemomobile.devicelock 1.0 import org.nemomobile.devicelock 1.0
import org.nemomobile.configuration 1.0 import org.nemomobile.configuration 1.0
import "notifications"
Image { Image {
id: lockScreen id: lockScreen
source: lockScreenWallpaper.value source: lockScreenWallpaper.value
fillMode: Image.PreserveAspectCrop fillMode: Image.PreserveAspectCrop
property bool displayOn
ConfigurationValue{ ConfigurationValue{
id: lockScreenWallpaper id: lockScreenWallpaper
key: "/home/glacier/lockScreen/wallpaperImage" key: "/home/glacier/lockScreen/wallpaperImage"
...@@ -22,22 +26,78 @@ Image { ...@@ -22,22 +26,78 @@ Image {
right: parent.right right: parent.right
} }
} }
DeviceLockUI {
id: deviceLockUI MouseArea {
visible: false//DeviceLock.state === DeviceLock.Locked id:mouseArea
anchors { anchors.fill: parent
top: clock.bottom }
left: parent.left Connections {
target:Lipstick.compositor
onDisplayOff: {
displayOn = false
displayOffTimer.stop()
}
onDisplayOn:{
displayOn = true
displayOffTimer.stop()
}
} }
height: parent.height-clock.height Connections {
width: parent.width target: LipstickSettings
onLockscreenVisibleChanged: {
if (lockscreenVisible() && displayOn) {
displayOffTimer.restart()
}
}
}
Timer {
id:displayOffTimer
interval: 7000
onRunningChanged: {
if(running && !displayOn) {
stop()
}
}
onTriggered: {
if(displayOn && lockscreenVisible() && !Lipstick.compositor.gestureOnGoing && !codepad.visible) {
setLockScreen(true)
Lipstick.compositor.setDisplayOff()
}
}
}
//visible: ListView {
z: 201 id: notificationColumn
opacity: codePad.visible ? 1 - codePad.opacity : 1
anchors{
top: clock.bottom
topMargin: Theme.itemSpacingHuge
bottom:parent.bottom
bottomMargin: Theme.itemSpacingHuge
left:parent.left
leftMargin: Theme.itemSpacingLarge
right:parent.right
rightMargin: Theme.itemSpacingLarge
} }
interactive:false
spacing: 0
MouseArea { model: NotificationListModel {
anchors.fill: parent id: notifmodel
}
delegate: NotificationItem {
enabled:DeviceLock.state !== DeviceLock.Locked
scale: notificationColumn.opacity
transformOrigin: Item.Left
iconSize: Theme.itemHeightMedium
appName.font.pixelSize: Theme.fontSizeSmall
appName.visible: DeviceLock.state !== DeviceLock.Locked
appName.anchors.verticalCenter: appIcon.verticalCenter
appName.anchors.top: null
appBody.font.pixelSize: Theme.fontSizeTiny
appBody.visible: false
appSummary.visible: false
}
} }
} }
src/qml/LockscreenClock.qml
View file @ 807b9751
...@@ -51,7 +51,7 @@ Rectangle { ...@@ -51,7 +51,7 @@ Rectangle {
Label { Label {
id: weekdayDisplay id: weekdayDisplay
font.pixelSize: Theme.fontSizeLarge font.pixelSize: Theme.fontSizeMedium
color: Theme.textColor color: Theme.textColor
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
font.weight: Font.Bold font.weight: Font.Bold
...@@ -65,7 +65,7 @@ Rectangle { ...@@ -65,7 +65,7 @@ Rectangle {
Label { Label {
id: dateDisplay id: dateDisplay
font.pixelSize: Theme.fontSizeLarge font.pixelSize: Theme.fontSizeMedium
color: Theme.textColor color: Theme.textColor
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
font.weight: Font.Light font.weight: Font.Light
......
src/qml/MainScreen.qml
View file @ 807b9751
...@@ -46,9 +46,17 @@ Page { ...@@ -46,9 +46,17 @@ Page {
// This is used in the favorites page and in the lock screen // This is used in the favorites page and in the lock screen
WallClock { WallClock {
id: wallClock id: wallClock
enabled: true /* XXX: Disable when display is off */ enabled: true
updateFrequency: WallClock.Minute updateFrequency: WallClock.Minute
} }
//force refresh
Connections {
target: Lipstick.compositor
onDisplayAboutToBeOn: {
wallClock.enabled = false
wallClock.enabled = true
}
}
// This is used in the lock screen // This is used in the lock screen
ConfigurationValue { ConfigurationValue {
id: wallpaperSource id: wallpaperSource
......
src/qml/SearchListView.qml
View file @ 807b9751
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
****************************************************************************************/ ****************************************************************************************/
import QtQuick 2.6 import QtQuick 2.6
import org.nemomobile.lipstick 0.1 import org.nemomobile.lipstick 0.1
import QtQuick.Controls 1.4
import QtQuick.Controls.Nemo 1.0 import QtQuick.Controls.Nemo 1.0
import QtQuick.Controls.Styles.Nemo 1.0 import QtQuick.Controls.Styles.Nemo 1.0
import org.nemomobile.contacts 1.0 import org.nemomobile.contacts 1.0
...@@ -120,7 +119,7 @@ Item { ...@@ -120,7 +119,7 @@ Item {
} }
font.capitalization: Font.AllUppercase font.capitalization: Font.AllUppercase
font.pixelSize: Theme.fontSizeMedium font.pixelSize: Theme.fontSizeSmall
color: Theme.textColor color: Theme.textColor
anchors{ anchors{
left: parent.left left: parent.left
...@@ -163,7 +162,6 @@ Item { ...@@ -163,7 +162,6 @@ Item {
filterType: PeopleModel.FilterAll filterType: PeopleModel.FilterAll
filterPattern: searchString filterPattern: searchString
requiredProperty: PeopleModel.PhoneNumberRequired requiredProperty: PeopleModel.PhoneNumberRequired
//searchableProperty: root.searchableProperty
} }
//Orginal function ** Copyright (C) 2013 Jolla Ltd. ** Contact: Joona Petrell <joona.petrell@jollamobile.com> **BSD //Orginal function ** Copyright (C) 2013 Jolla Ltd. ** Contact: Joona Petrell <joona.petrell@jollamobile.com> **BSD
...@@ -259,7 +257,7 @@ Item { ...@@ -259,7 +257,7 @@ Item {
} }
Image { Image {
id: iconImage id: iconImage
width: parent.height-Theme.itemSpacingMedium width: Math.min(Theme.iconSizeLauncher, parent.height-Theme.itemSpacingMedium)
height: width height: width
source:iconSource source:iconSource
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
...@@ -308,7 +306,7 @@ Item { ...@@ -308,7 +306,7 @@ Item {
left: parent.left left: parent.left
right: parent.right right: parent.right
} }
font.pixelSize:Theme.fontSizeLarge font.pixelSize:Theme.fontSizeMedium
color:Theme.textColor color:Theme.textColor
elide:Text.ElideRight elide:Text.ElideRight
verticalAlignment:Text.AlignVCenter verticalAlignment:Text.AlignVCenter
...@@ -320,7 +318,7 @@ Item { ...@@ -320,7 +318,7 @@ Item {
top:mainLabel.bottom top:mainLabel.bottom
left:mainLabel.left left:mainLabel.left
} }
font.pixelSize:Theme.fontSizeSmall font.pixelSize:Theme.fontSizeTiny
color:Theme.textColor color:Theme.textColor
elide:Text.ElideRight elide:Text.ElideRight
verticalAlignment:Text.AlignVCenter verticalAlignment:Text.AlignVCenter
......
src/qml/Statusbar.qml
View file @ 807b9751
...@@ -59,7 +59,7 @@ Item { ...@@ -59,7 +59,7 @@ Item {
property int oldY property int oldY
anchors.fill: row anchors.fill: row
z: row.z + 10 z: row.z + 10
enabled: !lockscreenVisible() //enabled: !lockscreenVisible()
onClicked: { onClicked: {
if(oldX != mouseX && oldY !== mouseY && row.childAt(mouseX, mouseY) && row.currentChild !== row.childAt(mouseX, mouseY)) { if(oldX != mouseX && oldY !== mouseY && row.childAt(mouseX, mouseY) && row.currentChild !== row.childAt(mouseX, mouseY)) {
row.currentChild = row.childAt(mouseX, mouseY) row.currentChild = row.childAt(mouseX, mouseY)
......
src/qml/compositor.qml
View file @ 807b9751
...@@ -45,6 +45,8 @@ Compositor { ...@@ -45,6 +45,8 @@ Compositor {
property Item topmostApplicationWindow property Item topmostApplicationWindow
property Item topmostAlarmWindow: null property Item topmostAlarmWindow: null
property bool gestureOnGoing
function windowToFront(winId) { function windowToFront(winId) {
var o = root.windowForId(winId) var o = root.windowForId(winId)
var window = null var window = null
...@@ -141,6 +143,7 @@ Compositor { ...@@ -141,6 +143,7 @@ Compositor {
swipeAnimation.stop() swipeAnimation.stop()
cancelAnimation.stop() cancelAnimation.stop()
lockAnimation.stop() lockAnimation.stop()
gestureOnGoing = true
if (root.appActive) { if (root.appActive) {
state = "swipe" state = "swipe"
} }
...@@ -176,6 +179,9 @@ Compositor { ...@@ -176,6 +179,9 @@ Compositor {
// Locks // Locks
if (!Desktop.instance.lockscreenVisible()) { if (!Desktop.instance.lockscreenVisible()) {
Desktop.instance.setLockScreen(true) Desktop.instance.setLockScreen(true)
if(gesture == "down") {
setDisplayOff()
}
} }
// Brings up codepad, only left and right swipes allowed for it for now // Brings up codepad, only left and right swipes allowed for it for now
else if (Desktop.instance.lockscreenVisible() && !Desktop.instance.codepad.visible && DeviceLock.state == DeviceLock.Locked && (gesture !== "down" && gesture !== "up")) { else if (Desktop.instance.lockscreenVisible() && !Desktop.instance.codepad.visible && DeviceLock.state == DeviceLock.Locked && (gesture !== "down" && gesture !== "up")) {
...@@ -193,6 +199,7 @@ Compositor { ...@@ -193,6 +199,7 @@ Compositor {
cancelAnimation.start() cancelAnimation.start()
} }
} }
gestureOnGoing = false
} }
// States are for the animations that follow your finger during swipes // States are for the animations that follow your finger during swipes
states: [ states: [
......
src/qml/notifications/NotificationItem.qml
View file @ 807b9751
...@@ -6,7 +6,14 @@ MouseArea { ...@@ -6,7 +6,14 @@ MouseArea {
id: notifyArea id: notifyArea
height: childrenRect.height height: childrenRect.height
width: rootitem.width width: parent.width
property alias appIcon: appIcon
property alias appBody: appBody
property alias appName: appName
property alias appSummary: appSummary
property int iconSize: Theme.itemHeightExtraLarge
drag.target: notifyArea drag.target: notifyArea
drag.axis: Drag.XAxis drag.axis: Drag.XAxis
...@@ -54,10 +61,10 @@ MouseArea { ...@@ -54,10 +61,10 @@ MouseArea {
Image { Image {
id: appIcon id: appIcon
height: Theme.itemHeightExtraLarge
width: height
property string defaultIcon: "/usr/share/lipstick-glacier-home-qt5/qml/images/glacier.svg" property string defaultIcon: "/usr/share/lipstick-glacier-home-qt5/qml/images/glacier.svg"
height: iconSize
width: iconSize
anchors{ anchors{
left: parent.left left: parent.left
leftMargin: Theme.itemSpacingLarge leftMargin: Theme.itemSpacingLarge
...@@ -78,7 +85,7 @@ MouseArea { ...@@ -78,7 +85,7 @@ MouseArea {
Label { Label {
id: appName id: appName
text: modelData.appName text: modelData.appName
width: (rootitem.width-appIcon.width)-Theme.itemSpacingHuge width: (parent.width-appIcon.width)-Theme.itemSpacingHuge
color: Theme.textColor color: Theme.textColor
font.pixelSize: Theme.fontSizeMedium font.pixelSize: Theme.fontSizeMedium
font.capitalization: Font.AllUppercase font.capitalization: Font.AllUppercase
...@@ -93,9 +100,9 @@ MouseArea { ...@@ -93,9 +100,9 @@ MouseArea {
Label { Label {
id: appSummary id: appSummary
text: modelData.summary text: modelData.summary
width: (rootitem.width-appIcon.width)-Theme.itemSpacingHuge width: (parent.width-appIcon.width)-Theme.itemSpacingHuge
color: Theme.textColor color: Theme.textColor
font.pixelSize: Theme.fontSizeLarge font.pixelSize: Theme.fontSizeSmall
//font.bold :true //font.bold :true
//font.capitalization: Font.AllUppercase //font.capitalization: Font.AllUppercase
...@@ -109,10 +116,10 @@ MouseArea { ...@@ -109,10 +116,10 @@ MouseArea {
Label { Label {
id: appBody id: appBody
width: (rootitem.width-appIcon.width)-Theme.itemSpacingHuge width: (parent.width-appIcon.width)-Theme.itemSpacingHuge
text: modelData.body text: modelData.body
color: Theme.textColor color: Theme.textColor
font.pixelSize: Theme.fontSizeMedium font.pixelSize: Theme.fontSizeSmall
anchors{ anchors{
left: appName.left left: appName.left
top: appSummary.bottom top: appSummary.bottom
......
src/qml/notifications/NotificationPreview.qml
View file @ 807b9751
...@@ -144,7 +144,7 @@ Item { ...@@ -144,7 +144,7 @@ Item {
rightMargin: notificationArea.notificationMargin rightMargin: notificationArea.notificationMargin
//bottomMargin: notificationArea.notificationMargin //bottomMargin: notificationArea.notificationMargin
} }
font.pixelSize: Theme.fontSizeLarge font.pixelSize: Theme.fontSizeMedium
text: notificationPreviewPresenter.notification != null ? notificationPreviewPresenter.notification.previewSummary : "" text: notificationPreviewPresenter.notification != null ? notificationPreviewPresenter.notification.previewSummary : ""
color: Theme.textColor color: Theme.textColor
clip: true clip: true
...@@ -159,7 +159,7 @@ Item { ...@@ -159,7 +159,7 @@ Item {
right: summary.right right: summary.right
} }
font { font {
pixelSize: Theme.fontSizeMedium pixelSize: Theme.fontSizeSmall
bold: true bold: true
} }
text: notificationPreviewPresenter.notification != null ? notificationPreviewPresenter.notification.previewBody : "" text: notificationPreviewPresenter.notification != null ? notificationPreviewPresenter.notification.previewBody : ""
......
src/qml/statusbar/CommonPanel.qml
View file @ 807b9751
...@@ -93,7 +93,7 @@ Rectangle { ...@@ -93,7 +93,7 @@ Rectangle {
leftMargin: Theme.itemSpacingLarge leftMargin: Theme.itemSpacingLarge
} }
wrapMode: Text.Wrap wrapMode: Text.Wrap
font.pointSize: 8 font.pixelSize: Theme.fontSizeMedium
font.bold: true font.bold: true
color: "#ffffff" color: "#ffffff"
} }
......
src/qml/statusbar/StatusbarItem.qml
View file @ 807b9751
...@@ -35,7 +35,9 @@ Item { ...@@ -35,7 +35,9 @@ Item {
} }
MouseArea { MouseArea {
id:mouse id:mouse
anchors.fill: parent anchors.centerIn: parent
width: parent.width + Theme.itemSpacingSmall
height: parent.height + Theme.itemSpacingSmall
enabled: !lockscreenVisible() enabled: !lockscreenVisible()
onClicked: parent.clicked() onClicked: parent.clicked()
} }
......
src/qml/statusbar/WifiPanel.qml
View file @ 807b9751
...@@ -85,7 +85,7 @@ Component { ...@@ -85,7 +85,7 @@ Component {
verticalCenter: statusImage.verticalCenter verticalCenter: statusImage.verticalCenter
} }
width: root.width width: root.width
font.pixelSize: Theme.fontSizeMedium font.pixelSize: Theme.fontSizeSmall
text: modelData.name text: modelData.name
wrapMode: Text.Wrap wrapMode: Text.Wrap
color: modelData.state === "online" ? Theme.accentColor : Theme.textColor color: modelData.state === "online" ? Theme.accentColor : Theme.textColor
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment