Converted to the SequenceName dialog to a generic name chooser dialog:

NameChooser

src/gui/Makefile.am

@@ -96,8 +96,8 @@ libgui_la_SOURCES =															\
 	$(lumigui_srcdir)/dialogs/render.hpp									\
 	$(lumigui_srcdir)/dialogs/preferences-dialog.cpp						\
 	$(lumigui_srcdir)/dialogs/preferences-dialog.hpp						\
-	$(lumigui_srcdir)/dialogs/sequence-name.cpp								\
+	$(lumigui_srcdir)/dialogs/name-chooser.cpp								\
-	$(lumigui_srcdir)/dialogs/sequence-name.hpp								\
+	$(lumigui_srcdir)/dialogs/name-chooser.hpp								\
 	$(lumigui_srcdir)/panels/panel.cpp										\
 	$(lumigui_srcdir)/panels/panel.hpp										\
 	$(lumigui_srcdir)/panels/timeline-panel.cpp								\

src/gui/dialogs/name-chooser.cpp

@@ -21,7 +21,7 @@
 * *****************************************************/
 
 #include "../gtk-lumiera.hpp"
-#include "sequence-name.hpp"
+#include "name-chooser.hpp"
 #include "dialog.hpp"
 
 using namespace Gtk;
@@ -30,28 +30,13 @@ using namespace Glib;
 namespace gui {
 namespace dialogs {
 
-SequenceName::SequenceName(Window &parent, Action action,
+NameChooser::NameChooser(Window &parent, Glib::ustring title,
-  ustring default_title) :
+    Glib::ustring default_name) :
-  Dialog::Dialog("", parent, true),
+  Dialog::Dialog(title, parent, true),
   caption(_("Name:"))
 {
-  // Choose the dialog title
-  ustring title;
-  
-  switch(action)
-  {
-  case AddSequence: title = _("Add Sequence"); break;
-  case RenameSequence: title = _("Rename Sequence"); break;
-   
-  default:
-    ASSERT(0); // An invalid action value was supplied
-    break;
-  }
-    
-  set_title(title);
-
   // Add the controls
-  name.set_text(default_title);
+  name.set_text(default_name);
   name.set_activates_default();
   
   hBox.pack_start(caption);
@@ -75,7 +60,7 @@ SequenceName::SequenceName(Window &parent, Action action,
   show_all_children();
 }
 
-const Glib::ustring SequenceName::get_name() const
+const Glib::ustring NameChooser::get_name() const
 {
   return name.get_text();
 }

src/gui/dialogs/name-chooser.hpp

@@ -33,9 +33,9 @@ namespace gui {
 namespace dialogs {
 
 /** 
- * The defintion of sequence name dialog class
+ * The defintion of the name chooser dialog class
  */
-class SequenceName : public Gtk::Dialog
+class NameChooser : public Gtk::Dialog
 {
 public:
 
@@ -46,8 +46,9 @@ public:
   };
   
 public:
-  SequenceName(Gtk::Window &parent, SequenceName::Action action,
+
-    Glib::ustring default_title);
+  NameChooser(Gtk::Window &parent, Glib::ustring title,
+    Glib::ustring default_name);
     
   const Glib::ustring get_name() const;
 

src/gui/workspace/actions.cpp

@@ -25,7 +25,7 @@
 
 #include "../dialogs/render.hpp"
 #include "../dialogs/preferences-dialog.hpp"
-#include "../dialogs/sequence-name.hpp"
+#include "../dialogs/name-chooser.hpp"
 
 #include "../model/project.hpp"
 
@@ -185,8 +185,8 @@ Actions::on_menu_view_viewer()
 void
 Actions::on_menu_sequence_add()
 {
-  dialogs::SequenceName dialog(workspaceWindow,
+  dialogs::NameChooser dialog(workspaceWindow,
-    dialogs::SequenceName::AddSequence, "New Sequence");
+    _("Add Sequence"), _("New Sequence"));
   if(dialog.run() == RESPONSE_OK)
     workspaceWindow.get_project()->add_new_sequence(dialog.get_name());
 }