X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fsoundcloud_export_selector.cc;h=4a7b1849b1607d86a22b4b3d02088eb1095b79d1;hb=bf874562ef14368a5648215b6dc71936f1c3b33e;hp=1ecab514ab27b024403b50597a1c493103f116ef;hpb=95ccbc452f513a9d6f70de45bc413067e568364c;p=ardour.git

diff --git a/gtk2_ardour/soundcloud_export_selector.cc b/gtk2_ardour/soundcloud_export_selector.cc
index 1ecab514ab..4a7b1849b1 100644
--- a/gtk2_ardour/soundcloud_export_selector.cc
+++ b/gtk2_ardour/soundcloud_export_selector.cc
@@ -20,6 +20,9 @@
 
 
 *************************************************************************************/
+#include <gtkmm/frame.h>
+
+#include "ardour/debug.h"
 #include "ardour/soundcloud_upload.h"
 #include "soundcloud_export_selector.h"
 
@@ -29,64 +32,66 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <iostream>
-#include <glib/gstdio.h>
+#include "pbd/gstdio_compat.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 
 #include "ardour/session_metadata.h"
 #include "utils.h"
 
-SoundcloudExportSelector::SoundcloudExportSelector() :
+SoundcloudExportSelector::SoundcloudExportSelector () :
 	  sc_table (4, 3),
-	  soundcloud_public_checkbox (_("Make file(s) public")),
 	  soundcloud_username_label (_("User Email"), 1.0, 0.5),
 	  soundcloud_password_label (_("Password"), 1.0, 0.5),
+	  soundcloud_public_checkbox (_("Make files public")),
 	  soundcloud_open_checkbox (_("Open uploaded files in browser")),
+	  soundcloud_download_checkbox (_("Make files downloadable")),
 	  progress_bar()
 {
 
 
 	soundcloud_public_checkbox.set_name ("ExportCheckbox");
+	soundcloud_download_checkbox.set_name ("ExportCheckbox");
 	soundcloud_username_label.set_name ("ExportFormatLabel");
 	soundcloud_username_entry.set_name ("ExportFormatDisplay");
 	soundcloud_password_label.set_name ("ExportFormatLabel");
 	soundcloud_password_entry.set_name ("ExportFormatDisplay");
 
 	soundcloud_username_entry.set_text (ARDOUR::SessionMetadata::Metadata()->user_email());
-	soundcloud_password_entry.set_visibility(false);
+	soundcloud_password_entry.set_visibility (false);
 
-	Gtk::Frame *sc_frame = manage(new Gtk::Frame);
-	sc_frame->set_border_width(4);
-	sc_frame->set_shadow_type(Gtk::SHADOW_ETCHED_OUT);
-	sc_frame->set_name("soundcloud_export_box");
-	pack_start(*sc_frame, false, false);
+	Gtk::Frame *sc_frame = manage (new Gtk::Frame);
+	sc_frame->set_border_width (4);
+	sc_frame->set_shadow_type (Gtk::SHADOW_ETCHED_OUT);
+	sc_frame->set_name ("soundcloud_export_box");
+	pack_start (*sc_frame, false, false);
 
-	sc_table.set_border_width(4);
+	sc_table.set_border_width (4);
 	sc_table.set_col_spacings (5);
 	sc_table.set_row_spacings (5);
 	sc_frame->add (sc_table);
 
-	//		sc_table.attach ( *( manage (new EventBox (::get_icon (X_("soundcloud"))))) , 0, 1,  0, 1);
-	sc_table.attach ( *(Gtk::manage (new Gtk::Image (get_icon (X_("soundcloud"))))) , 0, 1,  0, 2);
+	sc_table.attach ( *(Gtk::manage (new Gtk::Image (ARDOUR_UI_UTILS::get_icon (X_("soundcloud"))))) , 0, 1,  0, 2);
 
-	sc_table.attach (soundcloud_public_checkbox, 2, 3,  1, 2);
-	sc_table.attach (soundcloud_username_label, 0, 1,  3, 4);
-	sc_table.attach (soundcloud_username_entry, 1, 3,  3, 4);
-	sc_table.attach (soundcloud_password_label, 0, 1,  5, 6);
-	sc_table.attach (soundcloud_password_entry, 1, 3,  5, 6);
-	sc_table.attach (soundcloud_open_checkbox, 2, 3,  7, 8);
+	sc_table.attach (soundcloud_username_label,    0, 1,  1, 2);
+	sc_table.attach (soundcloud_username_entry,    1, 3,  1, 2);
+	sc_table.attach (soundcloud_password_label,    0, 1,  2, 3);
+	sc_table.attach (soundcloud_password_entry,    1, 3,  2, 3);
+	sc_table.attach (soundcloud_public_checkbox,   2, 3,  3, 4);
+	sc_table.attach (soundcloud_open_checkbox,     2, 3,  4, 5);
+	sc_table.attach (soundcloud_download_checkbox, 2, 3,  5, 6);
 
-	pack_end(progress_bar, false, false);
-	sc_frame->show_all();
+	pack_end (progress_bar, false, false);
+	sc_frame->show_all ();
 }
 
 
 int
-SoundcloudExportSelector::do_progress_callback(double ultotal, double ulnow, const std::string &filename)
+SoundcloudExportSelector::do_progress_callback (double ultotal, double ulnow, const std::string &filename)
 {
-	std::cerr << "SoundcloudExportSelector::do_progress_callback(" << ultotal << ", " << ulnow << ", " << filename << ")..." << std::endl; 
+	DEBUG_TRACE (DEBUG::Soundcloud, string_compose ("SoundcloudExportSelector::do_progress_callback(%1, %2, %3)\n", ultotal, ulnow, filename));
 	if (soundcloud_cancel) {
 		progress_bar.set_fraction (0);
 		// cancel_button.set_label ("");
@@ -102,9 +107,8 @@ SoundcloudExportSelector::do_progress_callback(double ultotal, double ulnow, con
 
 	std::string prog;
 	prog = string_compose (_("%1: %2 of %3 bytes uploaded"), filename, ulnow, ultotal);
-	progress_bar.set_text( prog );
+	progress_bar.set_text (prog);
 
 
 	return 0;
 }
-