diff options
Diffstat (limited to 'examples/applicationmanager')
52 files changed, 85 insertions, 77 deletions
diff --git a/examples/applicationmanager/animated-windows/apps/animated-windows.fish/fish.qml b/examples/applicationmanager/animated-windows/apps/animated-windows.fish/fish.qml index 1c6a56e5..60e64926 100644 --- a/examples/applicationmanager/animated-windows/apps/animated-windows.fish/fish.qml +++ b/examples/applicationmanager/animated-windows/apps/animated-windows.fish/fish.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/animated-windows/apps/animated-windows.rabbit/rabbit.qml b/examples/applicationmanager/animated-windows/apps/animated-windows.rabbit/rabbit.qml index 4b5892b0..42a2cfab 100644 --- a/examples/applicationmanager/animated-windows/apps/animated-windows.rabbit/rabbit.qml +++ b/examples/applicationmanager/animated-windows/apps/animated-windows.rabbit/rabbit.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/animated-windows/doc/src/animated-windows.qdoc b/examples/applicationmanager/animated-windows/doc/src/animated-windows.qdoc index d412054c..efdb3157 100644 --- a/examples/applicationmanager/animated-windows/doc/src/animated-windows.qdoc +++ b/examples/applicationmanager/animated-windows/doc/src/animated-windows.qdoc @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Luxoft Application Manager. +** This file is part of the documentation of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:FDL-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/animated-windows/system-ui/main.qml b/examples/applicationmanager/animated-windows/system-ui/main.qml index cab98951..fd64b494 100644 --- a/examples/applicationmanager/animated-windows/system-ui/main.qml +++ b/examples/applicationmanager/animated-windows/system-ui/main.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/custom-appman/custom-appman.cpp b/examples/applicationmanager/custom-appman/custom-appman.cpp index 85f5d87a..45591130 100644 --- a/examples/applicationmanager/custom-appman/custom-appman.cpp +++ b/examples/applicationmanager/custom-appman/custom-appman.cpp @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage @@ -55,8 +55,8 @@ #include <QtAppManCommon/logging.h> #include <QtAppManMain/main.h> #include <QtAppManMain/defaultconfiguration.h> -#include <QtAppManPackage/package.h> -#include <QtAppManInstaller/sudo.h> +#include <QtAppManPackage/packageutilities.h> +#include <QtAppManManager/sudo.h> QT_USE_NAMESPACE_AM @@ -67,7 +67,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) QCoreApplication::setApplicationVersion("0.1"); Logging::initialize(argc, argv); - Package::ensureCorrectLocale(); + PackageUtilities::ensureCorrectLocale(); Sudo::forkServer(Sudo::DropPrivilegesPermanently); try { diff --git a/examples/applicationmanager/custom-appman/doc/src/custom-appman.qdoc b/examples/applicationmanager/custom-appman/doc/src/custom-appman.qdoc index 2f819c32..7aed03bb 100644 --- a/examples/applicationmanager/custom-appman/doc/src/custom-appman.qdoc +++ b/examples/applicationmanager/custom-appman/doc/src/custom-appman.qdoc @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Luxoft Application Manager. +** This file is part of the documentation of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:FDL-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/frame-timer/apps/frame-timer.fish/fish.qml b/examples/applicationmanager/frame-timer/apps/frame-timer.fish/fish.qml index 823ce505..9d3c6107 100644 --- a/examples/applicationmanager/frame-timer/apps/frame-timer.fish/fish.qml +++ b/examples/applicationmanager/frame-timer/apps/frame-timer.fish/fish.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/frame-timer/apps/frame-timer.rabbit/rabbit.qml b/examples/applicationmanager/frame-timer/apps/frame-timer.rabbit/rabbit.qml index 4b5892b0..42a2cfab 100644 --- a/examples/applicationmanager/frame-timer/apps/frame-timer.rabbit/rabbit.qml +++ b/examples/applicationmanager/frame-timer/apps/frame-timer.rabbit/rabbit.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/frame-timer/doc/src/frame-timer-example.qdoc b/examples/applicationmanager/frame-timer/doc/src/frame-timer-example.qdoc index 2397f508..e0939058 100644 --- a/examples/applicationmanager/frame-timer/doc/src/frame-timer-example.qdoc +++ b/examples/applicationmanager/frame-timer/doc/src/frame-timer-example.qdoc @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Luxoft Application Manager. +** This file is part of the documentation of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:FDL-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/frame-timer/system-ui/main.qml b/examples/applicationmanager/frame-timer/system-ui/main.qml index 1055843d..b95cec1d 100644 --- a/examples/applicationmanager/frame-timer/system-ui/main.qml +++ b/examples/applicationmanager/frame-timer/system-ui/main.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/hello-world/apps/hello-world.blue/main.qml b/examples/applicationmanager/hello-world/apps/hello-world.blue/main.qml index 8dd0a2a4..a2ba7929 100644 --- a/examples/applicationmanager/hello-world/apps/hello-world.blue/main.qml +++ b/examples/applicationmanager/hello-world/apps/hello-world.blue/main.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/hello-world/apps/hello-world.green/main.qml b/examples/applicationmanager/hello-world/apps/hello-world.green/main.qml index e2bbfd41..6fda63f7 100644 --- a/examples/applicationmanager/hello-world/apps/hello-world.green/main.qml +++ b/examples/applicationmanager/hello-world/apps/hello-world.green/main.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/hello-world/apps/hello-world.red/main.qml b/examples/applicationmanager/hello-world/apps/hello-world.red/main.qml index 944ee7db..fd04b159 100644 --- a/examples/applicationmanager/hello-world/apps/hello-world.red/main.qml +++ b/examples/applicationmanager/hello-world/apps/hello-world.red/main.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/hello-world/doc/src/hello-world.qdoc b/examples/applicationmanager/hello-world/doc/src/hello-world.qdoc index e3978de5..71d94a65 100644 --- a/examples/applicationmanager/hello-world/doc/src/hello-world.qdoc +++ b/examples/applicationmanager/hello-world/doc/src/hello-world.qdoc @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Luxoft Application Manager. +** This file is part of the documentation of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:FDL-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/hello-world/system-ui.qml b/examples/applicationmanager/hello-world/system-ui.qml index 2d5aaa11..95f3edb8 100644 --- a/examples/applicationmanager/hello-world/system-ui.qml +++ b/examples/applicationmanager/hello-world/system-ui.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/intents/apps/intents.blue/main.qml b/examples/applicationmanager/intents/apps/intents.blue/main.qml index fe549f88..89321457 100644 --- a/examples/applicationmanager/intents/apps/intents.blue/main.qml +++ b/examples/applicationmanager/intents/apps/intents.blue/main.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/intents/apps/intents.green/main.qml b/examples/applicationmanager/intents/apps/intents.green/main.qml index fe549f88..89321457 100644 --- a/examples/applicationmanager/intents/apps/intents.green/main.qml +++ b/examples/applicationmanager/intents/apps/intents.green/main.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/intents/apps/intents.red/main.qml b/examples/applicationmanager/intents/apps/intents.red/main.qml index 3d6b070d..f9c3998a 100644 --- a/examples/applicationmanager/intents/apps/intents.red/main.qml +++ b/examples/applicationmanager/intents/apps/intents.red/main.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/intents/doc/src/intents.qdoc b/examples/applicationmanager/intents/doc/src/intents.qdoc index 07c062b3..f1da854a 100644 --- a/examples/applicationmanager/intents/doc/src/intents.qdoc +++ b/examples/applicationmanager/intents/doc/src/intents.qdoc @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Luxoft Application Manager. +** This file is part of the documentation of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:FDL-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/intents/shared/IntentsApplicationWindow.qml b/examples/applicationmanager/intents/shared/IntentsApplicationWindow.qml index 4f56b576..ee58b1c2 100644 --- a/examples/applicationmanager/intents/shared/IntentsApplicationWindow.qml +++ b/examples/applicationmanager/intents/shared/IntentsApplicationWindow.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/intents/shared/IntentsUIPage.qml b/examples/applicationmanager/intents/shared/IntentsUIPage.qml index ccf5534f..0420a089 100644 --- a/examples/applicationmanager/intents/shared/IntentsUIPage.qml +++ b/examples/applicationmanager/intents/shared/IntentsUIPage.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/intents/system-ui.qml b/examples/applicationmanager/intents/system-ui.qml index 07efbcf2..328eb63b 100644 --- a/examples/applicationmanager/intents/system-ui.qml +++ b/examples/applicationmanager/intents/system-ui.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/app1.qml b/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/app1.qml index ae005f47..62aa661a 100644 --- a/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/app1.qml +++ b/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/app1.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage @@ -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 Binary files differindex adb840ce..35a54600 100644 --- a/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/icon.png +++ b/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/icon.png diff --git a/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/info.yaml b/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/info.yaml index 953e852f..6b2efc9b 100644 --- a/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/info.yaml +++ b/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/info.yaml @@ -1,9 +1,11 @@ formatVersion: 1 -formatType: am-application +formatType: am-package --- -id: 'tld.minidesk.app1' -icon: 'icon.png' -code: 'app1.qml' -runtime: 'qml' +id: 'tld.minidesk.app1' +icon: 'icon.png' name: en: 'App1' +applications: + - id: 'tld.minidesk.app1' + code: 'app1.qml' + runtime: 'qml' diff --git a/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/app2.qml b/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/app2.qml index ae4db3a3..c4bef427 100644 --- a/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/app2.qml +++ b/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/app2.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage @@ -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 Binary files differindex 3f8caa42..9c1d6cf2 100644 --- a/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/icon.png +++ b/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/icon.png diff --git a/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/info.yaml b/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/info.yaml index 65759aa8..140955eb 100644 --- a/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/info.yaml +++ b/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/info.yaml @@ -1,9 +1,11 @@ formatVersion: 1 -formatType: am-application +formatType: am-package --- -id: 'tld.minidesk.app2' -icon: 'icon.png' -code: 'app2.qml' -runtime: 'qml' +id: 'tld.minidesk.app2' +icon: 'icon.png' name: en: 'App2' +applications: + - id: 'tld.minidesk.app2' + code: 'app2.qml' + runtime: 'qml' diff --git a/examples/applicationmanager/minidesk/doc/images/minidesk.png b/examples/applicationmanager/minidesk/doc/images/minidesk.png Binary files differindex 66a545c9..edbe0783 100644 --- a/examples/applicationmanager/minidesk/doc/images/minidesk.png +++ b/examples/applicationmanager/minidesk/doc/images/minidesk.png diff --git a/examples/applicationmanager/minidesk/doc/src/minidesk.qdoc b/examples/applicationmanager/minidesk/doc/src/minidesk.qdoc index e44e5854..867448e8 100644 --- a/examples/applicationmanager/minidesk/doc/src/minidesk.qdoc +++ b/examples/applicationmanager/minidesk/doc/src/minidesk.qdoc @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Luxoft Application Manager. +** This file is part of the documentation of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:FDL-QTAS$ ** Commercial License Usage @@ -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/Readme.qml b/examples/applicationmanager/minidesk/system-ui/Readme.qml index 6565df71..65643913 100644 --- a/examples/applicationmanager/minidesk/system-ui/Readme.qml +++ b/examples/applicationmanager/minidesk/system-ui/Readme.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/minidesk/system-ui/chrome-bg.png b/examples/applicationmanager/minidesk/system-ui/chrome-bg.png Binary files differnew file mode 100644 index 00000000..0a6618c4 --- /dev/null +++ b/examples/applicationmanager/minidesk/system-ui/chrome-bg.png diff --git a/examples/applicationmanager/minidesk/system-ui/main.qml b/examples/applicationmanager/minidesk/system-ui/main.qml index 43265237..577599a2 100644 --- a/examples/applicationmanager/minidesk/system-ui/main.qml +++ b/examples/applicationmanager/minidesk/system-ui/main.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage @@ -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 diff --git a/examples/applicationmanager/multi-views/apps/tld.multi-views.app/app1.qml b/examples/applicationmanager/multi-views/apps/tld.multi-views.app/app1.qml index e5e3f6e8..dd8c7bbd 100644 --- a/examples/applicationmanager/multi-views/apps/tld.multi-views.app/app1.qml +++ b/examples/applicationmanager/multi-views/apps/tld.multi-views.app/app1.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/multi-views/doc/src/multi-views.qdoc b/examples/applicationmanager/multi-views/doc/src/multi-views.qdoc index 959b3dd7..7e5c6d9e 100644 --- a/examples/applicationmanager/multi-views/doc/src/multi-views.qdoc +++ b/examples/applicationmanager/multi-views/doc/src/multi-views.qdoc @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Luxoft Application Manager. +** This file is part of the documentation of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:FDL-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/multi-views/multi-views.pro b/examples/applicationmanager/multi-views/multi-views.pro index 2cff5f66..e7e041b9 100644 --- a/examples/applicationmanager/multi-views/multi-views.pro +++ b/examples/applicationmanager/multi-views/multi-views.pro @@ -4,6 +4,8 @@ CONFIG += am-systemui OTHER_FILES += \ am-config.yaml \ system-ui/*.qml \ + doc/src/*.qdoc \ + doc/images/*.png \ apps/tld.multi-views.app/*.yaml \ apps/tld.multi-views.app/*.qml \ apps/tld.multi-views.app/*.png \ diff --git a/examples/applicationmanager/multi-views/system-ui/Readme.qml b/examples/applicationmanager/multi-views/system-ui/Readme.qml index 23a7fb0b..ab201033 100644 --- a/examples/applicationmanager/multi-views/system-ui/Readme.qml +++ b/examples/applicationmanager/multi-views/system-ui/Readme.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/multi-views/system-ui/main.qml b/examples/applicationmanager/multi-views/system-ui/main.qml index 55f48188..b3ee5309 100644 --- a/examples/applicationmanager/multi-views/system-ui/main.qml +++ b/examples/applicationmanager/multi-views/system-ui/main.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/process-status/apps/process-status.cpu-hog/main.qml b/examples/applicationmanager/process-status/apps/process-status.cpu-hog/main.qml index baed4f24..4aa746bd 100644 --- a/examples/applicationmanager/process-status/apps/process-status.cpu-hog/main.qml +++ b/examples/applicationmanager/process-status/apps/process-status.cpu-hog/main.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/process-status/apps/process-status.mem-hog/main.qml b/examples/applicationmanager/process-status/apps/process-status.mem-hog/main.qml index 9a77bcd4..b899ea96 100644 --- a/examples/applicationmanager/process-status/apps/process-status.mem-hog/main.qml +++ b/examples/applicationmanager/process-status/apps/process-status.mem-hog/main.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/process-status/apps/process-status.slim/main.qml b/examples/applicationmanager/process-status/apps/process-status.slim/main.qml index 82de9abe..89a51cd8 100644 --- a/examples/applicationmanager/process-status/apps/process-status.slim/main.qml +++ b/examples/applicationmanager/process-status/apps/process-status.slim/main.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/process-status/doc/src/process-status-example.qdoc b/examples/applicationmanager/process-status/doc/src/process-status-example.qdoc index 5d012ac2..1bafdbf5 100644 --- a/examples/applicationmanager/process-status/doc/src/process-status-example.qdoc +++ b/examples/applicationmanager/process-status/doc/src/process-status-example.qdoc @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the documentation of the Luxoft Application Manager. +** This file is part of the documentation of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:FDL-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/process-status/system-ui/ApplicationDisplay.qml b/examples/applicationmanager/process-status/system-ui/ApplicationDisplay.qml index 89fccd9e..3dabe63b 100644 --- a/examples/applicationmanager/process-status/system-ui/ApplicationDisplay.qml +++ b/examples/applicationmanager/process-status/system-ui/ApplicationDisplay.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/process-status/system-ui/CpuGraph.qml b/examples/applicationmanager/process-status/system-ui/CpuGraph.qml index 4ba1edd8..8cd59c72 100644 --- a/examples/applicationmanager/process-status/system-ui/CpuGraph.qml +++ b/examples/applicationmanager/process-status/system-ui/CpuGraph.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/process-status/system-ui/MemoryText.qml b/examples/applicationmanager/process-status/system-ui/MemoryText.qml index 6b999da1..14eaf0b1 100644 --- a/examples/applicationmanager/process-status/system-ui/MemoryText.qml +++ b/examples/applicationmanager/process-status/system-ui/MemoryText.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/process-status/system-ui/Stats.qml b/examples/applicationmanager/process-status/system-ui/Stats.qml index 90983804..a62b6888 100644 --- a/examples/applicationmanager/process-status/system-ui/Stats.qml +++ b/examples/applicationmanager/process-status/system-ui/Stats.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/process-status/system-ui/main.qml b/examples/applicationmanager/process-status/system-ui/main.qml index b342939e..57bfb463 100644 --- a/examples/applicationmanager/process-status/system-ui/main.qml +++ b/examples/applicationmanager/process-status/system-ui/main.qml @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/softwarecontainer-plugin/README.md b/examples/applicationmanager/softwarecontainer-plugin/README.md index 57d7eb3b..d599c854 100644 --- a/examples/applicationmanager/softwarecontainer-plugin/README.md +++ b/examples/applicationmanager/softwarecontainer-plugin/README.md @@ -35,7 +35,8 @@ that the application-manager is using, if you intend on forwarding this bus. This is a bit tricky if the agent is run as root and the application- manager as non-root user, since the default session-bus policy in most distros disallows root to access user session-busses: the workaround is to -add a `<allow user="root"/>` policy in `/etc/dbus-1/session.conf`. +add a `<allow user="root"/>` policy within the `<policy context="default">` +element in `/etc/dbus-1/session.conf`. Please do also not forget to tell the agent about your environment, when running it via sudo: diff --git a/examples/applicationmanager/softwarecontainer-plugin/softwarecontainer.cpp b/examples/applicationmanager/softwarecontainer-plugin/softwarecontainer.cpp index dd27b4a3..2598f6aa 100644 --- a/examples/applicationmanager/softwarecontainer-plugin/softwarecontainer.cpp +++ b/examples/applicationmanager/softwarecontainer-plugin/softwarecontainer.cpp @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/softwarecontainer-plugin/softwarecontainer.h b/examples/applicationmanager/softwarecontainer-plugin/softwarecontainer.h index e951c55d..63ba2614 100644 --- a/examples/applicationmanager/softwarecontainer-plugin/softwarecontainer.h +++ b/examples/applicationmanager/softwarecontainer-plugin/softwarecontainer.h @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/startup-plugin/startup-plugin.cpp b/examples/applicationmanager/startup-plugin/startup-plugin.cpp index 0a1a9a25..3ec57bf6 100644 --- a/examples/applicationmanager/startup-plugin/startup-plugin.cpp +++ b/examples/applicationmanager/startup-plugin/startup-plugin.cpp @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage diff --git a/examples/applicationmanager/startup-plugin/startup-plugin.h b/examples/applicationmanager/startup-plugin/startup-plugin.h index fa62b702..f7540e96 100644 --- a/examples/applicationmanager/startup-plugin/startup-plugin.h +++ b/examples/applicationmanager/startup-plugin/startup-plugin.h @@ -4,7 +4,7 @@ ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:BSD-QTAS$ ** Commercial License Usage |
