Merge lp:~tintou/noise/gtk-3.10 into lp:~elementary-apps/noise/trunk

[Corentin Noël]

Port to GTK+ 3.10

- Use Gtk.HeaderBar.
- Stop using deprecated code (Gtk.Stock, etc.)

Now using Gtk HeaderBar.
fixed some deprecation warnings.
fixed stock removal.

[Cody Garver (codygarver)]

Diff line 3773 "Reset" is not translatable.

Diff lines 3978-3980 are out of alignment OR 3977 is out of alignment.

Otherwise, I approve this code.

You did not update the codestyle for some of the stuff you changed, but I would have done the same. It does not bother me.

There's more that could be replaced by Gtk >= 3.10 (like modebuttons in preferences) but this is a good start.

As a tip for the future, I recommend you find a standard location on your system like /tmp/noise for use when you update the translation template so it modifies less lines.

review: Needs Fixing

[Cody Garver (codygarver)]

The "Cancel" button in the preferences is supposed to be "Close".

review: Needs Fixing

[Corentin Noël (tintou)]

I've fixed everything, btw the modebutton in the preference dialog was already replaced

[Victor Martinez (victored)]

This is looking good Corentin!

I'm afraid this branch is trying to do too much in a single merge. Besides the necessary CMake changes, the actual GTK-related changes start at diff line 4389.

Everything else is related to the removal of several "using" statements and the introduction of singletons (which really makes a lot of sense for the Settings classes). These changes could and should live on a separate branch.

Let's avoid cluttering the diff by updating the POT file after merging the actual code changes.

review: Needs Fixing

[lp:~tintou/noise/gtk-3.10]

1557. By Corentin Noël on 2014-02-05

Corrected some code style

[Corentin Noël (tintou)]

Updated the branch !

[Victor Martinez (victored)]

Thanks!

The verbatim string changes in DataBaseManager.vala are still there. That's for a different branch too.

Regarding Gtk.Grid, let's just use "attach" when absolutely necessary. Whenever we use it as a replacement for Gtk.Box, using Gtk.Container.add is easier to read and maintain. We'd only set the desired orientation.

For instance, this:

+ content.attach (stack_switcher, 0, 0, 1, 1);
+ content.attach (stack, 0, 1, 1, 1);
+ content.attach (buttons, 0, 2, 1, 1);

... would become:

+ content.orientation = Gtk.Orientation.VERTICAL;
+ content.add (stack_switcher);
+ content.add (stack);
+ content.add (buttons);

I can't wait to see this merged! :)

review: Needs Fixing

[lp:~tintou/noise/gtk-3.10]

1558. By Corentin Noël on 2014-02-07

Reverted some changes and fixed adding on container

[Corentin Noël (tintou)]

Okay, I've reverted some changes and changed what you highlighted.

[Victor Martinez (victored)]

Thanks again.

Looks good to go!

To be consistent with the rest of the code, after merging this branch please change diff line 493 to:

+ header.set_markup("<b>" + _("Stats") + "</b>");

because there's no need to translate the markup along with the string. Not a merge blocker though.

review: Approve

[Victor Martinez (victored)]

edit:

+ header.set_markup(Markup.printf_escaped ("<b>%s</b>", _("Stats"));

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-01-24 17:57:08 +0000
+++ CMakeLists.txt	2014-02-07 15:39:13 +0000
@@ -72,7 +72,7 @@
   gee-0.8
   libpeas-1.0
   libpeas-gtk-1.0
-  gtk+-3.0>=3.4.2
+  gtk+-3.0>=3.10
   granite
   gstreamer-1.0
   gstreamer-tag-1.0
@@ -148,7 +148,7 @@
 
 find_package (Vala REQUIRED)
 include (ValaVersion)
-ensure_vala_version ("0.18.0" MINIMUM)
+ensure_vala_version ("0.22.0" MINIMUM)
 include (ValaPrecompile)
 
 set (DEPS_LIBRARIES ${DEPS_LIBRARIES} -lm)
@@ -163,4 +163,4 @@
 add_subdirectory (plugins)
 add_subdirectory (po)
 add_subdirectory (data)
-add_subdirectory (images)
+add_subdirectory (images)
\ No newline at end of file

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2013-12-19 21:56:54 +0000
+++ src/CMakeLists.txt	2014-02-07 15:39:13 +0000
@@ -115,4 +115,4 @@
 
 target_link_libraries (${EXEC_NAME} ${DEPS_LIBRARIES})
 
-install (TARGETS ${EXEC_NAME} RUNTIME DESTINATION bin)
+install (TARGETS ${EXEC_NAME} RUNTIME DESTINATION bin)
\ No newline at end of file

=== modified file 'src/Dialogs/EqualizerWindow.vala'
--- src/Dialogs/EqualizerWindow.vala	2013-12-06 12:01:00 +0000
+++ src/Dialogs/EqualizerWindow.vala	2014-02-07 15:39:13 +0000
@@ -148,7 +148,7 @@
 		var space_item = new ToolItem();
 		space_item.set_expand(true);
 
-		close_button = new Button.from_stock ("window-close");
+		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);
@@ -454,4 +454,3 @@
 		equalizer_settings.auto_switch_preset = preset_combo.automatic_chosen;
 	}
 }
-

=== modified file 'src/Dialogs/MediaEditor.vala'
--- src/Dialogs/MediaEditor.vala	2013-12-02 07:25:17 +0000
+++ src/Dialogs/MediaEditor.vala	2014-02-07 15:39:13 +0000
@@ -29,10 +29,6 @@
  *              Corentin Noël <[e-mail]>
  */
 
-using Gtk;
-using Gee;
-using Granite;
-
 /**
  * TODO: make this dialog edit and handle Media objects and not media rowids.
  *       We need this in order to allow editing temporary tracks (such as Audio
@@ -42,29 +38,29 @@
 #if USE_GRANITE_DECORATED_WINDOW
 public class Noise.MediaEditor : Granite.Widgets.LightWindow {
 #else
-public class Noise.MediaEditor : Window {
+public class Noise.MediaEditor : Gtk.Window {
 #endif
     LyricFetcher lf;
     
-    LinkedList<int> _allMedias;
-    LinkedList<int> _medias;
+    Gee.LinkedList<int> _allMedias;
+    Gee.LinkedList<int> _medias;
     
     //for padding around notebook mostly
-    Granite.Widgets.StaticNotebook notebook;
+    Gtk.Stack stack;
 
-    private HashMap<string, FieldEditor> fields;// a hashmap with each property and corresponding editor
-    private TextView lyricsText;
-    
-    private Button _save;
-    
-    private Label lyricsInfobarLabel;
+    private Gee.HashMap<string, FieldEditor> fields;// a hashmap with each property and corresponding editor
+    private Gtk.TextView lyricsText;
+    
+    private Gtk.Button _save;
+    
+    private Gtk.Label lyricsInfobarLabel;
     private Library library;
     
-    public signal void medias_saved(LinkedList<int> medias);
+    public signal void medias_saved (Gee.LinkedList<int> medias);
     
-    public MediaEditor(LinkedList<int> allMedias, LinkedList<int> medias, Library library) {
+    public MediaEditor (Gee.LinkedList<int> allMedias, Gee.LinkedList<int> medias, Library library) {
         this.library = library;
-        this.window_position = WindowPosition.CENTER;
+        this.window_position = Gtk.WindowPosition.CENTER;
         this.type_hint = Gdk.WindowTypeHint.DIALOG;
         this.set_modal(false);
         this.set_transient_for(App.main_window);
@@ -78,49 +74,47 @@
         _allMedias = allMedias;
         _medias = medias;
         
-        // don't show notebook separator when using a decorated window
-        #if USE_GRANITE_DECORATED_WINDOW
-        notebook = new Granite.Widgets.StaticNotebook (false);
-        #else
-        notebook = new Granite.Widgets.StaticNotebook ();
-        #endif
+        stack = new Gtk.Stack ();
+        var stack_switcher = new Gtk.StackSwitcher ();
+        stack_switcher.set_stack (stack);
+        stack_switcher.halign = Gtk.Align.CENTER;
 
-        notebook.append_page(createBasicContent (), new Label(_("Metadata")));
+        stack.add_titled (createBasicContent (), "metadata", _("Metadata"));
         if(_medias.size == 1)
-            notebook.append_page(createLyricsContent (), new Label(_("Lyrics")));
+            stack.add_titled (createLyricsContent (), "lyrics", _("Lyrics"));
         else
             lyricsText = null;
-        
-        var buttons = new Gtk.ButtonBox (Orientation.HORIZONTAL);
-        buttons.set_layout (Gtk.ButtonBoxStyle.END);
 
         var arrows = new Granite.Widgets.NavigationArrows ();
 
-        _save = new Button.from_stock ("document-save");
+        _save = new Gtk.Button.with_label (_(STRING_SAVE));
         _save.set_size_request (85, -1);
 
         _save.valign = arrows.valign = Gtk.Align.END;
 
+        var buttons = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
+        buttons.margin_top = 12;
+        buttons.set_layout (Gtk.ButtonBoxStyle.END);
+
         buttons.pack_start (arrows, false, false, 0);
         buttons.pack_end (_save, false, false, 0);
 
         buttons.set_child_secondary (arrows, true);
 
-        var content = new Gtk.Box (Orientation.VERTICAL, 0);
-
-        buttons.margin_top = 12;
-
-        content.pack_start (notebook, true, true, 0);
-        content.pack_start (buttons, false, true, 0);
-
+        var content = new Gtk.Grid ();
+        content.orientation = Gtk.Orientation.VERTICAL;
         content.margin = 12;
 
+        content.add (stack_switcher);
+        content.add (stack);
+        content.add (buttons);
+
         this.add (content);
-        
+
         this.show_all();
-        
+
         arrows.sensitive = allMedias.size > 1;
-        
+
         if(_medias.size == 1) {
             foreach(FieldEditor fe in fields.values)
                 fe.set_check_visible(false);
@@ -134,7 +128,7 @@
     }
     
     public Gtk.Box createBasicContent () {
-        fields = new HashMap<string, FieldEditor>();
+        fields = new Gee.HashMap<string, FieldEditor>();
         Media sum = library.media_from_id(_medias.get(0)).copy();
         
         /** find what these media have what common, and keep those values **/
@@ -194,26 +188,26 @@
         if(sum.year == -1)
             sum.year = Time().year;
         
-        fields.set("Title", new FieldEditor(_("Title"), sum.title, new Entry()));
-        fields.set("Artist", new FieldEditor(_("Artist"), sum.artist, new Entry()));
-        fields.set("Album Artist", new FieldEditor(_("Album Artist"), sum.album_artist, new Entry()));
-        fields.set("Album", new FieldEditor(_("Album"), sum.album, new Entry()));
-        fields.set("Genre", new FieldEditor(_("Genre"), sum.genre, new Entry()));
-        fields.set("Composer", new FieldEditor(_("Composer"), sum.composer, new Entry()));
-        fields.set("Grouping", new FieldEditor(_("Grouping"), sum.grouping, new Entry()));
-        fields.set("Comment", new FieldEditor(_("Comment"), sum.comment, new TextView()));
-        fields.set("Track", new FieldEditor(_("Track"), sum.track.to_string(), new SpinButton.with_range(0, 500, 1)));
-        fields.set("Disc", new FieldEditor(_("Disc"), sum.album_number.to_string(), new SpinButton.with_range(0, 500, 1)));
-        fields.set("Year", new FieldEditor(_("Year"), sum.year.to_string(), new SpinButton.with_range(0, 9999, 1)));
-        fields.set("Rating", new FieldEditor(_("Rating"), sum.rating.to_string(), new Granite.Widgets.Rating(false, IconSize.MENU)));
+        fields.set("Title", new FieldEditor(_("Title"), sum.title, new Gtk.Entry()));
+        fields.set("Artist", new FieldEditor(_("Artist"), sum.artist, new Gtk.Entry()));
+        fields.set("Album Artist", new FieldEditor(_("Album Artist"), sum.album_artist, new Gtk.Entry()));
+        fields.set("Album", new FieldEditor(_("Album"), sum.album, new Gtk.Entry()));
+        fields.set("Genre", new FieldEditor(_("Genre"), sum.genre, new Gtk.Entry()));
+        fields.set("Composer", new FieldEditor(_("Composer"), sum.composer, new Gtk.Entry()));
+        fields.set("Grouping", new FieldEditor(_("Grouping"), sum.grouping, new Gtk.Entry()));
+        fields.set("Comment", new FieldEditor(_("Comment"), sum.comment, new Gtk.TextView()));
+        fields.set("Track", new FieldEditor(_("Track"), sum.track.to_string(), new Gtk.SpinButton.with_range(0, 500, 1)));
+        fields.set("Disc", new FieldEditor(_("Disc"), sum.album_number.to_string(), new Gtk.SpinButton.with_range(0, 500, 1)));
+        fields.set("Year", new FieldEditor(_("Year"), sum.year.to_string(), new Gtk.SpinButton.with_range(0, 9999, 1)));
+        fields.set("Rating", new FieldEditor(_("Rating"), sum.rating.to_string(), new Granite.Widgets.Rating(false, Gtk.IconSize.MENU)));
 #if HAVE_PODCASTS && HAVE_INTERNET_RADIO
-        fields.set("Media Type", new FieldEditor(_("Media Type"), sum.mediatype.to_string(), new ComboBoxText()));
+        fields.set("Media Type", new FieldEditor(_("Media Type"), sum.mediatype.to_string(), new Gtk.ComboBoxText()));
 #endif
 
-        var vert = new Box (Orientation.VERTICAL, 0); // separates editors with buttons and other stuff
-        var horiz = new Box (Orientation.HORIZONTAL, 0); // separates text with numerical editors
-        var textVert = new Box (Orientation.VERTICAL, 0); // separates text editors
-        var numerVert = new Box (Orientation.VERTICAL, 0); // separates numerical editors
+        var vert = new Gtk.Box (Gtk.Orientation.VERTICAL, 0); // separates editors with buttons and other stuff
+        var horiz = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0); // separates text with numerical editors
+        var textVert = new Gtk.Box (Gtk.Orientation.VERTICAL, 0); // separates text editors
+        var numerVert = new Gtk.Box (Gtk.Orientation.VERTICAL, 0); // separates numerical editors
         
         textVert.pack_start(fields.get("Title"), false, true, 0);
         textVert.pack_start(fields.get("Artist"), false, true, 5);
@@ -242,21 +236,21 @@
     }
     
     public Gtk.Box createLyricsContent () {
-        var lyricsContent = new Gtk.Box (Orientation.VERTICAL, 10);
-        
-        lyricsInfobarLabel = new Label("");
-        
-        lyricsInfobarLabel.set_justify(Justification.LEFT);
+        var lyricsContent = new Gtk.Box (Gtk.Orientation.VERTICAL, 10);
+        
+        lyricsInfobarLabel = new Gtk.Label("");
+        
+        lyricsInfobarLabel.set_justify(Gtk.Justification.LEFT);
         lyricsInfobarLabel.set_single_line_mode(true);
         lyricsInfobarLabel.ellipsize = Pango.EllipsizeMode.END;
         
 
-        lyricsText = new TextView();
-        lyricsText.set_wrap_mode(WrapMode.WORD_CHAR);
+        lyricsText = new Gtk.TextView();
+        lyricsText.set_wrap_mode(Gtk.WrapMode.WORD_CHAR);
         lyricsText.get_buffer().text = library.media_from_id(_medias.get(0)).lyrics;
 
-        var text_scroll = new ScrolledWindow(null, null);        
-        text_scroll.set_policy(PolicyType.AUTOMATIC, PolicyType.AUTOMATIC);
+        var text_scroll = new Gtk.ScrolledWindow(null, null);
+        text_scroll.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);
         
         text_scroll.add(lyricsText);
         
@@ -288,20 +282,20 @@
     
 
     public void lyricsFetched (Media m) {
-        Gdk.threads_enter ();
-
-        lyricsInfobarLabel.set_text ("");
-        lyricsInfobarLabel.hide();
-
-        if (!String.is_white_space (m.lyrics)) {
-            lyricsText.get_buffer().text = m.lyrics;
-        }
-        else {
-            lyricsInfobarLabel.show_all();
-            lyricsInfobarLabel.set_markup (_("Lyrics not found for %s").printf ("<i>" + String.escape (m.title) + "</i>"));
-        }
-
-        Gdk.threads_leave ();
+        Idle.add ( () => {
+
+            lyricsInfobarLabel.set_text ("");
+            lyricsInfobarLabel.hide();
+
+            if (!String.is_white_space (m.lyrics)) {
+                lyricsText.get_buffer().text = m.lyrics;
+            }
+            else {
+                lyricsInfobarLabel.show_all();
+                lyricsInfobarLabel.set_markup (_("Lyrics not found for %s").printf ("<i>" + String.escape (m.title) + "</i>"));
+            }
+            return false;
+        });
     }
 
     
@@ -318,7 +312,7 @@
             i = _allMedias.get(indexOfCurrentFirst - 1);
         
         // now fetch the previous media on current_view
-        var newMedias = new LinkedList<int>();
+        var newMedias = new Gee.LinkedList<int>();
         newMedias.add(i);
         
         change_media(newMedias);
@@ -336,13 +330,13 @@
         else
             i = _allMedias.get(indexOfCurrentLast + 1);
         
-        var newMedias = new LinkedList<int>();
+        var newMedias = new Gee.LinkedList<int>();
         newMedias.add(i);
         
         change_media(newMedias);
     }
     
-    public void change_media(LinkedList<int> newMedias) {
+    public void change_media(Gee.LinkedList<int> newMedias) {
         _medias = newMedias;
         
         Media sum = library.media_from_id(newMedias.get(0));
@@ -379,7 +373,7 @@
 #endif    
         if(lyricsText == null) {
             var lyrics = createLyricsContent ();
-            notebook.append_page(lyrics, new Label(_("Lyrics")));
+            stack.add_titled (lyrics, "lyrics", _("Lyrics"));
             lyrics.show_all();
         }
 
@@ -441,35 +435,35 @@
     }
 }
 
-public class Noise.FieldEditor : Box {
+public class Noise.FieldEditor : Gtk.Box {
     private string _name;
     private string _original;
     
     private Gtk.Box nameBox;
     
-    private CheckButton check;
-    private Label label;
-    private Entry entry;
-    private TextView textView;
-    private SpinButton spinButton;
+    private Gtk.CheckButton check;
+    private Gtk.Label label;
+    private Gtk.Entry entry;
+    private Gtk.TextView textView;
+    private Gtk.SpinButton spinButton;
     private Granite.Widgets.Rating ratingWidget;
-    private Image image;
+    private Gtk.Image image;
 #if HAVE_PODCASTS && HAVE_INTERNET_RADIO
-    private ComboBoxText comboBox;
+    private Gtk.ComboBoxText comboBox;
 #endif
     //private DoubleSpinButton doubleSpinButton;
 
-    public FieldEditor(string name, string original, Widget w) {
+    public FieldEditor(string name, string original, Gtk.Widget w) {
         _name = name;
         _original = original;
         set_orientation (Gtk.Orientation.VERTICAL);
         this.spacing = 0;
         
-        check = new CheckButton();
-        label = new Label(_name);
+        check = new Gtk.CheckButton();
+        label = new Gtk.Label(_name);
         nameBox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
         
-        label.justify = Justification.LEFT;
+        label.justify = Gtk.Justification.LEFT;
         label.xalign = 0.0f;
         label.set_markup("<b>" + _name + "</b>");
         
@@ -478,10 +472,10 @@
         
         this.pack_start(nameBox, false, false, 0);
         
-        if(w is Entry && !(w is SpinButton)) {
+        if(w is Gtk.Entry && !(w is Gtk.SpinButton)) {
             check.set_active(original != "");
             
-            entry = (Entry)w;
+            entry = (Gtk.Entry)w;
             if(name != _("Genre") && name != _("Grouping"))
                 entry.set_size_request(300, -1);
             else
@@ -491,16 +485,16 @@
             entry.changed.connect(entryChanged);
             this.pack_start(entry, true, true, 0);
         }
-        else if(w is TextView) {
+        else if(w is Gtk.TextView) {
             check.set_active(original != "");
             
-            textView = (TextView)w;
+            textView = (Gtk.TextView)w;
             textView.set_size_request(300, 90);
-            textView.set_wrap_mode(WrapMode.WORD_CHAR);
+            textView.set_wrap_mode(Gtk.WrapMode.WORD_CHAR);
             textView.get_buffer().text = original;
             
-            ScrolledWindow scroll = new ScrolledWindow(null, null);
-            scroll.set_policy(PolicyType.NEVER, PolicyType.AUTOMATIC);
+            var scroll = new Gtk.ScrolledWindow(null, null);
+            scroll.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
             
             scroll.add(textView);
             
@@ -509,19 +503,19 @@
             textView.buffer.changed.connect(textViewChanged);
             this.pack_start(scroll, true, true, 0);
         }
-        else if(w is SpinButton) {
+        else if(w is Gtk.SpinButton) {
             check.set_active(original != "0");
             
-            spinButton = (SpinButton)w;
+            spinButton = (Gtk.SpinButton)w;
             spinButton.set_size_request(100, -1);
             spinButton.value = check.get_active() ? double.parse(original) : 0.0;
             spinButton.adjustment.value_changed.connect(spinButtonChanged);
             this.pack_start(spinButton, true, true, 0);
         }
-        else if(w is Image) {
+        else if(w is Gtk.Image) {
             check.set_active(original != "");
             
-            image = (Image)w;
+            image = (Gtk.Image)w;
             image.set_size_request(100, 100);
             image.set_from_file(original);
             //callback on file dialogue saved. setup here
@@ -537,10 +531,10 @@
             this.pack_start(ratingWidget, true, true, 0);
         }
 #if HAVE_PODCASTS && HAVE_INTERNET_RADIO
-        else if(w is ComboBoxText) {
+        else if(w is Gtk.ComboBoxText) {
             check.set_active(original != "0");
             
-            comboBox = (ComboBoxText)w;
+            comboBox = (Gtk.ComboBoxText)w;
             comboBox.append_text(_("Song"));
 #if HAVE_PODCASTS
             comboBox.append_text(_("Podcast"));
@@ -669,14 +663,14 @@
     }
 }
 
-public class Noise.StatsDisplay : Box {
+public class Noise.StatsDisplay : Gtk.Box {
     public int plays;
     public int skips;
     public int last_played;
     
-    Label header;
-    Label info;
-    Button reset;
+    Gtk.Label header;
+    Gtk.Label info;
+    Gtk.Button reset;
     
     public StatsDisplay(int plays, int skips, int last_played) {
         this.plays = plays;
@@ -684,15 +678,15 @@
         this.last_played = last_played;
         set_orientation (Gtk.Orientation.VERTICAL);
         
-        header = new Label("");
-        info = new Label("");
-        reset = new Button.with_label("Reset");
+        header = new Gtk.Label("");
+        info = new Gtk.Label("");
+        reset = new Gtk.Button.with_label(_("Reset"));
         
-        header.justify = Justification.LEFT;
+        header.justify = Gtk.Justification.LEFT;
         header.xalign = 0.0f;
-        header.set_markup("<b>Stats</b>");
+        header.set_markup(_("<b>Stats</b>"));
         
-        info.justify = Justification.LEFT;
+        info.justify = Gtk.Justification.LEFT;
         info.xalign = 0.0f;
         
         setInfoText();
@@ -746,4 +740,4 @@
     public double getVal2() {
         return spin2.get_value();
     }
-}*/
+}*/
\ No newline at end of file

=== modified file 'src/Dialogs/PreferencesWindow.vala'
--- src/Dialogs/PreferencesWindow.vala	2013-12-07 02:16:17 +0000
+++ src/Dialogs/PreferencesWindow.vala	2014-02-07 15:39:13 +0000
@@ -31,9 +31,12 @@
     public const int MIN_WIDTH = 420;
     public const int MIN_HEIGHT = 300;
 
+    public Gtk.FileChooserButton library_filechooser;
+
     private Gee.Map<int, unowned Noise.SettingsWindow.NoteBook_Page> sections = new Gee.HashMap<int, unowned Noise.SettingsWindow.NoteBook_Page> ();
-    private Granite.Widgets.StaticNotebook main_static_notebook;
-    public Gtk.FileChooserButton library_filechooser;
+    private Gtk.Stack main_stack;
+    private Gtk.StackSwitcher main_stackswitcher;
+    private int index = 0;
 
     public PreferencesWindow (LibraryWindow lw) {
         build_ui (lw);
@@ -59,11 +62,9 @@
         return_val_if_fail (section != null, -1);
 
         // Pack the section
-        // TODO: file a bug against granite's static notebook: append_page()
-        // should return the index of the new page.
-        main_static_notebook.append_page (section, new Gtk.Label (section.name));
-        int index = sections.size;
+        main_stack.add_titled (section, "%d".printf (index), section.name);
         sections.set (index, section);
+        index++;
 
         section.show_all ();
 
@@ -72,7 +73,8 @@
 
 
     public void remove_section (int index) {
-        main_static_notebook.remove_page (index);
+        var section = sections.get (index);
+        section.destroy ();
         sections.unset (index);
     }
 
@@ -86,13 +88,17 @@
         window_position = Gtk.WindowPosition.CENTER;
         type_hint = Gdk.WindowTypeHint.DIALOG;
         transient_for = parent_window;
-
-        main_static_notebook = new Granite.Widgets.StaticNotebook (false);
-        main_static_notebook.hexpand = true;
-        main_static_notebook.margin_bottom = 24;
-
-        ((Gtk.Box)get_content_area()).add (main_static_notebook);
-        add_button ("window-close", Gtk.ResponseType.ACCEPT);
+        var main_grid = new Gtk.Grid ();
+        main_stack = new Gtk.Stack ();
+        main_stackswitcher = new Gtk.StackSwitcher ();
+        main_stackswitcher.set_stack (main_stack);
+        main_stackswitcher.halign = Gtk.Align.CENTER;
+        main_grid.attach (main_stackswitcher, 0, 0, 1, 1);
+        main_grid.attach (main_stack, 0, 1, 1, 1);
+        main_grid.hexpand = true;
+
+        ((Gtk.Box)get_content_area()).add (main_grid);
+        add_button (_("Close"), Gtk.ResponseType.ACCEPT);
     }
 }
 
@@ -163,4 +169,4 @@
         page.add_option (new Gtk.Label (hide_on_close_desc), hide_on_close_switch, ref row);
         
     }
-}
+}
\ No newline at end of file

=== modified file 'src/Dialogs/RemoveFilesDialog.vala'
--- src/Dialogs/RemoveFilesDialog.vala	2013-12-06 12:01:00 +0000
+++ src/Dialogs/RemoveFilesDialog.vala	2014-02-07 15:39:13 +0000
@@ -55,7 +55,7 @@
 		Label info = new Label("");
 		trash_button = new Button.with_label (_("Move to Trash"));
 		remove_button = new Button.with_label (_("Remove from %s").printf (app_name));
-		cancel_button = new Button.with_label (_("Cancel"));
+		cancel_button = new Button.with_label (_(STRING_CANCEL));
 		
 		bool multiple_media = to_remove.size > 1;
 
@@ -131,4 +131,4 @@
 		add(padding);
 		show_all();
 	}
-}
+}
\ No newline at end of file

=== modified file 'src/Dialogs/SmartPlaylistEditor.vala'
--- src/Dialogs/SmartPlaylistEditor.vala	2013-12-02 07:25:17 +0000
+++ src/Dialogs/SmartPlaylistEditor.vala	2014-02-07 15:39:13 +0000
@@ -87,7 +87,7 @@
         queries_grid.column_spacing = 12;
         queries_grid.expand = true;
         
-        add_button = new Gtk.Button.from_stock ("list-add");
+        add_button = new Gtk.Button.with_label (_("Add"));
         
         /* create extra option: limiter */
         var limiter_grid = new Gtk.Grid ();
@@ -113,8 +113,8 @@
         /* add the Save button on bottom */
         var button_box = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
         button_box.spacing = 6;
-        save_button = new Gtk.Button.from_stock ("document-save");
-        var close_button = new Gtk.Button.from_stock ("dialog-cancel");
+        save_button = new Gtk.Button.with_label (_(STRING_SAVE));
+        var close_button = new Gtk.Button.with_label (_(STRING_CANCEL));
         button_box.set_layout (Gtk.ButtonBoxStyle.END);
         button_box.pack_end (close_button, false, false, 0);
         button_box.pack_end (save_button, false, false, 0);
@@ -255,7 +255,7 @@
         _valueNumerical = new Gtk.SpinButton.with_range (0, 9999, 1);
         _valueOption = new Gtk.ComboBoxText ();
         _valueRating = new Granite.Widgets.Rating (true, Gtk.IconSize.MENU, true);
-        remove_button = new Gtk.Button.from_stock ("list-remove");
+        remove_button = new Gtk.Button.with_label (_("Remove"));
         remove_button.halign = Gtk.Align.END;
         
         field_combobox.append_text (_("Album"));
@@ -442,4 +442,3 @@
                 || compared == SmartQuery.FieldType.DATE_RELEASED);
     }
 }
-

=== modified file 'src/FileOperator.vala'
--- src/FileOperator.vala	2013-12-02 14:12:51 +0000
+++ src/FileOperator.vala	2014-02-07 15:39:13 +0000
@@ -274,15 +274,19 @@
                 }
                 break;
             case GLib.FileMonitorEvent.CREATED:
-                var info = file.query_info (FileAttribute.STANDARD_TYPE + "," + GLib.FileAttribute.STANDARD_CONTENT_TYPE, GLib.FileQueryInfoFlags.NONE);
-                if (info.get_file_type () == FileType.REGULAR && FileUtils.is_valid_content_type (info.get_content_type ())) {
-                    var list = new Gee.LinkedList<string> ();
-                    list.add (file.get_uri ());
-                    import_files (list, ImportType.IMPORT);
-                } else if (info.get_file_type () == FileType.DIRECTORY) {
-                    var list = new Gee.LinkedList<string> ();
-                    FileUtils.count_music_files (file, ref list);
-                    import_files (list, ImportType.IMPORT);
+                try {
+                    var info = file.query_info (FileAttribute.STANDARD_TYPE + "," + GLib.FileAttribute.STANDARD_CONTENT_TYPE, GLib.FileQueryInfoFlags.NONE);
+                    if (info.get_file_type () == FileType.REGULAR && FileUtils.is_valid_content_type (info.get_content_type ())) {
+                        var list = new Gee.LinkedList<string> ();
+                        list.add (file.get_uri ());
+                        import_files (list, ImportType.IMPORT);
+                    } else if (info.get_file_type () == FileType.DIRECTORY) {
+                        var list = new Gee.LinkedList<string> ();
+                        FileUtils.count_music_files (file, ref list);
+                        import_files (list, ImportType.IMPORT);
+                    }
+                } catch (Error e) {
+                    critical (e.message);
                 }
                 break;
             case GLib.FileMonitorEvent.MOVED:
@@ -385,4 +389,4 @@
             return false;
         });
     }
-}
+}
\ No newline at end of file

=== modified file 'src/LibraryWindow.vala'
--- src/LibraryWindow.vala	2013-12-31 01:16:59 +0000
+++ src/LibraryWindow.vala	2014-02-07 15:39:13 +0000
@@ -47,20 +47,20 @@
     private Gtk.Paned     view_container_hpaned; // view_container / info_panel
     public InfoPanel      info_panel;
 
-    private Gtk.Toolbar      main_toolbar; // Toolbar
-    private Gtk.ToolButton   previousButton;
-    private Gtk.ToolButton   playButton;
-    private Gtk.ToolButton   nextButton;
+    private Gtk.HeaderBar    headerbar;
+    private Gtk.Button       previousButton;
+    private Gtk.Button       playButton;
+    private Gtk.Button       nextButton;
     private Gtk.VolumeButton volumeButton;
 
     public Granite.Widgets.ThinPaned  main_hpaned      { get; private set; }
     public SourceListView             source_list_view { get; private set; }
     public ViewContainer              view_container   { get; private set; }
     public TopDisplay                 topDisplay       { get; private set; }
-    private FixedBin                  topDisplayBin    { get; private set; }
     public Widgets.ViewSelector       viewSelector     { get; private set; }
     public Granite.Widgets.SearchBar  searchField      { get; private set; }
     public Widgets.StatusBar          statusbar        { get; private set; }
+    private FixedBin                  topDisplayBin;
 
     /* AppMenu items */
     private Gtk.Menu          settingsMenu;
@@ -75,15 +75,18 @@
     private int window_height = 0;
 
     private Cancellable notification_cancellable;
-    
+
     PreferencesWindow? preferences = null;
-    
+
     private Gee.HashMap<unowned Playlist, int> match_playlists;
     private Gee.HashMap<string, int> match_devices;
     private Gee.HashMap<unowned Playlist, SourceListEntry> match_playlist_entry;
     private Gee.HashMap<Playlist, TreeViewSetup> match_tvs;
 
     public LibraryWindow () {
+        headerbar = new Gtk.HeaderBar ();
+        headerbar.show_close_button = true;
+        set_titlebar (headerbar);
         //FIXME? App.player.player.media_not_found.connect (media_not_found);
 
         this.library_manager.media_updated.connect (medias_updated);
@@ -204,7 +207,7 @@
         debug ("setting up main window");
 
         this.height_request = 350;
-        this.width_request = 600;
+        this.width_request = 400;
         this.window_position = Gtk.WindowPosition.CENTER;
 
         // set the size based on saved settings
@@ -262,39 +265,24 @@
 
         /** Toolbar widgets **/
 
-        main_toolbar            = new Gtk.Toolbar ();
-        previousButton          = new Gtk.ToolButton (null, null);
-        playButton              = new Gtk.ToolButton (null, null);
-        nextButton              = new Gtk.ToolButton (null, null);
+        previousButton          = new Gtk.Button.from_icon_name ("media-skip-backward", Gtk.IconSize.LARGE_TOOLBAR);
+        previousButton.set_tooltip_text (_("Previous"));
+        playButton              = new Gtk.Button.from_icon_name ("media-playback-start", Gtk.IconSize.LARGE_TOOLBAR);
+        playButton.set_tooltip_text (_("Play"));
+        nextButton              = new Gtk.Button.from_icon_name ("media-skip-forward", Gtk.IconSize.LARGE_TOOLBAR);
+        nextButton.set_tooltip_text (_("Next"));
         volumeButton            = new Gtk.VolumeButton ();
         topDisplay              = new TopDisplay ();
-        topDisplayBin           = new FixedBin (-1, -1, 800, -1);
+        topDisplayBin           = new FixedBin (200, -1, 600, -1);
         viewSelector            = new Widgets.ViewSelector ();
         searchField             = new Granite.Widgets.SearchBar (_("Search Music"));
 
-        // Set ToolButton icons and tooltips
-        previousButton.set_icon_name ("media-skip-backward");
-        previousButton.set_tooltip_text (_("Previous"));
-        playButton.set_icon_name ("media-playback-start");
-        playButton.set_tooltip_text (_("Play"));
-        nextButton.set_icon_name ("media-skip-forward");
-        nextButton.set_tooltip_text (_("Next"));
-
-        main_toolbar.get_style_context ().add_class (Gtk.STYLE_CLASS_PRIMARY_TOOLBAR);
 
         topDisplayBin.set_widget (topDisplay, true, false);
 
         // Set search timeout in ms
         searchField.pause_delay = 80;
 
-        var top_display_item   = new Gtk.ToolItem ();
-        var search_field_item  = new Gtk.ToolItem ();
-        var volume_item        = new Gtk.ToolItem ();
-
-        top_display_item.add (topDisplayBin);
-        search_field_item.add (searchField);
-        volume_item.add (volumeButton);
-        
         volumeButton.use_symbolic = true;
         volumeButton.value = 1;
 
@@ -304,18 +292,21 @@
 
         viewSelector.valign = Gtk.Align.CENTER;
 
-        top_display_item.set_expand (true);
         topDisplay.margin_left = 30;
         topDisplay.margin_right = 30;
-        
-        main_toolbar.insert (previousButton, -1);
-        main_toolbar.insert (playButton, -1);
-        main_toolbar.insert (nextButton, -1);
-        main_toolbar.insert (viewSelector, -1);
-        main_toolbar.insert (top_display_item, -1);
-        main_toolbar.insert (search_field_item, -1);
-        main_toolbar.insert (volume_item, -1);
-        main_toolbar.insert (((Noise.App) GLib.Application.get_default ()).create_appmenu (settingsMenu), -1);
+
+        headerbar.pack_start (previousButton);
+        headerbar.pack_start (playButton);
+        headerbar.pack_start (nextButton);
+        headerbar.pack_start (viewSelector);
+        headerbar.set_custom_title (topDisplayBin);
+        headerbar.pack_end (searchField);
+        // FIXME: Workaround for a bug...
+        var volume_grid = new Gtk.Grid ();
+        volume_grid.attach (volumeButton, 0, 0, 1, 1);
+        headerbar.pack_end (volume_grid);
+        headerbar.pack_end (((Noise.App) GLib.Application.get_default ()).create_appmenu (settingsMenu));
+        headerbar.show_all ();
 
 
         /** Info Panel **/
@@ -348,7 +339,6 @@
         main_hpaned.pack2 (view_container_hpaned, true, false);
 
         // Add controls to the GUI
-        verticalBox.pack_start (main_toolbar, false, false, 0);
         verticalBox.pack_start (main_hpaned, true, true, 0);
         verticalBox.pack_end (statusbar, false, false, 0);
 
@@ -762,7 +752,7 @@
         source_list_view.change_playlist_category_visibility (have_media);
 
         if(!App.player.media_active || have_media && !App.player.playing)
-            playButton.set_icon_name ("media-playback-start");
+            playButton.set_image (new Gtk.Image.from_icon_name ("media-playback-start", Gtk.IconSize.LARGE_TOOLBAR));
 
         bool show_top_display = media_active || doing_ops;
         topDisplay.set_visible (show_top_display);
@@ -1029,7 +1019,7 @@
 
 
     public virtual void playback_stopped (int was_playing) {
-        playButton.set_icon_name ("media-playback-start");
+        playButton.set_image (new Gtk.Image.from_icon_name ("media-playback-start", Gtk.IconSize.LARGE_TOOLBAR));
         //reset some booleans
         tested_for_video = false;
         media_considered_previewed = false;
@@ -1042,13 +1032,13 @@
     }
     
     public virtual void playback_started () {
-        playButton.set_icon_name ("media-playback-pause");
+        playButton.set_image (new Gtk.Image.from_icon_name ("media-playback-pause", Gtk.IconSize.LARGE_TOOLBAR));
 
         debug ("playback started");
     }
     
     public virtual void playback_paused () {
-        playButton.set_icon_name ("media-playback-start");
+        playButton.set_image (new Gtk.Image.from_icon_name ("media-playback-start", Gtk.IconSize.LARGE_TOOLBAR));
 
         debug ("playback paused");
     }
@@ -1134,7 +1124,7 @@
                                       _(STRING_CANCEL), Gtk.ResponseType.CANCEL,
                                       _(STRING_OPEN), Gtk.ResponseType.ACCEPT);
             file_chooser.set_select_multiple (true);
-            file_chooser.set_local_only(true);
+            file_chooser.set_local_only (true);
 
             if (file_chooser.run () == Gtk.ResponseType.ACCEPT) {
                 foreach (var folder in file_chooser.get_filenames()) {
@@ -1415,5 +1405,4 @@
 
         return base.configure_event (event);
     }
-}
-
+}
\ No newline at end of file

=== modified file 'src/Noise.vala'
--- src/Noise.vala	2013-12-01 14:35:04 +0000
+++ src/Noise.vala	2014-02-07 15:39:13 +0000
@@ -56,11 +56,11 @@
         program_name = "Noise";
         exec_name = "noise";
 
-        app_copyright = "2012-2013";
+        app_copyright = "2012-2014";
         application_id = "org.pantheon.noise";
         app_icon = "multimedia-audio-player";
         app_launcher = "noise.desktop";
-        app_years = "2012-2013";
+        app_years = "2012-2014";
 
         main_url = "https://launchpad.net/noise";
         bug_url = "https://bugs.launchpad.net/noise/+filebug";
@@ -144,4 +144,4 @@
     public string get_desktop_file_name () {
         return app_launcher;
     }
-}
+}
\ No newline at end of file

=== modified file 'src/Objects/LyricFetcher.vala'
--- src/Objects/LyricFetcher.vala	2013-05-01 13:50:20 +0000
+++ src/Objects/LyricFetcher.vala	2014-02-07 15:39:13 +0000
@@ -127,7 +127,6 @@
             else if ('-' == c)
                 fixed_string.append_unichar (c);
         }
-        warning (fixed_string.str);
         return fixed_string.str;
     }
 
@@ -161,4 +160,3 @@
         return rv.str;
     }
 }
-

=== modified file 'src/Widgets/EmbeddedAlert.vala'
--- src/Widgets/EmbeddedAlert.vala	2012-12-24 08:30:13 +0000
+++ src/Widgets/EmbeddedAlert.vala	2014-02-07 15:39:13 +0000
@@ -343,4 +343,4 @@
 
         return action_button;
     }
-}
+}
\ No newline at end of file

=== modified file 'src/Widgets/TopDisplay.vala'
--- src/Widgets/TopDisplay.vala	2013-06-04 07:20:37 +0000
+++ src/Widgets/TopDisplay.vala	2014-02-07 15:39:13 +0000
@@ -20,11 +20,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
-using Gtk;
-
-public class Noise.TopDisplay : Box {
+public class Noise.TopDisplay : Gtk.Grid {
     Gtk.Label label;
-    Gtk.Box scaleBox;
+    Gtk.Grid scale_grid;
     Gtk.Label leftTime;
     Gtk.Label rightTime;
     Gtk.Scale scale;
@@ -34,55 +32,57 @@
     private bool is_seeking = false;
     private uint timeout_id = 0;
     
-    public signal void scale_value_changed(ScrollType scroll, double val);
+    public signal void scale_value_changed (Gtk.ScrollType scroll, double val);
     
     public TopDisplay() {
-
-        this.orientation = Orientation.HORIZONTAL;
-
-        label = new Label("");
-        scale = new Scale.with_range (Gtk.Orientation.HORIZONTAL, 0, 1, 1000);
-        leftTime = new Label("0:00");
-        rightTime = new Label("0:00");
-        progressbar = new ProgressBar();
-        cancelButton = new Button();
+        width_request = 400;
+
+        label = new Gtk.Label ("");
+        label.hexpand = true;
+        scale = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 0, 1, 1000);
+        scale.hexpand = true;
+        leftTime = new Gtk.Label ("0:00");
+        rightTime = new Gtk.Label ("0:00");
+        progressbar = new Gtk.ProgressBar ();
+        cancelButton = new Gtk.Button ();
         
-        scaleBox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
+        scale_grid = new Gtk.Grid ();
 
         leftTime.margin_right = rightTime.margin_left = 3;
 
-        scaleBox.pack_start(leftTime, false, false, 0);
-        scaleBox.pack_start(scale, true, true, 0);
-        scaleBox.pack_start(rightTime, false, false, 0);
+        scale_grid.attach (leftTime, 0, 0, 1, 1);
+        scale_grid.attach (scale, 1, 0, 1, 1);
+        scale_grid.attach (rightTime, 2, 0, 1, 1);
         
         scale.set_draw_value (false);
         scale.can_focus = false;
+        scale.hexpand = true;
         
-        label.set_justify(Justification.CENTER);
-        label.set_single_line_mode(false);
+        label.set_justify (Gtk.Justification.CENTER);
+        label.set_single_line_mode (false);
         label.ellipsize = Pango.EllipsizeMode.END;
         
-        cancelButton.set_image(Icons.PROCESS_STOP.render_image (IconSize.MENU));
-        cancelButton.set_relief(Gtk.ReliefStyle.NONE);
+        cancelButton.set_image (Icons.PROCESS_STOP.render_image (Gtk.IconSize.MENU));
+        cancelButton.set_relief (Gtk.ReliefStyle.NONE);
         cancelButton.halign = cancelButton.valign = Gtk.Align.CENTER;
 
-        cancelButton.set_tooltip_text (_("Cancel"));
+        cancelButton.set_tooltip_text (_(STRING_CANCEL));
 
         // all but cancel
-        var info = new Box(Gtk.Orientation.VERTICAL, 0);
-        info.pack_start(label, false, true, 0);
-        info.pack_start(progressbar, false, true, 0);
-        info.pack_start(scaleBox, false, true, 0);
-        
-        this.pack_start(info, true, true, 0);
-        this.pack_end(cancelButton, false, false, 0);
-        
-        this.cancelButton.clicked.connect(cancel_clicked);
+        var info = new Gtk.Grid ();
+        info.attach (label, 0, 0, 1, 1);
+        info.attach (progressbar, 0, 1, 1, 1);
+        info.attach (scale_grid, 0, 1, 1, 1);
+        
+        attach (info, 0, 0, 1, 1);
+        attach (cancelButton, 0, 0, 1, 1);
+        
+        cancelButton.clicked.connect (cancel_clicked);
 
-        this.scale.button_press_event.connect(scale_button_press);
-        this.scale.button_release_event.connect(scale_button_release);
-        this.scale.value_changed.connect(value_changed);
-        this.scale.change_value.connect(change_value);
+        scale.button_press_event.connect (scale_button_press);
+        scale.button_release_event.connect (scale_button_release);
+        scale.value_changed.connect (value_changed);
+        scale.change_value.connect (change_value);
 
         App.player.player.current_position_update.connect (player_position_update);
         
@@ -152,15 +152,15 @@
     
     /** scale functions **/
     public void set_scale_range(double min, double max) {
-        scale.set_range(min, max);
-    }
-    
-    public void set_scale_value(double val) {
-        scale.set_value(val);
-    }
-    
-    public double get_scale_value() {
-        return scale.get_value();
+        scale.set_range (min, max);
+    }
+    
+    public void set_scale_value (double val) {
+        scale.set_value (val);
+    }
+    
+    public double get_scale_value () {
+        return scale.get_value ();
     }
     
     public virtual bool scale_button_press(Gdk.EventButton event) {
@@ -168,36 +168,42 @@
             return true;
         }
 
-        App.player.player.current_position_update.disconnect(player_position_update);
+        App.player.player.current_position_update.disconnect (player_position_update);
         is_seeking = true;
-        change_value (ScrollType.NONE, get_current_time ());
+        change_value (Gtk.ScrollType.NONE, get_current_time ());
 
         return false;
     }
     
-    public virtual bool scale_button_release(Gdk.EventButton event) {
+    public virtual bool scale_button_release (Gdk.EventButton event) {
         is_seeking = false;
 
-        change_value (ScrollType.NONE, get_current_time ());
+        change_value (Gtk.ScrollType.NONE, get_current_time ());
         
         return false;
     }
 
     public double get_current_time () {
         Gtk.Allocation extents;
-        int point_x = 0;
-        int point_y = 0;
-
-        scale.get_pointer (out point_x, out point_y);
+        double point_x = 0;
+        double point_y = 0;
+        Gdk.ModifierType mask;
+        unowned Gdk.Display display = Gdk.Display.get_default ();
+        unowned Gdk.Window scale_window = scale.get_window ();
+        unowned Gdk.DeviceManager device_manager = display.get_device_manager ();
+        scale_window.get_device_position_double (device_manager.get_client_pointer (), out point_x, out point_y, out mask);
         scale.get_allocation (out extents);
+        point_x = point_x - extents.x;
+        if (point_x < 0)
+            point_x = 0;
 
         // get miliseconds of media
         // calculate percentage to go to based on location
         return (double)point_x / (double)extents.width * scale.get_adjustment().upper;
     }
     
-    public virtual void value_changed() {
-        if(!scale.visible)
+    public virtual void value_changed () {
+        if (!scale.visible)
             return;
 
         double val = scale.get_value ();
@@ -214,7 +220,7 @@
         rightTime.set_text (TimeUtils.pretty_length_from_ms (media_duration_secs - elapsed_secs));
     }
     
-    public virtual bool change_value(ScrollType scroll, double val) {
+    public virtual bool change_value (Gtk.ScrollType scroll, double val) {
         App.player.player.current_position_update.disconnect(player_position_update);
         scale.set_value(val);
         scale_value_changed(scroll, val);
@@ -235,8 +241,8 @@
     
     /** other functions **/
     public void show_scale() {
-        scaleBox.set_no_show_all (false);
-        scaleBox.show_all ();
+        scale_grid.set_no_show_all (false);
+        scale_grid.show_all ();
 
         progressbar.set_no_show_all (true);
         progressbar.hide ();
@@ -246,8 +252,8 @@
     }
     
     public void show_progressbar() {
-        scaleBox.set_no_show_all (true);
-        scaleBox.hide();
+        scale_grid.set_no_show_all (true);
+        scale_grid.hide();
 
         progressbar.set_no_show_all (false);
         progressbar.show_all ();
@@ -257,8 +263,8 @@
     }
 
     public void hide_scale_and_progressbar() {
-        scaleBox.set_no_show_all (true);
-        scaleBox.hide();
+        scale_grid.set_no_show_all (true);
+        scale_grid.hide();
 
         progressbar.set_no_show_all (true);
         progressbar.hide ();
@@ -296,4 +302,4 @@
                 set_media (current_media);
         }
     }
-}
+}
\ No newline at end of file