Merge lp:~elementary-pantheon/pantheon-plugs/gcc-plug-urls into lp:~elementary-apps/pantheon-plugs/dynamic-gcc-plug-loki

Proposed by Danielle Foré
Status: Merged
Approved by: Corentin Noël
Approved revision: 73
Merged at revision: 73
Proposed branch: lp:~elementary-pantheon/pantheon-plugs/gcc-plug-urls
Merge into: lp:~elementary-apps/pantheon-plugs/dynamic-gcc-plug-loki
Diff against target: 79 lines (+16/-4)
4 files modified
plugs/Bluetooth/BluetoothPlug.vala (+4/-1)
plugs/Color/ColorPlug.vala (+4/-1)
plugs/Sound/SoundPlug.vala (+4/-1)
plugs/Wacom/WacomPlug.vala (+4/-1)
To merge this branch: bzr merge lp:~elementary-pantheon/pantheon-plugs/gcc-plug-urls
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+313510@code.launchpad.net

Commit message

Implement Preferences URL Specification

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugs/Bluetooth/BluetoothPlug.vala'
2--- plugs/Bluetooth/BluetoothPlug.vala 2016-04-20 01:10:54 +0000
3+++ plugs/Bluetooth/BluetoothPlug.vala 2016-12-18 20:58:40 +0000
4@@ -27,11 +27,14 @@
5 private Gtk.InfoBar infobar;
6
7 public Plug () {
8+ var settings = new Gee.TreeMap<string, string?> (null, null);
9+ settings.set ("network/bluetooth", null);
10 Object (category: Category.NETWORK,
11 code_name: "network-gcc-bluetooth",
12 display_name: GLib.dgettext ("unity-control-center", "Bluetooth"),
13 description: GLib.dgettext ("unity-control-center", "Configure Bluetooth settings"),
14- icon: "bluetooth");
15+ icon: "bluetooth",
16+ supported_settings: settings);
17 }
18
19 public override Gtk.Widget get_widget () {
20
21=== modified file 'plugs/Color/ColorPlug.vala'
22--- plugs/Color/ColorPlug.vala 2016-04-20 01:10:54 +0000
23+++ plugs/Color/ColorPlug.vala 2016-12-18 20:58:40 +0000
24@@ -27,11 +27,14 @@
25 private Gtk.TreeView tree;
26
27 public Plug () {
28+ var settings = new Gee.TreeMap<string, string?> (null, null);
29+ settings.set ("display/color", null);
30 Object (category: Category.HARDWARE,
31 code_name: "hardware-gcc-color",
32 display_name: GLib.dgettext ("unity-control-center", "Color"),
33 description: GLib.dgettext ("unity-control-center", "Color management settings"),
34- icon: "preferences-color");
35+ icon: "preferences-color",
36+ supported_settings: settings);
37 }
38
39 public override Gtk.Widget get_widget () {
40
41=== modified file 'plugs/Sound/SoundPlug.vala'
42--- plugs/Sound/SoundPlug.vala 2016-04-20 01:10:54 +0000
43+++ plugs/Sound/SoundPlug.vala 2016-12-18 20:58:40 +0000
44@@ -27,11 +27,14 @@
45 private Gtk.InfoBar infobar;
46
47 public Plug () {
48+ var settings = new Gee.TreeMap<string, string?> (null, null);
49+ settings.set ("sound", null);
50 Object (category: Category.HARDWARE,
51 code_name: "hardware-gcc-sound",
52 display_name: GLib.dgettext ("unity-control-center", "Sound"),
53 description: GLib.dgettext ("unity-control-center", "Change sound volume and sound events"),
54- icon: "preferences-desktop-sound");
55+ icon: "preferences-desktop-sound",
56+ supported_settings: settings);
57 }
58
59 public override Gtk.Widget get_widget () {
60
61=== modified file 'plugs/Wacom/WacomPlug.vala'
62--- plugs/Wacom/WacomPlug.vala 2016-04-20 01:10:54 +0000
63+++ plugs/Wacom/WacomPlug.vala 2016-12-18 20:58:40 +0000
64@@ -27,11 +27,14 @@
65 private Gtk.InfoBar infobar;
66
67 public Plug () {
68+ var settings = new Gee.TreeMap<string, string?> (null, null);
69+ settings.set ("input/wacom", null);
70 Object (category: Category.HARDWARE,
71 code_name: "hardware-gcc-wacom",
72 display_name: GLib.dgettext ("unity-control-center", "Wacom Tablet"),
73 description: GLib.dgettext ("unity-control-center", "Set your Wacom tablet preferences"),
74- icon: "input-tablet");
75+ icon: "input-tablet",
76+ supported_settings: settings);
77 }
78
79 public override Gtk.Widget get_widget () {

Subscribers

People subscribed via source and target branches