Unity Control Center

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

  1. onlyshowin-unity7-take2
  2. Merge into trunk
Proposed by Michael Terry
Status: Merged
Approved by: Robert Ancell
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 Approve
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.
Revision history for this message
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
=== modified file 'panels/appearance/unity-appearance-panel.desktop.in.in'
--- panels/appearance/unity-appearance-panel.desktop.in.in 2013-12-02 04:30:50 +0000
+++ panels/appearance/unity-appearance-panel.desktop.in.in 2017-03-13 13:02:10 +0000
@@ -7,7 +7,7 @@
7Type=Application7Type=Application
8StartupNotify=true8StartupNotify=true
9Categories=GNOME;GTK;Settings;DesktopSettings;X-Unity-Settings-Panel;X-GNOME-PersonalSettings9Categories=GNOME;GTK;Settings;DesktopSettings;X-Unity-Settings-Panel;X-GNOME-PersonalSettings
10OnlyShowIn=Unity;10OnlyShowIn=Unity7;
11X-Unity-Settings-Panel=appearance11X-Unity-Settings-Panel=appearance
12# Translators: those are keywords for the appearance control-center panel12# Translators: those are keywords for the appearance control-center panel
13_Keywords=Wallpaper;Background;Screen;Desktop;Theme;Appearance;Launcher;Unity;Menus;13_Keywords=Wallpaper;Background;Screen;Desktop;Theme;Appearance;Launcher;Unity;Menus;
1414
=== modified file 'panels/bluetooth/unity-bluetooth-panel.desktop.in.in'
--- panels/bluetooth/unity-bluetooth-panel.desktop.in.in 2013-12-02 04:30:50 +0000
+++ panels/bluetooth/unity-bluetooth-panel.desktop.in.in 2017-03-13 13:02:10 +0000
@@ -6,6 +6,6 @@
6Terminal=false6Terminal=false
7Type=Application7Type=Application
8Categories=GTK;GNOME;Settings;X-GNOME-NetworkSettings;HardwareSettings;X-Unity-Settings-Panel;8Categories=GTK;GNOME;Settings;X-GNOME-NetworkSettings;HardwareSettings;X-Unity-Settings-Panel;
9OnlyShowIn=Unity;9OnlyShowIn=Unity7;
10StartupNotify=true10StartupNotify=true
11X-Unity-Settings-Panel=bluetooth11X-Unity-Settings-Panel=bluetooth
1212
=== modified file 'panels/color/unity-color-panel.desktop.in.in'
--- panels/color/unity-color-panel.desktop.in.in 2013-12-03 02:12:11 +0000
+++ panels/color/unity-color-panel.desktop.in.in 2017-03-13 13:02:10 +0000
@@ -7,7 +7,7 @@
7Type=Application7Type=Application
8StartupNotify=true8StartupNotify=true
9Categories=GNOME;GTK;Settings;X-Unity-Settings-Panel;HardwareSettings9Categories=GNOME;GTK;Settings;X-Unity-Settings-Panel;HardwareSettings
10OnlyShowIn=Unity;10OnlyShowIn=Unity7;
11X-Unity-Settings-Panel=color11X-Unity-Settings-Panel=color
12# Translators: those are keywords for the color control-center panel12# Translators: those are keywords for the color control-center panel
13_Keywords=Color;ICC;Profile;Calibrate;Printer;Display;13_Keywords=Color;ICC;Profile;Calibrate;Printer;Display;
1414
=== modified file 'panels/datetime/unity-datetime-panel.desktop.in.in'
--- panels/datetime/unity-datetime-panel.desktop.in.in 2014-02-10 22:19:33 +0000
+++ panels/datetime/unity-datetime-panel.desktop.in.in 2017-03-13 13:02:10 +0000
@@ -9,4 +9,4 @@
9Type=Application9Type=Application
10Categories=GNOME;GTK;Utility;DesktopSettings;Settings;X-GNOME-SystemSettings;X-Unity-Settings-Panel;10Categories=GNOME;GTK;Utility;DesktopSettings;Settings;X-GNOME-SystemSettings;X-Unity-Settings-Panel;
11X-Unity-Settings-Panel=datetime11X-Unity-Settings-Panel=datetime
12OnlyShowIn=Unity;12OnlyShowIn=Unity7;
1313
=== modified file 'panels/display/unity-display-panel.desktop.in.in'
--- panels/display/unity-display-panel.desktop.in.in 2013-12-03 02:12:11 +0000
+++ panels/display/unity-display-panel.desktop.in.in 2017-03-13 13:02:10 +0000
@@ -7,7 +7,7 @@
7Type=Application7Type=Application
8StartupNotify=true8StartupNotify=true
9Categories=GNOME;GTK;Settings;HardwareSettings;X-Unity-Settings-Panel;9Categories=GNOME;GTK;Settings;HardwareSettings;X-Unity-Settings-Panel;
10OnlyShowIn=Unity;10OnlyShowIn=Unity77;
11X-Unity-Settings-Panel=display11X-Unity-Settings-Panel=display
12# Translators: those are keywords for the display control-center panel12# Translators: those are keywords for the display control-center panel
13_Keywords=Panel;Projector;xrandr;Screen;Resolution;Refresh;13_Keywords=Panel;Projector;xrandr;Screen;Resolution;Refresh;
1414
=== modified file 'panels/info/unity-info-panel.desktop.in.in'
--- panels/info/unity-info-panel.desktop.in.in 2014-02-20 17:15:24 +0000
+++ panels/info/unity-info-panel.desktop.in.in 2017-03-13 13:02:10 +0000
@@ -7,7 +7,7 @@
7Type=Application7Type=Application
8StartupNotify=true8StartupNotify=true
9Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;X-Unity-Settings-Panel;9Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;X-Unity-Settings-Panel;
10OnlyShowIn=Unity;10OnlyShowIn=Unity7;
11X-Unity-Settings-Panel=info11X-Unity-Settings-Panel=info
12# Translators: those are keywords for the System Information panel12# Translators: those are keywords for the System Information panel
13# "Preferred Applications" is the old name for the preference, so make13# "Preferred Applications" is the old name for the preference, so make
1414
=== modified file 'panels/keyboard/unity-keyboard-panel.desktop.in.in'
--- panels/keyboard/unity-keyboard-panel.desktop.in.in 2013-12-02 04:30:50 +0000
+++ panels/keyboard/unity-keyboard-panel.desktop.in.in 2017-03-13 13:02:10 +0000
@@ -7,7 +7,7 @@
7Type=Application7Type=Application
8StartupNotify=true8StartupNotify=true
9Categories=GNOME;GTK;Settings;HardwareSettings;X-Unity-Settings-Panel;9Categories=GNOME;GTK;Settings;HardwareSettings;X-Unity-Settings-Panel;
10OnlyShowIn=Unity;10OnlyShowIn=Unity7;
11X-Unity-Settings-Panel=keyboard11X-Unity-Settings-Panel=keyboard
12# Translators: those are keywords for the keyboard control-center panel12# Translators: those are keywords for the keyboard control-center panel
13_Keywords=Shortcut;Repeat;Blink;13_Keywords=Shortcut;Repeat;Blink;
1414
=== modified file 'panels/mouse/unity-mouse-panel.desktop.in.in'
--- panels/mouse/unity-mouse-panel.desktop.in.in 2013-12-02 04:30:50 +0000
+++ panels/mouse/unity-mouse-panel.desktop.in.in 2017-03-13 13:02:10 +0000
@@ -7,7 +7,7 @@
7Type=Application7Type=Application
8StartupNotify=true8StartupNotify=true
9Categories=GNOME;GTK;Settings;HardwareSettings;X-Unity-Settings-Panel;9Categories=GNOME;GTK;Settings;HardwareSettings;X-Unity-Settings-Panel;
10OnlyShowIn=Unity;10OnlyShowIn=Unity7;
11X-Unity-Settings-Panel=mouse11X-Unity-Settings-Panel=mouse
12# Translators: those are keywords for the mouse and touchpad control-center panel12# Translators: those are keywords for the mouse and touchpad control-center panel
13_Keywords=Trackpad;Pointer;Click;Tap;Double;Button;Trackball;13_Keywords=Trackpad;Pointer;Click;Tap;Double;Button;Trackball;
1414
=== modified file 'panels/network/unity-network-panel.desktop.in.in'
--- panels/network/unity-network-panel.desktop.in.in 2013-12-02 04:30:50 +0000
+++ panels/network/unity-network-panel.desktop.in.in 2017-03-13 13:02:10 +0000
@@ -7,7 +7,7 @@
7Type=Application7Type=Application
8StartupNotify=true8StartupNotify=true
9Categories=GNOME;GTK;Settings;HardwareSettings;X-Unity-Settings-Panel;9Categories=GNOME;GTK;Settings;HardwareSettings;X-Unity-Settings-Panel;
10OnlyShowIn=Unity;10OnlyShowIn=Unity7;
11X-Unity-Settings-Panel=network11X-Unity-Settings-Panel=network
12# Translators: those are keywords for the network control-center panel12# Translators: those are keywords for the network control-center panel
13_Keywords=Network;Wireless;IP;LAN;Proxy;13_Keywords=Network;Wireless;IP;LAN;Proxy;
1414
=== modified file 'panels/power/unity-power-panel.desktop.in.in'
--- panels/power/unity-power-panel.desktop.in.in 2013-12-03 02:12:11 +0000
+++ panels/power/unity-power-panel.desktop.in.in 2017-03-13 13:02:10 +0000
@@ -7,7 +7,7 @@
7Type=Application7Type=Application
8StartupNotify=true8StartupNotify=true
9Categories=GNOME;GTK;Settings;DesktopSettings;X-Unity-Settings-Panel;HardwareSettings9Categories=GNOME;GTK;Settings;DesktopSettings;X-Unity-Settings-Panel;HardwareSettings
10OnlyShowIn=Unity;10OnlyShowIn=Unity7;
11X-Unity-Settings-Panel=power11X-Unity-Settings-Panel=power
12# Translators: those are keywords for the power control-center panel12# Translators: those are keywords for the power control-center panel
13_Keywords=Power;Sleep;Suspend;Hibernate;Battery;13_Keywords=Power;Sleep;Suspend;Hibernate;Battery;
1414
=== modified file 'panels/region/unity-region-panel.desktop.in.in'
--- panels/region/unity-region-panel.desktop.in.in 2013-12-18 22:19:53 +0000
+++ panels/region/unity-region-panel.desktop.in.in 2017-03-13 13:02:10 +0000
@@ -7,7 +7,7 @@
7Type=Application7Type=Application
8StartupNotify=true8StartupNotify=true
9Categories=GNOME;GTK;Settings;DesktopSettings;X-Unity-Settings-Panel;X-GNOME-PersonalSettings9Categories=GNOME;GTK;Settings;DesktopSettings;X-Unity-Settings-Panel;X-GNOME-PersonalSettings
10OnlyShowIn=Unity;10OnlyShowIn=Unity7;
11X-Unity-Settings-Panel=region11X-Unity-Settings-Panel=region
12# Translators: those are keywords for the region control-center panel12# Translators: those are keywords for the region control-center panel
13_Keywords=Language;Layout;Keyboard;Input Method;Text Entry;13_Keywords=Language;Layout;Keyboard;Input Method;Text Entry;
1414
=== modified file 'panels/screen/unity-screen-panel.desktop.in.in'
--- panels/screen/unity-screen-panel.desktop.in.in 2013-12-02 04:30:50 +0000
+++ panels/screen/unity-screen-panel.desktop.in.in 2017-03-13 13:02:10 +0000
@@ -7,7 +7,7 @@
7Type=Application7Type=Application
8StartupNotify=true8StartupNotify=true
9Categories=GNOME;GTK;Settings;DesktopSettings;X-Unity-Settings-Panel;X-GNOME-PersonalSettings9Categories=GNOME;GTK;Settings;DesktopSettings;X-Unity-Settings-Panel;X-GNOME-PersonalSettings
10OnlyShowIn=Unity;10OnlyShowIn=Unity7;
11X-Unity-Settings-Panel=screen11X-Unity-Settings-Panel=screen
12# Translators: those are keywords for the brightness and lock control-center panel12# Translators: those are keywords for the brightness and lock control-center panel
13_Keywords=Brightness;Lock;Dim;Blank;Monitor;13_Keywords=Brightness;Lock;Dim;Blank;Monitor;
1414
=== modified file 'panels/sound/data/unity-sound-panel.desktop.in.in'
--- panels/sound/data/unity-sound-panel.desktop.in.in 2013-12-03 03:04:42 +0000
+++ panels/sound/data/unity-sound-panel.desktop.in.in 2017-03-13 13:02:10 +0000
@@ -7,7 +7,7 @@
7Type=Application7Type=Application
8StartupNotify=true8StartupNotify=true
9Categories=GNOME;GTK;Settings;HardwareSettings;X-Unity-Settings-Panel;9Categories=GNOME;GTK;Settings;HardwareSettings;X-Unity-Settings-Panel;
10OnlyShowIn=Unity;10OnlyShowIn=Unity7;
11X-Unity-Settings-Panel=sound11X-Unity-Settings-Panel=sound
12# Translators: those are keywords for the sound control-center panel12# Translators: those are keywords for the sound control-center panel
13_Keywords=Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;13_Keywords=Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;
1414
=== modified file 'panels/universal-access/unity-universal-access-panel.desktop.in.in'
--- panels/universal-access/unity-universal-access-panel.desktop.in.in 2013-12-02 04:30:50 +0000
+++ panels/universal-access/unity-universal-access-panel.desktop.in.in 2017-03-13 13:02:10 +0000
@@ -7,7 +7,7 @@
7Type=Application7Type=Application
8StartupNotify=true8StartupNotify=true
9Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;X-Unity-Settings-Panel;9Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;X-Unity-Settings-Panel;
10OnlyShowIn=Unity;10OnlyShowIn=Unity7;
11X-Unity-Settings-Panel=universal-access11X-Unity-Settings-Panel=universal-access
12# Translators: those are keywords for the universal access control-center panel12# Translators: those are keywords for the universal access control-center panel
13_Keywords=Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;13_Keywords=Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;
1414
=== modified file 'panels/user-accounts/data/unity-user-accounts-panel.desktop.in.in'
--- panels/user-accounts/data/unity-user-accounts-panel.desktop.in.in 2013-12-02 04:30:50 +0000
+++ panels/user-accounts/data/unity-user-accounts-panel.desktop.in.in 2017-03-13 13:02:10 +0000
@@ -7,7 +7,7 @@
7Type=Application7Type=Application
8StartupNotify=true8StartupNotify=true
9Categories=System;Settings;X-Unity-Settings-Panel;X-GNOME-SystemSettings9Categories=System;Settings;X-Unity-Settings-Panel;X-GNOME-SystemSettings
10OnlyShowIn=Unity;10OnlyShowIn=Unity7;
11X-Unity-Settings-Panel=user-accounts11X-Unity-Settings-Panel=user-accounts
12# Translators: those are keywords for the user accounts control-center panel12# Translators: those are keywords for the user accounts control-center panel
13_Keywords=Login;Name;Fingerprint;Avatar;Logo;Face;Password;13_Keywords=Login;Name;Fingerprint;Avatar;Logo;Face;Password;
1414
=== modified file 'panels/wacom/unity-wacom-panel.desktop.in.in'
--- panels/wacom/unity-wacom-panel.desktop.in.in 2014-02-19 02:24:52 +0000
+++ panels/wacom/unity-wacom-panel.desktop.in.in 2017-03-13 13:02:10 +0000
@@ -7,7 +7,7 @@
7Type=Application7Type=Application
8StartupNotify=true8StartupNotify=true
9Categories=GNOME;GTK;Settings;HardwareSettings;X-Unity-Settings-Panel;9Categories=GNOME;GTK;Settings;HardwareSettings;X-Unity-Settings-Panel;
10OnlyShowIn=Unity;10OnlyShowIn=Unity7;
11X-Unity-Settings-Panel=wacom11X-Unity-Settings-Panel=wacom
12# Translators: those are keywords for the wacom tablet control-center panel12# Translators: those are keywords for the wacom tablet control-center panel
13_Keywords=Tablet;Wacom;Stylus;Eraser;Mouse;13_Keywords=Tablet;Wacom;Stylus;Eraser;Mouse;
1414
=== modified file 'shell/unity-control-center.desktop.in.in'
--- shell/unity-control-center.desktop.in.in 2013-11-29 06:28:37 +0000
+++ shell/unity-control-center.desktop.in.in 2017-03-13 13:02:10 +0000
@@ -6,5 +6,5 @@
6Type=Application6Type=Application
7StartupNotify=true7StartupNotify=true
8Categories=GNOME;GTK;System;8Categories=GNOME;GTK;System;
9OnlyShowIn=Unity;9OnlyShowIn=Unity7;
10_Keywords=Preferences;Settings;10_Keywords=Preferences;Settings;

Subscribers

People subscribed via source and target branches