Merge lp:~victored/noise/equalizer-popover into lp:~elementary-apps/noise/trunk

[Victor Martinez]

Move equalizer controls into Gtk.Popover. lp:1284825

Move equalizer controls into Gtk.Popover. lp:1284825

- Refactor code to follow current code style, with the exception of tabs-vs-spaces to avoid creating a larger code diff.
- Use only Gee data structures (has refcount advantages).
- Use Gtk.MenuButton in statusbar for automated popover handling (needs a modal popover to work properly).
- Stop using Gtk.Adjustment and Gtk.Box, replacing them by Gtk.Grid.
- Reduce code redundancy.
- Remove unnecessary widgets.

Needs GTK+ 3.12 and Vala 0.24

[Victor Martinez (victored)]

Allow typing a name into the preset-name entry. Currently there are issues with focus and only one character is recognized.

review: Needs Fixing

[Victor Martinez (victored)]

Please note that this branch doesn't bump gtk and vala requirements, as Corentin's branch already does that and will be merged before this one. lp:~tintou/noise/fix-interface

[Victor Martinez (victored)]

The UI is not supposed to change significantly, so feel free to point out any interface issues.

[Danielle Foré (danrabbit)]

Victor, apart from the 1 char issue you pointed out this seems to work great!

I'm not sure if you think this should occur in another branch, but I think it would be a nice touch to change the green "check" icon to "document-save-symbolic"

[Victor Martinez (victored)]

I've changed the icon. It looks way better!

[Victor Martinez (victored)]

Please note that the style class "bottom-toolbar" was dropped

[Victor Martinez (victored)]

All fixed. Please review now.

[Victor Martinez (victored)]

review: Abstain

[Danielle Foré (danrabbit)]

Looks great Victor! Seems to work perfectly for me. No focus issues.

[lp:~victored/noise/equalizer-popover]

1564. By Victor Martinez on 2014-03-23

merge equalizer popover

1565. By Victor Martinez on 2014-03-23

Fix crash with GTK+ 3.11.9

A upstream change in how Gtk.Popover handles focus made the equalizer close too early after saving a preset. This happened because we were removing the current focus entry from the popover, which in the end resulted in a segmentation fault.

[Cody Garver (codygarver)]

When the equalizer is turned off and you click on the preset dropdown, it closes the popover

[Victor Martinez (victored)]

You're right Cody. That seems to happen when clicking insensitive widgets within the popover.

We could report that as a bug against Gtk.Popover.

[Corentin Noël (tintou)]

For the code, it's all good, but I would like to have the button appearance fixed in the theme...

review: Approve

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-03-07 15:52:49 +0000
+++ src/CMakeLists.txt	2014-03-23 22:17:56 +0000
@@ -27,6 +27,7 @@
     Widgets/SpaceWidget.vala
     Widgets/FixedBin.vala
     Widgets/ViewSelector.vala
+    Widgets/EqualizerPopover.vala
     Widgets/FastView/TileView/ImageUtils.vala
     Widgets/FastView/TileView/TileRenderer.vala
     Widgets/FastView/TileView/TileView.vala
@@ -63,7 +64,6 @@
     Views/ListView/Lists/CellDataFunctionHelper.vala
     Views/ListView/Lists/GenericList.vala
     Views/ListView/Lists/MusicListView.vala
-    Dialogs/EqualizerWindow.vala
     Dialogs/SmartPlaylistEditor.vala
     Dialogs/PreferencesWindow.vala
     Dialogs/InstallGstreamerPluginsDialog.vala
 
=== modified file 'src/LibraryWindow.vala'
--- src/LibraryWindow.vala	2014-03-16 21:06:57 +0000
+++ src/LibraryWindow.vala	2014-03-23 22:17:56 +0000
@@ -153,6 +153,11 @@
     }
 
     public override bool key_press_event (Gdk.EventKey event) {
+        // when typing in an editable widget, such as Gtk.Entry, don't block the event
+        var focus_widget = get_focus ();
+        if (focus_widget != null && focus_widget is Gtk.Editable)
+            return base.key_press_event (event);
+
         var modifiers = Gtk.accelerator_get_default_mod_mask ();
         bool modifiers_active = (event.state & modifiers) != 0;
 
 
=== renamed file 'src/Dialogs/EqualizerWindow.vala' => 'src/Widgets/EqualizerPopover.vala'
--- src/Dialogs/EqualizerWindow.vala	2014-02-02 11:47:19 +0000
+++ src/Widgets/EqualizerPopover.vala	2014-03-23 22:17:56 +0000
@@ -1,5 +1,6 @@
 /*-
- * Copyright (c) 2011-2012	   Scott Ringwelski <[e-mail]>
+ * Copyright (c) 2011-2012	Scott Ringwelski <[e-mail]>
+ * Copyright (c) 2014 Noise Developers (http://launchpad.net/noise)
  *
  * Originally Written by Scott Ringwelski and Victor Eduardo for
  * BeatBox Music Player: http://www.launchpad.net/beat-box
@@ -20,307 +21,309 @@
  * Boston, MA 02111-1307, USA.
  */
 
-using Gtk;
-
-public class Noise.EqualizerWindow : Gtk.Window {
-
-	private Switch eq_switch;
+public class Noise.EqualizerPopover : Gtk.Popover {
+	private Gtk.Switch eq_switch;
+	private Gtk.Entry new_preset_entry;
+	private Gtk.Grid side_list;
+	private Gtk.Grid scale_container;
 	private PresetList preset_combo;
-	private Entry new_preset_entry;
-	private Toolbar bottom_toolbar;
-	private ToolItem side_list;
-	private ToolItem new_preset_field;
-	private Button close_button;
-
-	private bool apply_changes;
-	private bool initialized;
-	private bool adding_preset;
+	private Gee.List<Gtk.Scale> scales;
+	private Gee.List<int> target_levels;
+	private Settings.Equalizer equalizer_settings;
+	private string new_preset_name;
+	private bool apply_changes = false;
+	private bool initialized = false;
+	private bool adding_preset = false;
+	private bool in_transition = false;
+	private bool closing = false;
 
 	private const int ANIMATION_TIMEOUT = 20;
 
-	private List<Scale> scale_list;
-	private List<Label> label_list;
-
-	private bool in_transition;
-	private Gee.ArrayList<int> target_levels;
-
-	private string new_preset_name;
-	private Settings.Equalizer equalizer_settings;
-
-	public EqualizerWindow () {
-		scale_list = new List<Gtk.Scale>();
-		label_list = new List<Label>();
-		target_levels = new Gee.ArrayList<int>();
-
-		adding_preset = false;
-		initialized = false;
-		apply_changes = false;
-
-		build_ui();
-		load_presets();
+	private const string[] DECIBELS = {
+		"60", "170", "310", "600", "1k", "3k", "6k", "12k", "14k", "16k"
+	};
+
+	public EqualizerPopover () {
+		scales = new Gee.ArrayList<Gtk.Scale> ();
+		target_levels = new Gee.ArrayList<int> ();
+
+		equalizer_settings = Settings.Equalizer.get_default ();
+
+		build_ui ();
+		load_presets ();
 
 		initialized = true;
 
-        equalizer_settings = Settings.Equalizer.get_default ();
 		if (equalizer_settings.auto_switch_preset) {
-			preset_combo.selectAutomaticPreset();
+			preset_combo.selectAutomaticPreset ();
 		} else {
 			var preset = equalizer_settings.selected_preset;
 			if (preset != null)
-				preset_combo.selectPreset(preset);
+				preset_combo.selectPreset (preset);
 		}
 
 		on_eq_switch_toggled ();
 		apply_changes = true;
 	}
 
-	void build_ui () {
-		set_title(_("Equalizer"));
-
-		window_position = WindowPosition.CENTER;
-		type_hint = Gdk.WindowTypeHint.DIALOG;
-		set_transient_for (App.main_window);
-		set_size_request(440, 224);
-		resizable = false;
-		set_deletable(false);
-
-		set_icon(render_icon ("preferences-system", IconSize.DIALOG, null));
-
-		var outer_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 10);
-		var inner_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
-		var scales = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
-
-		bottom_toolbar = new Toolbar();
-		eq_switch = new Switch();
-		preset_combo = new PresetList();
-
-		eq_switch.set_active(equalizer_settings.equalizer_enabled);
-
-		string[] decibels = {"60", "170", "310", "600", "1k", "3k", "6k", "12k", "14k", "16k"};
-		//string[] decibels = {"32", "64", "125", "250", "500", "1k", "2k", "4k", "8k", "16k"};
-
-		for (int index = 0; index < 10; ++index) {
-			var holder = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
-			var v = new Gtk.Scale.with_range(Gtk.Orientation.VERTICAL, -80, 80, 1);
-			v.add_mark(0, PositionType.LEFT, null);
-			v.draw_value = false;
-			v.inverted = true;
-
-			var label = new Label(decibels[index]);
-
-			holder.pack_start(v, true, true, 0);
-			holder.pack_end(UI.wrap_alignment (label, 4, 0, 0, 0), false, false, 0);
-
-			scales.pack_start(holder, true, true, 6);
-			scale_list.append(v);
-			label_list.append(label);
-
-			v.value_changed.connect( () => {
-				if(apply_changes && initialized && !preset_combo.automatic_chosen) {
-					App.player.player.set_equalizer_gain(scale_list.index(v), (int)scale_list.nth_data(scale_list.index(v)).get_value());
-
-					if(!in_transition) {
-						if (!preset_combo.getSelectedPreset().is_default)
-							preset_combo.getSelectedPreset().setGain(scale_list.index(v), (int)scale_list.nth_data(scale_list.index(v)).get_value());
+	public override void closed () {
+		closing = true;
+
+		if (in_transition)
+			set_target_levels ();
+		else if (adding_preset)
+			add_new_preset ();
+
+		save_presets ();
+
+		var selected_preset = preset_combo.getSelectedPreset ();
+		equalizer_settings.selected_preset = selected_preset != null ? selected_preset.name : "";
+		equalizer_settings.auto_switch_preset = preset_combo.automatic_chosen;
+
+		closing = false;
+	}
+
+	public bool verify_preset_name (string preset_name) {
+		if (preset_name == null || String.is_white_space (preset_name))
+			return false;
+
+		foreach (var preset in preset_combo.getPresets ()) {
+			if (preset_name == preset.name)
+				return false;
+		}
+
+		return true;
+	}
+
+	private void build_ui () {
+		set_size_request (-1, 240);
+
+		scale_container = new Gtk.Grid ();
+		scale_container.column_spacing = 12;
+		scale_container.margin = 18;
+		scale_container.margin_bottom = 0;
+
+		foreach (string decibel in DECIBELS) {
+			var scale = new Gtk.Scale.with_range (Gtk.Orientation.VERTICAL, -80, 80, 1);
+			scale.add_mark (0, Gtk.PositionType.LEFT, null);
+			scale.draw_value = false;
+			scale.inverted = true;
+
+			var tag = new Gtk.Label (decibel);
+
+			scale.halign = tag.halign = Gtk.Align.CENTER;
+			scale.expand = true;
+			tag.hexpand = true;
+
+			var holder = new Gtk.Grid ();
+			holder.orientation = Gtk.Orientation.VERTICAL;
+			holder.expand = true;
+			holder.row_spacing = 4;
+			holder.add (scale);
+			holder.add (tag);
+
+			scale_container.add (holder);
+			scales.add (scale);
+
+			scale.value_changed.connect (() => {
+				if (initialized && apply_changes && !preset_combo.automatic_chosen) {
+					int index = scales.index_of (scale);
+					int val = (int) scale.get_value ();
+					apply_equalizer_gain (index, val);
+
+					if (!in_transition) {
+						var selected_preset = preset_combo.getSelectedPreset ();
+
+						if (selected_preset.is_default)
+							on_default_preset_modified ();
 						else
-							on_default_preset_modified();
+							selected_preset.setGain (index, val);
 					}
 				}
 			});
-
 		}
 
-		preset_combo.set_size_request(165, -1);
-
-		var eq_switch_item = new ToolItem();
-		eq_switch_item.add(eq_switch);
-
-		side_list = new ToolItem();
-		side_list.add(preset_combo);
-
-		new_preset_entry = new Entry();
-
-		var entry_icon = Icons.render_icon ("dialog-apply", IconSize.MENU);
-		new_preset_entry.set_icon_from_pixbuf(Gtk.EntryIconPosition.SECONDARY, entry_icon);
-		new_preset_entry.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, _("Save preset"));
-
-		new_preset_field = new ToolItem();
-		new_preset_field.add(new_preset_entry);
-
-		var space_item = new ToolItem();
-		space_item.set_expand(true);
-
-		close_button = new Button.with_label (_("Close"));
-		var close_button_item = new ToolItem();
-		close_button.set_size_request(120, -1);
-		close_button_item.set_expand(false);
-		close_button_item.add(close_button);
-
-		// Set spacing stuff
-		eq_switch.valign = preset_combo.valign = close_button.valign = new_preset_entry.valign = Gtk.Align.CENTER;
+		eq_switch = new Gtk.Switch ();
+		eq_switch.set_active (equalizer_settings.equalizer_enabled);
+
+		preset_combo = new PresetList ();
+		preset_combo.set_size_request (165, -1);
+
+		side_list = new Gtk.Grid ();
+		side_list.add (preset_combo);
+
+		new_preset_entry = new Gtk.Entry ();
+		new_preset_entry.secondary_icon_name = "document-save-symbolic";
+		new_preset_entry.secondary_icon_tooltip_text = _("Save preset");
+
+		eq_switch.valign = preset_combo.valign = new_preset_entry.valign = Gtk.Align.CENTER;
 
 		// Sync size between entry and combobox
-		preset_combo.size_allocate.connect ( (alloc) => {
+		preset_combo.size_allocate.connect ((alloc) => {
 			new_preset_entry.set_size_request (alloc.width, alloc.height);
+			new_preset_entry.queue_resize ();
 		});
 
-		bottom_toolbar.insert(eq_switch_item, 0);
-		bottom_toolbar.insert(side_list, 1);
-		bottom_toolbar.insert(space_item, 2);
-		bottom_toolbar.insert(close_button_item, 3);
-
-		// Set the egtk bottom toolbar style.
-		bottom_toolbar.get_style_context().add_class("bottom-toolbar");
-
-		inner_box.pack_end(UI.wrap_alignment (bottom_toolbar, 0, 0, 0, 0), false, false, 0);
-		inner_box.pack_start(UI.wrap_alignment (scales, 0, 12, 0, 12), true, true, 10);
-
-		outer_box.pack_start(inner_box);
-		add(outer_box);
-
-		eq_switch.notify["active"].connect(on_eq_switch_toggled);
-		preset_combo.automatic_preset_chosen.connect(on_automatic_chosen);
-		preset_combo.delete_preset_chosen.connect(remove_preset_clicked);
+		var bottom_controls = new Gtk.Grid ();
+		bottom_controls.margin = 12;
+		bottom_controls.margin_top = 0;
+		bottom_controls.add (eq_switch);
+		bottom_controls.add (side_list);
+
+		var layout = new Gtk.Grid ();
+		layout.orientation = Gtk.Orientation.VERTICAL;
+		layout.row_spacing = 12;
+
+		layout.add (scale_container);
+		layout.add (new Gtk.Separator (Gtk.Orientation.HORIZONTAL));
+		layout.add (bottom_controls);
+		layout.show_all ();
+
+		add (layout);
+
+		eq_switch.notify["active"].connect (on_eq_switch_toggled);
+		preset_combo.automatic_preset_chosen.connect (on_automatic_chosen);
+		preset_combo.delete_preset_chosen.connect (remove_preset_clicked);
 		preset_combo.preset_selected.connect (preset_selected);
 		new_preset_entry.activate.connect (add_new_preset);
 		new_preset_entry.icon_press.connect (new_preset_entry_icon_pressed);
 		new_preset_entry.focus_out_event.connect (on_entry_focus_out);
-
-		close_button.clicked.connect ( () => destroy () );
-		destroy.connect(on_quit);
-
-		show_all();
-	}
-
-	bool on_entry_focus_out () {
-		if (!in_destruction ())
-			new_preset_entry.grab_focus();
+	}
+
+	private void apply_equalizer_gain (int index, int val) {
+		App.player.player.set_equalizer_gain (index, val);
+	}
+
+	private void apply_automatic_gains () {
+		App.player.change_gains_thread ();
+	}
+
+	private bool on_entry_focus_out () {
+		if (!closing)
+			new_preset_entry.grab_focus ();
+
 		return false;
 	}
 
-	void set_sliders_sensitivity (bool sensitivity) {
-		foreach (var scale in scale_list) {
-			label_list.nth_data(scale_list.index(scale)).sensitive = sensitivity;
-			scale.sensitive = sensitivity;
-		}
+	private void set_sliders_sensitivity (bool sensitivity) {
+		scale_container.sensitive = sensitivity;
 	}
 
-	void on_eq_switch_toggled () {
+	private void on_eq_switch_toggled () {
 		in_transition = false;
 
-		bool eq_active = eq_switch.get_active();
+		bool eq_active = eq_switch.active;
 		preset_combo.sensitive = eq_active;
 		set_sliders_sensitivity (eq_active);
 		equalizer_settings.equalizer_enabled = eq_active;
 
 		if (eq_active) {
-			if(!preset_combo.automatic_chosen) {
-				EqualizerPreset? selected_preset = preset_combo.getSelectedPreset();
+			if (preset_combo.automatic_chosen) {
+				preset_combo.selectAutomaticPreset ();
+			} else {
+				var selected_preset = preset_combo.getSelectedPreset ();
 
 				if (selected_preset != null) {
-					for(int i = 0; i < 10; ++i)
-						App.player.player.set_equalizer_gain(i, selected_preset.getGain(i));
+					for (int i = 0; i < scales.size; ++i)
+						apply_equalizer_gain (i, selected_preset.getGain (i));
 				}
 			}
-			else {
-				preset_combo.selectAutomaticPreset();
-			}
-		}
-		else {
-			for (int i = 0; i < 10; ++i)
-				App.player.player.set_equalizer_gain(i, 0);
+		} else {
+			for (int i = 0; i < scales.size; ++i)
+				apply_equalizer_gain (i, 0);
 		}
 	}
 
-	void load_presets () {
+	private void load_presets () {
 		foreach (var preset in Equalizer.get_default_presets ()) {
 			preset.is_default = true;
-			preset_combo.addPreset(preset);
+			preset_combo.addPreset (preset);
 		}
 
-		foreach (var preset in equalizer_settings.getPresets ()) {
-			preset_combo.addPreset(preset);
-		}
+		foreach (var preset in equalizer_settings.getPresets ())
+			preset_combo.addPreset (preset);
 	}
 
-	void save_presets () {
-		string[] val = new string[0];
+	private void save_presets () {
+		var val = new string[0];
 
 		foreach (var preset in preset_combo.getPresets ()) {
-			if (preset.is_default)
-			    continue;
-			val += preset.to_string ();
+			if (!preset.is_default)
+				val += preset.to_string ();
 		}
 
 		equalizer_settings.custom_presets = val;
 	}
 
-	void preset_selected (EqualizerPreset p) {
-
+	private void preset_selected (EqualizerPreset p) {
 		if (!initialized)
 			return;
 
 		set_sliders_sensitivity (true);
-		target_levels.clear();
-
-		foreach (int i in p.gains) {
-			target_levels.add(i);
-		}
-
-		if (in_destruction () || (initialized && !apply_changes) || adding_preset) {
+		target_levels.clear ();
+
+		foreach (int i in p.gains)
+			target_levels.add (i);
+
+		if (closing || (initialized && !apply_changes) || adding_preset) {
 			set_target_levels ();
-		}
-		else if (!in_transition) {
+		} else if (!in_transition) {
 			in_transition = true;
-			Timeout.add(ANIMATION_TIMEOUT, transition_scales);
+			Timeout.add (ANIMATION_TIMEOUT, transition_scales);
 		}
 	}
 
-	void set_target_levels () {
+	private void set_target_levels () {
 		in_transition = false;
 
-		for (int index = 0; index < 10; ++index)
-			scale_list.nth_data(index).set_value(target_levels.get(index));
+		for (int index = 0; index < scales.size; ++index) {
+			var scale = scales.get (index);
+			scale.set_value (target_levels.get (index));
+		}
 	}
 
-	bool transition_scales () {
+	private bool transition_scales () {
 		if (!in_transition)
 			return false;
 
 		bool is_finished = true;
 
-		for (int index = 0; index < 10; ++index) {
-			double currLvl = scale_list.nth_data(index).get_value();
-			double targetLvl = target_levels.get(index);
-			double difference = targetLvl - currLvl;
-
-			if (in_destruction () || Math.fabs(difference) <= 1) {
-				scale_list.nth_data(index).set_value(targetLvl);
+		for (int index = 0; index < scales.size; ++index) {
+			var scale = scales.get (index);
+			double current_level = scale.get_value ();
+			double target_level = target_levels.get (index);
+			double difference = target_level - current_level;
+
+			if (closing || Math.fabs (difference) <= 1) {
+				scale.set_value (target_level);
+
 				// if switching from the automatic mode, apply the changes correctly
-				if (!preset_combo.automatic_chosen && targetLvl == 0)
-					App.player.player.set_equalizer_gain (index, 0);
-			}
-			else {
-				scale_list.nth_data(index).set_value(scale_list.nth_data(index).get_value() + (difference / 8.0));
+				if (!preset_combo.automatic_chosen && target_level == 0)
+					apply_equalizer_gain (index, 0);
+			} else {
+				scale.set_value (scale.get_value () + (difference / 8.0));
 				is_finished = false;
 			}
 		}
 
 		if (is_finished) {
 			in_transition = false;
-			return false; // stop
+
+			// all done. stop
+			return false;
 		}
 
-		return true; // keep going
+		// keep going
+		return true;
 	}
 
-	void on_automatic_chosen () {
+	private void on_automatic_chosen () {
 		equalizer_settings.auto_switch_preset = preset_combo.automatic_chosen;
 
-		target_levels.clear();
+		target_levels.clear ();
 
-		for (int i = 0; i < 10; ++i)
-			target_levels.add(0);
+		for (int i = 0; i < scales.size; ++i)
+			target_levels.add (0);
 
 		set_sliders_sensitivity (false);
 
@@ -328,89 +331,79 @@
 			in_transition = true;
 			Timeout.add (ANIMATION_TIMEOUT, transition_scales);
 			save_presets ();
-			App.player.change_gains_thread ();
-		}
-		else {
+			apply_automatic_gains ();
+		} else {
 			set_target_levels ();
 		}
 	}
 
-	void on_default_preset_modified () {
-
-		if(adding_preset || in_destruction ())
+	private void on_default_preset_modified () {
+		if (adding_preset || closing)
 			return;
 
 		adding_preset = true;
 
-		close_button.sensitive = !adding_preset;
-
-		bottom_toolbar.remove(side_list);
-		bottom_toolbar.insert(new_preset_field, 1);
-
-		new_preset_name = create_new_preset_name(true);
-
-		new_preset_entry.set_text(new_preset_name);
+		side_list.remove (preset_combo);
+		side_list.add (new_preset_entry);
+		side_list.show_all ();
+
+		new_preset_name = create_new_preset_name (true);
+
+		new_preset_entry.set_text (new_preset_name);
 		eq_switch.sensitive = false;
-		bottom_toolbar.show_all();
-		new_preset_entry.grab_focus();
-	}
-
-	void new_preset_entry_icon_pressed (EntryIconPosition pos, Gdk.Event event) {
-
-		if(pos != Gtk.EntryIconPosition.SECONDARY && !adding_preset)
-			return;
-
-		add_new_preset();
-	}
-
-	void add_new_preset() {
-
-		if(!adding_preset)
-			return;
-
-		var new_name = new_preset_entry.get_text();
-
-		if(verify_preset_name(new_name))
+		new_preset_entry.grab_focus ();
+	}
+
+	private void new_preset_entry_icon_pressed (Gtk.EntryIconPosition pos, Gdk.Event event) {
+		if (pos != Gtk.EntryIconPosition.SECONDARY && !adding_preset)
+			return;
+
+		add_new_preset ();
+	}
+
+	private void add_new_preset () {
+		if (!adding_preset)
+			return;
+
+		var new_name = new_preset_entry.get_text ();
+
+		if (verify_preset_name (new_name))
 			new_preset_name = new_name;
 
-		int i = 0;
-		int[] gains = new int[10];
-
-		foreach(Scale scale in scale_list) {
-			gains[i] = (int)scale_list.nth_data(scale_list.index(scale)).get_value();
-			i++;
-		}
-
-		var new_preset = new EqualizerPreset.with_gains(new_preset_name, gains);
-		preset_combo.addPreset(new_preset);
-
-		bottom_toolbar.remove(new_preset_field);
-		bottom_toolbar.insert(side_list, 1);
-		bottom_toolbar.show_all();
+		int[] gains = new int[scales.size];
+
+		for (int i = 0; i < scales.size; i++)
+			gains[i] = (int) scales.get (i).get_value ();
+
+		var new_preset = new EqualizerPreset.with_gains (new_preset_name, gains);
+		preset_combo.addPreset (new_preset);
+
+		side_list.add (preset_combo);
+		side_list.set_focus_child (preset_combo);
+		side_list.remove (new_preset_entry);
+		side_list.show_all ();
+
 		eq_switch.sensitive = true;
 		adding_preset = false;
-		close_button.sensitive = !adding_preset;
 	}
 
-	string create_new_preset_name (bool from_current) {
+	private string create_new_preset_name (bool from_current) {
+		string current_preset_name = from_current ? preset_combo.getSelectedPreset ().name : "";
+		string preset_name = "";
 
-		int i = 0;
 		bool is_valid = false;
-
-		string current_preset_name = (from_current)? preset_combo.getSelectedPreset().name : "";
-		string preset_name = "...";
-
-		do
-		{
+		int i = 0;
+
+		do {
 			debug ("preset name %s is invalid. Looping", preset_name);
+
 			// We have to be explicit in order to make this translatable
 			if (from_current) {
 				if (i < 1)
 					preset_name = _("%s (Custom)").printf (current_preset_name);
 				else
 					preset_name = _("%s (Custom %i)").printf (current_preset_name, i);
-			}
-			else {
+			} else {
 				if (i < 1)
 					preset_name = _("Custom Preset");
 				else
@@ -418,41 +411,13 @@
 			}
 
 			i++;
-			is_valid = verify_preset_name(preset_name);
-
+			is_valid = verify_preset_name (preset_name);
 		} while (!is_valid);
 
 		return preset_name;
 	}
 
-	public bool verify_preset_name (string preset_name) {
-		if (preset_name == null)
-			return false;
-
-		if (String.is_white_space (preset_name))
-			return false;
-
-		foreach (var preset in preset_combo.getPresets ()) {
-			if (preset_name == preset.name)
-				return false;
-		}
-
-		return true;
-	}
-
-
-	void remove_preset_clicked () {
-		preset_combo.removeCurrentPreset();
-	}
-
-	void on_quit () {
-		if (in_transition)
-			set_target_levels ();
-		else if (adding_preset)
-			add_new_preset ();
-
-		save_presets ();
-		equalizer_settings.selected_preset = (preset_combo.getSelectedPreset() != null)? preset_combo.getSelectedPreset().name : "";
-		equalizer_settings.auto_switch_preset = preset_combo.automatic_chosen;
+	private void remove_preset_clicked () {
+		preset_combo.removeCurrentPreset ();
 	}
 }
 \ No newline at end of file
 
=== modified file 'src/Widgets/StatusBar.vala'
--- src/Widgets/StatusBar.vala	2014-03-14 16:05:56 +0000
+++ src/Widgets/StatusBar.vala	2014-03-23 22:17:56 +0000
@@ -179,42 +179,13 @@
 #endif
     }
 
-
-    private class EqualizerChooser : SimpleOptionChooser {
-
-        private Gtk.Window? equalizer_window = null;
-
+    private class EqualizerChooser : Gtk.MenuButton {
         public EqualizerChooser () {
-            var eq_show_image = Icons.EQ_SYMBOLIC.render_image (Gtk.IconSize.MENU);
-            var eq_hide_image = Icons.EQ_SYMBOLIC.render_image (Gtk.IconSize.MENU);
-
-            appendItem (_("Hide"), eq_show_image, _("Show Equalizer"));
-            appendItem (_("Show"), eq_hide_image, _("Hide Equalizer"));
-
-            setOption (0);
-
-            option_changed.connect (eq_option_chooser_clicked);
-        }
-
-        private void eq_option_chooser_clicked () {
-            int val = current_option;
-
-            if (equalizer_window == null && val == 1) {
-                equalizer_window = new EqualizerWindow ();
-                equalizer_window.show_all ();
-                equalizer_window.destroy.connect ( () => {
-                    // revert the option to "Hide equalizer" after the window is destroyed
-                    setOption (0);
-                });
-            }
-            else if (val == 0 && equalizer_window != null) {
-                equalizer_window.destroy ();
-                equalizer_window = null;
-            }
+            popover = new EqualizerPopover ();
+            add (Icons.EQ_SYMBOLIC.render_image (Gtk.IconSize.MENU));
         }
     }
 
-
     private class InfoPanelChooser : SimpleOptionChooser {
 
         public InfoPanelChooser () {