Visual tweaks to Soundcloud panel

Re-arrange the items in the Soundcloud panel into a more sensible order &
arrangement, and add a (not-yet functional) tick-box to set the uploaded
files to be downloadable.

6 files changed, 18 insertions, 11 deletions

diff --git a/gtk2_ardour/soundcloud_export_selector.cc b/gtk2_ardour/soundcloud_export_selector.cc
index 1ecab514ab..ab1f1a63c8 100644
--- a/gtk2_ardour/soundcloud_export_selector.cc
+++ b/gtk2_ardour/soundcloud_export_selector.cc
@@ -40,15 +40,17 @@ using namespace PBD;
 
 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");
@@ -63,7 +65,7 @@ SoundcloudExportSelector::SoundcloudExportSelector() :
 	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);
@@ -71,12 +73,13 @@ SoundcloudExportSelector::SoundcloudExportSelector() :
 	//		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 (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();
diff --git a/gtk2_ardour/soundcloud_export_selector.h b/gtk2_ardour/soundcloud_export_selector.h
index 87222fcf5e..0ee6fbeb01 100644
--- a/gtk2_ardour/soundcloud_export_selector.h
+++ b/gtk2_ardour/soundcloud_export_selector.h
@@ -24,16 +24,18 @@ class SoundcloudExportSelector : public Gtk::VBox, public ARDOUR::SessionHandleP
 	std::string password () { return soundcloud_password_entry.get_text (); }
 	bool make_public  () { return soundcloud_public_checkbox.get_active (); }
 	bool open_page    () { return soundcloud_open_checkbox.get_active (); }
+	bool downloadable () { return soundcloud_download_checkbox.get_active (); }
 	void cancel () { soundcloud_cancel = true; }
 
   private:
 	Gtk::Table  sc_table;
-	Gtk::CheckButton soundcloud_public_checkbox;
 	Gtk::Label soundcloud_username_label;
 	Gtk::Entry soundcloud_username_entry;
 	Gtk::Label soundcloud_password_label;
 	Gtk::Entry soundcloud_password_entry;
+	Gtk::CheckButton soundcloud_public_checkbox;
 	Gtk::CheckButton soundcloud_open_checkbox;
+	Gtk::CheckButton soundcloud_download_checkbox;
 	bool soundcloud_cancel;
 	Gtk::ProgressBar progress_bar;
 	
diff --git a/libs/ardour/ardour/export_handler.h b/libs/ardour/ardour/export_handler.h
index 082ebbcc49..8336cea732 100644
--- a/libs/ardour/ardour/export_handler.h
+++ b/libs/ardour/ardour/export_handler.h
@@ -118,6 +118,7 @@ class LIBARDOUR_API ExportHandler : public ExportElementFactory, public sigc::tr
 	std::string soundcloud_password;
 	bool soundcloud_make_public;
 	bool soundcloud_open_page;
+	bool soundcloud_downloadable;
 
   private:
 
diff --git a/libs/ardour/ardour/soundcloud_upload.h b/libs/ardour/ardour/soundcloud_upload.h
index 6b8700e784..c1074f016b 100644
--- a/libs/ardour/ardour/soundcloud_upload.h
+++ b/libs/ardour/ardour/soundcloud_upload.h
@@ -35,7 +35,7 @@ public:
 	~SoundcloudUploader();
 
 	std::string	Get_Auth_Token(std::string username, std::string password);
-	std::string Upload (std::string file_path, std::string title, std::string token, bool ispublic, ARDOUR::ExportHandler *caller);
+	std::string Upload (std::string file_path, std::string title, std::string token, bool ispublic, bool downloadable, ARDOUR::ExportHandler *caller);
 	static int progress_callback(void *caller, double dltotal, double dlnow, double ultotal, double ulnow);
 
 
diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc
index 3865bb205a..ed799512b9 100644
--- a/libs/ardour/export_handler.cc
+++ b/libs/ardour/export_handler.cc
@@ -360,6 +360,7 @@ ExportHandler::finish_timespan ()
 					PBD::basename_nosuffix(filename), // title
 					token,
 					soundcloud_make_public,
+					soundcloud_downloadable,
 					this);
 
 			if (path.length() != 0) {
diff --git a/libs/ardour/soundcloud_upload.cc b/libs/ardour/soundcloud_upload.cc
index f003d5ab65..6fe32663f8 100644
--- a/libs/ardour/soundcloud_upload.cc
+++ b/libs/ardour/soundcloud_upload.cc
@@ -155,7 +155,7 @@ SoundcloudUploader::progress_callback(void *caller, double dltotal, double dlnow
 
 
 std::string
-SoundcloudUploader::Upload(std::string file_path, std::string title, std::string token, bool ispublic, ARDOUR::ExportHandler *caller)
+SoundcloudUploader::Upload(std::string file_path, std::string title, std::string token, bool ispublic, bool downloadable, ARDOUR::ExportHandler *caller)
 {
 	int still_running;