diff options
author | Arnaud Ferraris <arnaud.ferraris@collabora.com> | 2021-12-10 12:44:27 +0100 |
---|---|---|
committer | Arnaud Ferraris <arnaud.ferraris@collabora.com> | 2021-12-20 21:08:46 +0100 |
commit | 9495545c38d5e72014cba05f8ea79c98ed3321a1 (patch) | |
tree | 51a4fcd709e772c4ed824ed9757c17d3463ef4f2 /launcher/qml | |
parent | 20cd96660d4bfb44e0be5695f71a92d5fb53a143 (diff) |
launcher: rely on applaunchd for application startupmarlin_12.91.0marlin/12.91.012.91.0
In the new App FW setup, `launcher` should only instruct `applaunchd` to
execute an application. In order to do so, it must first build a list of
available applications by looking for and parsing `.desktop` files in
relevant folders.
Then, when an application must be started, it has to call the
corresponding `applaunchd` method through D-Bus, which will then handle
the application startup using either command line execution or D-Bus
activation.
Bug-AGL: SPEC-4159 SPEC-4160
Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
Change-Id: Ie2f55a5acb64ed90aa6aafb687c927d87f6cc0aa
Diffstat (limited to 'launcher/qml')
-rw-r--r-- | launcher/qml/IconItem.qml | 2 | ||||
-rw-r--r-- | launcher/qml/Launcher.qml | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/launcher/qml/IconItem.qml b/launcher/qml/IconItem.qml index 5adbe81..5207196 100644 --- a/launcher/qml/IconItem.qml +++ b/launcher/qml/IconItem.qml @@ -39,7 +39,7 @@ Item { anchors.horizontalCenter: parent.horizontalCenter width: 220 height: width - source: './images/%1_%2.svg'.arg(model.icon).arg(loc.pressed && (loc.index === model.index || loc.currentId === model.id) ? 'active' : 'inactive') + source: main.icon antialiasing: item.state !== '' property string initial: model.name.substring(0,1).toUpperCase() diff --git a/launcher/qml/Launcher.qml b/launcher/qml/Launcher.qml index befce07..3c948dd 100644 --- a/launcher/qml/Launcher.qml +++ b/launcher/qml/Launcher.qml @@ -82,7 +82,6 @@ ApplicationWindow { property string currentId: '' property int newIndex: -1 property int index: grid.indexAt(loc.mouseX, loc.mouseY) - property string output_screen: '' x: 62 y: 264 onPressAndHold: currentId = applicationModel.id(newIndex = index) @@ -96,7 +95,7 @@ ApplicationWindow { // output_screen = 'Virtual-1' //} if (currentId === '') { - homescreenHandler.tapShortcut(applicationModel.appid(loc.index), output_screen) + homescreenHandler.tapShortcut(applicationModel.appid(loc.index)) } else { currentId = '' } |