Fix ExportFormatSpecification copy-c'tor

[ardour.git] / gtk2_ardour / export_format_selector.cc

diff --git a/gtk2_ardour/export_format_selector.cc b/gtk2_ardour/export_format_selector.cc
index d3ffce936a67867618724c6df17533f4f602ebfe..cf973b86b3d367f89238a7b58d204020fcb4aa8b 100644 (file)
--- a/gtk2_ardour/export_format_selector.cc
+++ b/gtk2_ardour/export_format_selector.cc
@@ -17,16 +17,16 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-
-#include "export_format_selector.h"
-
-#include "export_format_dialog.h"
+#include <gtkmm/messagedialog.h>
+#include <gtkmm/stock.h>
 
 #include "ardour/export_format_specification.h"
 #include "ardour/export_profile_manager.h"
-#include "ardour/session.h"
 
-#include "i18n.h"
+#include "export_format_selector.h"
+#include "export_format_dialog.h"
+
+#include "pbd/i18n.h"
 
 ExportFormatSelector::ExportFormatSelector () :
   edit_button (Gtk::Stock::EDIT),
@@ -38,13 +38,8 @@ ExportFormatSelector::ExportFormatSelector () :
        pack_start (remove_button, false, false, 3);
        pack_start (new_button, false, false, 3);
 
-       format_combo.set_name ("PaddedButton");
-       edit_button.set_name ("PaddedButton");
-       remove_button.set_name ("PaddedButton");
-       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 */
@@ -96,7 +91,7 @@ ExportFormatSelector::update_format_list ()
                tree_it->set_value (format_cols.label, (*it)->description());
        }
 
-       if (format_combo.get_active_row_number() == -1) {
+       if (format_combo.get_active_row_number() == -1 && format_combo.get_model()->children().size() > 0) {
                format_combo.set_active (0);
        }
 
@@ -123,7 +118,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 ();
                }
@@ -131,11 +126,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);
 }
 
@@ -149,6 +159,9 @@ ExportFormatSelector::open_edit_dialog (bool new_dialog)
                update_format_description ();
                FormatEdited (state->format);
                CriticalSelectionChanged();
+       } else {
+               FormatReverted (state->format);
+               CriticalSelectionChanged();
        }
        return response;
 }