From 7bb12533f8a0fbd8db45c7df1d2b0b5c0e1b2160 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Sat, 13 Nov 2021 06:31:00 +0100 Subject: Rename com.canonical.unity.slider --- examples/unityqmlmenumodel.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/unityqmlmenumodel.qml b/examples/unityqmlmenumodel.qml index c0e5adc..12ec49a 100644 --- a/examples/unityqmlmenumodel.qml +++ b/examples/unityqmlmenumodel.qml @@ -42,7 +42,7 @@ Item { if (isSeparator) { return separator; } - else if (type == "com.canonical.unity.slider") { + else if (type == "org.ayatana.indicator.slider") { listview.model.loadExtendedAttributes(index, {'min-icon': 'icon', 'max-icon': 'icon'}); return slider; -- cgit v1.2.3 From e72815691706f2d49b8c230da6cc9ff700206892 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Mon, 15 Nov 2021 03:03:35 +0100 Subject: Rename com.canonical.test* --- examples/exportactiongroup.py | 8 ++++---- examples/exportmenu.py | 6 +++--- examples/info-menumodel.cpp | 4 ++-- examples/render-menumodel.qml | 8 ++++---- tests/script/dbusmenuscript.h | 6 +++--- tests/script/menuscript.py | 6 +++--- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/examples/exportactiongroup.py b/examples/exportactiongroup.py index b1237a8..df05b0d 100755 --- a/examples/exportactiongroup.py +++ b/examples/exportactiongroup.py @@ -18,8 +18,8 @@ """ This example script exports an action group on the session bus under the name -com.canonical.testactiongroup and at the object path -/com/canonical/testactiongroup. +org.ayatana.testactiongroup and at the object path +/org/ayatana/testactiongroup. """ import sys @@ -28,8 +28,8 @@ from gi.repository import Gio from gi.repository import GLib -BUS_NAME = 'com.canonical.testactiongroup' -BUS_OBJECT_PATH = '/com/canonical/testactiongroup' +BUS_NAME = 'org.ayatana.testactiongroup' +BUS_OBJECT_PATH = '/org/ayatana/testactiongroup' def action_activated(action, data): diff --git a/examples/exportmenu.py b/examples/exportmenu.py index b7c37b1..8e0f16e 100755 --- a/examples/exportmenu.py +++ b/examples/exportmenu.py @@ -18,7 +18,7 @@ """ This example script exports a menu model on the session bus under the name -com.canonical.testmenu and at the object path /com/canonical/testmenu. +org.ayatana.testmenu and at the object path /org/ayatana/testmenu. The menu model contains items that have attributes with custom values, as well as sub-menus. """ @@ -29,8 +29,8 @@ from gi.repository import Gio from gi.repository import GLib -BUS_NAME = 'com.canonical.testmenu' -BUS_OBJECT_PATH = '/com/canonical/testmenu' +BUS_NAME = 'org.ayatana.testmenu' +BUS_OBJECT_PATH = '/org/ayatana/testmenu' def bus_acquired(bus, name): menu = Gio.Menu() diff --git a/examples/info-menumodel.cpp b/examples/info-menumodel.cpp index a0bdb0a..d4fd0a7 100644 --- a/examples/info-menumodel.cpp +++ b/examples/info-menumodel.cpp @@ -33,8 +33,8 @@ #include -#define BUS_NAME "com.canonical.testmenu" -#define BUS_OBJECT_PATH "/com/canonical/testmenu" +#define BUS_NAME "org.ayatana.testmenu" +#define BUS_OBJECT_PATH "/org/ayatana/testmenu" class MenuModelMonitor : public QDBusMenuModel diff --git a/examples/render-menumodel.qml b/examples/render-menumodel.qml index 7d8e0a1..5458eeb 100644 --- a/examples/render-menumodel.qml +++ b/examples/render-menumodel.qml @@ -18,8 +18,8 @@ */ // This example QML application renders a menu model exposed on the session bus -// under the well-known name com.canonical.testmenu and at the object path -// /com/canonical/testmenu. +// under the well-known name org.ayatana.testmenu and at the object path +// /org/ayatana/testmenu. import QtQuick 2.0 import QMenuModel 0.1 @@ -32,8 +32,8 @@ Item { QDBusMenuModel { id: menuModel busType: DBus.SessionBus - busName: "com.canonical.testmenu" - objectPath: "/com/canonical/testmenu" + busName: "org.ayatana.testmenu" + objectPath: "/org/ayatana/testmenu" onStatusChanged: { if (status == DBus.Connecting) { view.reset() diff --git a/tests/script/dbusmenuscript.h b/tests/script/dbusmenuscript.h index 862686c..03c5ad3 100644 --- a/tests/script/dbusmenuscript.h +++ b/tests/script/dbusmenuscript.h @@ -24,9 +24,9 @@ #include #include -#define SCRIPT_SERVICE_NAME "com.canonical.test" -#define SCRIPT_OBJECT_PATH "/com/canonical/test/menuscript" -#define SCRIPT_INTERFACE_NAME "com.canonical.test.menuscript" +#define SCRIPT_SERVICE_NAME "org.ayatana.test" +#define SCRIPT_OBJECT_PATH "/org/ayatana/test/menuscript" +#define SCRIPT_INTERFACE_NAME "org.ayatana.test.menuscript" #define MENU_SERVICE_NAME SCRIPT_SERVICE_NAME ".menu" #define MENU_OBJECT_PATH SCRIPT_OBJECT_PATH "/menu" diff --git a/tests/script/menuscript.py b/tests/script/menuscript.py index db71c08..caa96e2 100644 --- a/tests/script/menuscript.py +++ b/tests/script/menuscript.py @@ -21,9 +21,9 @@ from gi.repository import GObject from gi.repository import GLib from gi.repository import Gio -SERVICE_NAME = "com.canonical.test" -INTERFACE_NAME = "com.canonical.test.menuscript" -OBJECT_PATH = "/com/canonical/test/menuscript" +SERVICE_NAME = "org.ayatana.test" +INTERFACE_NAME = "org.ayatana.test.menuscript" +OBJECT_PATH = "/org/ayatana/test/menuscript" MENU_SERVICE_NAME= SERVICE_NAME + ".menu" MENU_OBJECT_PATH = OBJECT_PATH + "/menu" bus = None -- cgit v1.2.3 From 9e464fbd117923523bfec977c6c621520d552d43 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Mon, 15 Nov 2021 03:11:40 +0100 Subject: libqmenumodel/QMenuModel/plugin.h: Rename com.canonical.qmenumodel --- libqmenumodel/QMenuModel/plugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libqmenumodel/QMenuModel/plugin.h b/libqmenumodel/QMenuModel/plugin.h index 3474139..2d06eb8 100644 --- a/libqmenumodel/QMenuModel/plugin.h +++ b/libqmenumodel/QMenuModel/plugin.h @@ -25,7 +25,7 @@ class QMenuModelQmlPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "com.canonical.qmenumodel") + Q_PLUGIN_METADATA(IID "org.ayatana.qmenumodel") public: void initializeEngine(QQmlEngine *engine, const char *uri); -- cgit v1.2.3 From f89d65360b67d87f506fc9939df43735a2637427 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Mon, 15 Nov 2021 03:14:41 +0100 Subject: examples/unityqmlmenumodel.qml: Rename com.canonical.indicator.sound --- examples/unityqmlmenumodel.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/unityqmlmenumodel.qml b/examples/unityqmlmenumodel.qml index 12ec49a..e7360e0 100644 --- a/examples/unityqmlmenumodel.qml +++ b/examples/unityqmlmenumodel.qml @@ -25,9 +25,9 @@ Item { UnityMenuModel { id: menu - busName: "com.canonical.indicator.sound" - actions: { "indicator": "/com/canonical/indicator/sound" } - menuObjectPath: "/com/canonical/indicator/sound/desktop" + busName: "org.ayatana.indicator.sound" + actions: { "indicator": "/org/ayatana/indicator/sound" } + menuObjectPath: "/org/ayatana/indicator/sound/desktop" } ListView { -- cgit v1.2.3 From a4f024e4bd35e2b4b5570084b40484cf9c26d791 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Mon, 15 Nov 2021 03:16:29 +0100 Subject: examples/exportmenu.py: Rename x-canonical-currentvalue --- examples/exportmenu.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/exportmenu.py b/examples/exportmenu.py index 8e0f16e..ed996e2 100755 --- a/examples/exportmenu.py +++ b/examples/exportmenu.py @@ -42,7 +42,7 @@ def bus_acquired(bus, name): bar = Gio.MenuItem.new('bar', 'bar') bar.set_attribute_value('x-defaultvalue', GLib.Variant.new_string('Hello World!')) - bar.set_attribute_value('x-canonical-currentvalue', + bar.set_attribute_value('x-ayatana-currentvalue', GLib.Variant.new_string('awesome')) bar.set_attribute_value('x-velocity', GLib.Variant.new_uint64(83374)) menu.append_item(bar) -- cgit v1.2.3 From 0d2c880a580c1ea9bb796e1116d18560fea0e4d6 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Mon, 15 Nov 2021 03:19:14 +0100 Subject: Rename com.ubuntu.menu --- libqmenumodel/src/qdbusactiongroup.cpp | 4 ++-- libqmenumodel/src/qdbusmenumodel.cpp | 4 ++-- libqmenumodel/src/qstateaction.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libqmenumodel/src/qdbusactiongroup.cpp b/libqmenumodel/src/qdbusactiongroup.cpp index edbb073..0ff734b 100644 --- a/libqmenumodel/src/qdbusactiongroup.cpp +++ b/libqmenumodel/src/qdbusactiongroup.cpp @@ -43,8 +43,8 @@ QDBusActionGroup { id: actionGroup busType: 1 - busName: "com.ubuntu.menu" - objectPath: "com/ubuntu/menu/actions" + busName: "org.ayatana.menu" + objectPath: "org/ayatana/menu/actions" } Button { diff --git a/libqmenumodel/src/qdbusmenumodel.cpp b/libqmenumodel/src/qdbusmenumodel.cpp index 207584e..8f70a1b 100644 --- a/libqmenumodel/src/qdbusmenumodel.cpp +++ b/libqmenumodel/src/qdbusmenumodel.cpp @@ -38,8 +38,8 @@ QDBusMenuModel { id: menuModel busType: 1 - busName: "com.ubuntu.menu" - objectPath: "com/ubuntu/menu" + busName: "org.ayatana.menu" + objectPath: "org/ayatana/menu" } ListView { diff --git a/libqmenumodel/src/qstateaction.cpp b/libqmenumodel/src/qstateaction.cpp index fcffa44..e9736e8 100644 --- a/libqmenumodel/src/qstateaction.cpp +++ b/libqmenumodel/src/qstateaction.cpp @@ -36,8 +36,8 @@ QDBusActionGroup { id: actionGroup busType: 1 - busName: "com.ubuntu.menu" - objectPath: "com/ubuntu/menu/actions" + busName: "org.ayatana.menu" + objectPath: "org/ayatana/menu/actions" } Button { -- cgit v1.2.3