ardour/livetrax
13
0
Fork 0
Code

library downloading: various fixes to GUI

Browse Source
This commit is contained in:
Paul Davis 2022-09-10 15:19:16 -06:00
parent 9cfcca8ba4
commit c7f5c89681
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gtk2_ardour/library_download_dialog.cc
View File

@ -19,6 +19,8 @@
#include <cmath> #include <cmath>
#include <iostream> #include <iostream>
#include <glib/gstdio.h>
#include "pbd/i18n.h" #include "pbd/i18n.h"
#include <glibmm/markup.h> #include <glibmm/markup.h>
@ -85,6 +87,9 @@ LibraryDownloadDialog::add_library (ARDOUR::LibraryDescription const & ld)
(*i)[_columns.license] = ld.license(); (*i)[_columns.license] = ld.license();
(*i)[_columns.size] = ld.size(); (*i)[_columns.size] = ld.size();
(*i)[_columns.installed] = ld.installed(); (*i)[_columns.installed] = ld.installed();
if (ld.installed()) {
std::cerr << ld.name() << " should be installed\n";
}
(*i)[_columns.url] = ld.url(); (*i)[_columns.url] = ld.url();
if (ld.installed()) { if (ld.installed()) {
@ -113,6 +118,10 @@ LibraryDownloadDialog::install (std::string const & path, Gtk::TreePath const &
(*row)[_columns.installed] = false; (*row)[_columns.installed] = false;
(*row)[_columns.install] = _("Install"); (*row)[_columns.install] = _("Install");
} }
/* Always unlink (remove) the downloaded archive */
// ::g_unlink (path.c_str());
} }
@ -122,20 +131,18 @@ LibraryDownloadDialog::download (Gtk::TreePath const & path)
Gtk::TreeModel::iterator row = _model->get_iter (path); Gtk::TreeModel::iterator row = _model->get_iter (path);
std::string url = (*row)[_columns.url]; std::string url = (*row)[_columns.url];
std::cerr << "will download " << url << " to " << Config->get_clip_library_dir() << std::endl;
ARDOUR::Downloader* downloader = new ARDOUR::Downloader (url, ARDOUR::Config->get_clip_library_dir()); ARDOUR::Downloader* downloader = new ARDOUR::Downloader (url, ARDOUR::Config->get_clip_library_dir());
/* setup timer callback to update progressbar */ /* setup timer callback to update progressbar */
Glib::signal_timeout().connect (sigc::bind (sigc::mem_fun (*this, &LibraryDownloadDialog::dl_timer_callback), downloader, path), 40); Glib::signal_timeout().connect (sigc::bind (sigc::mem_fun (*this, &LibraryDownloadDialog::dl_timer_callback), downloader, path), 40);
(*row)[_columns.downloader] = downloader;
/* and go ... */ /* and go ... */
downloader->start (); downloader->start ();
(*row)[_columns.downloader] = downloader;
/* and back to the GUI event loop, though we're modal so not much is possible */ /* and back to the GUI event loop, though we're modal so not much is possible */
} }
@ -149,7 +156,7 @@ LibraryDownloadDialog::dl_timer_callback (Downloader* dl, Gtk::TreePath treepath
*/ */
if (dl->status() == 0) { if (dl->status() == 0) {
(*row)[_columns.progress] = (int) round ((dl->progress() * 100.0)); (*row)[_columns.progress] = (int) round (dl->progress() * 100.0);
return true; /* call again */ return true; /* call again */
} }
@ -183,8 +190,6 @@ LibraryDownloadDialog::display_button_press (GdkEventButton* ev)
Gtk::TreeIter iter = _model->get_iter (path); Gtk::TreeIter iter = _model->get_iter (path);
std::cerr << "Click\n";
string cur = (*iter)[_columns.install]; string cur = (*iter)[_columns.install];
if (cur == _("Install")) { if (cur == _("Install")) {
if (!(*iter)[_columns.installed]) { if (!(*iter)[_columns.installed]) {

2
gtk2_ardour/library_download_dialog.h
View File

@ -65,7 +65,7 @@ class LibraryDownloadDialog : public ArdourDialog
/* these are not displayed */ /* these are not displayed */
Gtk::TreeModelColumn<std::string> url; Gtk::TreeModelColumn<std::string> url;
Gtk::TreeModelColumn<ARDOUR::Downloader*> downloader; Gtk::TreeModelColumn<ARDOUR::Downloader*> downloader;
Gtk::TreeModelColumn<double> progress; Gtk::TreeModelColumn<int> progress;
/* used as tooltip */ /* used as tooltip */
Gtk::TreeModelColumn<std::string> description; Gtk::TreeModelColumn<std::string> description;
}; };