summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--wayland/democompositor/democompositor.qrc8
-rw-r--r--wayland/democompositor/images/Icon_Clocks.pngbin0 -> 1870 bytes
-rw-r--r--wayland/democompositor/images/Icon_Maps.pngbin0 -> 1529 bytes
-rw-r--r--wayland/democompositor/images/Icon_RSS.pngbin0 -> 1769 bytes
-rw-r--r--wayland/democompositor/images/Icon_StocQt.pngbin0 -> 1639 bytes
-rw-r--r--wayland/democompositor/qml/MyButton.qml2
-rw-r--r--wayland/democompositor/qml/Screen.qml8
7 files changed, 8 insertions, 10 deletions
diff --git a/wayland/democompositor/democompositor.qrc b/wayland/democompositor/democompositor.qrc
index e4fcc75..940f04e 100644
--- a/wayland/democompositor/democompositor.qrc
+++ b/wayland/democompositor/democompositor.qrc
@@ -6,15 +6,15 @@
<file>qml/MyButton.qml</file>
<file>qml/LaunchButton.qml</file>
<file>qml/TimedButton.qml</file>
- <file>images/icon1.png</file>
- <file>images/icon2.png</file>
- <file>images/icon3.png</file>
- <file>images/icon4.png</file>
<file>images/quit.png</file>
<file>images/greendot.png</file>
<file>images/reddot.png</file>
<file>images/graydot.png</file>
<file>images/graydots.png</file>
<file>images/greendots.png</file>
+ <file>images/Icon_Clocks.png</file>
+ <file>images/Icon_Maps.png</file>
+ <file>images/Icon_RSS.png</file>
+ <file>images/Icon_StocQt.png</file>
</qresource>
</RCC>
diff --git a/wayland/democompositor/images/Icon_Clocks.png b/wayland/democompositor/images/Icon_Clocks.png
new file mode 100644
index 0000000..0ca1955
--- /dev/null
+++ b/wayland/democompositor/images/Icon_Clocks.png
Binary files differ
diff --git a/wayland/democompositor/images/Icon_Maps.png b/wayland/democompositor/images/Icon_Maps.png
new file mode 100644
index 0000000..fac0dc9
--- /dev/null
+++ b/wayland/democompositor/images/Icon_Maps.png
Binary files differ
diff --git a/wayland/democompositor/images/Icon_RSS.png b/wayland/democompositor/images/Icon_RSS.png
new file mode 100644
index 0000000..54ada4f
--- /dev/null
+++ b/wayland/democompositor/images/Icon_RSS.png
Binary files differ
diff --git a/wayland/democompositor/images/Icon_StocQt.png b/wayland/democompositor/images/Icon_StocQt.png
new file mode 100644
index 0000000..d12aec1
--- /dev/null
+++ b/wayland/democompositor/images/Icon_StocQt.png
Binary files differ
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 {