diff options
| author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2016-02-17 11:58:54 +0100 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-03-11 08:50:46 +0000 |
| commit | 15ce4b3327f0815900e4453f2f83e4eb898e1d82 (patch) | |
| tree | 3d695a349ee5c88584e49f2ec73565bc404f2370 /wayland/democompositor/qml | |
| parent | cdaf26d23204a0a745885ab0db886388618d50db (diff) | |
New icons
Change-Id: Ibb6c7c52dc9004268fc4ff501fc5a38b25743d25
Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
Diffstat (limited to 'wayland/democompositor/qml')
| -rw-r--r-- | wayland/democompositor/qml/MyButton.qml | 2 | ||||
| -rw-r--r-- | wayland/democompositor/qml/Screen.qml | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/wayland/democompositor/qml/MyButton.qml b/wayland/democompositor/qml/MyButton.qml index c8397a6..30d7236 100644 --- a/wayland/democompositor/qml/MyButton.qml +++ b/wayland/democompositor/qml/MyButton.qml @@ -118,8 +118,6 @@ Item { rect.anchors.right = parent.right parent.longPressed = false } - onEntered: console.log("Enter: " + buttonText.text) - onExited: console.log("Exit: " + buttonText.text) drag.target: rect drag.threshold: 5 drag.axis: Drag.XAxis diff --git a/wayland/democompositor/qml/Screen.qml b/wayland/democompositor/qml/Screen.qml index 2064480..48abd19 100644 --- a/wayland/democompositor/qml/Screen.qml +++ b/wayland/democompositor/qml/Screen.qml @@ -246,7 +246,7 @@ WaylandOutput { textColor: textCol text.text: "Clocks" executable: "./clocks" - icon.source: "qrc:/images/icon1.png" + icon.source: "qrc:/images/Icon_Clocks.png" } LaunchButton { @@ -257,7 +257,7 @@ WaylandOutput { textColor: textCol text.text: "RSS News" executable: "./rssnews" - icon.source: "qrc:/images/icon2.png" + icon.source: "qrc:/images/Icon_RSS.png" } LaunchButton { height: 60 @@ -267,7 +267,7 @@ WaylandOutput { textColor: textCol text.text: "StoQt" executable: "./stocqt" - icon.source: "qrc:/images/icon3.png" + icon.source: "qrc:/images/Icon_StocQt.png" } LaunchButton { height: 60 @@ -277,7 +277,7 @@ WaylandOutput { textColor: textCol text.text: "Maps" executable: "./qml_location_mapviewer" - icon.source: "qrc:/images/icon4.png" + icon.source: "qrc:/images/Icon_Maps.png" } TimedButton { |