diff options
author | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2013-03-15 19:59:19 +0000 |
---|---|---|
committer | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2013-03-17 12:33:59 +0000 |
commit | 2233e91086c01eeaf4d023db4e305944bc4565e6 (patch) | |
tree | 34f7a9254a946d853eb8844a79276d801915d1cf /gtk2_ardour/sfdb_ui.h | |
parent | 8cbb9727e959a744057de387a293aecdce09a62c (diff) |
Freesound fixes for #5853, and a few other small improvements
Add a 'More' button to load the next page of results without clearing the already-found list.
Don't allow cancellation of searches, and don't update progress bar around searches, since we only get one page at a time now.
Show number of pages of results remaining to download in the tooltip of the 'More' button.
Use a new Mootcher object for each request, to avoid bad things happening when clicking in the Freesound search results list while a search or file download is already in progress.
Make the 'Stop' button insensitive except when it will actually stop the download of a sound file.
Only retrieve one page worth of data per search, rather than looping to get all pages.
Don't show an error in the log window if the user cancelled download.
Request 100 items per page, rather than the default 30.
Fix DOS line endings.
Diffstat (limited to 'gtk2_ardour/sfdb_ui.h')
-rw-r--r-- | gtk2_ardour/sfdb_ui.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/gtk2_ardour/sfdb_ui.h b/gtk2_ardour/sfdb_ui.h index 6992bc5fcd..bed800ad73 100644 --- a/gtk2_ardour/sfdb_ui.h +++ b/gtk2_ardour/sfdb_ui.h @@ -149,6 +149,7 @@ class SoundFileBrowser : public ArdourWindow FreesoundColumns freesound_list_columns; Glib::RefPtr<Gtk::ListStore> freesound_list; + Gtk::Button freesound_more_btn; Gtk::Button freesound_stop_btn; public: @@ -173,21 +174,15 @@ class SoundFileBrowser : public ArdourWindow Gtk::Entry freesound_entry; Gtk::ComboBoxText freesound_sort; - Gtk::SpinButton freesound_page; - + Gtk::Button freesound_search_btn; Gtk::TreeView freesound_list_view; Gtk::ProgressBar freesound_progress_bar; - bool freesound_search_cancel; bool freesound_download_cancel; void freesound_search(); -#ifdef FREESOUND - Mootcher *mootcher; -#endif - protected: bool resetting_ourselves; int matches; @@ -228,7 +223,9 @@ class SoundFileBrowser : public ArdourWindow void freesound_list_view_selected (); void freesound_list_view_activated (const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn*); void freesound_search_clicked (); + void freesound_more_clicked (); void freesound_stop_clicked (); + int freesound_page; void chooser_file_activated (); |