Code Review
/
apps
/
homescreen.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
homescreen: fix master volume control name
[apps/homescreen.git]
/
homescreen
/
qml
/
ShortcutArea.qml
diff --git
a/homescreen/qml/ShortcutArea.qml
b/homescreen/qml/ShortcutArea.qml
index
e0c9182
..
489b1e0
100644
(file)
--- a/
homescreen/qml/ShortcutArea.qml
+++ b/
homescreen/qml/ShortcutArea.qml
@@
-1,7
+1,7
@@
/*
* Copyright (C) 2016 The Qt Company Ltd.
* Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH
/*
* Copyright (C) 2016 The Qt Company Ltd.
* Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH
- * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
+ * Copyright (c) 2017
, 2018, 2019
TOYOTA MOTOR CORPORATION
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-18,28
+18,30
@@
import QtQuick 2.2
import QtQuick.Layouts 1.1
import QtQuick 2.2
import QtQuick.Layouts 1.1
+import QtQuick.Window 2.2
Item {
id: root
Item {
id: root
- width: 785
- height: 218
-
ListModel {
id: applicationModel
ListElement {
ListModel {
id: applicationModel
ListElement {
+ appid: 'launcher'
name: 'launcher'
application: 'launcher@0.1'
}
ListElement {
name: 'launcher'
application: 'launcher@0.1'
}
ListElement {
+ appid: 'mediaplayer'
name: 'MediaPlayer'
application: 'mediaplayer@0.1'
}
ListElement {
name: 'MediaPlayer'
application: 'mediaplayer@0.1'
}
ListElement {
+ appid: 'hvac'
name: 'HVAC'
application: 'hvac@0.1'
}
ListElement {
name: 'HVAC'
application: 'hvac@0.1'
}
ListElement {
+ appid: 'navigation'
name: 'Navigation'
application: 'navigation@0.1'
}
name: 'Navigation'
application: 'navigation@0.1'
}
@@
-49,7
+51,7
@@
Item {
RowLayout {
anchors.fill: parent
RowLayout {
anchors.fill: parent
- spacing:
2
+ spacing:
0
Repeater {
model: applicationModel
delegate: ShortcutIcon {
Repeater {
model: applicationModel
delegate: ShortcutIcon {
@@
-58,17
+60,10
@@
Item {
name: model.name
active: model.name === launcher.current
onClicked: {
name: model.name
active: model.name === launcher.current
onClicked: {
- pid = launcher.launch(model.application)
- if (1 < pid) {
- applicationArea.visible = true
- }
- else {
- console.warn(model.application)
- console.warn("app cannot be launched!")
- }
- homescreenHandler.tapShortcut(model.name)
+ console.log("Activating: " + model.appid)
+ homescreenHandler.tapShortcut(model.appid)
}
}
}
}
-
}
+ }
}
}
}
}