Merge lp:~hyuchia/noise/fix-1226027 into lp:~elementary-apps/noise/trunk

[Diego Islas Ocampo]

Remember selected music folder (lp:1226027)

Fix behavior where selecting a new folder from the FileChooser in the Preferences window would not be applied.

[Jeremy Wootten (jeremywootten)]

Apart from the small formatting error indicated inline, this works as expected.

review: Needs Fixing

[Jeremy Wootten (jeremywootten)]

review: Needs Fixing (code format)

[lp:~hyuchia/noise/fix-1226027]

2052. By Diego Islas Ocampo on 2017-03-18

Add space before function call

[Diego Islas Ocampo (hyuchia)]

Just added the space :)

[Jeremy Wootten (jeremywootten)]

Approving code and function. There is no impact on the UI.

review: Approve (code, function)

=== modified file 'src/Dialogs/PreferencesWindow.vala'
--- src/Dialogs/PreferencesWindow.vala	2016-12-31 17:15:12 +0000
+++ src/Dialogs/PreferencesWindow.vala	2017-03-18 04:56:44 +0000
@@ -39,7 +39,7 @@
     public PreferencesWindow () {
         build_ui ();
         App.main_window.add_preference_page.connect ((page) => {add_page (page);});
-        
+
         // Add general section
         library_filechooser = new Gtk.FileChooserButton (_("Select Music Folder…"), Gtk.FileChooserAction.SELECT_FOLDER);
         library_filechooser.hexpand = true;
@@ -47,7 +47,9 @@
         library_filechooser.set_current_folder (Settings.Main.get_default ().music_folder);
         //library_filechooser.set_local_only (true);
         var general_section = new Preferences.GeneralPage (library_filechooser);
-        library_filechooser.file_set.connect (() => {App.main_window.setMusicFolder(library_filechooser.get_current_folder ());});
+        library_filechooser.file_set.connect (() => {
+            App.main_window.setMusicFolder (library_filechooser.get_filename ());
+        });
         add_page (general_section.page);
 
         Plugins.Manager.get_default ().hook_preferences_window (this);
@@ -129,40 +131,40 @@
         page = new Noise.SettingsWindow.NoteBook_Page (_("General"));
 
         int row = 0;
-        
+
         // Music Folder Location
-        
+
         var label = new Gtk.Label (_("Music Folder Location"));
         page.add_section (label, ref row);
-        
+
         var spacer = new Gtk.Label ("");
         spacer.set_hexpand (true);
 
         page.add_full_option (library_filechooser, ref row);
-        
+
         label = new Gtk.Label (_("Library Management"));
         page.add_section (label, ref row);
-        
+
         var main_settings = Settings.Main.get_default ();
-        
+
         organize_folders_switch = new Gtk.Switch ();
         main_settings.schema.bind("update-folder-hierarchy", organize_folders_switch, "active", SettingsBindFlags.DEFAULT);
         page.add_option (new Gtk.Label (_("Keep Music folder organized:")), organize_folders_switch, ref row);
-        
+
         write_file_metadata_switch = new Gtk.Switch ();
         main_settings.schema.bind("write-metadata-to-file", write_file_metadata_switch, "active", SettingsBindFlags.DEFAULT);
         page.add_option (new Gtk.Label (_("Write metadata to file:")), write_file_metadata_switch, ref row);
-        
+
         copy_imported_music_switch = new Gtk.Switch ();
         main_settings.schema.bind("copy-imported-music", copy_imported_music_switch, "active", SettingsBindFlags.DEFAULT);
         page.add_option (new Gtk.Label (_("Copy imported files to Library:")), copy_imported_music_switch, ref row);
-        
+
         label = new Gtk.Label (_("Desktop Integration"));
         page.add_section (label, ref row);
 
         hide_on_close_switch = new Gtk.Switch ();
         main_settings.schema.bind("close-while-playing", hide_on_close_switch, "active", SettingsBindFlags.INVERT_BOOLEAN);
         page.add_option (new Gtk.Label (_("Continue playback when closed:")), hide_on_close_switch, ref row);
-        
+
     }
 }

=== modified file 'src/LibraryWindow.vala'
--- src/LibraryWindow.vala	2016-12-31 17:15:12 +0000
+++ src/LibraryWindow.vala	2017-03-18 04:56:44 +0000
@@ -125,9 +125,9 @@
             App.player.player.current_position_update.connect (current_position_update);
             App.player.player.error_occured.connect (error_occured);
         });
-        
+
         NotificationManager.get_default ().show_alert.connect (doAlert);
-        
+
         match_playlists = new Gee.HashMap<unowned Playlist, int> ();
         match_devices = new Gee.HashMap<string, int> ();
         match_playlist_entry = new Gee.HashMap<unowned Playlist, SourceListEntry> ();
@@ -228,7 +228,7 @@
 
         return base.key_press_event (event);
     }
- 
+
     private inline void setup_window () {
         debug ("setting up main window");
 
@@ -281,7 +281,7 @@
         settingsMenu.append (new Gtk.SeparatorMenuItem ());
         settingsMenu.append (editPreferences);
         settingsMenu.show_all ();
-        
+
         var menu_icon = new Gtk.Image.from_icon_name ("open-menu", Gtk.IconSize.LARGE_TOOLBAR);
         appMenu.set_image (menu_icon);
         appMenu.popup = settingsMenu;
@@ -365,15 +365,15 @@
     }
 
     public void connect_to_sourcelist_signals () {
-        
+
         source_list_view.selection_changed.connect ((page_number) => {
             view_container.set_current_view_from_index (page_number);
         });
-        
+
         source_list_view.activated.connect ( () => {
             search_field_has_focus = false;
         });
-        
+
         source_list_view.item_action_activated.connect ((page_number) => {
             var view = view_container.get_view (page_number);
             if (view is DeviceView) {
@@ -389,7 +389,7 @@
                 source_list_view.start_editing_item(source_list_view.selected);
             }
         });
-        
+
         source_list_view.playlist_edit_clicked.connect ((page_number) => {
             var view = view_container.get_view (page_number);
             if (view is PlaylistViewWrapper) {
@@ -399,7 +399,7 @@
                 }
             }
         });
-        
+
         source_list_view.playlist_remove_clicked.connect ((page_number) => {
             var view = view_container.get_view (page_number);
             if (view is PlaylistViewWrapper) {
@@ -411,7 +411,7 @@
                 }
             }
         });
-        
+
         source_list_view.device_import_clicked.connect ((page_number) => {
             foreach (var device in DeviceManager.get_default ().get_initialized_devices ()) {
                 if(page_number == match_devices.get (device.get_unique_identifier())) {
@@ -420,7 +420,7 @@
                 }
             }
         });
-        
+
         source_list_view.device_new_playlist_clicked.connect ((page_number) => {
             foreach (var device in DeviceManager.get_default ().get_initialized_devices ()) {
                 if(page_number == match_devices.get (device.get_unique_identifier())) {
@@ -429,7 +429,7 @@
                 }
             }
         });
-        
+
         source_list_view.device_sync_clicked.connect ((page_number) => {
             foreach (var device in DeviceManager.get_default ().get_initialized_devices ()) {
                 if(page_number == match_devices.get (device.get_unique_identifier())) {
@@ -438,7 +438,7 @@
                 }
             }
         });
-        
+
         source_list_view.device_eject_clicked.connect ((page_number) => {
             foreach (var device in DeviceManager.get_default ().get_initialized_devices ()) {
                 if(page_number == match_devices.get (device.get_unique_identifier())) {
@@ -447,7 +447,7 @@
                 }
             }
         });
-        
+
         source_list_view.playlist_remove_clicked.connect ((page_number) => {
             var view = view_container.get_view (page_number);
             if (view is PlaylistViewWrapper) {
@@ -459,7 +459,7 @@
                 }
             }
         });
-        
+
         source_list_view.playlist_save_clicked.connect ((page_number) => {
             var view = view_container.get_view (page_number);
             if (view is PlaylistViewWrapper) {
@@ -475,7 +475,7 @@
                 }
             }
         });
-        
+
         source_list_view.playlist_export_clicked.connect ((page_number) => {
             var view = view_container.get_view (page_number);
             if (view is PlaylistViewWrapper) {
@@ -668,7 +668,7 @@
 
         debug ("Finished loading playlists");
     }
-    
+
 
     /**
      * SourceList Configuration
@@ -736,7 +736,7 @@
         int page_number = match_devices.get (device.get_unique_identifier());
         source_list_view.change_device_name (page_number, device.getDisplayName());
     }
-    
+
     private void remove_device (Device device) {
         if (!match_devices.has_key (device.get_unique_identifier()))
             return;
@@ -763,7 +763,7 @@
                 debug ("adding device view with %d\n", d.get_library ().get_medias().size);
                 var tvs = new TreeViewSetup (ViewWrapper.Hint.DEVICE_AUDIO);
                 var music_view_wrapper = new DeviceViewWrapper(tvs, d, d.get_library ());
-                
+
                 int subview_number = view_container.add_view (music_view_wrapper);
                 entry = source_list_view.add_item  (view_number, d.getDisplayName(), ViewWrapper.Hint.DEVICE, d.get_icon(), new ThemedIcon ("media-eject-symbolic"), null, d);
                 source_list_view.add_item (subview_number, _("Music"), ViewWrapper.Hint.DEVICE_AUDIO, new ThemedIcon ("library-music"), null, entry as SourceListExpandableItem, d);
@@ -957,7 +957,7 @@
         media_considered_played = false;
         added_to_play_count = false;
         media_half_played_sended = false;
-        
+
         update_sensitivities.begin ();
 
         Timeout.add (3000, () => {
@@ -967,7 +967,7 @@
                     return null;
                 });
             }
-            
+
             return false;
         });
     }
@@ -985,13 +985,13 @@
 
         debug ("playback stopped");
     }
-    
+
     public virtual void playback_started () {
         playButton.set_image (new Gtk.Image.from_icon_name ("media-playback-pause-symbolic", Gtk.IconSize.LARGE_TOOLBAR));
         playButton.set_tooltip_text (_("Pause"));
         debug ("playback started");
     }
-    
+
     public virtual void playback_paused () {
         playButton.set_image (new Gtk.Image.from_icon_name ("media-playback-start-symbolic", Gtk.IconSize.LARGE_TOOLBAR));
         playButton.set_tooltip_text (_("Play"));
@@ -1115,11 +1115,13 @@
             smfc.finished.connect( (cont) => {
                 if(cont) {
                     library_manager.set_music_folder.begin (folder);
+                    main_settings.music_folder = folder;
                 }
             });
         }
         else {
             library_manager.set_music_folder.begin (folder);
+            main_settings.music_folder = folder;
         }
     }
 
@@ -1239,7 +1241,7 @@
         if (!main_settings.privacy_mode_enabled ()) {
             main_settings.search_string = searchField.text;
         }
-        
+
         // Save info pane (context pane) width
         saved_state.more_width = info_panel.get_allocated_width ();