Skip to content

Commit 5de6133

Browse files
fly602fly602
committed
chore: 修改polikit中actiond的风格
修改polikit中actiond的风格
1 parent 912b45e commit 5de6133

File tree

316 files changed

+3312
-3293
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

316 files changed

+3312
-3293
lines changed

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ translate: $(addsuffix /LC_MESSAGES/dde-daemon.mo, $(addprefix out/locale/, ${LA
133133
pot:
134134
deepin-update-pot misc/po/locale_config.ini
135135

136-
POLICIES=accounts1 Grub2 Fprintd1
136+
POLICIES=accounts grub2 fprintd
137137
ts:
138138
for i in $(POLICIES); do \
139139
deepin-policy-ts-convert policy2ts misc/polkit-action/org.deepin.dde.$$i.policy.in misc/ts/org.deepin.dde.$$i.policy; \

‎bin/dde-system-daemon/wallpaper.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const maxSize = 32 * 1024 * 1024
2828
const wallPaperDir = "/usr/share/wallpapers/custom-wallpapers/"
2929
const solidWallPaperPath = "/usr/share/wallpapers/custom-solidwallpapers/"
3030
const solidPrefix = "solid::"
31-
const polkitActionUserAdministration = "org.deepin.dde.accounts1.user-administration"
31+
const polkitActionUserAdministration = "org.deepin.dde.accounts.user-administration"
3232

3333
var wallPaperDirs = []string{
3434
wallPaperDir,

‎fprintd1/device.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
)
1717

1818
const (
19-
actionIdEnroll = "org.deepin.dde.fprintd1.enroll"
20-
actionIdDelete = "org.deepin.dde.fprintd1.delete-enrolled-fingers"
19+
actionIdEnroll = "org.deepin.dde.fprintd.enroll"
20+
actionIdDelete = "org.deepin.dde.fprintd.delete-enrolled-fingers"
2121
)
2222

2323
type IDevice interface {

‎grub2/grub2_ifc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const (
2020
dbusPath = "/org/deepin/dde/Grub2"
2121
dbusInterface = dbusServiceName
2222

23-
polikitActionIdCommon = "org.deepin.dde.Grub2"
23+
polikitActionIdCommon = "org.deepin.dde.grub2"
2424
polikitActionIdPrepareGfxmodeDetect = "org.deepin.dde.grub2.prepare-gfxmode-detect"
2525

2626
timeoutMax = 10

‎misc/polkit-action/org.deepin.dde.accounts1.policy.in ‎misc/polkit-action/org.deepin.dde.accounts.policy.in

+11-11
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<vendor/>
77
<vendor_url/>
88

9-
<action id="org.deepin.dde.accounts1.change-own-user-data">
9+
<action id="org.deepin.dde.accounts.change-own-user-data">
1010
<description>Change your own user data</description>
1111
<message>Authentication is required to change your own user data</message>
1212
<defaults>
@@ -16,7 +16,7 @@
1616
</defaults>
1717
</action>
1818

19-
<action id="org.deepin.dde.accounts1.user-administration">
19+
<action id="org.deepin.dde.accounts.user-administration">
2020
<description>Manage user accounts</description>
2121
<message>Authentication is required to change user data</message>
2222
<defaults>
@@ -26,7 +26,7 @@
2626
</defaults>
2727
</action>
2828

29-
<action id="org.deepin.dde.accounts1.enable-auto-login">
29+
<action id="org.deepin.dde.accounts.enable-auto-login">
3030
<description>Enable Auto Login</description>
3131
<message>Authentication is required to enable auto login</message>
3232
<defaults>
@@ -36,7 +36,7 @@
3636
</defaults>
3737
</action>
3838

39-
<action id="org.deepin.dde.accounts1.disable-auto-login">
39+
<action id="org.deepin.dde.accounts.disable-auto-login">
4040
<description>Disable Auto Login</description>
4141
<message>Authentication is required to disable auto login</message>
4242
<defaults>
@@ -46,7 +46,7 @@
4646
</defaults>
4747
</action>
4848

49-
<action id="org.deepin.dde.accounts1.enable-quick-login">
49+
<action id="org.deepin.dde.accounts.enable-quick-login">
5050
<description>Enable Quick Login</description>
5151
<message>Authentication is required to enable quick login</message>
5252
<defaults>
@@ -56,7 +56,7 @@
5656
</defaults>
5757
</action>
5858

59-
<action id="org.deepin.dde.accounts1.disable-quick-login">
59+
<action id="org.deepin.dde.accounts.disable-quick-login">
6060
<description>Disable Quick Login</description>
6161
<message>Authentication is required to disable quick login</message>
6262
<defaults>
@@ -66,7 +66,7 @@
6666
</defaults>
6767
</action>
6868

69-
<action id="org.deepin.dde.accounts1.enable-wechat-auth">
69+
<action id="org.deepin.dde.accounts.enable-wechat-auth">
7070
<description>Enable WeChat Code Login</description>
7171
<message>Authentication is required to enable WeChat code login</message>
7272
<defaults>
@@ -76,7 +76,7 @@
7676
</defaults>
7777
</action>
7878

79-
<action id="org.deepin.dde.accounts1.disable-wechat-auth">
79+
<action id="org.deepin.dde.accounts.disable-wechat-auth">
8080
<description>Disable WeChat Code Login</description>
8181
<message>Authentication is required to disable WeChat code login</message>
8282
<defaults>
@@ -86,7 +86,7 @@
8686
</defaults>
8787
</action>
8888

89-
<action id="org.deepin.dde.accounts1.enable-nopass-login">
89+
<action id="org.deepin.dde.accounts.enable-nopass-login">
9090
<description>Enable Login without password</description>
9191
<message>Authentication is required to enable login without password</message>
9292
<defaults>
@@ -96,7 +96,7 @@
9696
</defaults>
9797
</action>
9898

99-
<action id="org.deepin.dde.accounts1.disable-nopass-login">
99+
<action id="org.deepin.dde.accounts.disable-nopass-login">
100100
<description>Disable Login without password</description>
101101
<message>Authentication is required to disable login without password</message>
102102
<defaults>
@@ -106,7 +106,7 @@
106106
</defaults>
107107
</action>
108108

109-
<action id="org.deepin.dde.accounts1.set-keyboard-layout">
109+
<action id="org.deepin.dde.accounts.set-keyboard-layout">
110110
<description>Set keyboard layout</description>
111111
<message>Authentication is required to set keyboard layout</message>
112112
<defaults>

‎misc/polkit-action/org.deepin.dde.airplane.policy

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE policyconfig PUBLIC
3+
"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
4+
"http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
5+
<policyconfig>
6+
<vendor>LinuxDeepin</vendor>
7+
<vendor_url>https://www.deepin.com/</vendor_url>
8+
9+
<action id="org.deepin.dde.airplane-mode.enable-disable-any">
10+
<description>Enable or disable any switch in airplane mode</description>
11+
<message>Authentication is required to enable or disable any switch in airplane mode</message>
12+
<defaults>
13+
<allow_any>no</allow_any>
14+
<allow_inactive>no</allow_inactive>
15+
<allow_active>yes</allow_active>
16+
</defaults>
17+
</action>
18+
19+
</policyconfig>

‎misc/polkit-action/org.deepin.dde.Fprintd1.policy.in ‎misc/polkit-action/org.deepin.dde.fprintd.policy.in

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<policyconfig>
55
<vendor>LinuxDeepin</vendor>
66
<vendor_url>https://www.deepin.com/</vendor_url>
7-
<action id="org.deepin.dde.fprintd1.enroll">
7+
<action id="org.deepin.dde.fprintd.enroll">
88
<description>Add fingerprint password</description>
99
<message>Authentication is required to add fingerprint password</message>
1010
<defaults>
@@ -13,7 +13,7 @@
1313
<allow_active>auth_admin_keep</allow_active>
1414
</defaults>
1515
</action>
16-
<action id="org.deepin.dde.fprintd1.delete-enrolled-fingers">
16+
<action id="org.deepin.dde.fprintd.delete-enrolled-fingers">
1717
<description>Clear fingerprint passwords</description>
1818
<message>Authentication is required to clear fingerprint passwords</message>
1919
<defaults>
@@ -22,7 +22,7 @@
2222
<allow_active>auth_admin_keep</allow_active>
2323
</defaults>
2424
</action>
25-
<action id="org.deepin.dde.fprintd1.rename-enrolled-finger">
25+
<action id="org.deepin.dde.fprintd.rename-enrolled-finger">
2626
<description>Rename fingerprint password</description>
2727
<message>Authentication is required to rename fingerprint password</message>
2828
<defaults>
@@ -31,7 +31,7 @@
3131
<allow_active>auth_admin_keep</allow_active>
3232
</defaults>
3333
</action>
34-
<action id="org.deepin.dde.fprintd1.manager">
34+
<action id="org.deepin.dde.fprintd.manager">
3535
<description>Manage fingerprint passwords</description>
3636
<message>Password is required to perform this action</message>
3737
<defaults>

‎misc/polkit-action/org.deepin.dde.Grub2.policy.in ‎misc/polkit-action/org.deepin.dde.grub2.policy.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<vendor>LinuxDeepin</vendor>
77
<vendor_url>https://www.deepin.com/</vendor_url>
88

9-
<action id="org.deepin.dde.Grub2">
9+
<action id="org.deepin.dde.grub2">
1010
<description>Change the grub configuration</description>
1111
<message>Authentication is required to change the grub configuration</message>
1212
<defaults>

‎misc/ts/org.deepin.dde.accounts1.policy/policy.ts ‎misc/ts/org.deepin.dde.accounts.policy/policy.ts

+22-22
Original file line numberDiff line numberDiff line change
@@ -2,112 +2,112 @@
22
<context>
33
<name>policy</name>
44
<message>
5-
<location filename="org.deepin.dde.accounts1.change-own-user-data!message" line="0"/>
5+
<location filename="org.deepin.dde.accounts.change-own-user-data!message" line="0"/>
66
<source>Authentication is required to change your own user data</source>
77
<translation>Authentication is required to change your own user data</translation>
88
</message>
99
<message>
10-
<location filename="org.deepin.dde.accounts1.change-own-user-data!description" line="0"/>
10+
<location filename="org.deepin.dde.accounts.change-own-user-data!description" line="0"/>
1111
<source>Change your own user data</source>
1212
<translation>Change your own user data</translation>
1313
</message>
1414
<message>
15-
<location filename="org.deepin.dde.accounts1.user-administration!message" line="0"/>
15+
<location filename="org.deepin.dde.accounts.user-administration!message" line="0"/>
1616
<source>Authentication is required to change user data</source>
1717
<translation>Authentication is required to change user data</translation>
1818
</message>
1919
<message>
20-
<location filename="org.deepin.dde.accounts1.user-administration!description" line="0"/>
20+
<location filename="org.deepin.dde.accounts.user-administration!description" line="0"/>
2121
<source>Manage user accounts</source>
2222
<translation>Manage user accounts</translation>
2323
</message>
2424
<message>
25-
<location filename="org.deepin.dde.accounts1.enable-auto-login!message" line="0"/>
25+
<location filename="org.deepin.dde.accounts.enable-auto-login!message" line="0"/>
2626
<source>Authentication is required to enable auto login</source>
2727
<translation>Authentication is required to enable auto login</translation>
2828
</message>
2929
<message>
30-
<location filename="org.deepin.dde.accounts1.enable-auto-login!description" line="0"/>
30+
<location filename="org.deepin.dde.accounts.enable-auto-login!description" line="0"/>
3131
<source>Enable Auto Login</source>
3232
<translation>Enable Auto Login</translation>
3333
</message>
3434
<message>
35-
<location filename="org.deepin.dde.accounts1.disable-auto-login!message" line="0"/>
35+
<location filename="org.deepin.dde.accounts.disable-auto-login!message" line="0"/>
3636
<source>Authentication is required to disable auto login</source>
3737
<translation>Authentication is required to disable auto login</translation>
3838
</message>
3939
<message>
40-
<location filename="org.deepin.dde.accounts1.disable-auto-login!description" line="0"/>
40+
<location filename="org.deepin.dde.accounts.disable-auto-login!description" line="0"/>
4141
<source>Disable Auto Login</source>
4242
<translation>Disable Auto Login</translation>
4343
</message>
4444
<message>
45-
<location filename="org.deepin.dde.accounts1.enable-quick-login!message" line="0"/>
45+
<location filename="org.deepin.dde.accounts.enable-quick-login!message" line="0"/>
4646
<source>Authentication is required to enable quick login</source>
4747
<translation>Authentication is required to enable quick login</translation>
4848
</message>
4949
<message>
50-
<location filename="org.deepin.dde.accounts1.enable-quick-login!description" line="0"/>
50+
<location filename="org.deepin.dde.accounts.enable-quick-login!description" line="0"/>
5151
<source>Enable Quick Login</source>
5252
<translation>Enable Quick Login</translation>
5353
</message>
5454
<message>
55-
<location filename="org.deepin.dde.accounts1.disable-quick-login!message" line="0"/>
55+
<location filename="org.deepin.dde.accounts.disable-quick-login!message" line="0"/>
5656
<source>Authentication is required to disable quick login</source>
5757
<translation>Authentication is required to disable quick login</translation>
5858
</message>
5959
<message>
60-
<location filename="org.deepin.dde.accounts1.disable-quick-login!description" line="0"/>
60+
<location filename="org.deepin.dde.accounts.disable-quick-login!description" line="0"/>
6161
<source>Disable Quick Login</source>
6262
<translation>Disable Quick Login</translation>
6363
</message>
6464
<message>
65-
<location filename="org.deepin.dde.accounts1.enable-wechat-auth!message" line="0" />
65+
<location filename="org.deepin.dde.accounts.enable-wechat-auth!message" line="0" />
6666
<source>Authentication is required to enable WeChat code login</source>
6767
<translation type="unfinished" />
6868
</message>
6969
<message>
70-
<location filename="org.deepin.dde.accounts1.enable-wechat-auth!description" line="0" />
70+
<location filename="org.deepin.dde.accounts.enable-wechat-auth!description" line="0" />
7171
<source>Enable WeChat Code Login</source>
7272
<translation type="unfinished" />
7373
</message>
7474
<message>
75-
<location filename="org.deepin.dde.accounts1.disable-wechat-auth!message" line="0" />
75+
<location filename="org.deepin.dde.accounts.disable-wechat-auth!message" line="0" />
7676
<source>Authentication is required to disable WeChat code login</source>
7777
<translation type="unfinished" />
7878
</message>
7979
<message>
80-
<location filename="org.deepin.dde.accounts1.disable-wechat-auth!description" line="0" />
80+
<location filename="org.deepin.dde.accounts.disable-wechat-auth!description" line="0" />
8181
<source>Disable WeChat Code Login</source>
8282
<translation type="unfinished" />
8383
</message>
8484
<message>
85-
<location filename="org.deepin.dde.accounts1.enable-nopass-login!message" line="0"/>
85+
<location filename="org.deepin.dde.accounts.enable-nopass-login!message" line="0"/>
8686
<source>Authentication is required to enable login without password</source>
8787
<translation>Authentication is required to enable login without password</translation>
8888
</message>
8989
<message>
90-
<location filename="org.deepin.dde.accounts1.enable-nopass-login!description" line="0"/>
90+
<location filename="org.deepin.dde.accounts.enable-nopass-login!description" line="0"/>
9191
<source>Enable Login without password</source>
9292
<translation>Enable Login without password</translation>
9393
</message>
9494
<message>
95-
<location filename="org.deepin.dde.accounts1.disable-nopass-login!message" line="0"/>
95+
<location filename="org.deepin.dde.accounts.disable-nopass-login!message" line="0"/>
9696
<source>Authentication is required to disable login without password</source>
9797
<translation>Authentication is required to disable login without password</translation>
9898
</message>
9999
<message>
100-
<location filename="org.deepin.dde.accounts1.disable-nopass-login!description" line="0"/>
100+
<location filename="org.deepin.dde.accounts.disable-nopass-login!description" line="0"/>
101101
<source>Disable Login without password</source>
102102
<translation>Disable Login without password</translation>
103103
</message>
104104
<message>
105-
<location filename="org.deepin.dde.accounts1.set-keyboard-layout!message" line="0"/>
105+
<location filename="org.deepin.dde.accounts.set-keyboard-layout!message" line="0"/>
106106
<source>Authentication is required to set keyboard layout</source>
107107
<translation>Authentication is required to set keyboard layout</translation>
108108
</message>
109109
<message>
110-
<location filename="org.deepin.dde.accounts1.set-keyboard-layout!description" line="0"/>
110+
<location filename="org.deepin.dde.accounts.set-keyboard-layout!description" line="0"/>
111111
<source>Set keyboard layout</source>
112112
<translation>Set keyboard layout</translation>
113113
</message>

0 commit comments

Comments
 (0)