Merge lp:~tintou/pantheon-plugs/dynamic-freya-sound into lp:pantheon-plugs/dynamic-freya

Proposed by Corentin Noël
Status: Merged
Merged at revision: 29
Proposed branch: lp:~tintou/pantheon-plugs/dynamic-freya-sound
Merge into: lp:pantheon-plugs/dynamic-freya
Diff against target: 31 lines (+8/-0)
1 file modified
src/GccPanel.vala (+8/-0)
To merge this branch: bzr merge lp:~tintou/pantheon-plugs/dynamic-freya-sound
Reviewer Review Type Date Requested Status
elementary Pantheon team Pending
Review via email: mp+250550@code.launchpad.net

Commit message

[Sound] Do not show theme selector.
[BottomBar] Do not show if empty.

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
=== modified file 'src/GccPanel.vala'
--- src/GccPanel.vala 2014-10-19 01:25:23 +0000
+++ src/GccPanel.vala 2015-02-22 11:21:54 +0000
@@ -141,6 +141,7 @@
141 }141 }
142142
143 action_bar = new Gtk.ActionBar ();143 action_bar = new Gtk.ActionBar ();
144 action_bar.no_show_all = true;
144145
145 // unfortunately we need some special behaviors146 // unfortunately we need some special behaviors
146 switch (type_name) {147 switch (type_name) {
@@ -164,6 +165,12 @@
164165
165 var stack = stack_from_notebook (notebook);166 var stack = stack_from_notebook (notebook);
166 stack.margin = 12;167 stack.margin = 12;
168 var real_stack = (Gtk.Stack)search_widget_type ((Gtk.Container)stack, typeof (Gtk.Stack));
169 var effect_panel = (Gtk.Container)real_stack.get_child_by_name ("2");
170 foreach (var child in effect_panel.get_children ()) {
171 if (child.get_type ().name () == "GvcSoundThemeChooser")
172 child.destroy ();
173 }
167 ((Gtk.Box) panel.get_child ()).pack_start (stack);174 ((Gtk.Box) panel.get_child ()).pack_start (stack);
168175
169 break;176 break;
@@ -209,6 +216,7 @@
209 widget.show ();216 widget.show ();
210217
211 action_bar.pack_end (widget);218 action_bar.pack_end (widget);
219 action_bar.no_show_all = false;
212 action_bar.show ();220 action_bar.show ();
213 }221 }
214222

Subscribers

People subscribed via source and target branches