|
[-]
[+]
|
Changed |
_service:tar_git:sailfishos-patches-advanced.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -3,6 +3,6 @@
<service name="tar_git">
<param name="url">https://github.com/sailfishos-patches/sailfishos-patches-advanced.git</param>
<param name="branch">master</param>
- <param name="revision">660fe8ca797422578532d47a848c1d53f353a375</param>
+ <param name="revision">61bda78ec8f432e2267f387b2405731d2b6ed6f5</param>
</service>
</services>
|
|
[-]
[+]
|
Deleted |
_service:tar_git:sailfishos-patches-advanced-0.3.2.tar.bz2/maintained/homescreen-ambience-control-center/unified_diff.patch
^
|
| @@ -1,68 +0,0 @@
---- original/usr/share/lipstick-jolla-home-qt5/qml/AmbiencePage.qml 2014-06-08 21:55:01.862978516 +0200
-+++ patched/usr/share/lipstick-jolla-home-qt5/qml/AmbiencePage.qml 2014-06-08 22:45:58.007084002 +0200
-@@ -9,6 +9,8 @@
- import Sailfish.Silica 1.0
- import Sailfish.Ambience 1.0
- import Sailfish.Gallery 1.0
-+import com.jolla.settings 1.0
-+import org.nemomobile.systemsettings 1.0
- import org.nemomobile.configuration 1.0
- import org.nemomobile.thumbnailer 1.0
- import org.nemomobile.lipstick 0.1
-@@ -32,6 +34,10 @@
- && (ambienceSwitcherOpen || (ambienceSwitcherEnabled && ambienceModel.count > 1))
- && (PeekFilter.activeArea == PeekFilter.Left || PeekFilter.activeArea == PeekFilter.Right) && Lipstick.compositor.homeActive
- && !launcher.openedChildFolder && !desktop.closeApplicationEnabled
-+ readonly property bool _switcherLockEnabled: (!progressAnimation.running && !contentAnimation.running)
-+ && (ambienceSwitcherOpen || (ambienceSwitcherEnabled && ambienceModel.count > 1))
-+ && (PeekFilter.activeArea == PeekFilter.Left || PeekFilter.activeArea == PeekFilter.Right) && Lipstick.compositor.homeActive
-+ && !launcher.openedChildFolder && !desktop.closeApplicationEnabled
-
- property string _currentHomeWallpaper: Ambience.homeWallpaper
-
-@@ -42,7 +48,9 @@
- }
-
- PeekFilter.onGestureStarted: {
-- if (_switcherEnabled) {
-+ if ((_switcherEnabled && PeekFilter.activeArea == PeekFilter.Left)
-+ || (_switcherLockEnabled && PeekFilter.activeArea == PeekFilter.Right)
-+ || ambienceSwitcherOpen) {
- anchorAmbienceItem()
- progressBinding.when = true
- }
-@@ -120,6 +128,16 @@
- ambienceItem.anchors.right = undefined
- ambienceItem.anchors.left = contentItem.right
- }
-+
-+ if (!ambienceSwitcherOpen) {
-+ if (PeekFilter.activeArea == PeekFilter.Right) {
-+ gridView.visible = false
-+ widgets.visible = true
-+ } else {
-+ gridView.visible = true
-+ widgets.visible = false
-+ }
-+ }
- }
-
- property real _progress
-@@ -210,6 +228,17 @@
- anchors.left: contentItem.right
- // Scenegraph does not seem to cull yet, explicitly hide
- visible: contentItem.x != 0 || page.ambienceSwitcherOpen
-+
-+ Item {
-+ id: widgets
-+ visible: false
-+ anchors.fill: parent
-+
-+ FavoritesZone {
-+ id: favorites
-+ anchors.top: parent.top
-+ }
-+ }
-
- ImageGridView {
- id: gridView
|
|
[-]
[+]
|
Changed |
_service:tar_git:sailfishos-patches-advanced-0.3.3.tar.bz2/maintained/homescreen-5x6-launcher/unified_diff.patch
^
|
| @@ -1,5 +1,5 @@
---- original/usr/share/lipstick-jolla-home-qt5/qml/launcher/LauncherGrid.qml 2014-06-08 21:55:01.847978384 +0200
-+++ patched/usr/share/lipstick-jolla-home-qt5/qml/launcher/LauncherGrid.qml 2014-06-08 22:14:11.587192377 +0200
+--- original/usr/share/lipstick-jolla-home-qt5/launcher/LauncherGrid.qml 2014-06-08 21:55:01.847978384 +0200
++++ patched/usr/share/lipstick-jolla-home-qt5/launcher/LauncherGrid.qml 2014-06-08 22:14:11.587192377 +0200
@@ -17,7 +17,7 @@
property Item reorderItem
|
|
[-]
[+]
|
Added |
_service:tar_git:sailfishos-patches-advanced-0.3.3.tar.bz2/maintained/homescreen-datenetwork/patch.json
^
|
| @@ -0,0 +1,9 @@
+{
+ "name": "Date & Network",
+ "description": "This patch allows to show date and network name both on the lockscreen.",
+ "category": "homescreen",
+ "infos": {
+ "maintainer": "@Van_ess/van-ess0"
+ }
+}
+
|
|
[-]
[+]
|
Added |
_service:tar_git:sailfishos-patches-advanced-0.3.3.tar.bz2/maintained/homescreen-datenetwork/unified_diff.patch
^
|
| @@ -0,0 +1,47 @@
+--- /usr/share/lipstick-jolla-home-qt5/lockscreen/Lockscreen.qml 2014-07-18 01:14:25.682334258 +0400
++++ /usr/share/lipstick-jolla-home-qt5/lockscreen/Lockscreen.qml 2014-07-18 01:16:55.609656142 +0400
+@@ -122,12 +122,13 @@
+ topMargin: Theme.paddingLarge
+ }
+ width: parent.width
+- height: Math.max(cellularNetworkNameStatusIndicator.height, dateLabel.height)
++ height: cellularNetworkNameStatusIndicator.height + dateLabel.height
+
+ CellularNetworkNameStatusIndicator {
+ id: cellularNetworkNameStatusIndicator
+ anchors.horizontalCenter: parent.horizontalCenter
+- opacity: 1 - dateLabel.opacity
++ anchors.top: dateLabel.bottom
++ opacity: dateLabel.opacity
+ }
+
+ Label {
+@@ -147,10 +148,11 @@
+ enabled: lockScreen.onDisplay
+ updateFrequency: WallClock.Day
+ }
+- Behavior on opacity {
++ opacity: 1
++ /*Behavior on opacity {
+ id: dateOpacityBehavior
+ FadeAnimation { }
+- }
++ }*/
+ }
+ }
+
+@@ -283,12 +285,12 @@
+ Timer {
+ id: hideDateTimer
+ interval: 3000
+- onTriggered: {
++ /*onTriggered: {
+ var indicator = cellularNetworkNameStatusIndicator
+ if (!lipstickSettings.lowPowerMode && (indicator.homeNetwork || indicator.visitorNetwork)) {
+ lockScreen.state = "showCellularNetworkName"
+ }
+- }
++ }*/
+ }
+
+ states: [
|
|
[-]
[+]
|
Changed |
_service:tar_git:sailfishos-patches-advanced-0.3.3.tar.bz2/maintained/homescreen-editmode-title/unified_diff.patch
^
|
| @@ -1,14 +1,14 @@
---- original/usr/share/lipstick-jolla-home-qt5/qml/launcher/LauncherGrid.qml 2014-06-08 21:55:01.847978384 +0200
-+++ patched/usr/share/lipstick-jolla-home-qt5/qml/launcher/LauncherGrid.qml 2014-06-15 12:28:18.029087835 +0200
-@@ -400,7 +400,6 @@
+--- original/usr/share/lipstick-jolla-home-qt5/launcher/LauncherGrid.qml 2014-06-08 21:55:01.847978384 +0200
++++ patched/usr/share/lipstick-jolla-home-qt5/launcher/LauncherGrid.qml 2014-06-15 12:28:18.029087835 +0200
+@@ -479,7 +479,6 @@
color: down ? Theme.highlightColor : Theme.primaryColor
font.pixelSize: Theme.fontSizeTiny
text: object.title
-- visible: !removeApplicationEnabled
+- visible: !launcherEditMode || itemType === LauncherModel.Folder
}
-
+
Component {
-@@ -422,8 +421,8 @@
+@@ -501,8 +500,8 @@
Component {
id: uninstallButtonComponent
UninstallButton {
@@ -16,6 +16,6 @@
- anchors.horizontalCenter: parent.horizontalCenter
+ anchors.verticalCenter: launcherIcon.top
+ anchors.right: parent.right
- enabled: removeApplicationEnabled
+ enabled: launcherEditMode
opacity: enabled ? 1.0 : 0.0
- visible: removeApplicationEnabled && itemType == LauncherModel.Application && appControl.isUninstallable(object.filePath) && !object.isUpdating
+ visible: launcherEditMode && itemType == LauncherModel.ApCplication && appControl.isUninstallable(object.filePath) && !object.isUpdating
|
|
[-]
[+]
|
Changed |
_service:tar_git:sailfishos-patches-advanced-0.3.3.tar.bz2/maintained/homescreen-eventview-control-center/unified_diff.patch
^
|
| @@ -1,15 +1,15 @@
---- original/usr/share/lipstick-jolla-home-qt5/qml/EventsView.qml 2014-04-16 20:11:29.235787000 +0300
-+++ patched/usr/share/lipstick-jolla-home-qt5/qml/EventsView.qml 2014-04-16 20:12:27.938427102 +0300
+--- original/usr/share/lipstick-jolla-home-qt5/eventsview/EventsView.qml 2014-04-16 20:11:29.235787000 +0300
++++ patched/usr/share/lipstick-jolla-home-qt5/eventsview/EventsView.qml 2014-04-16 20:12:27.938427102 +0300
@@ -15,6 +15,8 @@
- import org.nemomobile.configuration 1.0
import Sailfish.Accounts 1.0
- import "scripts/desktop.js" as Desktop
+ import "../scripts/desktop.js" as Desktop
+ import "../notifications"
+import com.jolla.settings 1.0
+import org.nemomobile.systemsettings 1.0
ApplicationWindow {
id: eventFeedWindow
-@@ -151,6 +153,15 @@
+@@ -162,6 +164,15 @@
width: parent.width
height: Theme.paddingLarge
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:sailfishos-patches-advanced-0.3.3.tar.bz2/maintained/homescreen-force-2x2-multitask/unified_diff.patch
^
|
| @@ -1,5 +1,5 @@
---- original/usr/share/lipstick-jolla-home-qt5/qml/Switcher.qml 2014-04-11 18:27:26.136184697 +0200
-+++ patched/usr/share/lipstick-jolla-home-qt5/qml/Switcher.qml 2014-04-14 18:57:02.096244521 +0200
+--- original/usr/share/lipstick-jolla-home-qt5/switcher/Switcher.qml 2014-04-11 18:27:26.136184697 +0200
++++ patched/usr/share/lipstick-jolla-home-qt5/switcher/Switcher.qml 2014-04-14 18:57:02.096244521 +0200
@@ -103,9 +103,9 @@
function updateColumns() {
|
|
[-]
[+]
|
Changed |
_service:tar_git:sailfishos-patches-advanced-0.3.3.tar.bz2/maintained/homescreen-force-3x3-multitask/unified_diff.patch
^
|
| @@ -1,5 +1,5 @@
---- original/usr/share/lipstick-jolla-home-qt5/qml/Switcher.qml 2014-04-11 18:27:26.136184697 +0200
-+++ patched/usr/share/lipstick-jolla-home-qt5/qml/Switcher.qml 2014-04-14 18:57:02.096244521 +0200
+--- original/usr/share/lipstick-jolla-home-qt5/switcher/Switcher.qml 2014-04-11 18:27:26.136184697 +0200
++++ patched/usr/share/lipstick-jolla-home-qt5/switcher/Switcher.qml 2014-04-14 18:57:02.096244521 +0200
@@ -95,7 +95,7 @@
top: parent.top
margins: Theme.paddingLarge
|
|
[-]
[+]
|
Changed |
_service:tar_git:sailfishos-patches-advanced-0.3.3.tar.bz2/maintained/homescreen-swipe-feedback/unified_diff.patch
^
|
| @@ -1,10 +1,11 @@
---- original/usr/share/lipstick-jolla-home-qt5/qml/compositor.qml 2014-04-11 18:27:26.050184002 +0200
-+++ patched/usr/share/lipstick-jolla-home-qt5/qml/compositor.qml 2014-04-11 18:58:44.549885640 +0200
-@@ -193,6 +193,14 @@
- alarmsLayer.showAlarm(alarmsLayer.alarmWindowToBeClosed)
- alarmsLayer.alarmWindowToBeClosed = null
+diff -ur original/usr/share/lipstick-jolla-home-qt5/compositor.qml patched/usr/share/lipstick-jolla-home-qt5/compositor.qml
+--- original/usr/share/lipstick-jolla-home-qt5/compositor.qml 2014-11-18 21:22:01.005907235 +0100
++++ patched/usr/share/lipstick-jolla-home-qt5/compositor.qml 2014-11-21 20:42:35.473133859 +0100
+@@ -215,6 +215,14 @@
+ startHideApplicationWindow(partnerAppearAnimation.target)
}
-+
+ partnerAppearGesture = false
++
+ if (root.homePeeking) {
+ if (PeekFilter.activeArea == PeekFilter.Left || PeekFilter.activeArea == PeekFilter.Right) {
+ appLayer.state = "horizontalCancel"
@@ -15,12 +16,12 @@
}
PeekFilter.onGestureStarted: {
-@@ -202,6 +210,14 @@
- if (eventPeek && root.topmostAlarmWindow) {
- eventsLayer.aboveAlarms = true
+@@ -240,6 +248,14 @@
+ partnerAppearAnimation.target = targetWindow
+ partnerAppearGesture = true
}
-+
-+ if (root.homePeeking) {
++
++ if (root.homePeeking && !root.eventsPeeking) {
+ if (PeekFilter.activeArea == PeekFilter.Left || PeekFilter.activeArea == PeekFilter.Right) {
+ appLayer.state = "horizontalMove"
+ } else if (PeekFilter.activeArea == PeekFilter.Top || PeekFilter.activeArea == PeekFilter.Bottom) {
@@ -30,7 +31,7 @@
}
PeekFilter.onActiveChanged: {
-@@ -412,11 +428,124 @@
+@@ -516,7 +532,120 @@
Item {
id: appLayer
@@ -151,9 +152,13 @@
+ ]
z: 2
-
-- opacity: root.topmostApplicationWindow != null ? (!homePeek && (root.eventsActive || eventPeek || root.alarmActive) ? 1 : (root.appActive ? (1 - Math.min(1, PeekFilter.progress)) : (appPeek ? Math.min(1, PeekFilter.progress) : 0))) : 0
-+ opacity: root.topmostApplicationWindow != null ? (!homePeek && (root.eventsActive || eventPeek || root.alarmActive) ? 1 : (root.appActive ? (1 - 0.8 * Math.min(1, PeekFilter.progress)) : (appPeek ? Math.min(1, PeekFilter.progress) : 0))) : 0
+
+@@ -524,7 +653,7 @@
+
+ property bool keepAppLayerOpaque: !homePeek && (root.eventsActive || eventPeek || root.alarmActive || partnerAppearAnimation.running || partnerAppearGesture)
+
+- property real targetOpacity: root.topmostApplicationWindow != null ? (keepAppLayerOpaque ? 1 : (root.appActive ? (1 - Math.min(1, PeekFilter.progress)) : 0)) : ((root.partnerAppearGesture || partnerAppearAnimation.running) ? 1 : 0)
++ property real targetOpacity: root.topmostApplicationWindow != null ? (!homePeek && (root.eventsActive || eventPeek || root.alarmActive) ? 1 : (root.appActive ? (1 - 0.8 * Math.min(1, PeekFilter.progress)) : (appPeek ? Math.min(1, PeekFilter.progress) : 0))) : 0
visible: opacity > 0 // TODO: scenegraph should cull, but doesn't seem to do so. investigate.
enabled: root.appActive
-
+ opacity: 0
|
|
[-]
[+]
|
Changed |
_service:tar_git:sailfishos-patches-advanced-0.3.3.tar.bz2/unmaintained/homescreen-ambience-control-center/patch.json
^
|
| (renamed from maintained/homescreen-ambience-control-center/patch.json)
|
|
[-]
[+]
|
Added |
_service:tar_git:sailfishos-patches-advanced-0.3.3.tar.bz2/unmaintained/homescreen-ambience-control-center/unified_diff.patch
^
|
| @@ -0,0 +1,68 @@
+--- original/usr/share/lipstick-jolla-home-qt5/ambiencepicker/AmbiencePage.qml 2014-06-08 21:55:01.862978516 +0200
++++ patched/usr/share/lipstick-jolla-home-qt5/ambiencepicker/AmbiencePage.qml 2014-06-08 22:45:58.007084002 +0200
+@@ -9,6 +9,8 @@
+ import Sailfish.Silica 1.0
+ import Sailfish.Ambience 1.0
+ import Sailfish.Gallery 1.0
++import com.jolla.settings 1.0
++import org.nemomobile.systemsettings 1.0
+ import org.nemomobile.configuration 1.0
+ import org.nemomobile.thumbnailer 1.0
+ import org.nemomobile.lipstick 0.1
+@@ -32,6 +34,10 @@
+ && (ambienceSwitcherOpen || (ambienceSwitcherEnabled && ambienceModel.count > 1))
+ && (PeekFilter.activeArea == PeekFilter.Left || PeekFilter.activeArea == PeekFilter.Right) && Lipstick.compositor.homeActive
+ && !launcher.openedChildFolder && !desktop.closeApplicationEnabled
++ readonly property bool _switcherLockEnabled: (!progressAnimation.running && !contentAnimation.running)
++ && (ambienceSwitcherOpen || (ambienceSwitcherEnabled && ambienceModel.count > 1))
++ && (PeekFilter.activeArea == PeekFilter.Left || PeekFilter.activeArea == PeekFilter.Right) && Lipstick.compositor.homeActive
++ && !launcher.openedChildFolder && !desktop.closeApplicationEnabled
+
+ property string _currentHomeWallpaper: Ambience.homeWallpaper
+
+@@ -42,7 +48,9 @@
+ }
+
+ PeekFilter.onGestureStarted: {
+- if (_switcherEnabled) {
++ if ((_switcherEnabled && PeekFilter.activeArea == PeekFilter.Left)
++ || (_switcherLockEnabled && PeekFilter.activeArea == PeekFilter.Right)
++ || ambienceSwitcherOpen) {
+ anchorAmbienceItem()
+ progressBinding.when = true
+ }
+@@ -120,6 +128,16 @@
+ ambienceItem.anchors.right = undefined
+ ambienceItem.anchors.left = contentItem.right
+ }
++
++ if (!ambienceSwitcherOpen) {
++ if (PeekFilter.activeArea == PeekFilter.Right) {
++ gridView.visible = false
++ widgets.visible = true
++ } else {
++ gridView.visible = true
++ widgets.visible = false
++ }
++ }
+ }
+
+ property real _progress
+@@ -210,6 +228,17 @@
+ anchors.left: contentItem.right
+ // Scenegraph does not seem to cull yet, explicitly hide
+ visible: contentItem.x != 0 || page.ambienceSwitcherOpen
++
++ Item {
++ id: widgets
++ visible: false
++ anchors.fill: parent
++
++ FavoritesZone {
++ id: favorites
++ anchors.top: parent.top
++ }
++ }
+
+ ImageGridView {
+ id: gridView
|
|
[-]
[+]
|
Added |
_service:tar_git:sailfishos-patches-advanced-0.3.3.tar.bz2/unmaintained/homescreen-eventview-no-clear-remorse/patch.json
^
|
| @@ -0,0 +1,8 @@
+{
+ "name": "No remorse for clearing notifications",
+ "description": "A homescreen patch that removes the remorse timer when clearing notifications.",
+ "category": "homescreen",
+ "infos": {
+ "maintainer": "sevanteri"
+ }
+}
|
|
[-]
[+]
|
Added |
_service:tar_git:sailfishos-patches-advanced-0.3.3.tar.bz2/unmaintained/homescreen-eventview-no-clear-remorse/unified_diff.patch
^
|
| @@ -0,0 +1,26 @@
+--- original/usr/share/lipstick-jolla-home-qt5/eventsview/EventsView.qml 2014-07-15 16:58:26.839394563 +0300
++++ patched/usr/share/lipstick-jolla-home-qt5/eventsview/EventsView.qml 2014-07-15 16:59:25.882397760 +0300
+@@ -90,21 +90,7 @@
+ }
+
+ function clearNotifications() {
+- if (!remorse) {
+- remorse = remorseComponent.createObject(page)
+- }
+-
+- //% "Clearing notifications"
+- remorse.execute(qsTrId("lipstick-jolla-home-no-clearing-notifications"))
+- }
+-
+- Component {
+- id: remorseComponent
+-
+- RemorsePopup {
+- z: 100
+- onTriggered: verticalNotificationListModel.clearRequested()
+- }
++ verticalNotificationListModel.clearRequested()
+ }
+
+ SilicaListView {
+
|
|
[-]
[+]
|
Changed |
_service:tar_git:sailfishos-patches-advanced-0.3.3.tar.bz2/unmaintained/homescreen-unlimited-multitask/unified_diff.patch
^
|
| @@ -1,5 +1,5 @@
---- original/opt/lipstick-pandora/qml/Launcher.qml 2014-04-02 13:14:43.671356007 +0200
-+++ patched/opt/lipstick-pandora/qml/Launcher.qml 2014-04-04 14:43:25.786030732 +0200
+--- original/opt/lipstick-pandora/launcher/Launcher.qml 2014-04-02 13:14:43.671356007 +0200
++++ patched/opt/lipstick-pandora/launcher/Launcher.qml 2014-04-04 14:43:25.786030732 +0200
@@ -17,7 +17,8 @@
property Item reorderItem
property int columns: 4
|
