Merge lp:~mterry/unity-control-center/onlyshowin-unity7-take2 into lp:unity-control-center

Proposed by Michael Terry on 2017-03-13
Status: Merged
Approved by: Robert Ancell on 2017-03-13
Approved revision: 12881
Merged at revision: 12881
Proposed branch: lp:~mterry/unity-control-center/onlyshowin-unity7-take2
Merge into: lp:unity-control-center
Diff against target: 214 lines (+17/-17)
17 files modified
panels/appearance/unity-appearance-panel.desktop.in.in (+1/-1)
panels/bluetooth/unity-bluetooth-panel.desktop.in.in (+1/-1)
panels/color/unity-color-panel.desktop.in.in (+1/-1)
panels/datetime/unity-datetime-panel.desktop.in.in (+1/-1)
panels/display/unity-display-panel.desktop.in.in (+1/-1)
panels/info/unity-info-panel.desktop.in.in (+1/-1)
panels/keyboard/unity-keyboard-panel.desktop.in.in (+1/-1)
panels/mouse/unity-mouse-panel.desktop.in.in (+1/-1)
panels/network/unity-network-panel.desktop.in.in (+1/-1)
panels/power/unity-power-panel.desktop.in.in (+1/-1)
panels/region/unity-region-panel.desktop.in.in (+1/-1)
panels/screen/unity-screen-panel.desktop.in.in (+1/-1)
panels/sound/data/unity-sound-panel.desktop.in.in (+1/-1)
panels/universal-access/unity-universal-access-panel.desktop.in.in (+1/-1)
panels/user-accounts/data/unity-user-accounts-panel.desktop.in.in (+1/-1)
panels/wacom/unity-wacom-panel.desktop.in.in (+1/-1)
shell/unity-control-center.desktop.in.in (+1/-1)
To merge this branch: bzr merge lp:~mterry/unity-control-center/onlyshowin-unity7-take2
Reviewer Review Type Date Requested Status
Robert Ancell 2017-03-13 Approve on 2017-03-13
Review via email: mp+319688@code.launchpad.net

Commit message

Only show Unity Control Center in unity7.

Description of the change

Unity8 has Ubuntu System Settings.

(second MP because launchpad balked at the first)

To post a comment you must log in.
Robert Ancell (robert-ancell) wrote :

Looks good - I checked my current Unity is reporting:
$ echo $XDG_CURRENT_DESKTOP
Unity:Unity7

I don't think there's any backwards compatibility issues with this change.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'panels/appearance/unity-appearance-panel.desktop.in.in'
2--- panels/appearance/unity-appearance-panel.desktop.in.in 2013-12-02 04:30:50 +0000
3+++ panels/appearance/unity-appearance-panel.desktop.in.in 2017-03-13 13:02:10 +0000
4@@ -7,7 +7,7 @@
5 Type=Application
6 StartupNotify=true
7 Categories=GNOME;GTK;Settings;DesktopSettings;X-Unity-Settings-Panel;X-GNOME-PersonalSettings
8-OnlyShowIn=Unity;
9+OnlyShowIn=Unity7;
10 X-Unity-Settings-Panel=appearance
11 # Translators: those are keywords for the appearance control-center panel
12 _Keywords=Wallpaper;Background;Screen;Desktop;Theme;Appearance;Launcher;Unity;Menus;
13
14=== modified file 'panels/bluetooth/unity-bluetooth-panel.desktop.in.in'
15--- panels/bluetooth/unity-bluetooth-panel.desktop.in.in 2013-12-02 04:30:50 +0000
16+++ panels/bluetooth/unity-bluetooth-panel.desktop.in.in 2017-03-13 13:02:10 +0000
17@@ -6,6 +6,6 @@
18 Terminal=false
19 Type=Application
20 Categories=GTK;GNOME;Settings;X-GNOME-NetworkSettings;HardwareSettings;X-Unity-Settings-Panel;
21-OnlyShowIn=Unity;
22+OnlyShowIn=Unity7;
23 StartupNotify=true
24 X-Unity-Settings-Panel=bluetooth
25
26=== modified file 'panels/color/unity-color-panel.desktop.in.in'
27--- panels/color/unity-color-panel.desktop.in.in 2013-12-03 02:12:11 +0000
28+++ panels/color/unity-color-panel.desktop.in.in 2017-03-13 13:02:10 +0000
29@@ -7,7 +7,7 @@
30 Type=Application
31 StartupNotify=true
32 Categories=GNOME;GTK;Settings;X-Unity-Settings-Panel;HardwareSettings
33-OnlyShowIn=Unity;
34+OnlyShowIn=Unity7;
35 X-Unity-Settings-Panel=color
36 # Translators: those are keywords for the color control-center panel
37 _Keywords=Color;ICC;Profile;Calibrate;Printer;Display;
38
39=== modified file 'panels/datetime/unity-datetime-panel.desktop.in.in'
40--- panels/datetime/unity-datetime-panel.desktop.in.in 2014-02-10 22:19:33 +0000
41+++ panels/datetime/unity-datetime-panel.desktop.in.in 2017-03-13 13:02:10 +0000
42@@ -9,4 +9,4 @@
43 Type=Application
44 Categories=GNOME;GTK;Utility;DesktopSettings;Settings;X-GNOME-SystemSettings;X-Unity-Settings-Panel;
45 X-Unity-Settings-Panel=datetime
46-OnlyShowIn=Unity;
47+OnlyShowIn=Unity7;
48
49=== modified file 'panels/display/unity-display-panel.desktop.in.in'
50--- panels/display/unity-display-panel.desktop.in.in 2013-12-03 02:12:11 +0000
51+++ panels/display/unity-display-panel.desktop.in.in 2017-03-13 13:02:10 +0000
52@@ -7,7 +7,7 @@
53 Type=Application
54 StartupNotify=true
55 Categories=GNOME;GTK;Settings;HardwareSettings;X-Unity-Settings-Panel;
56-OnlyShowIn=Unity;
57+OnlyShowIn=Unity77;
58 X-Unity-Settings-Panel=display
59 # Translators: those are keywords for the display control-center panel
60 _Keywords=Panel;Projector;xrandr;Screen;Resolution;Refresh;
61
62=== modified file 'panels/info/unity-info-panel.desktop.in.in'
63--- panels/info/unity-info-panel.desktop.in.in 2014-02-20 17:15:24 +0000
64+++ panels/info/unity-info-panel.desktop.in.in 2017-03-13 13:02:10 +0000
65@@ -7,7 +7,7 @@
66 Type=Application
67 StartupNotify=true
68 Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;X-Unity-Settings-Panel;
69-OnlyShowIn=Unity;
70+OnlyShowIn=Unity7;
71 X-Unity-Settings-Panel=info
72 # Translators: those are keywords for the System Information panel
73 # "Preferred Applications" is the old name for the preference, so make
74
75=== modified file 'panels/keyboard/unity-keyboard-panel.desktop.in.in'
76--- panels/keyboard/unity-keyboard-panel.desktop.in.in 2013-12-02 04:30:50 +0000
77+++ panels/keyboard/unity-keyboard-panel.desktop.in.in 2017-03-13 13:02:10 +0000
78@@ -7,7 +7,7 @@
79 Type=Application
80 StartupNotify=true
81 Categories=GNOME;GTK;Settings;HardwareSettings;X-Unity-Settings-Panel;
82-OnlyShowIn=Unity;
83+OnlyShowIn=Unity7;
84 X-Unity-Settings-Panel=keyboard
85 # Translators: those are keywords for the keyboard control-center panel
86 _Keywords=Shortcut;Repeat;Blink;
87
88=== modified file 'panels/mouse/unity-mouse-panel.desktop.in.in'
89--- panels/mouse/unity-mouse-panel.desktop.in.in 2013-12-02 04:30:50 +0000
90+++ panels/mouse/unity-mouse-panel.desktop.in.in 2017-03-13 13:02:10 +0000
91@@ -7,7 +7,7 @@
92 Type=Application
93 StartupNotify=true
94 Categories=GNOME;GTK;Settings;HardwareSettings;X-Unity-Settings-Panel;
95-OnlyShowIn=Unity;
96+OnlyShowIn=Unity7;
97 X-Unity-Settings-Panel=mouse
98 # Translators: those are keywords for the mouse and touchpad control-center panel
99 _Keywords=Trackpad;Pointer;Click;Tap;Double;Button;Trackball;
100
101=== modified file 'panels/network/unity-network-panel.desktop.in.in'
102--- panels/network/unity-network-panel.desktop.in.in 2013-12-02 04:30:50 +0000
103+++ panels/network/unity-network-panel.desktop.in.in 2017-03-13 13:02:10 +0000
104@@ -7,7 +7,7 @@
105 Type=Application
106 StartupNotify=true
107 Categories=GNOME;GTK;Settings;HardwareSettings;X-Unity-Settings-Panel;
108-OnlyShowIn=Unity;
109+OnlyShowIn=Unity7;
110 X-Unity-Settings-Panel=network
111 # Translators: those are keywords for the network control-center panel
112 _Keywords=Network;Wireless;IP;LAN;Proxy;
113
114=== modified file 'panels/power/unity-power-panel.desktop.in.in'
115--- panels/power/unity-power-panel.desktop.in.in 2013-12-03 02:12:11 +0000
116+++ panels/power/unity-power-panel.desktop.in.in 2017-03-13 13:02:10 +0000
117@@ -7,7 +7,7 @@
118 Type=Application
119 StartupNotify=true
120 Categories=GNOME;GTK;Settings;DesktopSettings;X-Unity-Settings-Panel;HardwareSettings
121-OnlyShowIn=Unity;
122+OnlyShowIn=Unity7;
123 X-Unity-Settings-Panel=power
124 # Translators: those are keywords for the power control-center panel
125 _Keywords=Power;Sleep;Suspend;Hibernate;Battery;
126
127=== modified file 'panels/region/unity-region-panel.desktop.in.in'
128--- panels/region/unity-region-panel.desktop.in.in 2013-12-18 22:19:53 +0000
129+++ panels/region/unity-region-panel.desktop.in.in 2017-03-13 13:02:10 +0000
130@@ -7,7 +7,7 @@
131 Type=Application
132 StartupNotify=true
133 Categories=GNOME;GTK;Settings;DesktopSettings;X-Unity-Settings-Panel;X-GNOME-PersonalSettings
134-OnlyShowIn=Unity;
135+OnlyShowIn=Unity7;
136 X-Unity-Settings-Panel=region
137 # Translators: those are keywords for the region control-center panel
138 _Keywords=Language;Layout;Keyboard;Input Method;Text Entry;
139
140=== modified file 'panels/screen/unity-screen-panel.desktop.in.in'
141--- panels/screen/unity-screen-panel.desktop.in.in 2013-12-02 04:30:50 +0000
142+++ panels/screen/unity-screen-panel.desktop.in.in 2017-03-13 13:02:10 +0000
143@@ -7,7 +7,7 @@
144 Type=Application
145 StartupNotify=true
146 Categories=GNOME;GTK;Settings;DesktopSettings;X-Unity-Settings-Panel;X-GNOME-PersonalSettings
147-OnlyShowIn=Unity;
148+OnlyShowIn=Unity7;
149 X-Unity-Settings-Panel=screen
150 # Translators: those are keywords for the brightness and lock control-center panel
151 _Keywords=Brightness;Lock;Dim;Blank;Monitor;
152
153=== modified file 'panels/sound/data/unity-sound-panel.desktop.in.in'
154--- panels/sound/data/unity-sound-panel.desktop.in.in 2013-12-03 03:04:42 +0000
155+++ panels/sound/data/unity-sound-panel.desktop.in.in 2017-03-13 13:02:10 +0000
156@@ -7,7 +7,7 @@
157 Type=Application
158 StartupNotify=true
159 Categories=GNOME;GTK;Settings;HardwareSettings;X-Unity-Settings-Panel;
160-OnlyShowIn=Unity;
161+OnlyShowIn=Unity7;
162 X-Unity-Settings-Panel=sound
163 # Translators: those are keywords for the sound control-center panel
164 _Keywords=Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;
165
166=== modified file 'panels/universal-access/unity-universal-access-panel.desktop.in.in'
167--- panels/universal-access/unity-universal-access-panel.desktop.in.in 2013-12-02 04:30:50 +0000
168+++ panels/universal-access/unity-universal-access-panel.desktop.in.in 2017-03-13 13:02:10 +0000
169@@ -7,7 +7,7 @@
170 Type=Application
171 StartupNotify=true
172 Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;X-Unity-Settings-Panel;
173-OnlyShowIn=Unity;
174+OnlyShowIn=Unity7;
175 X-Unity-Settings-Panel=universal-access
176 # Translators: those are keywords for the universal access control-center panel
177 _Keywords=Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;
178
179=== modified file 'panels/user-accounts/data/unity-user-accounts-panel.desktop.in.in'
180--- panels/user-accounts/data/unity-user-accounts-panel.desktop.in.in 2013-12-02 04:30:50 +0000
181+++ panels/user-accounts/data/unity-user-accounts-panel.desktop.in.in 2017-03-13 13:02:10 +0000
182@@ -7,7 +7,7 @@
183 Type=Application
184 StartupNotify=true
185 Categories=System;Settings;X-Unity-Settings-Panel;X-GNOME-SystemSettings
186-OnlyShowIn=Unity;
187+OnlyShowIn=Unity7;
188 X-Unity-Settings-Panel=user-accounts
189 # Translators: those are keywords for the user accounts control-center panel
190 _Keywords=Login;Name;Fingerprint;Avatar;Logo;Face;Password;
191
192=== modified file 'panels/wacom/unity-wacom-panel.desktop.in.in'
193--- panels/wacom/unity-wacom-panel.desktop.in.in 2014-02-19 02:24:52 +0000
194+++ panels/wacom/unity-wacom-panel.desktop.in.in 2017-03-13 13:02:10 +0000
195@@ -7,7 +7,7 @@
196 Type=Application
197 StartupNotify=true
198 Categories=GNOME;GTK;Settings;HardwareSettings;X-Unity-Settings-Panel;
199-OnlyShowIn=Unity;
200+OnlyShowIn=Unity7;
201 X-Unity-Settings-Panel=wacom
202 # Translators: those are keywords for the wacom tablet control-center panel
203 _Keywords=Tablet;Wacom;Stylus;Eraser;Mouse;
204
205=== modified file 'shell/unity-control-center.desktop.in.in'
206--- shell/unity-control-center.desktop.in.in 2013-11-29 06:28:37 +0000
207+++ shell/unity-control-center.desktop.in.in 2017-03-13 13:02:10 +0000
208@@ -6,5 +6,5 @@
209 Type=Application
210 StartupNotify=true
211 Categories=GNOME;GTK;System;
212-OnlyShowIn=Unity;
213+OnlyShowIn=Unity7;
214 _Keywords=Preferences;Settings;

Subscribers

People subscribed via source and target branches