diff --git a/misc/dbus/services/com.deepin.SessionManager.service b/misc/dbus/services/com.deepin.SessionManager.service index 5baee6c..5e79acb 100644 --- a/misc/dbus/services/com.deepin.SessionManager.service +++ b/misc/dbus/services/com.deepin.SessionManager.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.SessionManager Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.SessionManager.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/com.deepin.WMSwitcher.service b/misc/dbus/services/com.deepin.WMSwitcher.service index 9d24e5e..16ab3b7 100644 --- a/misc/dbus/services/com.deepin.WMSwitcher.service +++ b/misc/dbus/services/com.deepin.WMSwitcher.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.WMSwitcher Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.WMSwitcher.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/com.deepin.api.XEventMonitor.service b/misc/dbus/services/com.deepin.api.XEventMonitor.service index fbe932f..00a92fe 100644 --- a/misc/dbus/services/com.deepin.api.XEventMonitor.service +++ b/misc/dbus/services/com.deepin.api.XEventMonitor.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.api.XEventMonitor Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.api.XEventMonitor.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/com.deepin.daemon.Appearance.service b/misc/dbus/services/com.deepin.daemon.Appearance.service index 323a93a..21a4c4c 100644 --- a/misc/dbus/services/com.deepin.daemon.Appearance.service +++ b/misc/dbus/services/com.deepin.daemon.Appearance.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.daemon.Appearance Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.daemon.Appearance.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/com.deepin.daemon.Audio.service b/misc/dbus/services/com.deepin.daemon.Audio.service index edc9c8b..0ff114d 100644 --- a/misc/dbus/services/com.deepin.daemon.Audio.service +++ b/misc/dbus/services/com.deepin.daemon.Audio.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.daemon.Audio Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.daemon.Audio.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/com.deepin.daemon.Bluetooth.service b/misc/dbus/services/com.deepin.daemon.Bluetooth.service index 00c25fe..53a8c02 100644 --- a/misc/dbus/services/com.deepin.daemon.Bluetooth.service +++ b/misc/dbus/services/com.deepin.daemon.Bluetooth.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.daemon.Bluetooth Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.daemon.Bluetooth.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/com.deepin.daemon.Display.service b/misc/dbus/services/com.deepin.daemon.Display.service index 484d109..38bcf07 100644 --- a/misc/dbus/services/com.deepin.daemon.Display.service +++ b/misc/dbus/services/com.deepin.daemon.Display.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.daemon.Display Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.daemon.Display.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/com.deepin.daemon.InputDevices.service b/misc/dbus/services/com.deepin.daemon.InputDevices.service index 99b9090..986daf7 100644 --- a/misc/dbus/services/com.deepin.daemon.InputDevices.service +++ b/misc/dbus/services/com.deepin.daemon.InputDevices.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.daemon.InputDevices Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.daemon.InputDevices.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/com.deepin.daemon.Keybinding.service b/misc/dbus/services/com.deepin.daemon.Keybinding.service index c63d16c..c27ad1c 100644 --- a/misc/dbus/services/com.deepin.daemon.Keybinding.service +++ b/misc/dbus/services/com.deepin.daemon.Keybinding.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.daemon.Keybinding Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.daemon.Keybinding.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/com.deepin.daemon.LangSelector.service b/misc/dbus/services/com.deepin.daemon.LangSelector.service index d947f5c..4d6bb24 100644 --- a/misc/dbus/services/com.deepin.daemon.LangSelector.service +++ b/misc/dbus/services/com.deepin.daemon.LangSelector.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.daemon.LangSelector Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.daemon.LangSelector.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/com.deepin.daemon.Mime.service b/misc/dbus/services/com.deepin.daemon.Mime.service index 8ad2b9a..2115f6d 100644 --- a/misc/dbus/services/com.deepin.daemon.Mime.service +++ b/misc/dbus/services/com.deepin.daemon.Mime.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.daemon.Mime Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.daemon.Mime.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/com.deepin.daemon.Network.service b/misc/dbus/services/com.deepin.daemon.Network.service index d3fe9e6..abfbb45 100644 --- a/misc/dbus/services/com.deepin.daemon.Network.service +++ b/misc/dbus/services/com.deepin.daemon.Network.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.daemon.Network Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.daemon.Network.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/com.deepin.daemon.Power.service b/misc/dbus/services/com.deepin.daemon.Power.service index a880586..4ddf5d2 100644 --- a/misc/dbus/services/com.deepin.daemon.Power.service +++ b/misc/dbus/services/com.deepin.daemon.Power.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.daemon.Power Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.daemon.Power.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/com.deepin.daemon.SoundEffect.service b/misc/dbus/services/com.deepin.daemon.SoundEffect.service index 66dd61e..b45fe72 100644 --- a/misc/dbus/services/com.deepin.daemon.SoundEffect.service +++ b/misc/dbus/services/com.deepin.daemon.SoundEffect.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.daemon.SoundEffect Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.daemon.SoundEffect.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/com.deepin.daemon.SystemInfo.service b/misc/dbus/services/com.deepin.daemon.SystemInfo.service index ec59f59..eabc873 100644 --- a/misc/dbus/services/com.deepin.daemon.SystemInfo.service +++ b/misc/dbus/services/com.deepin.daemon.SystemInfo.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.daemon.SystemInfo Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.daemon.SystemInfo.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/com.deepin.daemon.Timedate.service b/misc/dbus/services/com.deepin.daemon.Timedate.service index e88251b..0814f43 100644 --- a/misc/dbus/services/com.deepin.daemon.Timedate.service +++ b/misc/dbus/services/com.deepin.daemon.Timedate.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.daemon.Timedate Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.daemon.Timedate.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/com.deepin.dde.ControlCenter.service b/misc/dbus/services/com.deepin.dde.ControlCenter.service index d668fbb..a2dd65d 100644 --- a/misc/dbus/services/com.deepin.dde.ControlCenter.service +++ b/misc/dbus/services/com.deepin.dde.ControlCenter.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.dde.ControlCenter Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.dde.ControlCenter.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/com.deepin.dde.Dock.service b/misc/dbus/services/com.deepin.dde.Dock.service index 106e971..e5a4eec 100644 --- a/misc/dbus/services/com.deepin.dde.Dock.service +++ b/misc/dbus/services/com.deepin.dde.Dock.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.dde.Dock Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.dde.Dock.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/com.deepin.dde.Launcher.service b/misc/dbus/services/com.deepin.dde.Launcher.service index f8909b5..55a69df 100644 --- a/misc/dbus/services/com.deepin.dde.Launcher.service +++ b/misc/dbus/services/com.deepin.dde.Launcher.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.dde.Launcher Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.dde.Launcher.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/com.deepin.dde.Notification.service b/misc/dbus/services/com.deepin.dde.Notification.service index 12310e1..5a00e8d 100644 --- a/misc/dbus/services/com.deepin.dde.Notification.service +++ b/misc/dbus/services/com.deepin.dde.Notification.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.dde.Notification Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.dde.Notification.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/com.deepin.dde.TrayManager.service b/misc/dbus/services/com.deepin.dde.TrayManager.service index 02a6f3a..3cc7f45 100644 --- a/misc/dbus/services/com.deepin.dde.TrayManager.service +++ b/misc/dbus/services/com.deepin.dde.TrayManager.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.dde.TrayManager Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.dde.TrayManager.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/com.deepin.dde.daemon.Dock.service b/misc/dbus/services/com.deepin.dde.daemon.Dock.service index ef8ff20..da38476 100644 --- a/misc/dbus/services/com.deepin.dde.daemon.Dock.service +++ b/misc/dbus/services/com.deepin.dde.daemon.Dock.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.dde.daemon.Dock Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.dde.daemon.Dock.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/com.deepin.dde.daemon.Launcher.service b/misc/dbus/services/com.deepin.dde.daemon.Launcher.service index d9b4543..eb0a55e 100644 --- a/misc/dbus/services/com.deepin.dde.daemon.Launcher.service +++ b/misc/dbus/services/com.deepin.dde.daemon.Launcher.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.dde.daemon.Launcher Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.dde.daemon.Launcher.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/com.deepin.dde.lockFront.service b/misc/dbus/services/com.deepin.dde.lockFront.service index 9fb6fe2..9d6a8ac 100644 --- a/misc/dbus/services/com.deepin.dde.lockFront.service +++ b/misc/dbus/services/com.deepin.dde.lockFront.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.dde.lockFront Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.dde.lockFront.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/com.deepin.dde.osd.service b/misc/dbus/services/com.deepin.dde.osd.service index a8f502f..0edfb8d 100644 --- a/misc/dbus/services/com.deepin.dde.osd.service +++ b/misc/dbus/services/com.deepin.dde.osd.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.dde.osd Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.dde.osd.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/com.deepin.dde.shutdownFront.service b/misc/dbus/services/com.deepin.dde.shutdownFront.service index b1777f3..647388a 100644 --- a/misc/dbus/services/com.deepin.dde.shutdownFront.service +++ b/misc/dbus/services/com.deepin.dde.shutdownFront.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.dde.shutdownFront Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.dde.shutdownFront.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/org.deepin.api.XEventMonitor1.service b/misc/dbus/services/org.deepin.api.XEventMonitor1.service index 3948015..e4a7766 100644 --- a/misc/dbus/services/org.deepin.api.XEventMonitor1.service +++ b/misc/dbus/services/org.deepin.api.XEventMonitor1.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=org.deepin.api.XEventMonitor1 Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@org.deepin.api.XEventMonitor1.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/org.deepin.daemon.Appearance1.service b/misc/dbus/services/org.deepin.daemon.Appearance1.service index 1c63627..ab1a831 100644 --- a/misc/dbus/services/org.deepin.daemon.Appearance1.service +++ b/misc/dbus/services/org.deepin.daemon.Appearance1.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=org.deepin.daemon.Appearance1 Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@org.deepin.daemon.Appearance1.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/org.deepin.daemon.Audio1.service b/misc/dbus/services/org.deepin.daemon.Audio1.service index 01c64a4..bb47458 100644 --- a/misc/dbus/services/org.deepin.daemon.Audio1.service +++ b/misc/dbus/services/org.deepin.daemon.Audio1.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=org.deepin.daemon.Audio1 Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@org.deepin.daemon.Audio1.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/org.deepin.daemon.Bluetooth1.service b/misc/dbus/services/org.deepin.daemon.Bluetooth1.service index 247dc00..92539a5 100644 --- a/misc/dbus/services/org.deepin.daemon.Bluetooth1.service +++ b/misc/dbus/services/org.deepin.daemon.Bluetooth1.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=org.deepin.daemon.Bluetooth1 Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@org.deepin.daemon.Bluetooth1.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/org.deepin.daemon.LangSelector1.service b/misc/dbus/services/org.deepin.daemon.LangSelector1.service index 7ffa959..3a2eb80 100644 --- a/misc/dbus/services/org.deepin.daemon.LangSelector1.service +++ b/misc/dbus/services/org.deepin.daemon.LangSelector1.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=org.deepin.daemon.LangSelector1 Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@org.deepin.daemon.LangSelector1.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/org.deepin.daemon.Power1.service b/misc/dbus/services/org.deepin.daemon.Power1.service index 17313f9..c3c7e7d 100644 --- a/misc/dbus/services/org.deepin.daemon.Power1.service +++ b/misc/dbus/services/org.deepin.daemon.Power1.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=org.deepin.daemon.Power1 Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@org.deepin.daemon.Power1.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/org.deepin.daemon.SoundEffect1.service b/misc/dbus/services/org.deepin.daemon.SoundEffect1.service index d1c8936..777100b 100644 --- a/misc/dbus/services/org.deepin.daemon.SoundEffect1.service +++ b/misc/dbus/services/org.deepin.daemon.SoundEffect1.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=org.deepin.daemon.SoundEffect1 Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@org.deepin.daemon.SoundEffect1.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/org.deepin.daemon.SystemInfo1.service b/misc/dbus/services/org.deepin.daemon.SystemInfo1.service index 94fadfc..13b9477 100644 --- a/misc/dbus/services/org.deepin.daemon.SystemInfo1.service +++ b/misc/dbus/services/org.deepin.daemon.SystemInfo1.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=org.deepin.daemon.SystemInfo1 Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@org.deepin.daemon.SystemInfo1.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/org.deepin.daemon.Timedate1.service b/misc/dbus/services/org.deepin.daemon.Timedate1.service index 26233e5..80cb806 100644 --- a/misc/dbus/services/org.deepin.daemon.Timedate1.service +++ b/misc/dbus/services/org.deepin.daemon.Timedate1.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=org.deepin.daemon.Timedate1 Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@org.deepin.daemon.Timedate1.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/services/org.desktopspec.permission.service b/misc/dbus/services/org.desktopspec.permission.service index c6d34fb..4227bf8 100644 --- a/misc/dbus/services/org.desktopspec.permission.service +++ b/misc/dbus/services/org.desktopspec.permission.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=org.desktopspec.permission Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@org.desktopspec.permission.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/system-services/com.deepin.daemon.Accounts.service b/misc/dbus/system-services/com.deepin.daemon.Accounts.service index 2851e62..97b957c 100644 --- a/misc/dbus/system-services/com.deepin.daemon.Accounts.service +++ b/misc/dbus/system-services/com.deepin.daemon.Accounts.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.daemon.Accounts Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.daemon.Accounts.service +SystemdService=dde-api-dbus-proxy-v1.service \ No newline at end of file diff --git a/misc/dbus/system-services/com.deepin.daemon.AirplaneMode.service b/misc/dbus/system-services/com.deepin.daemon.AirplaneMode.service index 4d17b12..d555752 100644 --- a/misc/dbus/system-services/com.deepin.daemon.AirplaneMode.service +++ b/misc/dbus/system-services/com.deepin.daemon.AirplaneMode.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.daemon.AirplaneMode Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.daemon.AirplaneMode.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/system-services/com.deepin.daemon.Gesture.service b/misc/dbus/system-services/com.deepin.daemon.Gesture.service index 27868ef..87bcc0d 100644 --- a/misc/dbus/system-services/com.deepin.daemon.Gesture.service +++ b/misc/dbus/system-services/com.deepin.daemon.Gesture.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.daemon.Gesture Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.daemon.Gesture.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/system-services/com.deepin.daemon.Grub2.service b/misc/dbus/system-services/com.deepin.daemon.Grub2.service index ecca239..7d9e833 100644 --- a/misc/dbus/system-services/com.deepin.daemon.Grub2.service +++ b/misc/dbus/system-services/com.deepin.daemon.Grub2.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.daemon.Grub2 Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.daemon.Grub2.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/system-services/com.deepin.daemon.PasswdConf.service b/misc/dbus/system-services/com.deepin.daemon.PasswdConf.service index d41d6ab..0db37aa 100644 --- a/misc/dbus/system-services/com.deepin.daemon.PasswdConf.service +++ b/misc/dbus/system-services/com.deepin.daemon.PasswdConf.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.daemon.PasswdConf Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.daemon.PasswdConf.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/system-services/com.deepin.daemon.PowerManager.service b/misc/dbus/system-services/com.deepin.daemon.PowerManager.service index 213564c..3d362a4 100644 --- a/misc/dbus/system-services/com.deepin.daemon.PowerManager.service +++ b/misc/dbus/system-services/com.deepin.daemon.PowerManager.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.daemon.PowerManager Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.daemon.PowerManager.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/system-services/com.deepin.daemon.Timedated.service b/misc/dbus/system-services/com.deepin.daemon.Timedated.service index 3c76a87..ba97d75 100644 --- a/misc/dbus/system-services/com.deepin.daemon.Timedated.service +++ b/misc/dbus/system-services/com.deepin.daemon.Timedated.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.daemon.Timedated Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.daemon.Timedated.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/system-services/com.deepin.dde.LockService.service b/misc/dbus/system-services/com.deepin.dde.LockService.service index 2131bfc..80e6217 100644 --- a/misc/dbus/system-services/com.deepin.dde.LockService.service +++ b/misc/dbus/system-services/com.deepin.dde.LockService.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.dde.LockService Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.dde.LockService.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/system-services/com.deepin.lastore.service b/misc/dbus/system-services/com.deepin.lastore.service index a462fe3..d75c7db 100644 --- a/misc/dbus/system-services/com.deepin.lastore.service +++ b/misc/dbus/system-services/com.deepin.lastore.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.lastore Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.lastore.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/system-services/com.deepin.system.Display.service b/misc/dbus/system-services/com.deepin.system.Display.service index 64c2a39..9249040 100644 --- a/misc/dbus/system-services/com.deepin.system.Display.service +++ b/misc/dbus/system-services/com.deepin.system.Display.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.system.Display Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.system.Display.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/system-services/com.deepin.system.Network.service b/misc/dbus/system-services/com.deepin.system.Network.service index 33b25f1..b28cb5d 100644 --- a/misc/dbus/system-services/com.deepin.system.Network.service +++ b/misc/dbus/system-services/com.deepin.system.Network.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.system.Network Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.system.Network.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/system-services/com.deepin.system.Power.service b/misc/dbus/system-services/com.deepin.system.Power.service index d5f65e2..50a5ca0 100644 --- a/misc/dbus/system-services/com.deepin.system.Power.service +++ b/misc/dbus/system-services/com.deepin.system.Power.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.system.Power Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.system.Power.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/system-services/com.deepin.system.SystemInfo.service b/misc/dbus/system-services/com.deepin.system.SystemInfo.service index ba66c48..f68a556 100644 --- a/misc/dbus/system-services/com.deepin.system.SystemInfo.service +++ b/misc/dbus/system-services/com.deepin.system.SystemInfo.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=com.deepin.system.SystemInfo Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@com.deepin.system.SystemInfo.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/system-services/org.deepin.daemon.Accounts1.service b/misc/dbus/system-services/org.deepin.daemon.Accounts1.service index f9c6911..ed8f0fd 100644 --- a/misc/dbus/system-services/org.deepin.daemon.Accounts1.service +++ b/misc/dbus/system-services/org.deepin.daemon.Accounts1.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=org.deepin.daemon.Accounts1 Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@org.deepin.daemon.Accounts1.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/system-services/org.deepin.daemon.Grub2.service b/misc/dbus/system-services/org.deepin.daemon.Grub2.service index ed8b420..1a1b645 100644 --- a/misc/dbus/system-services/org.deepin.daemon.Grub2.service +++ b/misc/dbus/system-services/org.deepin.daemon.Grub2.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=org.deepin.daemon.Grub2 Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@org.deepin.daemon.Grub2.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/system-services/org.deepin.daemon.Timedated1.service b/misc/dbus/system-services/org.deepin.daemon.Timedated1.service index 87a0264..9994bd6 100644 --- a/misc/dbus/system-services/org.deepin.daemon.Timedated1.service +++ b/misc/dbus/system-services/org.deepin.daemon.Timedated1.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=org.deepin.daemon.Timedated1 Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@org.deepin.daemon.Timedated1.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/system-services/org.deepin.lastore1.service b/misc/dbus/system-services/org.deepin.lastore1.service index f00b724..5aab04d 100644 --- a/misc/dbus/system-services/org.deepin.lastore1.service +++ b/misc/dbus/system-services/org.deepin.lastore1.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=org.deepin.lastore1 Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@org.deepin.lastore1.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/system-services/org.deepin.system.Power1.service b/misc/dbus/system-services/org.deepin.system.Power1.service index 107b845..0c7aa22 100644 --- a/misc/dbus/system-services/org.deepin.system.Power1.service +++ b/misc/dbus/system-services/org.deepin.system.Power1.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=org.deepin.system.Power1 Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@org.deepin.system.Power1.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/dbus/system-services/org.deepin.system.SystemInfo1.service b/misc/dbus/system-services/org.deepin.system.SystemInfo1.service index 94671d8..4f97b03 100644 --- a/misc/dbus/system-services/org.deepin.system.SystemInfo1.service +++ b/misc/dbus/system-services/org.deepin.system.SystemInfo1.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=org.deepin.system.SystemInfo1 Exec=/usr/bin/false -SystemdService=dde-api-dbus-proxy-v1@org.deepin.system.SystemInfo1.service +SystemdService=dde-api-dbus-proxy-v1.service diff --git a/misc/systemd/system/dde-api-dbus-proxy-v1@.service b/misc/systemd/system/dde-api-dbus-proxy-v1.service similarity index 73% rename from misc/systemd/system/dde-api-dbus-proxy-v1@.service rename to misc/systemd/system/dde-api-dbus-proxy-v1.service index ba255d1..72d5fad 100644 --- a/misc/systemd/system/dde-api-dbus-proxy-v1@.service +++ b/misc/systemd/system/dde-api-dbus-proxy-v1.service @@ -1,10 +1,10 @@ [Unit] -Description=dde-api-proxy-v1 service for %I +Description=dde-api-proxy-v1 service [Service] Type=dbus -BusName=%I -ExecStart=/usr/lib/dde-api-proxy/dbus-proxy/dde-api-dbus-proxy-system-v1 -s %I +BusName=com.deepin.daemon.Accounts +ExecStart=/usr/lib/dde-api-proxy/dbus-proxy/dde-api-dbus-proxy-v1 --system DevicePolicy=closed diff --git a/misc/systemd/user/dde-api-dbus-proxy-v1.service b/misc/systemd/user/dde-api-dbus-proxy-v1.service new file mode 100644 index 0000000..2b95e5a --- /dev/null +++ b/misc/systemd/user/dde-api-dbus-proxy-v1.service @@ -0,0 +1,11 @@ +[Unit] +Description=dde-api-proxy-v1 service + +Requires=dbus.socket +After=dbus.socket + +[Service] +Type=dbus +BusName=com.deepin.api.XEventMonitor +ExecStart=/usr/lib/dde-api-proxy/dbus-proxy/dde-api-dbus-proxy-v1 +Slice=session.slice diff --git a/misc/systemd/user/dde-api-dbus-proxy-v1@.service b/misc/systemd/user/dde-api-dbus-proxy-v1@.service deleted file mode 100644 index 6ee57f2..0000000 --- a/misc/systemd/user/dde-api-dbus-proxy-v1@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=dde-api-proxy-v1 service for %I - -Requires=dbus.socket -After=dbus.socket - -[Service] -Type=dbus -BusName=%I -ExecStart=/usr/lib/dde-api-proxy/dbus-proxy/dde-api-dbus-proxy-session-v1 -s %I -Slice=session.slice diff --git a/src/dbus-proxy/CMakeLists.txt b/src/dbus-proxy/CMakeLists.txt index 7c85fb7..69f40b8 100644 --- a/src/dbus-proxy/CMakeLists.txt +++ b/src/dbus-proxy/CMakeLists.txt @@ -14,8 +14,13 @@ find_package(PkgConfig REQUIRED) find_package(DtkCore REQUIRED) find_package(DtkTools REQUIRED) -macro(qt5_add_dbus_proxy_interface_fix srcs xml class file) - execute_process(COMMAND ${DTK_XML2CPP} -c ${class} -p ${PROJECT_BINARY_DIR}/dbus-proxy/dbusinterface/${file} ${DBUS_FILE_PATH}/${xml}) +macro(qt5_add_dbus_proxy_interface_fix srcs xml class file neednamespace) + if(${neednamespace}) + execute_process(COMMAND ${DTK_XML2CPP} -c ${class} -p ${PROJECT_BINARY_DIR}/dbus-proxy/dbusinterface/${file} ${DBUS_FILE_PATH}/${xml}) + else() + execute_process(COMMAND ${DTK_XML2CPP} -c ${class} -p ${PROJECT_BINARY_DIR}/dbus-proxy/dbusinterface/${file} ${DBUS_FILE_PATH}/${xml} -N) + endif() + list(APPEND ${srcs} ${PROJECT_BINARY_DIR}/dbus-proxy/dbusinterface/${file}.h ${PROJECT_BINARY_DIR}/dbus-proxy/dbusinterface/${file}.cpp diff --git a/src/dbus-proxy/common/dbusproxybasemanager.hpp b/src/dbus-proxy/common/dbusproxybasemanager.hpp new file mode 100644 index 0000000..ce9343a --- /dev/null +++ b/src/dbus-proxy/common/dbusproxybasemanager.hpp @@ -0,0 +1,37 @@ +// SPDX-FileCopyrightText: 2018 - 2024 UnionTech Software Technology Co., Ltd. +// +// SPDX-License-Identifier: GPL-3.0-or-later + +#pragma once + +#include "dbusproxybase.hpp" + +#include +#include +#include +#include + + +class DBusProxyManager { +protected: + using creaetDbusProxy = std::function; + +public: + DBusProxyManager(QDBusConnection::BusType busType) + : m_busType(busType) + { + + } + + virtual void init() = 0; + + void createDBusProxy(){ + for(auto creatFunc : m_dbusProxyFactory){ + creatFunc(); + } + } + +protected: + QVector m_dbusProxyFactory; + QDBusConnection::BusType m_busType; +}; diff --git a/src/dbus-proxy/v1/CMakeLists.txt b/src/dbus-proxy/v1/CMakeLists.txt index 10b7eeb..01441ec 100644 --- a/src/dbus-proxy/v1/CMakeLists.txt +++ b/src/dbus-proxy/v1/CMakeLists.txt @@ -1,5 +1,4 @@ -set(PRO_SYSTEM_NAME "dde-api-dbus-proxy-system-v1") -set(PRO_SESSION_NAME "dde-api-dbus-proxy-session-v1") +set(PRO_NAME "dde-api-dbus-proxy-v1") file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/dbus-proxy/dbusinterface/v1/session/) file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/dbus-proxy/dbusinterface/v1/system/) @@ -11,101 +10,82 @@ list(APPEND QT_DBUS_PROXY_INTERFACE_INCLUDE file(GLOB_RECURSE PROXY_DBUS_TYPES ${DBUS_FILE_PATH}/types/*) # dbus interface -qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.Accounts1.xml System_Accounts1 v1/system/system_org_deepin_dde_Accounts1) -qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.Accounts1.User.xml System_Accounts1User v1/system/system_org_deepin_dde_Accounts1_User) -qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.Gesture1.xml System_Gesture1 v1/system/system_org_deepin_dde_Gesture1) -qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.Grub2.xml System_Grub2 v1/system/system_org_deepin_dde_Grub2) -qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.Grub2.Theme.xml System_Grub2Theme v1/system/system_org_deepin_dde_Grub2_Theme) -qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.Grub2.EditAuthentication.xml System_Grub2EditAuthentication v1/system/system_org_deepin_dde_Grub2_EditAuthentication) -qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.PasswdConf1.xml System_PasswdConf1 v1/system/system_org_deepin_dde_PasswdConf1) -qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.Lastore1.Manager.xml System_Lastore1Manager v1/system/system_org_deepin_dde_Lastore1_Manager) -qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.Lastore1.Updater.xml System_Lastore1Updater v1/system/system_org_deepin_dde_Lastore1_Updater) -qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.Lastore1.Job.xml System_Lastore1Job v1/system/system_org_deepin_dde_Lastore1_Job) -qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.LockService1.xml System_LockService1 v1/system/system_org_deepin_dde_LockService1) -qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.Display1.xml System_Display1 v1/system/system_org_deepin_dde_Display1) -qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.Power1.xml System_Power1 v1/system/system_org_deepin_dde_Power1) -qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.SystemInfo1.xml System_SystemInfo1 v1/system/system_org_deepin_dde_SystemInfo1) -qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.Timedate1.xml System_Timedate1 v1/system/system_org_deepin_dde_Timedate1) -qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.Network1.xml System_Network1 v1/system/system_org_deepin_dde_Network1) -qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.AirplaneMode1.xml System_AirplaneMode1 v1/system/system_org_deepin_dde_AirplaneMode1) -qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.PowerManager1.xml System_PowerManager1 v1/system/system_org_deepin_dde_PowerManager1) +qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.Accounts1.xml System_Accounts1 v1/system/system_org_deepin_dde_Accounts1 ON) +qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.Accounts1.User.xml System_Accounts1User v1/system/system_org_deepin_dde_Accounts1_User ON) +qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.Gesture1.xml System_Gesture1 v1/system/system_org_deepin_dde_Gesture1 ON) +qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.Grub2.xml System_Grub2 v1/system/system_org_deepin_dde_Grub2 ON) +qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.Grub2.Theme.xml System_Grub2Theme v1/system/system_org_deepin_dde_Grub2_Theme ON) +qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.Grub2.EditAuthentication.xml System_Grub2EditAuthentication v1/system/system_org_deepin_dde_Grub2_EditAuthentication ON) +qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.PasswdConf1.xml System_PasswdConf1 v1/system/system_org_deepin_dde_PasswdConf1 ON) +qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.Lastore1.Manager.xml System_Lastore1Manager v1/system/system_org_deepin_dde_Lastore1_Manager ON) +qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.Lastore1.Updater.xml System_Lastore1Updater v1/system/system_org_deepin_dde_Lastore1_Updater ON) +qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.Lastore1.Job.xml System_Lastore1Job v1/system/system_org_deepin_dde_Lastore1_Job ON) +qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.LockService1.xml System_LockService1 v1/system/system_org_deepin_dde_LockService1 ON) +qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.Display1.xml System_Display1 v1/system/system_org_deepin_dde_Display1 OFF) +qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.Power1.xml System_Power1 v1/system/system_org_deepin_dde_Power1 OFF) +qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.SystemInfo1.xml System_SystemInfo1 v1/system/system_org_deepin_dde_SystemInfo1 OFF) +qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.Timedate1.xml System_Timedate1 v1/system/system_org_deepin_dde_Timedate1 OFF) +qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.Network1.xml System_Network1 v1/system/system_org_deepin_dde_Network1 OFF) +qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.AirplaneMode1.xml System_AirplaneMode1 v1/system/system_org_deepin_dde_AirplaneMode1 ON) +qt5_add_dbus_proxy_interface_fix(SYSTEM_PROXY_INTERFACE_SOURCES v1/system/org.deepin.dde.PowerManager1.xml System_PowerManager1 v1/system/system_org_deepin_dde_PowerManager1 ON) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.XEventMonitor1.xml Session_XEventMonitor1 v1/session/session_org_deepin_dde_XEventMonitor1) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Appearance1.xml Session_Appearance1 v1/session/session_org_deepin_dde_Appearance1) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Audio1.xml Session_Audio1 v1/session/session_org_deepin_dde_Audio1) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Audio1.Sink.xml Session_Audio1Sink v1/session/session_org_deepin_dde_Audio1_Sink) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Audio1.Source.xml Session_Audio1Source v1/session/session_org_deepin_dde_Audio1_Source) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Bluetooth1.xml Session_Bluetooth1 v1/session/session_org_deepin_dde_Bluetooth1) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Display1.xml Session_Display1 v1/session/session_org_deepin_dde_Display1) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Display1.Monitor.xml Session_Display1Monitor v1/session/session_org_deepin_dde_Display1_Monitor) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Keybinding1.xml Session_Keybinding1 v1/session/session_org_deepin_dde_Keybinding1) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.LangSelector1.xml Session_LangSelector1 v1/session/session_org_deepin_dde_LangSelector1) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Network1.xml Session_Network1 v1/session/session_org_deepin_dde_Network1) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Permission1.xml Session_Permission1 v1/session/session_org_deepin_dde_Permission1) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Power1.xml Session_Power1 v1/session/session_org_deepin_dde_Power1) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.SoundEffect1.xml Session_SoundEffect1 v1/session/session_org_deepin_dde_SoundEffect1) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.SystemInfo1.xml Session_SystemInfo1 v1/session/session_org_deepin_dde_SystemInfo1) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Timedate1.xml Session_Timedate1 v1/session/session_org_deepin_dde_Timedate1) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.ControlCenter1.xml Session_ControlCenter1 v1/session/session_org_deepin_dde_ControlCenter1) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.ControlCenter1.GrandSearch.xml Session_ControlCenter1GrandSearch v1/session/session_org_deepin_dde_ControlCenter1_GrandSearch) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.daemon.Dock1.xml Session_DaemonDock1 v1/session/session_org_deepin_dde_daemon_Dock1) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.daemon.Launcher1.xml Session_DaemonLauncher1 v1/session/session_org_deepin_dde_daemon_Launcher1) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Dock1.xml Session_Dock1 v1/session/session_org_deepin_dde_Dock1) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Launcher1.xml Session_Launcher1 v1/session/session_org_deepin_dde_Launcher1) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.LockFront1.xml Session_LockFront1 v1/session/session_org_deepin_dde_LockFront1) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Notification1.xml Session_Notification1 v1/session/session_org_deepin_dde_Notification1) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Osd1.xml Session_Osd1 v1/session/session_org_deepin_dde_Osd1) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.ShutdownFront1.xml Session_ShutdownFront1 v1/session/session_org_deepin_dde_ShutdownFront1) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.TrayManager1.xml Session_TrayManager1 v1/session/session_org_deepin_dde_TrayManager1) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.SessionManager1.xml Session_SessionManager1 v1/session/session_org_deepin_dde_SessionManager1) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.StartManager1.xml Session_StartManager1 v1/session/session_org_deepin_dde_StartManager1) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.desktopspec.MimeManager1.xml Session_MimeManager v1/session/session_org_desktopspec_MimeManager1) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.WMSwitcher1.xml Session_WMSwitcher1 v1/session/session_org_deepin_dde_WMSwitcher1) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.InputDevices1.xml Session_InputDevices1 v1/session/session_org_deepin_dde_InputDevices1) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.InputDevice1.Wacom.xml Session_InputDevice1Wacom v1/session/session_org_deepin_dde_InputDevice1_Wacom) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.InputDevice1.TouchPad.xml Session_InputDevice1TouchPad v1/session/session_org_deepin_dde_InputDevice1_TouchPad) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.daemon.Dock1.Entry.xml Session_Dock1Entry v1/session/session_org_deepin_dde_daemon_Dock1_Entry) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.InputDevice1.Keyboard.xml Session_InputDevice1Keyboard v1/session/session_org_deepin_dde_InputDevice1_Keyboard) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.InputDevice1.Mouse.xml Session_InputDevice1Mouse v1/session/session_org_deepin_dde_InputDevice1_Mouse) -qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.InputDevice1.TrackPoint.xml Session_InputDevice1TrackPoint v1/session/session_org_deepin_dde_InputDevice1_TrackPoint) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.XEventMonitor1.xml Session_XEventMonitor1 v1/session/session_org_deepin_dde_XEventMonitor1 ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Appearance1.xml Session_Appearance1 v1/session/session_org_deepin_dde_Appearance1 ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Audio1.xml Session_Audio1 v1/session/session_org_deepin_dde_Audio1 ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Audio1.Sink.xml Session_Audio1Sink v1/session/session_org_deepin_dde_Audio1_Sink ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Audio1.Source.xml Session_Audio1Source v1/session/session_org_deepin_dde_Audio1_Source ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Bluetooth1.xml Session_Bluetooth1 v1/session/session_org_deepin_dde_Bluetooth1 ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Display1.xml Session_Display1 v1/session/session_org_deepin_dde_Display1 OFF) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Display1.Monitor.xml Session_Display1Monitor v1/session/session_org_deepin_dde_Display1_Monitor ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Keybinding1.xml Session_Keybinding1 v1/session/session_org_deepin_dde_Keybinding1 ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.LangSelector1.xml Session_LangSelector1 v1/session/session_org_deepin_dde_LangSelector1 ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Network1.xml Session_Network1 v1/session/session_org_deepin_dde_Network1 OFF) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Permission1.xml Session_Permission1 v1/session/session_org_deepin_dde_Permission1 ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Power1.xml Session_Power1 v1/session/session_org_deepin_dde_Power1 OFF) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.SoundEffect1.xml Session_SoundEffect1 v1/session/session_org_deepin_dde_SoundEffect1 ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.SystemInfo1.xml Session_SystemInfo1 v1/session/session_org_deepin_dde_SystemInfo1 OFF) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Timedate1.xml Session_Timedate1 v1/session/session_org_deepin_dde_Timedate1 OFF) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.ControlCenter1.xml Session_ControlCenter1 v1/session/session_org_deepin_dde_ControlCenter1 ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.ControlCenter1.GrandSearch.xml Session_ControlCenter1GrandSearch v1/session/session_org_deepin_dde_ControlCenter1_GrandSearch ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.daemon.Dock1.xml Session_DaemonDock1 v1/session/session_org_deepin_dde_daemon_Dock1 ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.daemon.Launcher1.xml Session_DaemonLauncher1 v1/session/session_org_deepin_dde_daemon_Launcher1 ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Dock1.xml Session_Dock1 v1/session/session_org_deepin_dde_Dock1 ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Launcher1.xml Session_Launcher1 v1/session/session_org_deepin_dde_Launcher1 ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.LockFront1.xml Session_LockFront1 v1/session/session_org_deepin_dde_LockFront1 ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Notification1.xml Session_Notification1 v1/session/session_org_deepin_dde_Notification1 ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.Osd1.xml Session_Osd1 v1/session/session_org_deepin_dde_Osd1 ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.ShutdownFront1.xml Session_ShutdownFront1 v1/session/session_org_deepin_dde_ShutdownFront1 ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.TrayManager1.xml Session_TrayManager1 v1/session/session_org_deepin_dde_TrayManager1 ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.SessionManager1.xml Session_SessionManager1 v1/session/session_org_deepin_dde_SessionManager1 ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.StartManager1.xml Session_StartManager1 v1/session/session_org_deepin_dde_StartManager1 ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.desktopspec.MimeManager1.xml Session_MimeManager v1/session/session_org_desktopspec_MimeManager1 ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.WMSwitcher1.xml Session_WMSwitcher1 v1/session/session_org_deepin_dde_WMSwitcher1 ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.InputDevices1.xml Session_InputDevices1 v1/session/session_org_deepin_dde_InputDevices1 ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.InputDevice1.Wacom.xml Session_InputDevice1Wacom v1/session/session_org_deepin_dde_InputDevice1_Wacom ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.InputDevice1.TouchPad.xml Session_InputDevice1TouchPad v1/session/session_org_deepin_dde_InputDevice1_TouchPad ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.daemon.Dock1.Entry.xml Session_Dock1Entry v1/session/session_org_deepin_dde_daemon_Dock1_Entry ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.InputDevice1.Keyboard.xml Session_InputDevice1Keyboard v1/session/session_org_deepin_dde_InputDevice1_Keyboard ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.InputDevice1.Mouse.xml Session_InputDevice1Mouse v1/session/session_org_deepin_dde_InputDevice1_Mouse ON) +qt5_add_dbus_proxy_interface_fix(SESSION_PROXY_INTERFACE_SOURCES v1/session/org.deepin.dde.InputDevice1.TrackPoint.xml Session_InputDevice1TrackPoint v1/session/session_org_deepin_dde_InputDevice1_TrackPoint ON) -add_executable(${PRO_SYSTEM_NAME} - system/main.cpp +add_executable(${PRO_NAME} + main.cpp ${SYSTEM_PROXY_INTERFACE_SOURCES} - ${PROXY_DBUS_TYPES} -) -target_link_libraries(${PRO_SYSTEM_NAME} - Qt${QT_VERSION_MAJOR}::Core - Qt${QT_VERSION_MAJOR}::DBus - ${DtkCore_LIBRARIES} - ) -target_include_directories(${PRO_SYSTEM_NAME} PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} - ${PROXY_DBUSEXTENDED_INCLUDE} - ${DBUS_PROXY_SOURCE_PATH}/dbus/ - ${DBUS_PROXY_SOURCE_PATH}/common/ - ${QT_DBUS_PROXY_INTERFACE_INCLUDE} - ${DBUS_FILE_PATH} - ${DtkCore_INCLUDE_DIRS} -) -install(TARGETS ${PRO_SYSTEM_NAME} DESTINATION lib/dde-api-proxy/dbus-proxy/) - -add_executable(${PRO_SESSION_NAME} - session/main.cpp ${SESSION_PROXY_INTERFACE_SOURCES} ${PROXY_DBUS_TYPES} ) -target_link_libraries(${PRO_SESSION_NAME} +target_link_libraries(${PRO_NAME} Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::DBus ${DtkCore_LIBRARIES} ) -target_include_directories(${PRO_SESSION_NAME} PUBLIC +target_include_directories(${PRO_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${PROXY_DBUSEXTENDED_INCLUDE} ${DBUS_PROXY_SOURCE_PATH}/dbus/ ${DBUS_PROXY_SOURCE_PATH}/common/ ${QT_DBUS_PROXY_INTERFACE_INCLUDE} ${DBUS_FILE_PATH} + ${DtkCore_INCLUDE_DIRS} ) -install(TARGETS ${PRO_SESSION_NAME} DESTINATION lib/dde-api-proxy/dbus-proxy/) +install(TARGETS ${PRO_NAME} DESTINATION lib/dde-api-proxy/dbus-proxy/) \ No newline at end of file diff --git a/src/dbus-proxy/v1/main.cpp b/src/dbus-proxy/v1/main.cpp new file mode 100644 index 0000000..1d189a1 --- /dev/null +++ b/src/dbus-proxy/v1/main.cpp @@ -0,0 +1,41 @@ +// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd. +// +// SPDX-License-Identifier: GPL-3.0-or-later +#include +#include +#include +#include + +#include "session/sessiondbusproxymanager.hpp" +#include "system/systemdbusproxymanager.hpp" +#include "deepinruntime.hpp" + +int main(int argc, char *argv[]) +{ + QCoreApplication a(argc, argv); + + QCommandLineParser parser; + parser.setApplicationDescription("dde-api-proxy-session"); + parser.addHelpOption(); + QCommandLineOption serviceOption({"s", "system"}, "system level services"); + parser.addOption(serviceOption); + parser.process(a); + + DBusProxyManager *manager; + if(parser.isSet(serviceOption)){ + if (!DeepinRuntime::CheckStartddeSession()) { + qWarning() << "check startdde session error."; + return 0; + } + + manager = new SystemDBusProxyManager(QDBusConnection::SystemBus); + }else{ + manager = new SessionDBusProxyManager(QDBusConnection::SessionBus); + } + + manager->init(); + manager->createDBusProxy(); + qInfo() << "proxy modules finish to start."; + + return a.exec(); +} diff --git a/src/dbus-proxy/v1/session/main.cpp b/src/dbus-proxy/v1/session/main.cpp deleted file mode 100644 index 8051ead..0000000 --- a/src/dbus-proxy/v1/session/main.cpp +++ /dev/null @@ -1,208 +0,0 @@ -// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd. -// -// SPDX-License-Identifier: GPL-3.0-or-later -#include -#include -#include -#include - -// dde-appearance -#include "session/org_deepin_dde_Appearance1.hpp" -// dde-daemon -#include "session/org_deepin_dde_Audio1.hpp" -#include "session/org_deepin_dde_Bluetooth1.hpp" -#include "session/org_deepin_dde_InputDevices1.hpp" -#include "session/org_deepin_dde_InputDevice1_Wacom.hpp" -#include "session/org_deepin_dde_InputDevice1_TouchPad.hpp" -#include "session/org_deepin_dde_InputDevice1_Keyboard.hpp" -#include "session/org_deepin_dde_InputDevice1_Mouse.hpp" -#include "session/org_deepin_dde_InputDevice1_TrackPoint.hpp" -#include "session/org_deepin_dde_Keybinding1.hpp" -#include "session/org_deepin_dde_LangSelector1.hpp" -#include "session/org_deepin_dde_Network1.hpp" -#include "session/org_deepin_dde_Power1.hpp" -#include "session/org_deepin_dde_SoundEffect1.hpp" -#include "session/org_deepin_dde_SystemInfo1.hpp" -#include "session/org_deepin_dde_Timedate1.hpp" -#include "session/org_deepin_dde_TrayManager1.hpp" -#include "session/org_deepin_dde_XEventMonitor1.hpp" -// startdde -#include "session/org_deepin_dde_Display1.hpp" -// dde-session -#include "session/org_deepin_dde_SessionManager1.hpp" -#include "session/org_deepin_dde_WMSwitcher1.hpp" -// dde-permission-manager -#include "session/org_deepin_dde_Permission1.hpp" -// dde-application-manager -#include "session/org_deepin_dde_daemon_Dock1.hpp" -#include "session/org_deepin_dde_daemon_Launcher1.hpp" -#include "session/org_deepin_dde_StartManager1.hpp" -#include "session/org_desktopspec_MimeManager1.hpp" -// dde-control-center -#include "session/org_deepin_dde_ControlCenter1.hpp" -// dde-dock -#include "session/org_deepin_dde_Dock1.hpp" -// dde-launcher -#include "session/org_deepin_dde_Launcher1.hpp" -// dde-lock -#include "session/org_deepin_dde_LockFront1.hpp" -#include "session/org_deepin_dde_ShutdownFront1.hpp" -// dde-osd -#include "session/org_deepin_dde_Notification1.hpp" -#include "session/org_deepin_dde_Osd1.hpp" - -#include "deepinruntime.hpp" - -int main(int argc, char *argv[]) -{ - QCoreApplication a(argc, argv); - - QCommandLineParser parser; - parser.setApplicationDescription("dde-api-proxy-session"); - parser.addHelpOption(); - QCommandLineOption serviceOption({"s", "service"}, "specific the service name", "service name"); - parser.addOption(serviceOption); - parser.process(a); - - qInfo() << parser.value(serviceOption); - if (parser.value(serviceOption) == "com.deepin.daemon.Appearance") { - // V0 -> V1 - new SessionAppearance1Proxy("org.deepin.dde.Appearance1", "/org/deepin/dde/Appearance1", "org.deepin.dde.Appearance1", - "com.deepin.daemon.Appearance", "/com/deepin/daemon/Appearance", "com.deepin.daemon.Appearance", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "org.deepin.daemon.Appearance1") { - // V0.5 -> V1 - new SessionAppearance1Proxy("org.deepin.dde.Appearance1", "/org/deepin/dde/Appearance1", "org.deepin.dde.Appearance1", - "org.deepin.daemon.Appearance1", "/org/deepin/daemon/Appearance1", "org.deepin.daemon.Appearance1", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "com.deepin.daemon.Audio") { - // V0 -> V1 - new SessionAudio1Proxy("org.deepin.dde.Audio1", "/org/deepin/dde/Audio1", "org.deepin.dde.Audio1", - "com.deepin.daemon.Audio", "/com/deepin/daemon/Audio", "com.deepin.daemon.Audio", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "com.deepin.daemon.Bluetooth") { - new SessionBluetooth1Proxy("org.deepin.dde.Bluetooth1", "/org/deepin/dde/Bluetooth1", "org.deepin.dde.Bluetooth1", - "com.deepin.daemon.Bluetooth", "/com/deepin/daemon/Bluetooth", "com.deepin.daemon.Bluetooth", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "com.deepin.daemon.InputDevices") { - new SessionInputDevices1Proxy("org.deepin.dde.InputDevices1", "/org/deepin/dde/InputDevices1", "org.deepin.dde.InputDevices1", - "com.deepin.daemon.InputDevices", "/com/deepin/daemon/InputDevices", "com.deepin.daemon.InputDevices", QDBusConnection::SessionBus); - new SessionInputDevice1WacomProxy("org.deepin.dde.InputDevices1", "/org/deepin/dde/InputDevice1/Wacom", "org.deepin.dde.InputDevice1.Wacom", - "com.deepin.daemon.InputDevices", "/com/deepin/daemon/InputDevice/Wacom", "com.deepin.daemon.InputDevice.Wacom", QDBusConnection::SessionBus); - new SessionInputDevice1TouchPadProxy("org.deepin.dde.InputDevices1", "/org/deepin/dde/InputDevice1/TouchPad", "org.deepin.dde.InputDevice1.TouchPad", - "com.deepin.daemon.InputDevices", "/com/deepin/daemon/InputDevice/TouchPad", "com.deepin.daemon.InputDevice.TouchPad", QDBusConnection::SessionBus); - new SessionInputDevice1KeyboardProxy("org.deepin.dde.InputDevices1", "/org/deepin/dde/InputDevice1/Keyboard", "org.deepin.dde.InputDevice1.Keyboard", - "com.deepin.daemon.InputDevices", "/com/deepin/daemon/InputDevice/Keyboard", "com.deepin.daemon.InputDevice.Keyboard", QDBusConnection::SessionBus); - new SessionInputDevice1MouseProxy("org.deepin.dde.InputDevices1", "/org/deepin/dde/InputDevice1/Mouse", "org.deepin.dde.InputDevice1.Mouse", - "com.deepin.daemon.InputDevices", "/com/deepin/daemon/InputDevice/Mouse", "com.deepin.daemon.InputDevice.Mouse", QDBusConnection::SessionBus); - new SessionInputDevice1TrackPointProxy("org.deepin.dde.InputDevices1", "/org/deepin/dde/InputDevice1/Mouse", "org.deepin.dde.InputDevice1.TrackPoint", - "com.deepin.daemon.InputDevices", "/com/deepin/daemon/InputDevice/Mouse", "com.deepin.daemon.InputDevice.TrackPoint", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "com.deepin.daemon.Keybinding") { - new SessionKeybinding1Proxy("org.deepin.dde.Keybinding1", "/org/deepin/dde/Keybinding1", "org.deepin.dde.Keybinding1", - "com.deepin.daemon.Keybinding", "/com/deepin/daemon/Keybinding", "com.deepin.daemon.Keybinding", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "com.deepin.daemon.LangSelector") { - new SessionLangSelector1Proxy("org.deepin.dde.LangSelector1", "/org/deepin/dde/LangSelector1", "org.deepin.dde.LangSelector1", - "com.deepin.daemon.LangSelector", "/com/deepin/daemon/LangSelector", "com.deepin.daemon.LangSelector", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "com.deepin.daemon.Network") { - new SessionNetwork1Proxy("org.deepin.dde.Network1", "/org/deepin/dde/Network1", "org.deepin.dde.Network1", - "com.deepin.daemon.Network", "/com/deepin/daemon/Network", "com.deepin.daemon.Network", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "com.deepin.daemon.Power") { - new SessionPower1Proxy("org.deepin.dde.Power1", "/org/deepin/dde/Power1", "org.deepin.dde.Power1", - "com.deepin.daemon.Power", "/com/deepin/daemon/Power", "com.deepin.daemon.Power", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "com.deepin.daemon.SoundEffect") { - new SessionSoundEffect1Proxy("org.deepin.dde.SoundEffect1", "/org/deepin/dde/SoundEffect1", "org.deepin.dde.SoundEffect1", - "com.deepin.daemon.SoundEffect", "/com/deepin/daemon/SoundEffect", "com.deepin.daemon.SoundEffect", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "com.deepin.daemon.SystemInfo") { - new SessionSystemInfo1Proxy("org.deepin.dde.SystemInfo1", "/org/deepin/dde/SystemInfo1", "org.deepin.dde.SystemInfo1", - "com.deepin.daemon.SystemInfo", "/com/deepin/daemon/SystemInfo", "com.deepin.daemon.SystemInfo", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "com.deepin.daemon.Timedate") { - new SessionTimedate1Proxy("org.deepin.dde.Timedate1", "/org/deepin/dde/Timedate1", "org.deepin.dde.Timedate1", - "com.deepin.daemon.Timedate", "/com/deepin/daemon/Timedate", "com.deepin.daemon.Timedate", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "com.deepin.dde.TrayManager") { - new SessionTrayManager1Proxy("org.deepin.dde.TrayManager1", "/org/deepin/dde/TrayManager1", "org.deepin.dde.TrayManager1", - "com.deepin.dde.TrayManager", "/com/deepin/dde/TrayManager", "com.deepin.dde.TrayManager", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "com.deepin.api.XEventMonitor") { - new SessionXEventMonitor1Proxy("org.deepin.dde.XEventMonitor1", "/org/deepin/dde/XEventMonitor1", "org.deepin.dde.XEventMonitor1", - "com.deepin.api.XEventMonitor", "/com/deepin/api/XEventMonitor", "com.deepin.api.XEventMonitor", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "org.deepin.daemon.Audio1") { - // V0.5 -> V1 - new SessionAudio1Proxy("org.deepin.dde.Audio1", "/org/deepin/dde/Audio1", "org.deepin.dde.Audio1", - "org.deepin.daemon.Audio1", "/org/deepin/daemon/Audio1", "org.deepin.daemon.Audio1", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "org.deepin.daemon.Bluetooth1") { - new SessionBluetooth1Proxy("org.deepin.dde.Bluetooth1", "/org/deepin/dde/Bluetooth1", "org.deepin.dde.Bluetooth1", - "org.deepin.daemon.Bluetooth1", "/org/deepin/daemon/Bluetooth1", "org.deepin.daemon.Bluetooth1", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "org.deepin.daemon.LangSelector1") { - new SessionLangSelector1Proxy("org.deepin.dde.LangSelector1", "/org/deepin/dde/LangSelector1", "org.deepin.dde.LangSelector1", - "org.deepin.daemon.LangSelector1", "/org/deepin/daemon/LangSelector1", "org.deepin.daemon.LangSelector1", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "org.deepin.daemon.Power1") { - new SessionPower1Proxy("org.deepin.dde.Power1", "/org/deepin/dde/Power1", "org.deepin.dde.Power1", - "org.deepin.daemon.Power1", "/org/deepin/daemon/Power1", "org.deepin.daemon.Power1", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "org.deepin.daemon.SoundEffect1") { - new SessionSoundEffect1Proxy("org.deepin.dde.SoundEffect1", "/org/deepin/dde/SoundEffect1", "org.deepin.dde.SoundEffect1", - "org.deepin.daemon.SoundEffect1", "/org/deepin/daemon/SoundEffect1", "org.deepin.daemon.SoundEffect1", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "org.deepin.daemon.Timedate1") { - new SessionTimedate1Proxy("org.deepin.dde.Timedate1", "/org/deepin/dde/Timedate1", "org.deepin.dde.Timedate1", - "org.deepin.daemon.Timedate1", "/org/deepin/daemon/Timedate1", "org.deepin.daemon.Timedate1", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "org.deepin.daemon.SystemInfo1") { - new SessionSystemInfo1Proxy("org.deepin.dde.SystemInfo1", "/org/deepin/dde/SystemInfo1", "org.deepin.dde.SystemInfo1", - "org.deepin.daemon.SystemInfo1", "/org/deepin/daemon/SystemInfo1", "org.deepin.daemon.SystemInfo1", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "org.deepin.api.XEventMonitor1") { - new SessionXEventMonitor1Proxy("org.deepin.dde.XEventMonitor1", "/org/deepin/dde/XEventMonitor1", "org.deepin.dde.XEventMonitor1", - "org.deepin.api.XEventMonitor1", "/org/deepin/api/XEventMonitor1", "org.deepin.api.XEventMonitor1", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "com.deepin.daemon.Display") { - // V0 -> V1 - new SessionDisplay1Proxy("org.deepin.dde.Display1", "/org/deepin/dde/Display1", "org.deepin.dde.Display1", - "com.deepin.daemon.Display", "/com/deepin/daemon/Display", "com.deepin.daemon.Display", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "com.deepin.SessionManager") { - // V0 -> V1 - new SessionSessionManager1Proxy("org.deepin.dde.SessionManager1", "/org/deepin/dde/SessionManager1", "org.deepin.dde.SessionManager1", - "com.deepin.SessionManager", "/com/deepin/SessionManager", "com.deepin.SessionManager", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "com.deepin.WMSwitcher") { - new SessionWMSwitcher1Proxy("org.deepin.dde.WMSwitcher1", "/org/deepin/dde/WMSwitcher1", "org.deepin.dde.WMSwitcher1", - "com.deepin.WMSwitcher", "/com/deepin/WMSwitcher", "com.deepin.WMSwitcher", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "org.desktopspec.permission") { - // V0 -> V1 - new SessionPermission1Proxy("org.deepin.dde.Permission1", "/org/deepin/dde/Permission1", "org.deepin.dde.Permission1", - "org.desktopspec.permission", "/org/desktopspec/permission", "org.desktopspec.permission", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "com.deepin.dde.daemon.Dock") { - // V0 -> V1 - new SessionDaemonDock1Proxy("org.deepin.dde.daemon.Dock1", "/org/deepin/dde/daemon/Dock1", "org.deepin.dde.daemon.Dock1", - "com.deepin.dde.daemon.Dock", "/com/deepin/dde/daemon/Dock", "com.deepin.dde.daemon.Dock", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "com.deepin.dde.daemon.Launcher") { - new SessionDaemonLauncher1Proxy("org.deepin.dde.daemon.Launcher1", "/org/deepin/dde/daemon/Launcher1", "org.deepin.dde.daemon.Launcher1", - "com.deepin.dde.daemon.Launcher", "/com/deepin/dde/daemon/Launcher", "com.deepin.dde.daemon.Launcher", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "com.deepin.SessionManager") { - // V0 StartManager的服务名为"com.deepin.SessionManager" - new SessionStartManager1Proxy("org.deepin.dde.StartManager1", "/org/deepin/dde/StartManager1", "org.deepin.dde.StartManager1", - "com.deepin.SessionManager", "/com/deepin/StartManager", "com.deepin.StartManager", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "com.deepin.daemon.Mime") { - new SessionMimeManager1Proxy("org.desktopspec.ApplicationManager1", "/org/desktopspec/ApplicationManager1/MimeManager1", "org.desktopspec.MimeManager1", - "com.deepin.daemon.Mime", "/com/deepin/daemon/Mime", "com.deepin.daemon.Mime", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "com.deepin.dde.ControlCenter") { - // V0 -> V1 - new SessionControlCenter1Proxy("org.deepin.dde.ControlCenter1", "/org/deepin/dde/ControlCenter1", "org.deepin.dde.ControlCenter1", - "com.deepin.dde.ControlCenter", "/com/deepin/dde/ControlCenter", "com.deepin.dde.ControlCenter", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "com.deepin.dde.Dock") { - // V0 -> V1 - new SessionDock1Proxy("org.deepin.dde.Dock1", "/org/deepin/dde/Dock1", "org.deepin.dde.Dock1", - "com.deepin.dde.Dock", "/com/deepin/dde/Dock", "com.deepin.dde.Dock", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "com.deepin.dde.Launcher") { - // V0 -> V1 - new SessionLauncher1Proxy("org.deepin.dde.Launcher1", "/org/deepin/dde/Launcher1", "org.deepin.dde.Launcher1", - "com.deepin.dde.Launcher", "/com/deepin/dde/Launcher", "com.deepin.dde.Launcher", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "com.deepin.dde.lockFront") { - // V0 -> V1 - new SessionLockFront1Proxy("org.deepin.dde.LockFront1", "/org/deepin/dde/LockFront1", "org.deepin.dde.LockFront1", - "com.deepin.dde.lockFront", "/com/deepin/dde/lockFront", "com.deepin.dde.lockFront", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "com.deepin.dde.shutdownFront") { - new SessionShutdownFront1Proxy("org.deepin.dde.ShutdownFront1", "/org/deepin/dde/ShutdownFront1", "org.deepin.dde.ShutdownFront1", - "com.deepin.dde.shutdownFront", "/com/deepin/dde/shutdownFront", "com.deepin.dde.shutdownFront", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "com.deepin.dde.Notification") { - // V0 -> V1 - new SessionNotification1Proxy("org.deepin.dde.Notification1", "/org/deepin/dde/Notification1", "org.deepin.dde.Notification1", - "com.deepin.dde.Notification", "/com/deepin/dde/Notification", "com.deepin.dde.Notification", QDBusConnection::SessionBus); - } else if (parser.value(serviceOption) == "com.deepin.dde.osd") { - new SessionOsd1Proxy("org.deepin.dde.Osd1", "/org/deepin/dde/Osd1", "org.deepin.dde.Osd1", - "com.deepin.dde.osd", "/", "com.deepin.dde.osd", QDBusConnection::SessionBus); - } - - qInfo() << "proxy modules finish to start."; - - return a.exec(); -} diff --git a/src/dbus-proxy/v1/session/org_deepin_dde_Display1.hpp b/src/dbus-proxy/v1/session/org_deepin_dde_Display1.hpp index 6cf472c..1cc96bc 100644 --- a/src/dbus-proxy/v1/session/org_deepin_dde_Display1.hpp +++ b/src/dbus-proxy/v1/session/org_deepin_dde_Display1.hpp @@ -21,7 +21,7 @@ class SessionDisplay1Proxy : public DBusProxyBase { } virtual DDBusExtendedAbstractInterface *initConnect() { - m_dbusProxy = new org::deepin::dde::Display1(m_dbusName, m_dbusPath, QDBusConnection::sessionBus(), this); + m_dbusProxy = new __Session_Display1(m_dbusName, m_dbusPath, QDBusConnection::sessionBus(), this); return m_dbusProxy; } virtual void signalMonitorCustom() @@ -37,7 +37,7 @@ class SessionDisplay1Proxy : public DBusProxyBase { ); } private: - org::deepin::dde::Display1 *m_dbusProxy; + __Session_Display1 *m_dbusProxy; }; diff --git a/src/dbus-proxy/v1/session/org_deepin_dde_Network1.hpp b/src/dbus-proxy/v1/session/org_deepin_dde_Network1.hpp index 7b9a5c7..fa53ede 100644 --- a/src/dbus-proxy/v1/session/org_deepin_dde_Network1.hpp +++ b/src/dbus-proxy/v1/session/org_deepin_dde_Network1.hpp @@ -17,11 +17,11 @@ class SessionNetwork1Proxy : public DBusProxyBase { } virtual DDBusExtendedAbstractInterface *initConnect() { - m_dbusProxy = new org::deepin::dde::Network1(m_dbusName, m_dbusPath, QDBusConnection::sessionBus(), this); + m_dbusProxy = new __Session_Network1(m_dbusName, m_dbusPath, QDBusConnection::sessionBus(), this); return m_dbusProxy; } private: - org::deepin::dde::Network1 *m_dbusProxy; + __Session_Network1 *m_dbusProxy; }; diff --git a/src/dbus-proxy/v1/session/org_deepin_dde_Power1.hpp b/src/dbus-proxy/v1/session/org_deepin_dde_Power1.hpp index 3af0583..7d1f50c 100644 --- a/src/dbus-proxy/v1/session/org_deepin_dde_Power1.hpp +++ b/src/dbus-proxy/v1/session/org_deepin_dde_Power1.hpp @@ -17,11 +17,11 @@ class SessionPower1Proxy : public DBusProxyBase { } virtual DDBusExtendedAbstractInterface *initConnect() { - m_dbusProxy = new org::deepin::dde::Power1(m_dbusName, m_dbusPath, QDBusConnection::sessionBus(), this); + m_dbusProxy = new __Session_Power1(m_dbusName, m_dbusPath, QDBusConnection::sessionBus(), this); return m_dbusProxy; } private: - org::deepin::dde::Power1 *m_dbusProxy; + __Session_Power1 *m_dbusProxy; }; diff --git a/src/dbus-proxy/v1/session/org_deepin_dde_SystemInfo1.hpp b/src/dbus-proxy/v1/session/org_deepin_dde_SystemInfo1.hpp index 6a840ac..0981cde 100644 --- a/src/dbus-proxy/v1/session/org_deepin_dde_SystemInfo1.hpp +++ b/src/dbus-proxy/v1/session/org_deepin_dde_SystemInfo1.hpp @@ -20,11 +20,11 @@ class SessionSystemInfo1Proxy : public DBusProxyBase { } virtual DDBusExtendedAbstractInterface *initConnect() { - m_dbusProxy = new org::deepin::dde::SystemInfo1(m_dbusName, m_dbusPath, QDBusConnection::sessionBus(), this); + m_dbusProxy = new __Session_SystemInfo1(m_dbusName, m_dbusPath, QDBusConnection::sessionBus(), this); return m_dbusProxy; } private: - org::deepin::dde::SystemInfo1 *m_dbusProxy; + __Session_SystemInfo1 *m_dbusProxy; }; diff --git a/src/dbus-proxy/v1/session/org_deepin_dde_Timedate1.hpp b/src/dbus-proxy/v1/session/org_deepin_dde_Timedate1.hpp index 3dfe255..c79051d 100644 --- a/src/dbus-proxy/v1/session/org_deepin_dde_Timedate1.hpp +++ b/src/dbus-proxy/v1/session/org_deepin_dde_Timedate1.hpp @@ -17,12 +17,12 @@ class SessionTimedate1Proxy : public DBusProxyBase { } virtual DDBusExtendedAbstractInterface *initConnect() { - m_dbusProxy = new org::deepin::dde::Timedate1(m_dbusName, m_dbusPath, QDBusConnection::sessionBus(), this); + m_dbusProxy = new __Session_Timedate1(m_dbusName, m_dbusPath, QDBusConnection::sessionBus(), this); return m_dbusProxy; } private: - org::deepin::dde::Timedate1 *m_dbusProxy; + __Session_Timedate1 *m_dbusProxy; }; diff --git a/src/dbus-proxy/v1/session/sessiondbusproxymanager.hpp b/src/dbus-proxy/v1/session/sessiondbusproxymanager.hpp new file mode 100644 index 0000000..d00b5b3 --- /dev/null +++ b/src/dbus-proxy/v1/session/sessiondbusproxymanager.hpp @@ -0,0 +1,232 @@ +// SPDX-FileCopyrightText: 2018 - 2024 UnionTech Software Technology Co., Ltd. +// +// SPDX-License-Identifier: GPL-3.0-or-later + +#pragma once + +#include "dbusproxybasemanager.hpp" +#include "org_deepin_dde_Appearance1.hpp" +#include "org_deepin_dde_Audio1.hpp" +#include "org_deepin_dde_Bluetooth1.hpp" +#include "org_deepin_dde_InputDevices1.hpp" +#include "org_deepin_dde_InputDevice1_Wacom.hpp" +#include "org_deepin_dde_InputDevice1_TouchPad.hpp" +#include "org_deepin_dde_InputDevice1_Keyboard.hpp" +#include "org_deepin_dde_InputDevice1_Mouse.hpp" +#include "org_deepin_dde_InputDevice1_TrackPoint.hpp" +#include "org_deepin_dde_Keybinding1.hpp" +#include "org_deepin_dde_LangSelector1.hpp" +#include "org_deepin_dde_Network1.hpp" +#include "org_deepin_dde_Power1.hpp" +#include "org_deepin_dde_SoundEffect1.hpp" +#include "org_deepin_dde_SystemInfo1.hpp" +#include "org_deepin_dde_Timedate1.hpp" +#include "org_deepin_dde_TrayManager1.hpp" +#include "org_deepin_dde_XEventMonitor1.hpp" +#include "org_deepin_dde_Display1.hpp" +#include "org_deepin_dde_SessionManager1.hpp" +#include "org_deepin_dde_WMSwitcher1.hpp" +#include "org_deepin_dde_Permission1.hpp" +#include "org_deepin_dde_daemon_Dock1.hpp" +#include "org_deepin_dde_daemon_Launcher1.hpp" +#include "org_deepin_dde_StartManager1.hpp" +#include "org_desktopspec_MimeManager1.hpp" +#include "org_deepin_dde_ControlCenter1.hpp" +#include "org_deepin_dde_Dock1.hpp" +#include "org_deepin_dde_Launcher1.hpp" +#include "org_deepin_dde_LockFront1.hpp" +#include "org_deepin_dde_ShutdownFront1.hpp" +#include "org_deepin_dde_Notification1.hpp" +#include "org_deepin_dde_Osd1.hpp" + +const QString &AppearanceOldDbusName = "com.deepin.daemon.Appearance"; +const QString &AudioOldDbusName = "com.deepin.daemon.Audio"; +const QString &BluetoothOldDbusName = "com.deepin.daemon.Bluetooth"; +const QString &InputDevicesOldDbusName = "com.deepin.daemon.InputDevices"; +const QString &KeybindingOldDbusName = "com.deepin.daemon.Keybinding"; +const QString &LangSelectorOldDbusName = "com.deepin.daemon.LangSelector"; +const QString &NetworkOldDbusName = "com.deepin.daemon.Network"; +const QString &PowerOldDbusName = "com.deepin.daemon.Power"; +const QString &SoundEffectOldDbusName = "com.deepin.daemon.SoundEffect"; +const QString &SystemInfoOldDbusName = "com.deepin.daemon.SystemInfo"; +const QString &TimedateOldDbusName = "com.deepin.daemon.Timedate"; +const QString &TrayManagerOldDbusName = "com.deepin.dde.TrayManager"; + +class SessionDBusProxyManager : public DBusProxyManager { + +public: + SessionDBusProxyManager(QDBusConnection::BusType busType) + :DBusProxyManager(busType) + { + + } + + void init() override + { + m_dbusProxyFactory.push_back([this]{ + return new SessionAppearance1Proxy("org.deepin.dde.Appearance1", "/org/deepin/dde/Appearance1", "org.deepin.dde.Appearance1", + "com.deepin.daemon.Appearance", "/com/deepin/daemon/Appearance", "com.deepin.daemon.Appearance", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionAudio1Proxy("org.deepin.dde.Audio1", "/org/deepin/dde/Audio1", "org.deepin.dde.Audio1", + "com.deepin.daemon.Audio", "/com/deepin/daemon/Audio", "com.deepin.daemon.Audio", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionBluetooth1Proxy("org.deepin.dde.Bluetooth1", "/org/deepin/dde/Bluetooth1", "org.deepin.dde.Bluetooth1", + "com.deepin.daemon.Bluetooth", "/com/deepin/daemon/Bluetooth", "com.deepin.daemon.Bluetooth", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionInputDevices1Proxy("org.deepin.dde.InputDevices1", "/org/deepin/dde/InputDevices1", "org.deepin.dde.InputDevices1", + "com.deepin.daemon.InputDevices", "/com/deepin/daemon/InputDevices", "com.deepin.daemon.InputDevices", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionInputDevice1WacomProxy("org.deepin.dde.InputDevices1", "/org/deepin/dde/InputDevice1/Wacom", "org.deepin.dde.InputDevice1.Wacom", + "com.deepin.daemon.InputDevices", "/com/deepin/daemon/InputDevice/Wacom", "com.deepin.daemon.InputDevice.Wacom", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionInputDevice1TouchPadProxy("org.deepin.dde.InputDevices1", "/org/deepin/dde/InputDevice1/TouchPad", "org.deepin.dde.InputDevice1.TouchPad", + "com.deepin.daemon.InputDevices", "/com/deepin/daemon/InputDevice/TouchPad", "com.deepin.daemon.InputDevice.TouchPad", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionInputDevice1KeyboardProxy("org.deepin.dde.InputDevices1", "/org/deepin/dde/InputDevice1/Keyboard", "org.deepin.dde.InputDevice1.Keyboard", + "com.deepin.daemon.InputDevices", "/com/deepin/daemon/InputDevice/Keyboard", "com.deepin.daemon.InputDevice.Keyboard", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionInputDevice1MouseProxy("org.deepin.dde.InputDevices1", "/org/deepin/dde/InputDevice1/Mouse", "org.deepin.dde.InputDevice1.Mouse", + "com.deepin.daemon.InputDevices", "/com/deepin/daemon/InputDevice/Mouse", "com.deepin.daemon.InputDevice.Mouse", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionInputDevice1TrackPointProxy("org.deepin.dde.InputDevices1", "/org/deepin/dde/InputDevice1/Mouse", "org.deepin.dde.InputDevice1.TrackPoint", + "com.deepin.daemon.InputDevices", "/com/deepin/daemon/InputDevice/Mouse", "com.deepin.daemon.InputDevice.TrackPoint", m_busType); + + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionKeybinding1Proxy("org.deepin.dde.Keybinding1", "/org/deepin/dde/Keybinding1", "org.deepin.dde.Keybinding1", + "com.deepin.daemon.Keybinding", "/com/deepin/daemon/Keybinding", "com.deepin.daemon.Keybinding", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionLangSelector1Proxy("org.deepin.dde.LangSelector1", "/org/deepin/dde/LangSelector1", "org.deepin.dde.LangSelector1", + "com.deepin.daemon.LangSelector", "/com/deepin/daemon/LangSelector", "com.deepin.daemon.LangSelector", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionNetwork1Proxy("org.deepin.dde.Network1", "/org/deepin/dde/Network1", "org.deepin.dde.Network1", + "com.deepin.daemon.Network", "/com/deepin/daemon/Network", "com.deepin.daemon.Network", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionPower1Proxy("org.deepin.dde.Power1", "/org/deepin/dde/Power1", "org.deepin.dde.Power1", + "com.deepin.daemon.Power", "/com/deepin/daemon/Power", "com.deepin.daemon.Power", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionSoundEffect1Proxy("org.deepin.dde.SoundEffect1", "/org/deepin/dde/SoundEffect1", "org.deepin.dde.SoundEffect1", + "com.deepin.daemon.SoundEffect", "/com/deepin/daemon/SoundEffect", "com.deepin.daemon.SoundEffect", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionSystemInfo1Proxy("org.deepin.dde.SystemInfo1", "/org/deepin/dde/SystemInfo1", "org.deepin.dde.SystemInfo1", + "com.deepin.daemon.SystemInfo", "/com/deepin/daemon/SystemInfo", "com.deepin.daemon.SystemInfo", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionTimedate1Proxy("org.deepin.dde.Timedate1", "/org/deepin/dde/Timedate1", "org.deepin.dde.Timedate1", + "com.deepin.daemon.Timedate", "/com/deepin/daemon/Timedate", "com.deepin.daemon.Timedate", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionTrayManager1Proxy("org.deepin.dde.TrayManager1", "/org/deepin/dde/TrayManager1", "org.deepin.dde.TrayManager1", + "com.deepin.dde.TrayManager", "/com/deepin/dde/TrayManager", "com.deepin.dde.TrayManager", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionXEventMonitor1Proxy("org.deepin.dde.XEventMonitor1", "/org/deepin/dde/XEventMonitor1", "org.deepin.dde.XEventMonitor1", + "com.deepin.api.XEventMonitor", "/com/deepin/api/XEventMonitor", "com.deepin.api.XEventMonitor", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionDisplay1Proxy("org.deepin.dde.Display1", "/org/deepin/dde/Display1", "org.deepin.dde.Display1", + "com.deepin.daemon.Display", "/com/deepin/daemon/Display", "com.deepin.daemon.Display", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionSessionManager1Proxy("org.deepin.dde.SessionManager1", "/org/deepin/dde/SessionManager1", "org.deepin.dde.SessionManager1", + "com.deepin.SessionManager", "/com/deepin/SessionManager", "com.deepin.SessionManager", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionWMSwitcher1Proxy("org.deepin.dde.WMSwitcher1", "/org/deepin/dde/WMSwitcher1", "org.deepin.dde.WMSwitcher1", + "com.deepin.WMSwitcher", "/com/deepin/WMSwitcher", "com.deepin.WMSwitcher", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionPermission1Proxy("org.deepin.dde.Permission1", "/org/deepin/dde/Permission1", "org.deepin.dde.Permission1", + "org.desktopspec.permission", "/org/desktopspec/permission", "org.desktopspec.permission", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionDaemonDock1Proxy("org.deepin.dde.daemon.Dock1", "/org/deepin/dde/daemon/Dock1", "org.deepin.dde.daemon.Dock1", + "com.deepin.dde.daemon.Dock", "/com/deepin/dde/daemon/Dock", "com.deepin.dde.daemon.Dock", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionDaemonLauncher1Proxy("org.deepin.dde.daemon.Launcher1", "/org/deepin/dde/daemon/Launcher1", "org.deepin.dde.daemon.Launcher1", + "com.deepin.dde.daemon.Launcher", "/com/deepin/dde/daemon/Launcher", "com.deepin.dde.daemon.Launcher", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionStartManager1Proxy("org.deepin.dde.StartManager1", "/org/deepin/dde/StartManager1", "org.deepin.dde.StartManager1", + "com.deepin.SessionManager", "/com/deepin/StartManager", "com.deepin.StartManager", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionMimeManager1Proxy("org.desktopspec.ApplicationManager1", "/org/desktopspec/ApplicationManager1/MimeManager1", "org.desktopspec.MimeManager1", + "com.deepin.daemon.Mime", "/com/deepin/daemon/Mime", "com.deepin.daemon.Mime", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionControlCenter1Proxy("org.deepin.dde.ControlCenter1", "/org/deepin/dde/ControlCenter1", "org.deepin.dde.ControlCenter1", + "com.deepin.dde.ControlCenter", "/com/deepin/dde/ControlCenter", "com.deepin.dde.ControlCenter", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionDock1Proxy("org.deepin.dde.Dock1", "/org/deepin/dde/Dock1", "org.deepin.dde.Dock1", + "com.deepin.dde.Dock", "/com/deepin/dde/Dock", "com.deepin.dde.Dock", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionLauncher1Proxy("org.deepin.dde.Launcher1", "/org/deepin/dde/Launcher1", "org.deepin.dde.Launcher1", + "com.deepin.dde.Launcher", "/com/deepin/dde/Launcher", "com.deepin.dde.Launcher", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionLockFront1Proxy("org.deepin.dde.LockFront1", "/org/deepin/dde/LockFront1", "org.deepin.dde.LockFront1", + "com.deepin.dde.lockFront", "/com/deepin/dde/lockFront", "com.deepin.dde.lockFront", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionShutdownFront1Proxy("org.deepin.dde.ShutdownFront1", "/org/deepin/dde/ShutdownFront1", "org.deepin.dde.ShutdownFront1", + "com.deepin.dde.shutdownFront", "/com/deepin/dde/shutdownFront", "com.deepin.dde.shutdownFront", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionNotification1Proxy("org.deepin.dde.Notification1", "/org/deepin/dde/Notification1", "org.deepin.dde.Notification1", + "com.deepin.dde.Notification", "/com/deepin/dde/Notification", "com.deepin.dde.Notification", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SessionOsd1Proxy("org.deepin.dde.Osd1", "/org/deepin/dde/Osd1", "org.deepin.dde.Osd1", + "com.deepin.dde.osd", "/", "com.deepin.dde.osd", m_busType); + }); + } +}; diff --git a/src/dbus-proxy/v1/system/main.cpp b/src/dbus-proxy/v1/system/main.cpp deleted file mode 100644 index f97a0a0..0000000 --- a/src/dbus-proxy/v1/system/main.cpp +++ /dev/null @@ -1,122 +0,0 @@ -// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd. -// -// SPDX-License-Identifier: GPL-3.0-or-later - - -#include -#include -#include -#include - -#include "system/org_deepin_dde_Accounts1.hpp" -#include "system/org_deepin_dde_Display1.hpp" -#include "system/org_deepin_dde_Gesture1.hpp" -#include "system/org_deepin_dde_Grub2.hpp" -#include "system/org_deepin_dde_Grub2_Theme.hpp" -#include "system/org_deepin_dde_Grub2_EditAuthentication.hpp" -#include "system/org_deepin_dde_Lastore1_Manager.hpp" -#include "system/org_deepin_dde_LockService1.hpp" -#include "system/org_deepin_dde_Network1.hpp" -#include "system/org_deepin_dde_PasswdConf1.hpp" -#include "system/org_deepin_dde_Power1.hpp" -#include "system/org_deepin_dde_SystemInfo1.hpp" -#include "system/org_deepin_dde_Timedate1.hpp" -#include "system/org_deepin_dde_AirplaneMode1.hpp" -#include "system/org_deepin_dde_PowerManager1.hpp" - -#include "deepinruntime.hpp" - -int main(int argc, char *argv[]) -{ - QCoreApplication a(argc, argv); - if (!DeepinRuntime::CheckStartddeSession()) { - qWarning() << "check startdde session error."; - return 0; - } - QCommandLineParser parser; - parser.setApplicationDescription("dde-api-proxy-system"); - parser.addHelpOption(); - QCommandLineOption serviceOption({"s", "service"}, "specific the service name", "service name"); - parser.addOption(serviceOption); - parser.process(a); - - if (parser.value(serviceOption) == "com.deepin.daemon.Accounts") { - // V0 -> V1 - new SystemAccounts1Proxy("org.deepin.dde.Accounts1", "/org/deepin/dde/Accounts1", "org.deepin.dde.Accounts1", - "com.deepin.daemon.Accounts", "/com/deepin/daemon/Accounts", "com.deepin.daemon.Accounts", QDBusConnection::SystemBus); - } else if (parser.value(serviceOption) == "com.deepin.system.Display") { - new SystemDisplay1Proxy("org.deepin.dde.Display1", "/org/deepin/dde/Display1", "org.deepin.dde.Display1", - "com.deepin.system.Display", "/com/deepin/system/Display", "com.deepin.system.Display", QDBusConnection::SystemBus); - } else if (parser.value(serviceOption) == "com.deepin.daemon.Gesture") { - new SystemGesture1Proxy("org.deepin.dde.Gesture1", "/org/deepin/dde/Gesture1", "org.deepin.dde.Gesture1", - "com.deepin.daemon.Gesture", "/com/deepin/daemon/Gesture", "com.deepin.daemon.Gesture", QDBusConnection::SystemBus); - } else if (parser.value(serviceOption) == "com.deepin.daemon.Grub2") { - new SystemGrub2Proxy("org.deepin.dde.Grub2", "/org/deepin/dde/Grub2", "org.deepin.dde.Grub2", - "com.deepin.daemon.Grub2", "/com/deepin/daemon/Grub2", "com.deepin.daemon.Grub2", QDBusConnection::SystemBus); - new SystemGrub2ThemeProxy("org.deepin.dde.Grub2", "/org/deepin/dde/Grub2/Theme", "org.deepin.dde.Grub2.Theme", - "com.deepin.daemon.Grub2", "/com/deepin/daemon/Grub2/Theme", "com.deepin.daemon.Grub2.Theme", QDBusConnection::SystemBus); - new SystemGrub2EditAuthenticationProxy("org.deepin.dde.Grub2", "/org/deepin/dde/Grub2/EditAuthentication", "org.deepin.dde.Grub2.EditAuthentication", - "com.deepin.daemon.Grub2", "/com/deepin/daemon/Grub2/EditAuthentication", "com.deepin.daemon.Grub2.EditAuthentication", QDBusConnection::SystemBus); - } else if (parser.value(serviceOption) == "com.deepin.system.Network") { - new SystemNetwork1Proxy("org.deepin.dde.Network1", "/org/deepin/dde/Network1", "org.deepin.dde.Network1", - "com.deepin.system.Network", "/com/deepin/system/Network", "com.deepin.system.Network", QDBusConnection::SystemBus); - } else if (parser.value(serviceOption) == "com.deepin.system.Power") { - new SystemPower1Proxy("org.deepin.dde.Power1", "/org/deepin/dde/Power1", "org.deepin.dde.Power1", - "com.deepin.system.Power", "/com/deepin/system/Power", "com.deepin.system.Power", QDBusConnection::SystemBus); - } else if (parser.value(serviceOption) == "com.deepin.system.SystemInfo") { - new SystemSystemInfo1Proxy("org.deepin.dde.SystemInfo1", "/org/deepin/dde/SystemInfo1", "org.deepin.dde.SystemInfo1", - "com.deepin.system.SystemInfo", "/com/deepin/system/SystemInfo", "com.deepin.system.SystemInfo", QDBusConnection::SystemBus); - } else if (parser.value(serviceOption) == "com.deepin.daemon.Timedated") { - new SystemTimedate1Proxy("org.deepin.dde.Timedate1", "/org/deepin/dde/Timedate1", "org.deepin.dde.Timedate1", - "com.deepin.daemon.Timedated", "/com/deepin/daemon/Timedated", "com.deepin.daemon.Timedated", QDBusConnection::SystemBus); - } else if (parser.value(serviceOption) == "com.deepin.daemon.AirplaneMode") { - new SystemAirplaneMode1Proxy("org.deepin.dde.AirplaneMode1", "/org/deepin/dde/AirplaneMode1", "org.deepin.dde.AirplaneMode1", - "com.deepin.daemon.AirplaneMode", "/com/deepin/daemon/AirplaneMode", "com.deepin.daemon.AirplaneMode", QDBusConnection::SystemBus); - } else if (parser.value(serviceOption) == "org.deepin.daemon.Accounts1") { - // V0.5 -> V1 - new SystemAccounts1Proxy("org.deepin.dde.Accounts1", "/org/deepin/dde/Accounts1", "org.deepin.dde.Accounts1", - "org.deepin.daemon.Accounts1", "/org/deepin/daemon/Accounts1", "org.deepin.daemon.Accounts1", QDBusConnection::SystemBus); - } else if (parser.value(serviceOption) == "org.deepin.daemon.Grub2") { - new SystemGrub2Proxy("org.deepin.dde.Grub2", "/org/deepin/dde/Grub2", "org.deepin.dde.Grub2", - "org.deepin.daemon.Grub2", "/org/deepin/daemon/Grub2", "org.deepin.daemon.Grub2", QDBusConnection::SystemBus); - } else if (parser.value(serviceOption) == "org.deepin.daemon.Grub2") { - new SystemGrub2ThemeProxy("org.deepin.dde.Grub2", "/org/deepin/dde/Grub2/Theme", "org.deepin.dde.Grub2.Theme", - "org.deepin.daemon.Grub2", "/org/deepin/daemon/Grub2/Theme", "org.deepin.daemon.Grub2.Theme", QDBusConnection::SystemBus); - } else if (parser.value(serviceOption) == "org.deepin.daemon.Grub2") { - new SystemGrub2EditAuthenticationProxy("org.deepin.dde.Grub2", "/org/deepin/dde/Grub2/EditAuthentication", "org.deepin.dde.Grub2.EditAuthentication", - "org.deepin.daemon.Grub2", "/org/deepin/daemon/Grub2/EditAuthentication", "org.deepin.daemon.Grub2.EditAuthentication", QDBusConnection::SystemBus); - } else if (parser.value(serviceOption) == "org.deepin.system.Power1") { - new SystemPower1Proxy("org.deepin.dde.Power1", "/org/deepin/dde/Power1", "org.deepin.dde.Power1", - "org.deepin.system.Power1", "/org/deepin/system/Power1", "org.deepin.system.Power1", QDBusConnection::SystemBus); - } else if (parser.value(serviceOption) == "org.deepin.system.SystemInfo1") { - new SystemSystemInfo1Proxy("org.deepin.dde.SystemInfo1", "/org/deepin/dde/SystemInfo1", "org.deepin.dde.SystemInfo1", - "org.deepin.system.SystemInfo1", "/org/deepin/system/SystemInfo1", "org.deepin.system.SystemInfo1", QDBusConnection::SystemBus); - } else if (parser.value(serviceOption) == "org.deepin.daemon.Timedated1") { - new SystemTimedate1Proxy("org.deepin.dde.Timedate1", "/org/deepin/dde/Timedate1", "org.deepin.dde.Timedate1", - "org.deepin.daemon.Timedated1", "/org/deepin/daemon/Timedated1", "org.deepin.daemon.Timedated1", QDBusConnection::SystemBus); - } else if (parser.value(serviceOption) == "com.deepin.lastore") { - // SystemLastore1ManagerProxy: 包含Manager和Updater - // V0 -> V1 - new SystemLastore1ManagerProxy("org.deepin.dde.Lastore1", "/org/deepin/dde/Lastore1", "org.deepin.dde.Lastore1.Manager", - "com.deepin.lastore", "/com/deepin/lastore", "com.deepin.lastore.Manager", QDBusConnection::SystemBus); - } else if (parser.value(serviceOption) == "org.deepin.lastore1") { - // V0.5 -> V1 - new SystemLastore1ManagerProxy("org.deepin.dde.Lastore1", "/org/deepin/dde/Lastore1", "org.deepin.dde.Lastore1.Manager", - "org.deepin.lastore1", "/org/deepin/lastore1", "org.deepin.lastore1.Manager", QDBusConnection::SystemBus); - } else if (parser.value(serviceOption) == "com.deepin.dde.LockService") { - // V0 -> V1 - new SystemLockService1Proxy("org.deepin.dde.LockService1", "/org/deepin/dde/LockService1", "org.deepin.dde.LockService1", - "com.deepin.dde.LockService", "/com/deepin/dde/LockService", "com.deepin.dde.LockService", QDBusConnection::SystemBus); - } else if (parser.value(serviceOption) == "com.deepin.daemon.PasswdConf") { - // V0 -> V1 - new SystemPasswdConf1Proxy("org.deepin.dde.PasswdConf1", "/org/deepin/dde/PasswdConf1", "org.deepin.dde.PasswdConf1", - "com.deepin.daemon.PasswdConf", "/com/deepin/daemon/PasswdConf", "com.deepin.daemon.PasswdConf", QDBusConnection::SystemBus); - } else if (parser.value(serviceOption) == "com.deepin.daemon.PowerManager") { - new SystemPowerManager1Proxy("org.deepin.dde.PowerManager1", "/org/deepin/dde/PowerManager1", "org.deepin.dde.PowerManager1", - "com.deepin.daemon.PowerManager", "/com/deepin/daemon/PowerManager", "com.deepin.daemon.PowerManager", QDBusConnection::SystemBus); - } - - qInfo() << "proxy modules finish to start."; - - return a.exec(); -} diff --git a/src/dbus-proxy/v1/system/org_deepin_dde_Display1.hpp b/src/dbus-proxy/v1/system/org_deepin_dde_Display1.hpp index 119ba67..20de14c 100644 --- a/src/dbus-proxy/v1/system/org_deepin_dde_Display1.hpp +++ b/src/dbus-proxy/v1/system/org_deepin_dde_Display1.hpp @@ -19,11 +19,11 @@ class SystemDisplay1Proxy : public DBusProxyBase { } virtual DDBusExtendedAbstractInterface *initConnect() { - m_dbusProxy = new org::deepin::dde::Display1(m_dbusName, m_dbusPath, QDBusConnection::systemBus(), this); + m_dbusProxy = new __System_Display1(m_dbusName, m_dbusPath, QDBusConnection::systemBus(), this); return m_dbusProxy; } private: - org::deepin::dde::Display1 *m_dbusProxy; + __System_Display1 *m_dbusProxy; }; diff --git a/src/dbus-proxy/v1/system/org_deepin_dde_Network1.hpp b/src/dbus-proxy/v1/system/org_deepin_dde_Network1.hpp index 50e8a2e..6ceb1d9 100644 --- a/src/dbus-proxy/v1/system/org_deepin_dde_Network1.hpp +++ b/src/dbus-proxy/v1/system/org_deepin_dde_Network1.hpp @@ -17,11 +17,11 @@ class SystemNetwork1Proxy : public DBusProxyBase { } virtual DDBusExtendedAbstractInterface *initConnect() { - m_dbusProxy = new org::deepin::dde::Network1(m_dbusName, m_dbusPath, QDBusConnection::systemBus(), this); + m_dbusProxy = new __System_Network1(m_dbusName, m_dbusPath, QDBusConnection::systemBus(), this); return m_dbusProxy; } private: - org::deepin::dde::Network1 *m_dbusProxy; + __System_Network1 *m_dbusProxy; }; diff --git a/src/dbus-proxy/v1/system/org_deepin_dde_Power1.hpp b/src/dbus-proxy/v1/system/org_deepin_dde_Power1.hpp index 2877ee6..6de007a 100644 --- a/src/dbus-proxy/v1/system/org_deepin_dde_Power1.hpp +++ b/src/dbus-proxy/v1/system/org_deepin_dde_Power1.hpp @@ -17,11 +17,11 @@ class SystemPower1Proxy : public DBusProxyBase { } virtual DDBusExtendedAbstractInterface *initConnect() { - m_dbusProxy = new org::deepin::dde::Power1(m_dbusName, m_dbusPath, QDBusConnection::systemBus(), this); + m_dbusProxy = new __System_Power1(m_dbusName, m_dbusPath, QDBusConnection::systemBus(), this); return m_dbusProxy; } private: - org::deepin::dde::Power1 *m_dbusProxy; + __System_Power1 *m_dbusProxy; }; diff --git a/src/dbus-proxy/v1/system/org_deepin_dde_SystemInfo1.hpp b/src/dbus-proxy/v1/system/org_deepin_dde_SystemInfo1.hpp index a2b4301..a04ca8f 100644 --- a/src/dbus-proxy/v1/system/org_deepin_dde_SystemInfo1.hpp +++ b/src/dbus-proxy/v1/system/org_deepin_dde_SystemInfo1.hpp @@ -19,11 +19,11 @@ class SystemSystemInfo1Proxy : public DBusProxyBase { } virtual DDBusExtendedAbstractInterface *initConnect() { - m_dbusProxy = new org::deepin::dde::SystemInfo1(m_dbusName, m_dbusPath, QDBusConnection::systemBus(), this); + m_dbusProxy = new __System_SystemInfo1(m_dbusName, m_dbusPath, QDBusConnection::systemBus(), this); return m_dbusProxy; } private: - org::deepin::dde::SystemInfo1 *m_dbusProxy; + __System_SystemInfo1 *m_dbusProxy; }; diff --git a/src/dbus-proxy/v1/system/org_deepin_dde_Timedate1.hpp b/src/dbus-proxy/v1/system/org_deepin_dde_Timedate1.hpp index 99f319c..639c51a 100644 --- a/src/dbus-proxy/v1/system/org_deepin_dde_Timedate1.hpp +++ b/src/dbus-proxy/v1/system/org_deepin_dde_Timedate1.hpp @@ -19,11 +19,11 @@ class SystemTimedate1Proxy : public DBusProxyBase { } virtual DDBusExtendedAbstractInterface *initConnect() { - m_dbusProxy = new org::deepin::dde::Timedate1(m_dbusName, m_dbusPath, QDBusConnection::systemBus(), this); + m_dbusProxy = new __System_Timedate1(m_dbusName, m_dbusPath, QDBusConnection::systemBus(), this); return m_dbusProxy; } private: - org::deepin::dde::Timedate1 *m_dbusProxy; + __System_Timedate1 *m_dbusProxy; }; diff --git a/src/dbus-proxy/v1/system/systemdbusproxymanager.hpp b/src/dbus-proxy/v1/system/systemdbusproxymanager.hpp new file mode 100644 index 0000000..975007d --- /dev/null +++ b/src/dbus-proxy/v1/system/systemdbusproxymanager.hpp @@ -0,0 +1,112 @@ +// SPDX-FileCopyrightText: 2018 - 2024 UnionTech Software Technology Co., Ltd. +// +// SPDX-License-Identifier: GPL-3.0-or-later + +#pragma once + +#include "dbusproxybasemanager.hpp" +#include "org_deepin_dde_Accounts1.hpp" +#include "org_deepin_dde_Display1.hpp" +#include "org_deepin_dde_Gesture1.hpp" +#include "org_deepin_dde_Grub2.hpp" +#include "org_deepin_dde_Grub2_Theme.hpp" +#include "org_deepin_dde_Grub2_EditAuthentication.hpp" +#include "org_deepin_dde_Network1.hpp" +#include "org_deepin_dde_Power1.hpp" +#include "org_deepin_dde_SystemInfo1.hpp" +#include "org_deepin_dde_Timedate1.hpp" +#include "org_deepin_dde_AirplaneMode1.hpp" +#include "org_deepin_dde_Lastore1_Manager.hpp" +#include "org_deepin_dde_LockService1.hpp" +#include "org_deepin_dde_PasswdConf1.hpp" +#include "org_deepin_dde_PowerManager1.hpp" + +class SystemDBusProxyManager : public DBusProxyManager { + +public: + SystemDBusProxyManager(QDBusConnection::BusType busType) + :DBusProxyManager(busType) + { + + } + + void init() override + { + m_dbusProxyFactory.push_back([this]{ + return new SystemAccounts1Proxy("org.deepin.dde.Accounts1", "/org/deepin/dde/Accounts1", "org.deepin.dde.Accounts1", + "com.deepin.daemon.Accounts", "/com/deepin/daemon/Accounts", "com.deepin.daemon.Accounts", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SystemDisplay1Proxy("org.deepin.dde.Display1", "/org/deepin/dde/Display1", "org.deepin.dde.Display1", + "com.deepin.system.Display", "/com/deepin/system/Display", "com.deepin.system.Display", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SystemGesture1Proxy("org.deepin.dde.Gesture1", "/org/deepin/dde/Gesture1", "org.deepin.dde.Gesture1", + "com.deepin.daemon.Gesture", "/com/deepin/daemon/Gesture", "com.deepin.daemon.Gesture", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SystemGrub2Proxy("org.deepin.dde.Grub2", "/org/deepin/dde/Grub2", "org.deepin.dde.Grub2", + "com.deepin.daemon.Grub2", "/com/deepin/daemon/Grub2", "com.deepin.daemon.Grub2", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SystemGrub2ThemeProxy("org.deepin.dde.Grub2", "/org/deepin/dde/Grub2/Theme", "org.deepin.dde.Grub2.Theme", + "com.deepin.daemon.Grub2", "/com/deepin/daemon/Grub2/Theme", "com.deepin.daemon.Grub2.Theme", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SystemGrub2EditAuthenticationProxy("org.deepin.dde.Grub2", "/org/deepin/dde/Grub2/EditAuthentication", "org.deepin.dde.Grub2.EditAuthentication", + "com.deepin.daemon.Grub2", "/com/deepin/daemon/Grub2/EditAuthentication", "com.deepin.daemon.Grub2.EditAuthentication", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SystemNetwork1Proxy("org.deepin.dde.Network1", "/org/deepin/dde/Network1", "org.deepin.dde.Network1", + "com.deepin.system.Network", "/com/deepin/system/Network", "com.deepin.system.Network", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SystemPower1Proxy("org.deepin.dde.Power1", "/org/deepin/dde/Power1", "org.deepin.dde.Power1", + "com.deepin.system.Power", "/com/deepin/system/Power", "com.deepin.system.Power", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SystemSystemInfo1Proxy("org.deepin.dde.SystemInfo1", "/org/deepin/dde/SystemInfo1", "org.deepin.dde.SystemInfo1", + "com.deepin.system.SystemInfo", "/com/deepin/system/SystemInfo", "com.deepin.system.SystemInfo", m_busType); + + }); + + m_dbusProxyFactory.push_back([this]{ + return new SystemTimedate1Proxy("org.deepin.dde.Timedate1", "/org/deepin/dde/Timedate1", "org.deepin.dde.Timedate1", + "com.deepin.daemon.Timedated", "/com/deepin/daemon/Timedated", "com.deepin.daemon.Timedated", m_busType); + + }); + + m_dbusProxyFactory.push_back([this]{ + return new SystemAirplaneMode1Proxy("org.deepin.dde.AirplaneMode1", "/org/deepin/dde/AirplaneMode1", "org.deepin.dde.AirplaneMode1", + "com.deepin.daemon.AirplaneMode", "/com/deepin/daemon/AirplaneMode", "com.deepin.daemon.AirplaneMode", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SystemLastore1ManagerProxy("org.deepin.dde.Lastore1", "/org/deepin/dde/Lastore1", "org.deepin.dde.Lastore1.Manager", + "com.deepin.lastore", "/com/deepin/lastore", "com.deepin.lastore.Manager", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SystemLockService1Proxy("org.deepin.dde.LockService1", "/org/deepin/dde/LockService1", "org.deepin.dde.LockService1", + "com.deepin.dde.LockService", "/com/deepin/dde/LockService", "com.deepin.dde.LockService", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SystemPasswdConf1Proxy("org.deepin.dde.PasswdConf1", "/org/deepin/dde/PasswdConf1", "org.deepin.dde.PasswdConf1", + "com.deepin.daemon.PasswdConf", "/com/deepin/daemon/PasswdConf", "com.deepin.daemon.PasswdConf", m_busType); + }); + + m_dbusProxyFactory.push_back([this]{ + return new SystemPowerManager1Proxy("org.deepin.dde.PowerManager1", "/org/deepin/dde/PowerManager1", "org.deepin.dde.PowerManager1", + "com.deepin.daemon.PowerManager", "/com/deepin/daemon/PowerManager", "com.deepin.daemon.PowerManager", m_busType); + }); + } +};