maemo.org - Talk

maemo.org - Talk (https://talk.maemo.org/index.php)
-   SailfishOS (https://talk.maemo.org/forumdisplay.php?f=52)
-   -   [WIP] App / Tweak: patchmanager a system-wide patching system + homescreen tweak (https://talk.maemo.org/showthread.php?t=92935)

cizi 2014-12-30 08:03

Re: [WIP] App / Tweak: patchmanager a system-wide patching system + homescreen tweak
 
Quote:

Originally Posted by J4ZZ (Post 1454309)
Your VolumeSlider.qml in
Code:

/usr/share/jolla-settings/pages/sounds/
should look like this

Code:

import QtQuick 2.0
import Sailfish.Silica 1.0
import com.jolla.settings.system 1.0
import org.nemomobile.systemsettings 1.0
import Sailfish.Ambience 1.0

Slider {
    id: slider

    property string entryPath

    //% "Default ringtone volume"
    label: qsTrId("settings_sounds_la_volume")
    maximumValue: 100
    minimumValue: 1
    value: profileControl.ringerVolume

    onValueChanged: profileControl.ringerVolume = value
    onPressAndHold: cancel()

    Profile {
        id: profileControl
        onRingerVolumeChanged: slider.value = profileControl.ringerVolume
    }
}


then the patch will work! ;)

Hi @J4ZZ thank you for your hint but still not works. Command line looks like this:
Code:

patch --dry-run -p 1 -d / -i /usr/share/patchmanager/patches/                                      sailfishos-eventsview-controls-remastered-patch/unified_diff.patch
patching file usr/share/lipstick-jolla-home-qt5/eventsview/EventsView.qml
patching file usr/share/lipstick-jolla-home-qt5/eventsview/EventsViewList.qml
patching file usr/share/lipstick-jolla-home-qt5/eventsview/FavoritesZoneControls                                      .qml
patching file usr/share/jolla-settings/pages/sounds/VolumeSlider.qml
Reversed (or previously applied) patch detected!  Assume -R? [n] y
patching file usr/share/jolla-settings/pages/mobilenetworking/DataConnection.qml
patching file usr/share/jolla-settings/pages/bluetooth/EnableSwitch.qml
patching file usr/share/jolla-settings/pages/gps_and_location/LocationSwitch.qml
[root@Jolla nemo]#

To be honest I have no idea what happened but the patch is still not working :-(.I tried this run from command line and I tried run the patch from patchmanager, still "Failed to install patch".

Do you know what is wrong please?

Eminem 2014-12-30 09:00

Re: [WIP] App / Tweak: patchmanager a system-wide patching system + homescreen tweak
 
1 Attachment(s)
Quote:

Originally Posted by J4ZZ (Post 1454335)
I'm pretty sure you do! ;)

Oops, got the folder but not the file. :(

J4ZZ 2014-12-30 14:18

Re: [WIP] App / Tweak: patchmanager a system-wide patching system + homescreen tweak
 
Quote:

Originally Posted by cizi (Post 1454367)
Hi @J4ZZ thank you for your hint but still not works. Command line looks like this:
[CODE]patch --dry-run -p 1 -d / -i /usr/share/patchmanager/patches/ sailfishos-eventsview-controls-remastered-patch/unified_diff.patch
patching file usr/share/jolla-settings/pages/sounds/VolumeSlider.qml
Reversed (or previously applied) patch detected! Assume -R? [n] y
CODE]

To be honest I have no idea what happened but the patch is still not working :-(.I tried this run from command line and I tried run the patch from patchmanager, still "Failed to install patch".

Do you know what is wrong please?

Sorry mate, I accently provided the content of an already patched VolumeSlider.qml...

here's the correct one (unpatched) VolumeSlider.qml

Code:

import QtQuick 2.0
import Sailfish.Silica 1.0
import com.jolla.settings.system 1.0
import org.nemomobile.systemsettings 1.0


Slider {
    id: slider

    property string entryPath

    //% "Default ringtone volume"
    label: qsTrId("settings_sounds_la_volume")
    maximumValue: 100
    minimumValue: 1
    value: profileControl.ringerVolume

    onValueChanged: profileControl.ringerVolume = value
    onPressAndHold: cancel()

    ProfileControl {
        id: profileControl
        onRingerVolumeChanged: slider.value = profileControl.ringerVolume
    }
}


J4ZZ 2014-12-30 14:22

Re: [WIP] App / Tweak: patchmanager a system-wide patching system + homescreen tweak
 
Quote:

Originally Posted by Eminem (Post 1454374)
Oops, got the folder but not the file. :(

Could you post the output of
Code:

patch --dry-run -p 1 -d / -i /usr/share/patchmanager/patches/sailfishos-eventsview-controls-remastered-patch/unified_diff.patch
please?

Eminem 2014-12-30 16:46

Re: [WIP] App / Tweak: patchmanager a system-wide patching system + homescreen tweak
 
Code:

[root@Jolla Downloads]# patch --dry-run -p 1 -d / -i /usr/share/patchmanager/patches/sailfishos-eventsview-controls-remastered-patch/unified_diff.patch
patching file usr/share/lipstick-jolla-home-qt5/eventsview/EventsView.qml
patching file usr/share/lipstick-jolla-home-qt5/eventsview/EventsViewList.qml
The next patch would create the file usr/share/lipstick-jolla-home-qt5/eventsview/FavoritesZoneControls.qml,
which already exists!  Assume -R? [n] n
Apply anyway? [n] n
Skipping patch.
1 out of 1 hunk ignored
patching file usr/share/jolla-settings/pages/sounds/VolumeSlider.qml
Hunk #2 FAILED at 18.
1 out of 2 hunks FAILED -- saving rejects to file usr/share/jolla-settings/pages/sounds/VolumeSlider.qml.rej
patching file usr/share/jolla-settings/pages/mobilenetworking/DataConnection.qml
patching file usr/share/jolla-settings/pages/bluetooth/EnableSwitch.qml
patching file usr/share/jolla-settings/pages/gps_and_location/LocationSwitch.qml
[root@Jolla Downloads]#


coderus 2014-12-30 17:37

Re: [WIP] App / Tweak: patchmanager a system-wide patching system + homescreen tweak
 
You just wait a bit. I'll update patches tomorrow.

TrD 2014-12-30 18:27

Re: [WIP] App / Tweak: patchmanager a system-wide patching system + homescreen tweak
 
Everyones talking about control center but how can I get 5x6 appgrid working? or is it working for every1 else and I just messed up something?

J4ZZ 2014-12-30 19:20

Re: [WIP] App / Tweak: patchmanager a system-wide patching system + homescreen tweak
 
Quote:

Originally Posted by Eminem (Post 1454434)
Code:

[root@Jolla Downloads]#
The next patch would create the file usr/share/lipstick-jolla-home-qt5/eventsview/FavoritesZoneControls.qml
patching file usr/share/jolla-settings/pages/sounds/VolumeSlider.qml


edit the content of your VolumeSlider.qml like I described above for user cizi and additionally remove or rename FavoritesZoneControls.qml... I marked the paths in red. :)

J4ZZ 2014-12-30 19:25

Re: [WIP] App / Tweak: patchmanager a system-wide patching system + homescreen tweak
 
Quote:

Originally Posted by TrD (Post 1454441)
Everyones talking about control center but how can I get 5x6 appgrid working? or is it working for every1 else and I just messed up something?

Yes it works fine, but is also included in launcher-combined-patches
So basically 5x6 patch is not needed anymore.

Eminem 2014-12-30 23:44

Re: [WIP] App / Tweak: patchmanager a system-wide patching system + homescreen tweak
 
Quote:

Originally Posted by J4ZZ (Post 1454446)
edit the content of your VolumeSlider.qml like I described above for user cizi and additionally remove or rename FavoritesZoneControls.qml... I marked the paths in red. :)

Output after editing is:

Code:

[root@Jolla ~]# patch --dry-run -p 1 -d / -i /usr/share/patchmanager/patches/sailfishos-eventsview-controls-remastered-patch/unified_diff.patch
patching file usr/share/lipstick-jolla-home-qt5/eventsview/EventsView.qml
patching file usr/share/lipstick-jolla-home-qt5/eventsview/EventsViewList.qml
patching file usr/share/lipstick-jolla-home-qt5/eventsview/FavoritesZoneControls.qml
patching file usr/share/jolla-settings/pages/sounds/VolumeSlider.qml
patching file usr/share/jolla-settings/pages/mobilenetworking/DataConnection.qml
patching file usr/share/jolla-settings/pages/bluetooth/EnableSwitch.qml
patching file usr/share/jolla-settings/pages/gps_and_location/LocationSwitch.qml
[root@Jolla ~]#

:D


All times are GMT. The time now is 16:55.

vBulletin® Version 3.8.8