basic adoption of new mouse binding facility

[ardour.git] / gtk2_ardour / ui_config.cc

diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc
index d541a49b772f0d3b0a6869a3f77f60632ce5a3f4..b61ef1b5516b0c24e0b408406f21cd6472b1eb39 100644 (file)
--- a/gtk2_ardour/ui_config.cc
+++ b/gtk2_ardour/ui_config.cc
@@ -71,8 +71,9 @@ UIConfiguration::load_defaults ()
        } else {
                rcfile = "ardour3_ui_default.conf";
        }
-       if ( !find_file_in_search_path (ardour_search_path() + system_config_search_path(),
-                                       rcfile, default_ui_rc_file) )
+
+       if (find_file_in_search_path (ardour_search_path() + system_config_search_path(),
+                                     rcfile, default_ui_rc_file) )
        {
                XMLTree tree;
                found = 1;
@@ -82,15 +83,16 @@ UIConfiguration::load_defaults ()
                info << string_compose (_("Loading default ui configuration file %1"), rcfile) << endl;
 
                if (!tree.read (rcfile.c_str())) {
-                       error << string_compose(_("Ardour: cannot read default ui configuration file \"%1\""), rcfile) << endmsg;
+                       error << string_compose(_("cannot read default ui configuration file \"%1\""), rcfile) << endmsg;
                        return -1;
                }
 
                if (set_state (*tree.root(), Stateful::loading_state_version)) {
-                       error << string_compose(_("Ardour: default ui configuration file \"%1\" not loaded successfully."), rcfile) << endmsg;
+                       error << string_compose(_("default ui configuration file \"%1\" not loaded successfully."), rcfile) << endmsg;
                        return -1;
                }
        }
+               
        return found;
 }
 
@@ -112,12 +114,12 @@ UIConfiguration::load_state ()
                info << string_compose (_("Loading default ui configuration file %1"), rcfile) << endl;
 
                if (!tree.read (rcfile.c_str())) {
-                       error << string_compose(_("Ardour: cannot read default ui configuration file \"%1\""), rcfile) << endmsg;
+                       error << string_compose(_("cannot read default ui configuration file \"%1\""), rcfile) << endmsg;
                        return -1;
                }
 
                if (set_state (*tree.root(), Stateful::loading_state_version)) {
-                       error << string_compose(_("Ardour: default ui configuration file \"%1\" not loaded successfully."), rcfile) << endmsg;
+                       error << string_compose(_("default ui configuration file \"%1\" not loaded successfully."), rcfile) << endmsg;
                        return -1;
                }
        }
@@ -132,21 +134,21 @@ UIConfiguration::load_state ()
 
                string rcfile = user_ui_rc_file.to_string();
 
-               info << string_compose (_("Loading user ui configuration file %1"), rcfile) << endl;
+               info << string_compose (_("Loading user ui configuration file %1"), rcfile) << endmsg;
 
                if (!tree.read (rcfile)) {
-                       error << string_compose(_("Ardour: cannot read ui configuration file \"%1\""), rcfile) << endmsg;
+                       error << string_compose(_("cannot read ui configuration file \"%1\""), rcfile) << endmsg;
                        return -1;
                }
 
                if (set_state (*tree.root(), Stateful::loading_state_version)) {
-                       error << string_compose(_("Ardour: user ui configuration file \"%1\" not loaded successfully."), rcfile) << endmsg;
+                       error << string_compose(_("user ui configuration file \"%1\" not loaded successfully."), rcfile) << endmsg;
                        return -1;
                }
        }
 
        if (!found)
-               error << "Ardour: could not find any ui configuration file, canvas will look broken." << endmsg;
+               error << _("could not find any ui configuration file, canvas will look broken.") << endmsg;
 
        pack_canvasvars();
        return 0;