summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernd Weimer <bernd.weimer@pelagicore.com>2019-07-19 13:33:32 +0200
committerBernd Weimer <bernd.weimer@pelagicore.com>2019-08-08 16:32:00 +0200
commit21db103f4de134c0c1141839551cace1610912ed (patch)
treea6484c2ca275dff32352b96b9ecb91dbed193a74
parent40b884dc34352ad4aa013a7d4bb35fac89656c66 (diff)
Repaint minidesk
Pig pink palled. Also added some transparency to better illustrate compositing. Change-Id: I1c8f894dd22213e65c6692024b4c8bad4bbe7ec5 Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
-rw-r--r--examples/applicationmanager/minidesk/apps/tld.minidesk.app1/app1.qml6
-rw-r--r--examples/applicationmanager/minidesk/apps/tld.minidesk.app1/icon.pngbin5138 -> 4804 bytes
-rw-r--r--examples/applicationmanager/minidesk/apps/tld.minidesk.app2/app2.qml2
-rw-r--r--examples/applicationmanager/minidesk/apps/tld.minidesk.app2/icon.pngbin5597 -> 4399 bytes
-rw-r--r--examples/applicationmanager/minidesk/doc/images/minidesk.pngbin103040 -> 84974 bytes
-rw-r--r--examples/applicationmanager/minidesk/doc/src/minidesk.qdoc18
-rw-r--r--examples/applicationmanager/minidesk/system-ui/chrome-bg.pngbin0 -> 488 bytes
-rw-r--r--examples/applicationmanager/minidesk/system-ui/main.qml13
8 files changed, 20 insertions, 19 deletions
diff --git a/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/app1.qml b/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/app1.qml
index 4b3767c8..62aa661a 100644
--- a/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/app1.qml
+++ b/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/app1.qml
@@ -56,12 +56,12 @@ import QtApplicationManager.Application 2.0
ApplicationManagerWindow {
id: root
- color: "peachpuff"
+ color: "lightgrey"
Rectangle {
anchors.centerIn: parent
width: 180; height: 180; radius: width/4
- color: "peru"
+ color: "lightsteelblue"
Image {
source: ApplicationInterface.icon
@@ -90,7 +90,7 @@ ApplicationManagerWindow {
ApplicationManagerWindow {
id: popUp
visible: false
- color: "lightcoral"
+ color: "orangered"
Text {
anchors.centerIn: parent
diff --git a/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/icon.png b/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/icon.png
index adb840ce..35a54600 100644
--- a/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/icon.png
+++ b/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/icon.png
Binary files differ
diff --git a/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/app2.qml b/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/app2.qml
index e7784d93..c4bef427 100644
--- a/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/app2.qml
+++ b/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/app2.qml
@@ -55,7 +55,7 @@ import QtQuick 2.4
import QtApplicationManager.Application 2.0
ApplicationManagerWindow {
- color: ApplicationInterface.systemProperties.light ? "peachpuff" : "black"
+ color: ApplicationInterface.systemProperties.light ? "#B0808080" : "black"
Image {
anchors.centerIn: parent
diff --git a/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/icon.png b/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/icon.png
index 3f8caa42..9c1d6cf2 100644
--- a/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/icon.png
+++ b/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/icon.png
Binary files differ
diff --git a/examples/applicationmanager/minidesk/doc/images/minidesk.png b/examples/applicationmanager/minidesk/doc/images/minidesk.png
index 66a545c9..edbe0783 100644
--- a/examples/applicationmanager/minidesk/doc/images/minidesk.png
+++ b/examples/applicationmanager/minidesk/doc/images/minidesk.png
Binary files differ
diff --git a/examples/applicationmanager/minidesk/doc/src/minidesk.qdoc b/examples/applicationmanager/minidesk/doc/src/minidesk.qdoc
index 4e68cf7e..867448e8 100644
--- a/examples/applicationmanager/minidesk/doc/src/minidesk.qdoc
+++ b/examples/applicationmanager/minidesk/doc/src/minidesk.qdoc
@@ -81,11 +81,11 @@ The \c appman binary (executable file) is usually located in the Qt installation
\dots
The \l{QtApplicationManager.SystemUI} module has to be imported to access the application manager
-APIs. The System UI window has a fixed size and linen background color. Instead of a \l{Rectangle},
-the root element could also be a \l{Window}. On top of the background, we display a
-\c Readme element with information on the
-features available. At the bottom left there is a textual indication for whether the
-application manager runs in single-process or multi-process mode.
+APIs. The System UI window has a fixed size and "whitesmoke" background color. Instead of a
+\l{Window}, the root element could also be a regular item, like a \l{Rectangle}. The application
+manager would wrap it in a window for you. On top of the background, we display a \c Readme element
+with information on the features available. At the bottom left there is a textual indication for
+whether the application manager runs in single-process or multi-process mode.
\section2 Launcher
@@ -114,8 +114,8 @@ WindowManager. The code that populates the window role of this ListModel is show
now let's focus on what this Repeater's delegate consists of:
\list
- \li A fixed size window container \l{Rectangle} in "tan" color. The location depends on the
- \c model.index, hence each application window has a different initial location.
+ \li A mostly transparent background \l{Image}. The location depends on the \c model.index,
+ hence each application window has a different initial location.
\li The name of the application that created that window, prefixed with "Decoration" on top.
This name is from the related ApplicationObject, defined in the application's
\l{Manifest Definition}{info.yaml} file.
@@ -205,7 +205,7 @@ the \l {WindowManager::windowAdded}{onWindowAdded} handler is invoked.
Only App1's "pop-up" ApplicationManagerWindow has the user-defined \c type property set. Such a
window is placed in the \c popUpContainer WindowItem. All other windows don't have a \c type
-property; they are added to the \c topLevelWindowsModel. This model is used in the SystemUI chrome
+property; they are added to the \c topLevelWindowsModel. This model is used in the System UI chrome
Repeater above. Consequently, the \l {WindowObject}{window} object passed as an argument to
\l {WindowManager::windowAdded}{onWindowAdded} is set as the
\l{WindowItem::window}{window} property of the WindowItem (within the Repeater's delegate).
@@ -215,7 +215,7 @@ will also be displayed since in the configuration file, "\c flags/noSecurity: \c
instance in KDE's Calculator:
\badcode
-$ QT_WAYLAND_DISABLE_WINDOWDECORATION=1 QT_WAYLAND_SHELL_INTEGRATION=xdg-shell-v5 kcalc -platform wayland
+$ QT_WAYLAND_DISABLE_WINDOWDECORATION=1 WAYLAND_DISPLAY=qtam-wayland-0 kcalc -platform wayland
\endcode
\section2 Inter-Process Communication (IPC) Extension
diff --git a/examples/applicationmanager/minidesk/system-ui/chrome-bg.png b/examples/applicationmanager/minidesk/system-ui/chrome-bg.png
new file mode 100644
index 00000000..0a6618c4
--- /dev/null
+++ b/examples/applicationmanager/minidesk/system-ui/chrome-bg.png
Binary files differ
diff --git a/examples/applicationmanager/minidesk/system-ui/main.qml b/examples/applicationmanager/minidesk/system-ui/main.qml
index bc2a8aef..577599a2 100644
--- a/examples/applicationmanager/minidesk/system-ui/main.qml
+++ b/examples/applicationmanager/minidesk/system-ui/main.qml
@@ -51,13 +51,15 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.11
+import QtQuick.Window 2.11
import QtApplicationManager.SystemUI 2.0
-Rectangle {
+Window {
+ title: "Minidesk - QtApplicationManager Example"
width: 1024
height: 640
- color: "linen"
+ color: "whitesmoke"
Readme {}
@@ -87,10 +89,9 @@ Rectangle {
Repeater {
model: ListModel { id: topLevelWindowsModel }
- delegate: Rectangle {
- width: 400; height: 320
+ delegate: Image {
+ source: "chrome-bg.png"
z: model.index
- color: "tan"
Text {
anchors.horizontalCenter: parent.horizontalCenter