Merge lp:~larsu/unity-control-center/sound-panel-ui-cleanup into lp:unity-control-center
- sound-panel-ui-cleanup
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Sebastien Bacher |
Approved revision: | 12708 |
Merged at revision: | 12721 |
Proposed branch: | lp:~larsu/unity-control-center/sound-panel-ui-cleanup |
Merge into: | lp:unity-control-center |
Diff against target: |
419 lines (+118/-64) 6 files modified
configure.ac (+1/-1) debian/control (+3/-2) panels/sound/gvc-channel-bar.c (+43/-25) panels/sound/gvc-channel-bar.h (+3/-0) panels/sound/gvc-combo-box.c (+1/-1) panels/sound/gvc-mixer-dialog.c (+67/-35) |
To merge this branch: | bzr merge lp:~larsu/unity-control-center/sound-panel-ui-cleanup |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sebastien Bacher | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+207494@code.launchpad.net |
Commit message
sound: various UI tweaks
Most importantly, add a "allow louder than 100%" checkbox (feeding from a key in com.canonical.
Description of the change
sound: various UI tweaks
Most importantly, add a "allow louder than 100%" checkbox (feeding from a key in com.canonical.
- 12707. By Lars Karlitski
-
Bump gtk build dependency to match configure
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:12706
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:12707
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Sebastien Bacher (seb128) wrote : | # |
could you rebase/pre-require https:/
- 12708. By Lars Karlitski
-
Merge lp:~laney/unity-control-center/schemas-depends-not-build-depends
[ Eleni Maria Stea ]
* Add a slider that can change the fonts-scale-factor gsetting (per
monitor text scaling factor)
[ Robert Ancell ]
* Fix various compile warnings.
* Stop using deprecated GtkStock.
* Stop using deprecated GdkColor.
* Use appropriate GSettings API for checking existence of schemas.
* Backport Wacom panel from GNOME Control Center 3.8
* Add option to toggle username in session indicator (LP: #1116497)
[ Sebastian Bacher ]
* debian/control.in:
- Build-Depends on dh-migrations
* debian/unity-control- center. migrations, debian/ ucc-unity- launcher. py:
- script to migration the g-c-c Unity's launcher entry to u-c-c
* debian/rules:
- clean some leftover references to g-c-c
- use dh_migrations.
* Merge in datetime panel from indicator-datetime
* Backport commit to fix notebook spacing issues.
* Let the launcher icons be scaled down to 16. (LP: #1168409).
* keyboard: wrap information label in the shortcuts panel. (LP: #1276119).
* debian/control:
- Run with either gnome-settings-daemon or unity-settings- daemon
(LP: #1277487)
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:12708
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Preview Diff
1 | === modified file 'configure.ac' |
2 | --- configure.ac 2014-02-19 02:24:52 +0000 |
3 | +++ configure.ac 2014-02-20 18:08:31 +0000 |
4 | @@ -102,7 +102,7 @@ |
5 | dnl ============================================== |
6 | |
7 | GLIB_REQUIRED_VERSION=2.31.2 |
8 | -GTK_REQUIRED_VERSION=3.5.13 |
9 | +GTK_REQUIRED_VERSION=3.10.0 |
10 | PA_REQUIRED_VERSION=2.0 |
11 | CANBERRA_REQUIRED_VERSION=0.13 |
12 | GDKPIXBUF_REQUIRED_VERSION=2.23.0 |
13 | |
14 | === modified file 'debian/control' |
15 | --- debian/control 2014-02-20 10:43:41 +0000 |
16 | +++ debian/control 2014-02-20 18:08:31 +0000 |
17 | @@ -13,7 +13,6 @@ |
18 | gnome-pkg-tools (>= 0.10), |
19 | gnome-settings-daemon-dev (>= 3.8.4), |
20 | gsettings-desktop-schemas-dev (>= 3.7.2.2), |
21 | - gsettings-ubuntu-schemas (>= 0.0.1+14.04.20140219), |
22 | hardening-wrapper, |
23 | intltool (>= 0.37.1), |
24 | libcanberra-gtk3-dev, |
25 | @@ -30,7 +29,7 @@ |
26 | libgnomekbd-dev, |
27 | libgoa-1.0-dev (>= 3.5.90), |
28 | libgstreamer-plugins-base0.10-dev, |
29 | - libgtk-3-dev (>= 3.5.13), |
30 | + libgtk-3-dev (>= 3.10.0), |
31 | libgtop2-dev, |
32 | libibus-1.0-dev (>= 1.5.0), |
33 | libnm-glib-dev (>= 0.9) [linux-any], |
34 | @@ -71,6 +70,8 @@ |
35 | gnome-menus (>= 2.12.0), |
36 | gnome-settings-daemon (>= 3.8.4) | unity-settings-daemon, |
37 | gsettings-desktop-schemas (>= 3.5.91), |
38 | + gsettings-ubuntu-schemas (>= 0.0.1+14.04.20140219), |
39 | + indicator-sound (>= 12.10.2+14.04.20140220), |
40 | Recommends: cups-pk-helper, |
41 | gnome-session-bin, |
42 | ubuntu-system-service, |
43 | |
44 | === modified file 'panels/sound/gvc-channel-bar.c' |
45 | --- panels/sound/gvc-channel-bar.c 2014-02-18 04:27:04 +0000 |
46 | +++ panels/sound/gvc-channel-bar.c 2014-02-20 18:08:31 +0000 |
47 | @@ -54,7 +54,7 @@ |
48 | GtkWidget *scale; |
49 | GtkWidget *high_image; |
50 | GtkWidget *mute_box; |
51 | - GtkWidget *mute_switch; |
52 | + GtkWidget *mute_check; |
53 | GtkAdjustment *adjustment; |
54 | GtkAdjustment *zero_adjustment; |
55 | gboolean show_mute; |
56 | @@ -68,6 +68,7 @@ |
57 | gboolean click_lock; |
58 | gboolean is_amplified; |
59 | guint32 base_volume; |
60 | + GtkPositionType mark_position; |
61 | }; |
62 | |
63 | enum |
64 | @@ -522,14 +523,14 @@ |
65 | } |
66 | |
67 | static void |
68 | -update_mute_switch (GvcChannelBar *bar) |
69 | +update_mute (GvcChannelBar *bar) |
70 | { |
71 | if (bar->priv->show_mute) { |
72 | - gtk_widget_show (bar->priv->mute_switch); |
73 | - gtk_switch_set_active (GTK_SWITCH (bar->priv->mute_switch), |
74 | - !bar->priv->is_muted); |
75 | + gtk_widget_show (bar->priv->mute_check); |
76 | + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (bar->priv->mute_check), |
77 | + bar->priv->is_muted); |
78 | } else { |
79 | - gtk_widget_hide (bar->priv->mute_switch); |
80 | + gtk_widget_hide (bar->priv->mute_check); |
81 | } |
82 | |
83 | if (bar->priv->is_muted) { |
84 | @@ -564,7 +565,7 @@ |
85 | /* Update our internal state before telling the |
86 | * front-end about our changes */ |
87 | bar->priv->is_muted = is_muted; |
88 | - update_mute_switch (bar); |
89 | + update_mute (bar); |
90 | g_object_notify (G_OBJECT (bar), "is-muted"); |
91 | } |
92 | } |
93 | @@ -585,7 +586,7 @@ |
94 | if (show_mute != bar->priv->show_mute) { |
95 | bar->priv->show_mute = show_mute; |
96 | g_object_notify (G_OBJECT (bar), "show-mute"); |
97 | - update_mute_switch (bar); |
98 | + update_mute (bar); |
99 | } |
100 | } |
101 | |
102 | @@ -612,24 +613,30 @@ |
103 | if (bar->priv->base_volume == ADJUSTMENT_MAX_NORMAL) { |
104 | str = g_strdup_printf ("<small>%s</small>", C_("volume", "100%")); |
105 | gtk_scale_add_mark (GTK_SCALE (bar->priv->scale), ADJUSTMENT_MAX_NORMAL, |
106 | - GTK_POS_BOTTOM, str); |
107 | + bar->priv->mark_position, str); |
108 | } else { |
109 | str = g_strdup_printf ("<small>%s</small>", C_("volume", "Unamplified")); |
110 | gtk_scale_add_mark (GTK_SCALE (bar->priv->scale), bar->priv->base_volume, |
111 | - GTK_POS_BOTTOM, str); |
112 | + bar->priv->mark_position, str); |
113 | /* Only show 100% if it's higher than the base volume */ |
114 | if (bar->priv->base_volume < ADJUSTMENT_MAX_NORMAL) { |
115 | str = g_strdup_printf ("<small>%s</small>", C_("volume", "100%")); |
116 | gtk_scale_add_mark (GTK_SCALE (bar->priv->scale), ADJUSTMENT_MAX_NORMAL, |
117 | - GTK_POS_BOTTOM, str); |
118 | + bar->priv->mark_position, str); |
119 | } |
120 | } |
121 | |
122 | g_free (str); |
123 | gtk_alignment_set (GTK_ALIGNMENT (bar->priv->mute_box), 0.5, 0, 0, 0); |
124 | - gtk_misc_set_alignment (GTK_MISC (bar->priv->low_image), 0.5, 0.15); |
125 | - gtk_misc_set_alignment (GTK_MISC (bar->priv->high_image), 0.5, 0.15); |
126 | gtk_misc_set_alignment (GTK_MISC (bar->priv->label), 0, 0); |
127 | + if (bar->priv->mark_position == GTK_POS_TOP) { |
128 | + gtk_misc_set_alignment (GTK_MISC (bar->priv->low_image), 0.5, 1.0); |
129 | + gtk_misc_set_alignment (GTK_MISC (bar->priv->high_image), 0.5, 1.0); |
130 | + } |
131 | + else { |
132 | + gtk_misc_set_alignment (GTK_MISC (bar->priv->low_image), 0.5, 0.0); |
133 | + gtk_misc_set_alignment (GTK_MISC (bar->priv->high_image), 0.5, 0.0); |
134 | + } |
135 | } else { |
136 | gtk_alignment_set (GTK_ALIGNMENT (bar->priv->mute_box), 0.5, 0.5, 0, 0); |
137 | gtk_misc_set_alignment (GTK_MISC (bar->priv->low_image), 0.5, 0.5); |
138 | @@ -776,7 +783,7 @@ |
139 | |
140 | self = GVC_CHANNEL_BAR (object); |
141 | |
142 | - update_mute_switch (self); |
143 | + update_mute (self); |
144 | |
145 | return object; |
146 | } |
147 | @@ -867,13 +874,15 @@ |
148 | } |
149 | |
150 | static void |
151 | -on_mute_switch_toggled (GtkSwitch *sw, |
152 | - GParamSpec *pspec, |
153 | - GvcChannelBar *bar) |
154 | +on_mute_check_toggled (GObject *object, |
155 | + GParamSpec *pspec, |
156 | + gpointer user_data) |
157 | { |
158 | - gboolean is_muted; |
159 | - is_muted = gtk_switch_get_active (sw); |
160 | - gvc_channel_bar_set_is_muted (bar, !is_muted); |
161 | + GvcChannelBar *bar = user_data; |
162 | + gboolean is_muted; |
163 | + |
164 | + is_muted = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (object)); |
165 | + gvc_channel_bar_set_is_muted (bar, is_muted); |
166 | } |
167 | |
168 | static void |
169 | @@ -886,6 +895,7 @@ |
170 | bar->priv->base_volume = ADJUSTMENT_MAX_NORMAL; |
171 | bar->priv->low_icon_name = g_strdup ("audio-volume-low-symbolic"); |
172 | bar->priv->high_icon_name = g_strdup ("audio-volume-high-symbolic"); |
173 | + bar->priv->mark_position = GTK_POS_BOTTOM; |
174 | |
175 | bar->priv->orientation = GTK_ORIENTATION_VERTICAL; |
176 | bar->priv->adjustment = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, |
177 | @@ -909,14 +919,14 @@ |
178 | G_CALLBACK (on_zero_adjustment_value_changed), |
179 | bar); |
180 | |
181 | - bar->priv->mute_switch = gtk_switch_new (); |
182 | - gtk_widget_set_no_show_all (bar->priv->mute_switch, TRUE); |
183 | - g_signal_connect (bar->priv->mute_switch, |
184 | + bar->priv->mute_check = gtk_check_button_new_with_label (_("Mute")); |
185 | + gtk_widget_set_no_show_all (bar->priv->mute_check, TRUE); |
186 | + g_signal_connect (bar->priv->mute_check, |
187 | "notify::active", |
188 | - G_CALLBACK (on_mute_switch_toggled), |
189 | + G_CALLBACK (on_mute_check_toggled), |
190 | bar); |
191 | bar->priv->mute_box = gtk_alignment_new (0.5, 0.5, 0, 0); |
192 | - gtk_container_add (GTK_CONTAINER (bar->priv->mute_box), bar->priv->mute_switch); |
193 | + gtk_container_add (GTK_CONTAINER (bar->priv->mute_box), bar->priv->mute_check); |
194 | |
195 | bar->priv->low_image = gtk_image_new_from_icon_name ("audio-volume-low-symbolic", |
196 | GTK_ICON_SIZE_MENU); |
197 | @@ -973,3 +983,11 @@ |
198 | NULL); |
199 | return GTK_WIDGET (bar); |
200 | } |
201 | + |
202 | +void |
203 | +gvc_channel_bar_set_mark_position (GvcChannelBar *bar, |
204 | + GtkPositionType position) |
205 | +{ |
206 | + bar->priv->mark_position = position; |
207 | + gvc_channel_bar_set_is_amplified (bar, bar->priv->is_amplified); |
208 | +} |
209 | |
210 | === modified file 'panels/sound/gvc-channel-bar.h' |
211 | --- panels/sound/gvc-channel-bar.h 2012-06-25 12:41:31 +0000 |
212 | +++ panels/sound/gvc-channel-bar.h 2014-02-20 18:08:31 +0000 |
213 | @@ -84,6 +84,9 @@ |
214 | gboolean gvc_channel_bar_scroll (GvcChannelBar *bar, |
215 | GdkEventScroll *event); |
216 | |
217 | +void gvc_channel_bar_set_mark_position (GvcChannelBar *bar, |
218 | + GtkPositionType position); |
219 | + |
220 | G_END_DECLS |
221 | |
222 | #endif /* __GVC_CHANNEL_BAR_H */ |
223 | |
224 | === modified file 'panels/sound/gvc-combo-box.c' |
225 | --- panels/sound/gvc-combo-box.c 2014-02-18 04:27:04 +0000 |
226 | +++ panels/sound/gvc-combo-box.c 2014-02-20 18:08:31 +0000 |
227 | @@ -346,7 +346,7 @@ |
228 | |
229 | |
230 | combo_box->priv->end_box = ebox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); |
231 | - gtk_box_pack_start (GTK_BOX (box), ebox, FALSE, FALSE, 0); |
232 | + gtk_box_pack_start (GTK_BOX (box), ebox, TRUE, FALSE, 0); |
233 | |
234 | if (combo_box->priv->size_group != NULL) { |
235 | gtk_size_group_add_widget (combo_box->priv->size_group, sbox); |
236 | |
237 | === modified file 'panels/sound/gvc-mixer-dialog.c' |
238 | --- panels/sound/gvc-mixer-dialog.c 2014-02-18 22:42:43 +0000 |
239 | +++ panels/sound/gvc-mixer-dialog.c 2014-02-20 18:08:31 +0000 |
240 | @@ -904,8 +904,6 @@ |
241 | bar_set_stream (dialog, dialog->priv->output_bar, stream); |
242 | gvc_channel_bar_set_base_volume (GVC_CHANNEL_BAR (dialog->priv->output_bar), |
243 | gvc_mixer_stream_get_base_volume (stream)); |
244 | - gvc_channel_bar_set_is_amplified (GVC_CHANNEL_BAR (dialog->priv->output_bar), |
245 | - gvc_mixer_stream_get_can_decibel (stream)); |
246 | /* Update the adjustment in case the previous bar wasn't decibel |
247 | * capable, and we clipped it */ |
248 | adj = GTK_ADJUSTMENT (gvc_channel_bar_get_adjustment (GVC_CHANNEL_BAR (dialog->priv->output_bar))); |
249 | @@ -962,7 +960,7 @@ |
250 | |
251 | if (dialog->priv->size_group != NULL) { |
252 | gvc_combo_box_set_size_group (GVC_COMBO_BOX (dialog->priv->output_profile_combo), |
253 | - dialog->priv->size_group, FALSE); |
254 | + dialog->priv->size_group, TRUE); |
255 | } |
256 | |
257 | active_profile = gvc_mixer_ui_device_get_active_profile (active_output); |
258 | @@ -1718,6 +1716,20 @@ |
259 | gtk_widget_destroy (d); |
260 | } |
261 | |
262 | +static void |
263 | +allow_amplify_check_changed (GObject *object, |
264 | + GParamSpec *pspec, |
265 | + gpointer user_data) |
266 | +{ |
267 | + const gchar *label; |
268 | + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (object))) |
269 | + label = (_("Allow louder than 100% (may distort sound)")); |
270 | + else |
271 | + label = (_("Allow louder than 100%")); |
272 | + |
273 | + gtk_button_set_label (GTK_BUTTON (object), label); |
274 | +} |
275 | + |
276 | static GObject * |
277 | gvc_mixer_dialog_constructor (GType type, |
278 | guint n_construct_properties, |
279 | @@ -1740,6 +1752,8 @@ |
280 | GvcMixerStream *stream; |
281 | GvcMixerCard *card; |
282 | GtkTreeSelection *selection; |
283 | + GtkWidget *mute_check; |
284 | + GtkWidget *allow_amplify_check; |
285 | |
286 | object = G_OBJECT_CLASS (gvc_mixer_dialog_parent_class)->constructor (type, n_construct_properties, construct_params); |
287 | |
288 | @@ -1750,13 +1764,51 @@ |
289 | |
290 | gtk_container_set_border_width (GTK_CONTAINER (self), 3); |
291 | |
292 | - self->priv->output_stream_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); |
293 | - alignment = gtk_alignment_new (0, 0, 1, 1); |
294 | - gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 0, 0); |
295 | - gtk_container_add (GTK_CONTAINER (alignment), self->priv->output_stream_box); |
296 | + // Output volume |
297 | + self->priv->output_bar = create_bar (self, FALSE, TRUE); |
298 | + gvc_channel_bar_set_show_mute (GVC_CHANNEL_BAR (self->priv->output_bar), FALSE); |
299 | + gvc_channel_bar_set_mark_position (GVC_CHANNEL_BAR (self->priv->output_bar), GTK_POS_TOP); |
300 | + gtk_widget_set_sensitive (self->priv->output_bar, FALSE); |
301 | + gtk_widget_set_valign (self->priv->output_bar, GTK_ALIGN_END); |
302 | + gtk_widget_set_size_request (self->priv->output_bar, 400, -1); |
303 | + g_settings_bind (self->priv->indicator_settings, "allow-amplified-volume", |
304 | + self->priv->output_bar, "is-amplified", G_SETTINGS_BIND_DEFAULT); |
305 | + |
306 | + label = gtk_label_new_with_mnemonic (_("_Output volume:")); |
307 | + gtk_widget_set_valign (label, GTK_ALIGN_END); |
308 | + gtk_widget_set_margin_top (label, 30); |
309 | + |
310 | + mute_check = gtk_check_button_new_with_label (_("Mute")); |
311 | + gtk_widget_set_halign (mute_check, GTK_ALIGN_START); |
312 | + g_object_bind_property (mute_check, "active", self->priv->output_bar, "is-muted", |
313 | + G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); |
314 | + |
315 | + /* TRANSLATORS: This label is used in a checkbox close to volume |
316 | + * slider. Please keep it brief. */ |
317 | + allow_amplify_check = gtk_check_button_new_with_label (_("Allow louder than 100%")); |
318 | + gtk_widget_set_halign (allow_amplify_check, GTK_ALIGN_START); |
319 | + gtk_widget_set_hexpand (allow_amplify_check, TRUE); |
320 | + g_signal_connect (allow_amplify_check, "notify::active", |
321 | + G_CALLBACK (allow_amplify_check_changed), NULL); |
322 | + g_settings_bind (self->priv->indicator_settings, "allow-amplified-volume", |
323 | + allow_amplify_check, "active", G_SETTINGS_BIND_DEFAULT); |
324 | + |
325 | + self->priv->output_stream_box = gtk_grid_new (); |
326 | + gtk_widget_set_halign (self->priv->output_stream_box, GTK_ALIGN_CENTER); |
327 | + gtk_grid_set_column_spacing (GTK_GRID (self->priv->output_stream_box), 6); |
328 | + gtk_grid_set_row_spacing (GTK_GRID (self->priv->output_stream_box), 6); |
329 | + gtk_grid_attach (GTK_GRID (self->priv->output_stream_box), |
330 | + label, 0, 0, 1, 1); |
331 | + gtk_grid_attach (GTK_GRID (self->priv->output_stream_box), |
332 | + self->priv->output_bar, 1, 0, 2, 1); |
333 | + gtk_grid_attach (GTK_GRID (self->priv->output_stream_box), |
334 | + mute_check, 1, 1, 1, 1); |
335 | + gtk_grid_attach (GTK_GRID (self->priv->output_stream_box), |
336 | + allow_amplify_check, 2, 1, 1, 1); |
337 | + |
338 | gtk_box_pack_start (GTK_BOX (main_vbox), |
339 | - alignment, |
340 | - FALSE, FALSE, 0); |
341 | + self->priv->output_stream_box, |
342 | + FALSE, TRUE, 0); |
343 | |
344 | self->priv->notebook = gtk_notebook_new (); |
345 | gtk_box_pack_start (GTK_BOX (main_vbox), |
346 | @@ -1810,8 +1862,8 @@ |
347 | |
348 | gtk_box_pack_start (GTK_BOX (self->priv->output_box), |
349 | settings_box, |
350 | - FALSE, |
351 | - FALSE, |
352 | + TRUE, |
353 | + TRUE, |
354 | 0); |
355 | gtk_box_pack_start (GTK_BOX (settings_box), |
356 | self->priv->selected_output_label, |
357 | @@ -1870,10 +1922,6 @@ |
358 | sbox, |
359 | FALSE, FALSE, 0); |
360 | |
361 | - label = gtk_label_new (_("Test:")); |
362 | - gtk_box_pack_start (GTK_BOX (sbox), |
363 | - label, |
364 | - FALSE, FALSE, 0); |
365 | if (self->priv->size_group != NULL) |
366 | gtk_size_group_add_widget (self->priv->size_group, sbox); |
367 | |
368 | @@ -1883,7 +1931,7 @@ |
369 | * Here 8 works fine, not sure why. */ |
370 | gtk_box_pack_start (GTK_BOX (test_sound_box), |
371 | self->priv->test_output_button, |
372 | - TRUE, TRUE, 8); |
373 | + FALSE, FALSE, 8); |
374 | |
375 | /* Is this needed */ |
376 | if (self->priv->size_group != NULL) |
377 | @@ -1936,8 +1984,8 @@ |
378 | self->priv->input_settings_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); |
379 | gtk_box_pack_start (GTK_BOX (self->priv->input_box), |
380 | self->priv->input_settings_box, |
381 | - FALSE, |
382 | - FALSE, |
383 | + TRUE, |
384 | + TRUE, |
385 | 0); |
386 | gtk_box_pack_start (GTK_BOX (self->priv->input_settings_box), |
387 | self->priv->selected_input_label, |
388 | @@ -2030,23 +2078,6 @@ |
389 | self->priv->no_apps_label, |
390 | TRUE, TRUE, 0); |
391 | |
392 | - self->priv->output_stream_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); |
393 | - alignment = gtk_alignment_new (0, 0, 1, 1); |
394 | - gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 12, 0, 0, 0); |
395 | - gtk_container_add (GTK_CONTAINER (alignment), self->priv->output_stream_box); |
396 | - gtk_box_pack_start (GTK_BOX (main_vbox), |
397 | - alignment, |
398 | - FALSE, FALSE, 0); |
399 | - // Output volume |
400 | - self->priv->output_bar = create_bar (self, FALSE, TRUE); |
401 | - gvc_channel_bar_set_name (GVC_CHANNEL_BAR (self->priv->output_bar), |
402 | - _("_Output volume:")); |
403 | - gtk_widget_set_sensitive (self->priv->output_bar, FALSE); |
404 | - gtk_widget_set_size_request (self->priv->output_bar, 460, -1); |
405 | - |
406 | - gtk_box_pack_start (GTK_BOX (self->priv->output_stream_box), |
407 | - self->priv->output_bar, TRUE, FALSE, 12); |
408 | - |
409 | gtk_widget_show_all (main_vbox); |
410 | |
411 | g_signal_connect (self->priv->mixer_control, |
412 | @@ -2149,6 +2180,7 @@ |
413 | dialog->priv = GVC_MIXER_DIALOG_GET_PRIVATE (dialog); |
414 | dialog->priv->bars = g_hash_table_new (NULL, NULL); |
415 | dialog->priv->size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); |
416 | + dialog->priv->indicator_settings = g_settings_new ("com.canonical.indicator.sound"); |
417 | } |
418 | |
419 | static void |
Thanks, looks good to me! Could you change debian/control to update the libgtk-3-dev build depends to 3.10, to match configure?