projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Create and make default the new rc file ardour2_ui.rc, with new font definitions
[ardour.git] / gtk2_ardour / route_ui.cc
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 102b706d1a2d2d8bef25f283c3fa9083d1099aae..68f6622e35d19a672e13753047aef05e110b41ba 100644 (file)
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -37,7 +37,6 @@
 #include <ardour/diskstream.h>
 
 #include "i18n.h"
-
 using namespace sigc;
 using namespace Gtk;
 using namespace Gtkmm2ext;
@@ -391,14 +390,14 @@ RouteUI::update_rec_display ()
                switch (_session.record_status ()) {
                case Session::Disabled:
                case Session::Enabled:
-                       if (rec_enable_button->get_state() != GTK_STATE_ACTIVE) {
-                               rec_enable_button->set_state (GTK_STATE_ACTIVE);
+                       if (rec_enable_button->get_state() != Gtk::STATE_ACTIVE) {
+                               rec_enable_button->set_state (Gtk::STATE_ACTIVE);
                        }
                        break;
 
                case Session::Recording:
-                       if (rec_enable_button->get_state() != GTK_STATE_SELECTED) {
-                               rec_enable_button->set_state (GTK_STATE_SELECTED);
+                       if (rec_enable_button->get_state() != Gtk::STATE_SELECTED) {
+                               rec_enable_button->set_state (Gtk::STATE_SELECTED);
                        }
                        break;
                }
@@ -422,7 +421,7 @@ RouteUI::build_solo_menu (void)
 
        check = new CheckMenuItem(_("Solo-safe"));
        check->set_active (_route.solo_safe());
-       check->toggled.connect (bind (mem_fun (*this, &RouteUI::toggle_solo_safe), check));
+       check->signal_toggled().connect (bind (mem_fun (*this, &RouteUI::toggle_solo_safe), check));
        _route.solo_safe_changed.connect(bind (mem_fun (*this, &RouteUI::solo_safe_toggle), check));
        items.push_back (CheckMenuElem(*check));
        check->show_all();
@@ -444,28 +443,28 @@ RouteUI::build_mute_menu(void)
        
        check = new CheckMenuItem(_("Pre Fader"));
        init_mute_menu(PRE_FADER, check);
-       check->toggled.connect(bind (mem_fun (*this, &RouteUI::toggle_mute_menu), PRE_FADER, check));
+       check->signal_toggled().connect(bind (mem_fun (*this, &RouteUI::toggle_mute_menu), PRE_FADER, check));
        _route.pre_fader_changed.connect(bind (mem_fun (*this, &RouteUI::pre_fader_toggle), check));
        items.push_back (CheckMenuElem(*check));
        check->show_all();
 
        check = new CheckMenuItem(_("Post Fader"));
        init_mute_menu(POST_FADER, check);
-       check->toggled.connect(bind (mem_fun (*this, &RouteUI::toggle_mute_menu), POST_FADER, check));
+       check->signal_toggled().connect(bind (mem_fun (*this, &RouteUI::toggle_mute_menu), POST_FADER, check));
        _route.post_fader_changed.connect(bind (mem_fun (*this, &RouteUI::post_fader_toggle), check));
        items.push_back (CheckMenuElem(*check));
        check->show_all();
        
        check = new CheckMenuItem(_("Control Outs"));
        init_mute_menu(CONTROL_OUTS, check);
-       check->toggled.connect(bind (mem_fun (*this, &RouteUI::toggle_mute_menu), CONTROL_OUTS, check));
+       check->signal_toggled().connect(bind (mem_fun (*this, &RouteUI::toggle_mute_menu), CONTROL_OUTS, check));
        _route.control_outs_changed.connect(bind (mem_fun (*this, &RouteUI::control_outs_toggle), check));
        items.push_back (CheckMenuElem(*check));
        check->show_all();
 
        check = new CheckMenuItem(_("Main Outs"));
        init_mute_menu(MAIN_OUTS, check);
-       check->toggled.connect(bind (mem_fun (*this, &RouteUI::toggle_mute_menu), MAIN_OUTS, check));
+       check->signal_toggled().connect(bind (mem_fun (*this, &RouteUI::toggle_mute_menu), MAIN_OUTS, check));
        _route.main_outs_changed.connect(bind (mem_fun (*this, &RouteUI::main_outs_toggle), check));
        items.push_back (CheckMenuElem(*check));
        check->show_all();
@@ -565,15 +564,14 @@ bool
 RouteUI::choose_color()
 {
        bool picked;
-       GdkColor color;
-       gdouble current[4];
+       Gdk::Color color;
+       Gdk::Color current;
 
-       current[0] = _color.get_red()  / 65535.0;
-       current[1] = _color.get_green() / 65535.0;
-       current[2] = _color.get_blue() / 65535.0;
-       current[3] = 1.0;
+       current.set_red ( _color.get_red()  / 65535);
+       current.set_green (_color.get_green() / 65535);
+       current.set_blue (_color.get_blue() / 65535);
 
-       color = Gtkmm2ext::UI::instance()->get_color (_("ardour: color selection"), picked, current);
+       color = Gtkmm2ext::UI::instance()->get_color (_("ardour: color selection"), picked, &current);
 
        if (picked) {
                set_color (color);
@@ -583,14 +581,14 @@ RouteUI::choose_color()
 }
 
 void
-RouteUI::set_color (Gdk_Color c)
+RouteUI::set_color (Gdk::Color c)
 {
        char buf[64];
        
        _color = c;
        
        ensure_xml_node ();
-       snprintf (buf, sizeof (buf), "%d:%d:%d", c.red, c.green, c.blue);
+       snprintf (buf, sizeof (buf), "%d:%d:%d", c.get_red(), c.get_green(), c.get_blue());
        xml_node->add_property ("color", buf);
 
         _route.gui_changed ("color", (void *) 0); /* EMIT_SIGNAL */
@@ -634,9 +632,9 @@ RouteUI::set_color_from_route ()
        if ((prop = xml_node->property ("color")) != 0) {
                int r, g, b;
                sscanf (prop->value().c_str(), "%d:%d:%d", &r, &g, &b);
-               _color.red = r;
-               _color.green = g;
-               _color.blue = b;
+               _color.set_red(r);
+               _color.set_green(g);
+               _color.set_blue(b);
                return 0;
        } 
        return 1;
@@ -649,9 +647,9 @@ RouteUI::remove_this_route ()
        string prompt;
 
        if (is_audio_track()) {
-               prompt  = compose (_("Do you really want to remove track \"%1\" ?\nYou may also lose the playlist used by this track.\n(cannot be undone)"), _route.name());
+               prompt  = string_compose (_("Do you really want to remove track \"%1\" ?\nYou may also lose the playlist used by this track.\n(cannot be undone)"), _route.name());
        } else {
-               prompt  = compose (_("Do you really want to remove bus \"%1\" ?\n(cannot be undone)"), _route.name());
+               prompt  = string_compose (_("Do you really want to remove bus \"%1\" ?\n(cannot be undone)"), _route.name());
        }
 
        choices.push_back (_("Yes, remove it."));
@@ -659,13 +657,13 @@ RouteUI::remove_this_route ()
 
        Choice prompter (prompt, choices);
 
-       prompter.chosen.connect (Gtk::Main::quit.slot());
+       prompter.chosen.connect(sigc::ptr_fun(Gtk::Main::quit));
        prompter.show_all ();
 
        Gtk::Main::run ();
 
        if (prompter.get_choice() == 0) {
-               Main::idle.connect (bind (mem_fun (&RouteUI::idle_remove_this_route), this));
+         Glib::signal_idle().connect (bind (sigc::ptr_fun (&RouteUI::idle_remove_this_route), this));
        }
 }
 
@@ -688,26 +686,24 @@ void
 RouteUI::route_rename ()
 {
        ArdourPrompter name_prompter (true);
+       string result;
        name_prompter.set_prompt (_("new name: "));
        name_prompter.set_initial_text (_route.name());
-       name_prompter.done.connect (Gtk::Main::quit.slot());
        name_prompter.show_all ();
 
-       Gtk::Main::run();
-
-       if (name_prompter.status == Gtkmm2ext::Prompter::cancelled) {
-               return;
-       }
-       
-       string result;
-       name_prompter.get_result (result);
+       switch (name_prompter.run ()) {
 
-       if (result.length() == 0) {
-               return;
+       case GTK_RESPONSE_ACCEPT:
+               name_prompter.get_result (result);
+               if (result.length()) {
+                       strip_whitespace_edges (result);
+                       _route.set_name (result, this);
+               }       
+               break;
        }
 
-       strip_whitespace_edges (result);
-       _route.set_name (result, this);
+       return;
+  
 }
 
 void
Unnamed repository; edit this file 'description' to name the repository.