Code Review
/
staging
/
HomeScreen.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add 2017 to copyright
[staging/HomeScreen.git]
/
HomeScreen
/
qml
/
ShortcutArea.qml
diff --git
a/HomeScreen/qml/ShortcutArea.qml
b/HomeScreen/qml/ShortcutArea.qml
index
aeaf097
..
14c7b6b
100644
(file)
--- a/
HomeScreen/qml/ShortcutArea.qml
+++ b/
HomeScreen/qml/ShortcutArea.qml
@@
-1,6
+1,6
@@
/*
* Copyright (C) 2016 The Qt Company Ltd.
/*
* Copyright (C) 2016 The Qt Company Ltd.
- * Copyright (C) 2016 Mentor Graphics Development (Deutschland) GmbH
+ * Copyright (C) 2016
, 2017
Mentor Graphics Development (Deutschland) GmbH
*
* 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.
@@
-28,7
+28,7
@@
Item {
id: applicationModel
ListElement {
name: 'Home'
id: applicationModel
ListElement {
name: 'Home'
- application: '
home@0.1
'
+ application: ''
}
ListElement {
name: 'Multimedia'
}
ListElement {
name: 'Multimedia'
@@
-40,11
+40,10
@@
Item {
}
ListElement {
name: 'Navigation'
}
ListElement {
name: 'Navigation'
- application: '
controls
@0.1'
+ application: '
navigation
@0.1'
}
}
}
}
- property int currentIndex: -1 // TODO: to be moved to whereever right
property int pid: -1
RowLayout {
property int pid: -1
RowLayout {
@@
-56,13
+55,13
@@
Item {
Layout.fillWidth: true
Layout.fillHeight: true
name: model.name
Layout.fillWidth: true
Layout.fillHeight: true
name: model.name
- active: model.
index === root.currentIndex
+ active: model.
application === launcher.current
onClicked: {
onClicked: {
- root.currentIndex = active ? -1 : model.index
if (0 === model.index) {
appLauncherAreaLauncher.visible = true
applicationArea.visible = false
layoutHandler.hideAppLayer()
if (0 === model.index) {
appLauncherAreaLauncher.visible = true
applicationArea.visible = false
layoutHandler.hideAppLayer()
+ launcher.current = ''
}
else {
pid = launcher.launch(model.application)
}
else {
pid = launcher.launch(model.application)