add variant of Rect::expand() that allows different amounts in each direction

[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 122facdd39d8affa4e3de581c1477c145f4e850b..c77a09cdec08e1248e24afe6fb7cf879fd0ba649 100644 (file)
--- a/gtk2_ardour/export_format_selector.cc
+++ b/gtk2_ardour/export_format_selector.cc
@@ -24,9 +24,8 @@
 
 #include "ardour/export_format_specification.h"
 #include "ardour/export_profile_manager.h"
-#include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 ExportFormatSelector::ExportFormatSelector () :
   edit_button (Gtk::Stock::EDIT),
@@ -38,22 +37,18 @@ 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 */
-       
+
        format_list = Gtk::ListStore::create (format_cols);
+        format_list->set_sort_column (format_cols.label, Gtk::SORT_ASCENDING);
        format_combo.set_model (format_list);
        format_combo.pack_start (format_cols.label);
        format_combo.set_active (0);
-       
+
        format_combo.signal_changed().connect (sigc::mem_fun (*this, &ExportFormatSelector::update_format_combo));
 }
 
@@ -65,9 +60,10 @@ ExportFormatSelector::~ExportFormatSelector ()
 void
 ExportFormatSelector::set_state (ARDOUR::ExportProfileManager::FormatStatePtr const state_, ARDOUR::Session * session_)
 {
-       session = session_;
+       SessionHandlePtr::set_session (session_);
+
        state = state_;
-       
+
        update_format_list ();
 }
 
@@ -94,10 +90,10 @@ 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);
        }
-       
+
        select_format (format_to_select);
 }
 
@@ -111,7 +107,7 @@ ExportFormatSelector::select_format (FormatPtr f)
                        break;
                }
        }
-       
+
        CriticalSelectionChanged();
 }
 
@@ -119,9 +115,9 @@ void
 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 ();
                }
@@ -129,11 +125,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);
 }
 
@@ -141,7 +152,7 @@ int
 ExportFormatSelector::open_edit_dialog (bool new_dialog)
 {
        ExportFormatDialog dialog (state->format, new_dialog);
-       dialog.set_session (session);
+       dialog.set_session (_session);
        Gtk::ResponseType response = (Gtk::ResponseType) dialog.run();
        if (response == Gtk::RESPONSE_APPLY) {
                update_format_description ();
@@ -163,7 +174,7 @@ ExportFormatSelector::update_format_combo ()
                edit_button.set_sensitive (false);
                remove_button.set_sensitive (false);
        }
-       
+
        CriticalSelectionChanged();
 }