Merge lp:~hyuchia/noise/fix-1226027 into lp:~elementary-apps/noise/trunk
- fix-1226027
- Merge into trunk
Proposed by
Diego Islas Ocampo
Status: | Merged | ||||
---|---|---|---|---|---|
Merge reported by: | Jeremy Wootten | ||||
Merged at revision: | not available | ||||
Proposed branch: | lp:~hyuchia/noise/fix-1226027 | ||||
Merge into: | lp:~elementary-apps/noise/trunk | ||||
Diff against target: |
291 lines (+40/-36) 2 files modified
src/Dialogs/PreferencesWindow.vala (+14/-12) src/LibraryWindow.vala (+26/-24) |
||||
To merge this branch: | bzr merge lp:~hyuchia/noise/fix-1226027 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jeremy Wootten | code, function | Approve | |
Review via email: mp+318665@code.launchpad.net |
Commit message
Remember selected music folder (lp:1226027)
Description of the change
Fix behavior where selecting a new folder from the FileChooser in the Preferences window would not be applied.
To post a comment you must log in.
Revision history for this message
Jeremy Wootten (jeremywootten) : | # |
review:
Needs Fixing
(code format)
lp:~hyuchia/noise/fix-1226027
updated
- 2052. By Diego Islas Ocampo
-
Add space before function call
Revision history for this message
Diego Islas Ocampo (hyuchia) wrote : | # |
Just added the space :)
Revision history for this message
Jeremy Wootten (jeremywootten) wrote : | # |
Approving code and function. There is no impact on the UI.
review:
Approve
(code, function)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'src/Dialogs/PreferencesWindow.vala' | |||
2 | --- src/Dialogs/PreferencesWindow.vala 2016-12-31 17:15:12 +0000 | |||
3 | +++ src/Dialogs/PreferencesWindow.vala 2017-03-18 04:56:44 +0000 | |||
4 | @@ -39,7 +39,7 @@ | |||
5 | 39 | public PreferencesWindow () { | 39 | public PreferencesWindow () { |
6 | 40 | build_ui (); | 40 | build_ui (); |
7 | 41 | App.main_window.add_preference_page.connect ((page) => {add_page (page);}); | 41 | App.main_window.add_preference_page.connect ((page) => {add_page (page);}); |
9 | 42 | 42 | ||
10 | 43 | // Add general section | 43 | // Add general section |
11 | 44 | library_filechooser = new Gtk.FileChooserButton (_("Select Music Folder…"), Gtk.FileChooserAction.SELECT_FOLDER); | 44 | library_filechooser = new Gtk.FileChooserButton (_("Select Music Folder…"), Gtk.FileChooserAction.SELECT_FOLDER); |
12 | 45 | library_filechooser.hexpand = true; | 45 | library_filechooser.hexpand = true; |
13 | @@ -47,7 +47,9 @@ | |||
14 | 47 | library_filechooser.set_current_folder (Settings.Main.get_default ().music_folder); | 47 | library_filechooser.set_current_folder (Settings.Main.get_default ().music_folder); |
15 | 48 | //library_filechooser.set_local_only (true); | 48 | //library_filechooser.set_local_only (true); |
16 | 49 | var general_section = new Preferences.GeneralPage (library_filechooser); | 49 | var general_section = new Preferences.GeneralPage (library_filechooser); |
18 | 50 | library_filechooser.file_set.connect (() => {App.main_window.setMusicFolder(library_filechooser.get_current_folder ());}); | 50 | library_filechooser.file_set.connect (() => { |
19 | 51 | App.main_window.setMusicFolder (library_filechooser.get_filename ()); | ||
20 | 52 | }); | ||
21 | 51 | add_page (general_section.page); | 53 | add_page (general_section.page); |
22 | 52 | 54 | ||
23 | 53 | Plugins.Manager.get_default ().hook_preferences_window (this); | 55 | Plugins.Manager.get_default ().hook_preferences_window (this); |
24 | @@ -129,40 +131,40 @@ | |||
25 | 129 | page = new Noise.SettingsWindow.NoteBook_Page (_("General")); | 131 | page = new Noise.SettingsWindow.NoteBook_Page (_("General")); |
26 | 130 | 132 | ||
27 | 131 | int row = 0; | 133 | int row = 0; |
29 | 132 | 134 | ||
30 | 133 | // Music Folder Location | 135 | // Music Folder Location |
32 | 134 | 136 | ||
33 | 135 | var label = new Gtk.Label (_("Music Folder Location")); | 137 | var label = new Gtk.Label (_("Music Folder Location")); |
34 | 136 | page.add_section (label, ref row); | 138 | page.add_section (label, ref row); |
36 | 137 | 139 | ||
37 | 138 | var spacer = new Gtk.Label (""); | 140 | var spacer = new Gtk.Label (""); |
38 | 139 | spacer.set_hexpand (true); | 141 | spacer.set_hexpand (true); |
39 | 140 | 142 | ||
40 | 141 | page.add_full_option (library_filechooser, ref row); | 143 | page.add_full_option (library_filechooser, ref row); |
42 | 142 | 144 | ||
43 | 143 | label = new Gtk.Label (_("Library Management")); | 145 | label = new Gtk.Label (_("Library Management")); |
44 | 144 | page.add_section (label, ref row); | 146 | page.add_section (label, ref row); |
46 | 145 | 147 | ||
47 | 146 | var main_settings = Settings.Main.get_default (); | 148 | var main_settings = Settings.Main.get_default (); |
49 | 147 | 149 | ||
50 | 148 | organize_folders_switch = new Gtk.Switch (); | 150 | organize_folders_switch = new Gtk.Switch (); |
51 | 149 | main_settings.schema.bind("update-folder-hierarchy", organize_folders_switch, "active", SettingsBindFlags.DEFAULT); | 151 | main_settings.schema.bind("update-folder-hierarchy", organize_folders_switch, "active", SettingsBindFlags.DEFAULT); |
52 | 150 | page.add_option (new Gtk.Label (_("Keep Music folder organized:")), organize_folders_switch, ref row); | 152 | page.add_option (new Gtk.Label (_("Keep Music folder organized:")), organize_folders_switch, ref row); |
54 | 151 | 153 | ||
55 | 152 | write_file_metadata_switch = new Gtk.Switch (); | 154 | write_file_metadata_switch = new Gtk.Switch (); |
56 | 153 | main_settings.schema.bind("write-metadata-to-file", write_file_metadata_switch, "active", SettingsBindFlags.DEFAULT); | 155 | main_settings.schema.bind("write-metadata-to-file", write_file_metadata_switch, "active", SettingsBindFlags.DEFAULT); |
57 | 154 | page.add_option (new Gtk.Label (_("Write metadata to file:")), write_file_metadata_switch, ref row); | 156 | page.add_option (new Gtk.Label (_("Write metadata to file:")), write_file_metadata_switch, ref row); |
59 | 155 | 157 | ||
60 | 156 | copy_imported_music_switch = new Gtk.Switch (); | 158 | copy_imported_music_switch = new Gtk.Switch (); |
61 | 157 | main_settings.schema.bind("copy-imported-music", copy_imported_music_switch, "active", SettingsBindFlags.DEFAULT); | 159 | main_settings.schema.bind("copy-imported-music", copy_imported_music_switch, "active", SettingsBindFlags.DEFAULT); |
62 | 158 | page.add_option (new Gtk.Label (_("Copy imported files to Library:")), copy_imported_music_switch, ref row); | 160 | page.add_option (new Gtk.Label (_("Copy imported files to Library:")), copy_imported_music_switch, ref row); |
64 | 159 | 161 | ||
65 | 160 | label = new Gtk.Label (_("Desktop Integration")); | 162 | label = new Gtk.Label (_("Desktop Integration")); |
66 | 161 | page.add_section (label, ref row); | 163 | page.add_section (label, ref row); |
67 | 162 | 164 | ||
68 | 163 | hide_on_close_switch = new Gtk.Switch (); | 165 | hide_on_close_switch = new Gtk.Switch (); |
69 | 164 | main_settings.schema.bind("close-while-playing", hide_on_close_switch, "active", SettingsBindFlags.INVERT_BOOLEAN); | 166 | main_settings.schema.bind("close-while-playing", hide_on_close_switch, "active", SettingsBindFlags.INVERT_BOOLEAN); |
70 | 165 | page.add_option (new Gtk.Label (_("Continue playback when closed:")), hide_on_close_switch, ref row); | 167 | page.add_option (new Gtk.Label (_("Continue playback when closed:")), hide_on_close_switch, ref row); |
72 | 166 | 168 | ||
73 | 167 | } | 169 | } |
74 | 168 | } | 170 | } |
75 | 169 | 171 | ||
76 | === modified file 'src/LibraryWindow.vala' | |||
77 | --- src/LibraryWindow.vala 2016-12-31 17:15:12 +0000 | |||
78 | +++ src/LibraryWindow.vala 2017-03-18 04:56:44 +0000 | |||
79 | @@ -125,9 +125,9 @@ | |||
80 | 125 | App.player.player.current_position_update.connect (current_position_update); | 125 | App.player.player.current_position_update.connect (current_position_update); |
81 | 126 | App.player.player.error_occured.connect (error_occured); | 126 | App.player.player.error_occured.connect (error_occured); |
82 | 127 | }); | 127 | }); |
84 | 128 | 128 | ||
85 | 129 | NotificationManager.get_default ().show_alert.connect (doAlert); | 129 | NotificationManager.get_default ().show_alert.connect (doAlert); |
87 | 130 | 130 | ||
88 | 131 | match_playlists = new Gee.HashMap<unowned Playlist, int> (); | 131 | match_playlists = new Gee.HashMap<unowned Playlist, int> (); |
89 | 132 | match_devices = new Gee.HashMap<string, int> (); | 132 | match_devices = new Gee.HashMap<string, int> (); |
90 | 133 | match_playlist_entry = new Gee.HashMap<unowned Playlist, SourceListEntry> (); | 133 | match_playlist_entry = new Gee.HashMap<unowned Playlist, SourceListEntry> (); |
91 | @@ -228,7 +228,7 @@ | |||
92 | 228 | 228 | ||
93 | 229 | return base.key_press_event (event); | 229 | return base.key_press_event (event); |
94 | 230 | } | 230 | } |
96 | 231 | 231 | ||
97 | 232 | private inline void setup_window () { | 232 | private inline void setup_window () { |
98 | 233 | debug ("setting up main window"); | 233 | debug ("setting up main window"); |
99 | 234 | 234 | ||
100 | @@ -281,7 +281,7 @@ | |||
101 | 281 | settingsMenu.append (new Gtk.SeparatorMenuItem ()); | 281 | settingsMenu.append (new Gtk.SeparatorMenuItem ()); |
102 | 282 | settingsMenu.append (editPreferences); | 282 | settingsMenu.append (editPreferences); |
103 | 283 | settingsMenu.show_all (); | 283 | settingsMenu.show_all (); |
105 | 284 | 284 | ||
106 | 285 | var menu_icon = new Gtk.Image.from_icon_name ("open-menu", Gtk.IconSize.LARGE_TOOLBAR); | 285 | var menu_icon = new Gtk.Image.from_icon_name ("open-menu", Gtk.IconSize.LARGE_TOOLBAR); |
107 | 286 | appMenu.set_image (menu_icon); | 286 | appMenu.set_image (menu_icon); |
108 | 287 | appMenu.popup = settingsMenu; | 287 | appMenu.popup = settingsMenu; |
109 | @@ -365,15 +365,15 @@ | |||
110 | 365 | } | 365 | } |
111 | 366 | 366 | ||
112 | 367 | public void connect_to_sourcelist_signals () { | 367 | public void connect_to_sourcelist_signals () { |
114 | 368 | 368 | ||
115 | 369 | source_list_view.selection_changed.connect ((page_number) => { | 369 | source_list_view.selection_changed.connect ((page_number) => { |
116 | 370 | view_container.set_current_view_from_index (page_number); | 370 | view_container.set_current_view_from_index (page_number); |
117 | 371 | }); | 371 | }); |
119 | 372 | 372 | ||
120 | 373 | source_list_view.activated.connect ( () => { | 373 | source_list_view.activated.connect ( () => { |
121 | 374 | search_field_has_focus = false; | 374 | search_field_has_focus = false; |
122 | 375 | }); | 375 | }); |
124 | 376 | 376 | ||
125 | 377 | source_list_view.item_action_activated.connect ((page_number) => { | 377 | source_list_view.item_action_activated.connect ((page_number) => { |
126 | 378 | var view = view_container.get_view (page_number); | 378 | var view = view_container.get_view (page_number); |
127 | 379 | if (view is DeviceView) { | 379 | if (view is DeviceView) { |
128 | @@ -389,7 +389,7 @@ | |||
129 | 389 | source_list_view.start_editing_item(source_list_view.selected); | 389 | source_list_view.start_editing_item(source_list_view.selected); |
130 | 390 | } | 390 | } |
131 | 391 | }); | 391 | }); |
133 | 392 | 392 | ||
134 | 393 | source_list_view.playlist_edit_clicked.connect ((page_number) => { | 393 | source_list_view.playlist_edit_clicked.connect ((page_number) => { |
135 | 394 | var view = view_container.get_view (page_number); | 394 | var view = view_container.get_view (page_number); |
136 | 395 | if (view is PlaylistViewWrapper) { | 395 | if (view is PlaylistViewWrapper) { |
137 | @@ -399,7 +399,7 @@ | |||
138 | 399 | } | 399 | } |
139 | 400 | } | 400 | } |
140 | 401 | }); | 401 | }); |
142 | 402 | 402 | ||
143 | 403 | source_list_view.playlist_remove_clicked.connect ((page_number) => { | 403 | source_list_view.playlist_remove_clicked.connect ((page_number) => { |
144 | 404 | var view = view_container.get_view (page_number); | 404 | var view = view_container.get_view (page_number); |
145 | 405 | if (view is PlaylistViewWrapper) { | 405 | if (view is PlaylistViewWrapper) { |
146 | @@ -411,7 +411,7 @@ | |||
147 | 411 | } | 411 | } |
148 | 412 | } | 412 | } |
149 | 413 | }); | 413 | }); |
151 | 414 | 414 | ||
152 | 415 | source_list_view.device_import_clicked.connect ((page_number) => { | 415 | source_list_view.device_import_clicked.connect ((page_number) => { |
153 | 416 | foreach (var device in DeviceManager.get_default ().get_initialized_devices ()) { | 416 | foreach (var device in DeviceManager.get_default ().get_initialized_devices ()) { |
154 | 417 | if(page_number == match_devices.get (device.get_unique_identifier())) { | 417 | if(page_number == match_devices.get (device.get_unique_identifier())) { |
155 | @@ -420,7 +420,7 @@ | |||
156 | 420 | } | 420 | } |
157 | 421 | } | 421 | } |
158 | 422 | }); | 422 | }); |
160 | 423 | 423 | ||
161 | 424 | source_list_view.device_new_playlist_clicked.connect ((page_number) => { | 424 | source_list_view.device_new_playlist_clicked.connect ((page_number) => { |
162 | 425 | foreach (var device in DeviceManager.get_default ().get_initialized_devices ()) { | 425 | foreach (var device in DeviceManager.get_default ().get_initialized_devices ()) { |
163 | 426 | if(page_number == match_devices.get (device.get_unique_identifier())) { | 426 | if(page_number == match_devices.get (device.get_unique_identifier())) { |
164 | @@ -429,7 +429,7 @@ | |||
165 | 429 | } | 429 | } |
166 | 430 | } | 430 | } |
167 | 431 | }); | 431 | }); |
169 | 432 | 432 | ||
170 | 433 | source_list_view.device_sync_clicked.connect ((page_number) => { | 433 | source_list_view.device_sync_clicked.connect ((page_number) => { |
171 | 434 | foreach (var device in DeviceManager.get_default ().get_initialized_devices ()) { | 434 | foreach (var device in DeviceManager.get_default ().get_initialized_devices ()) { |
172 | 435 | if(page_number == match_devices.get (device.get_unique_identifier())) { | 435 | if(page_number == match_devices.get (device.get_unique_identifier())) { |
173 | @@ -438,7 +438,7 @@ | |||
174 | 438 | } | 438 | } |
175 | 439 | } | 439 | } |
176 | 440 | }); | 440 | }); |
178 | 441 | 441 | ||
179 | 442 | source_list_view.device_eject_clicked.connect ((page_number) => { | 442 | source_list_view.device_eject_clicked.connect ((page_number) => { |
180 | 443 | foreach (var device in DeviceManager.get_default ().get_initialized_devices ()) { | 443 | foreach (var device in DeviceManager.get_default ().get_initialized_devices ()) { |
181 | 444 | if(page_number == match_devices.get (device.get_unique_identifier())) { | 444 | if(page_number == match_devices.get (device.get_unique_identifier())) { |
182 | @@ -447,7 +447,7 @@ | |||
183 | 447 | } | 447 | } |
184 | 448 | } | 448 | } |
185 | 449 | }); | 449 | }); |
187 | 450 | 450 | ||
188 | 451 | source_list_view.playlist_remove_clicked.connect ((page_number) => { | 451 | source_list_view.playlist_remove_clicked.connect ((page_number) => { |
189 | 452 | var view = view_container.get_view (page_number); | 452 | var view = view_container.get_view (page_number); |
190 | 453 | if (view is PlaylistViewWrapper) { | 453 | if (view is PlaylistViewWrapper) { |
191 | @@ -459,7 +459,7 @@ | |||
192 | 459 | } | 459 | } |
193 | 460 | } | 460 | } |
194 | 461 | }); | 461 | }); |
196 | 462 | 462 | ||
197 | 463 | source_list_view.playlist_save_clicked.connect ((page_number) => { | 463 | source_list_view.playlist_save_clicked.connect ((page_number) => { |
198 | 464 | var view = view_container.get_view (page_number); | 464 | var view = view_container.get_view (page_number); |
199 | 465 | if (view is PlaylistViewWrapper) { | 465 | if (view is PlaylistViewWrapper) { |
200 | @@ -475,7 +475,7 @@ | |||
201 | 475 | } | 475 | } |
202 | 476 | } | 476 | } |
203 | 477 | }); | 477 | }); |
205 | 478 | 478 | ||
206 | 479 | source_list_view.playlist_export_clicked.connect ((page_number) => { | 479 | source_list_view.playlist_export_clicked.connect ((page_number) => { |
207 | 480 | var view = view_container.get_view (page_number); | 480 | var view = view_container.get_view (page_number); |
208 | 481 | if (view is PlaylistViewWrapper) { | 481 | if (view is PlaylistViewWrapper) { |
209 | @@ -668,7 +668,7 @@ | |||
210 | 668 | 668 | ||
211 | 669 | debug ("Finished loading playlists"); | 669 | debug ("Finished loading playlists"); |
212 | 670 | } | 670 | } |
214 | 671 | 671 | ||
215 | 672 | 672 | ||
216 | 673 | /** | 673 | /** |
217 | 674 | * SourceList Configuration | 674 | * SourceList Configuration |
218 | @@ -736,7 +736,7 @@ | |||
219 | 736 | int page_number = match_devices.get (device.get_unique_identifier()); | 736 | int page_number = match_devices.get (device.get_unique_identifier()); |
220 | 737 | source_list_view.change_device_name (page_number, device.getDisplayName()); | 737 | source_list_view.change_device_name (page_number, device.getDisplayName()); |
221 | 738 | } | 738 | } |
223 | 739 | 739 | ||
224 | 740 | private void remove_device (Device device) { | 740 | private void remove_device (Device device) { |
225 | 741 | if (!match_devices.has_key (device.get_unique_identifier())) | 741 | if (!match_devices.has_key (device.get_unique_identifier())) |
226 | 742 | return; | 742 | return; |
227 | @@ -763,7 +763,7 @@ | |||
228 | 763 | debug ("adding device view with %d\n", d.get_library ().get_medias().size); | 763 | debug ("adding device view with %d\n", d.get_library ().get_medias().size); |
229 | 764 | var tvs = new TreeViewSetup (ViewWrapper.Hint.DEVICE_AUDIO); | 764 | var tvs = new TreeViewSetup (ViewWrapper.Hint.DEVICE_AUDIO); |
230 | 765 | var music_view_wrapper = new DeviceViewWrapper(tvs, d, d.get_library ()); | 765 | var music_view_wrapper = new DeviceViewWrapper(tvs, d, d.get_library ()); |
232 | 766 | 766 | ||
233 | 767 | int subview_number = view_container.add_view (music_view_wrapper); | 767 | int subview_number = view_container.add_view (music_view_wrapper); |
234 | 768 | entry = source_list_view.add_item (view_number, d.getDisplayName(), ViewWrapper.Hint.DEVICE, d.get_icon(), new ThemedIcon ("media-eject-symbolic"), null, d); | 768 | entry = source_list_view.add_item (view_number, d.getDisplayName(), ViewWrapper.Hint.DEVICE, d.get_icon(), new ThemedIcon ("media-eject-symbolic"), null, d); |
235 | 769 | source_list_view.add_item (subview_number, _("Music"), ViewWrapper.Hint.DEVICE_AUDIO, new ThemedIcon ("library-music"), null, entry as SourceListExpandableItem, d); | 769 | source_list_view.add_item (subview_number, _("Music"), ViewWrapper.Hint.DEVICE_AUDIO, new ThemedIcon ("library-music"), null, entry as SourceListExpandableItem, d); |
236 | @@ -957,7 +957,7 @@ | |||
237 | 957 | media_considered_played = false; | 957 | media_considered_played = false; |
238 | 958 | added_to_play_count = false; | 958 | added_to_play_count = false; |
239 | 959 | media_half_played_sended = false; | 959 | media_half_played_sended = false; |
241 | 960 | 960 | ||
242 | 961 | update_sensitivities.begin (); | 961 | update_sensitivities.begin (); |
243 | 962 | 962 | ||
244 | 963 | Timeout.add (3000, () => { | 963 | Timeout.add (3000, () => { |
245 | @@ -967,7 +967,7 @@ | |||
246 | 967 | return null; | 967 | return null; |
247 | 968 | }); | 968 | }); |
248 | 969 | } | 969 | } |
250 | 970 | 970 | ||
251 | 971 | return false; | 971 | return false; |
252 | 972 | }); | 972 | }); |
253 | 973 | } | 973 | } |
254 | @@ -985,13 +985,13 @@ | |||
255 | 985 | 985 | ||
256 | 986 | debug ("playback stopped"); | 986 | debug ("playback stopped"); |
257 | 987 | } | 987 | } |
259 | 988 | 988 | ||
260 | 989 | public virtual void playback_started () { | 989 | public virtual void playback_started () { |
261 | 990 | playButton.set_image (new Gtk.Image.from_icon_name ("media-playback-pause-symbolic", Gtk.IconSize.LARGE_TOOLBAR)); | 990 | playButton.set_image (new Gtk.Image.from_icon_name ("media-playback-pause-symbolic", Gtk.IconSize.LARGE_TOOLBAR)); |
262 | 991 | playButton.set_tooltip_text (_("Pause")); | 991 | playButton.set_tooltip_text (_("Pause")); |
263 | 992 | debug ("playback started"); | 992 | debug ("playback started"); |
264 | 993 | } | 993 | } |
266 | 994 | 994 | ||
267 | 995 | public virtual void playback_paused () { | 995 | public virtual void playback_paused () { |
268 | 996 | playButton.set_image (new Gtk.Image.from_icon_name ("media-playback-start-symbolic", Gtk.IconSize.LARGE_TOOLBAR)); | 996 | playButton.set_image (new Gtk.Image.from_icon_name ("media-playback-start-symbolic", Gtk.IconSize.LARGE_TOOLBAR)); |
269 | 997 | playButton.set_tooltip_text (_("Play")); | 997 | playButton.set_tooltip_text (_("Play")); |
270 | @@ -1115,11 +1115,13 @@ | |||
271 | 1115 | smfc.finished.connect( (cont) => { | 1115 | smfc.finished.connect( (cont) => { |
272 | 1116 | if(cont) { | 1116 | if(cont) { |
273 | 1117 | library_manager.set_music_folder.begin (folder); | 1117 | library_manager.set_music_folder.begin (folder); |
274 | 1118 | main_settings.music_folder = folder; | ||
275 | 1118 | } | 1119 | } |
276 | 1119 | }); | 1120 | }); |
277 | 1120 | } | 1121 | } |
278 | 1121 | else { | 1122 | else { |
279 | 1122 | library_manager.set_music_folder.begin (folder); | 1123 | library_manager.set_music_folder.begin (folder); |
280 | 1124 | main_settings.music_folder = folder; | ||
281 | 1123 | } | 1125 | } |
282 | 1124 | } | 1126 | } |
283 | 1125 | 1127 | ||
284 | @@ -1239,7 +1241,7 @@ | |||
285 | 1239 | if (!main_settings.privacy_mode_enabled ()) { | 1241 | if (!main_settings.privacy_mode_enabled ()) { |
286 | 1240 | main_settings.search_string = searchField.text; | 1242 | main_settings.search_string = searchField.text; |
287 | 1241 | } | 1243 | } |
289 | 1242 | 1244 | ||
290 | 1243 | // Save info pane (context pane) width | 1245 | // Save info pane (context pane) width |
291 | 1244 | saved_state.more_width = info_panel.get_allocated_width (); | 1246 | saved_state.more_width = info_panel.get_allocated_width (); |
292 | 1245 | 1247 |
Apart from the small formatting error indicated inline, this works as expected.