allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Merge branch 'radiosrb' of https://github.com/adiknoth/ardour

Browse Source
This commit is contained in:
Robin Gareus
2013-06-23 18:05:05 +02:00
parent 60e4598aec db7bd7ca58
commit 072e49d324
3 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gtk2_ardour/export_format_selector.cc
View File

@@ -43,7 +43,7 @@ ExportFormatSelector::ExportFormatSelector () :
new_button.set_name ("PaddedButton");
edit_button.signal_clicked().connect (sigc::hide_return (sigc::bind (sigc::mem_fun (*this, &ExportFormatSelector::open_edit_dialog), false)));
remove_button.signal_clicked().connect (sigc::mem_fun (*this, &ExportFormatSelector::remove_format));
remove_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (*this, &ExportFormatSelector::remove_format), true));
new_button.signal_clicked().connect (sigc::mem_fun (*this, &ExportFormatSelector::add_new_format));
/* Format combo */
@@ -122,7 +122,7 @@ ExportFormatSelector::add_new_format ()
FormatPtr new_format = state->format = NewFormat (state->format);
if (open_edit_dialog (true) != Gtk::RESPONSE_APPLY) {
remove_format();
remove_format(false);
if (state->list->empty()) {
state->format.reset ();
}
@@ -130,11 +130,26 @@ ExportFormatSelector::add_new_format ()
}
void
ExportFormatSelector::remove_format ()
ExportFormatSelector::remove_format (bool called_from_button)
{
if (called_from_button) {
Gtk::MessageDialog dialog (_("Do you really want to remove the format?"),
false,
Gtk::MESSAGE_QUESTION,
Gtk::BUTTONS_YES_NO);
if (Gtk::RESPONSE_YES != dialog.run ()) {
/* User has selected "no" or closed the dialog, better
* abort
*/
return;
}
}
FormatPtr remove;
Gtk::TreeModel::iterator it = format_combo.get_active();
remove = it->get_value (format_cols.format);
FormatRemoved (remove);
}

2
gtk2_ardour/export_format_selector.h
View File

@@ -63,7 +63,7 @@ class ExportFormatSelector : public Gtk::HBox, public ARDOUR::SessionHandlePtr
void select_format (FormatPtr f);
void add_new_format ();
void remove_format ();
void remove_format (bool called_from_button = false);
int open_edit_dialog (bool new_dialog = false);
void update_format_combo ();
void update_format_description ();

12
gtk2_ardour/export_preset_selector.cc
View File

@@ -153,6 +153,18 @@ ExportPresetSelector::remove_current ()
{
if (!profile_manager) { return; }
Gtk::MessageDialog dialog (_("Do you really want to remove this preset?"),
false,
Gtk::MESSAGE_QUESTION,
Gtk::BUTTONS_YES_NO);
if (Gtk::RESPONSE_YES != dialog.run ()) {
/* User has selected "no" or closed the dialog, better
* abort
*/
return;
}
profile_manager->remove_preset();
entry.get_entry()->set_text ("");
sync_with_manager ();