add a Restore Defaults button to the theme manager, and another set of waveform changes

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2949 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 11 insertions, 6 deletions

diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc
index b4524f9cc6..78574542d6 100644
--- a/gtk2_ardour/ui_config.cc
+++ b/gtk2_ardour/ui_config.cc
@@ -54,16 +54,15 @@ UIConfiguration::~UIConfiguration ()
 }
 
 int
-UIConfiguration::load_state ()
+UIConfiguration::load_defaults ()
 {
-	bool found = false;
-
+	int found = 0;
 	std::string rcfile = find_config_file ("ardour2_ui_default.conf");
 	
 	if (rcfile.length())
 	{
 		XMLTree tree;
-		found = true;
+		found = 1;
 
 		cerr << string_compose (_("loading default ui configuration file %1"), rcfile) << endl;
 		
@@ -77,8 +76,14 @@ UIConfiguration::load_state ()
 			return -1;
 		}
 	}
-
-	rcfile = find_config_file ("ardour2_ui.conf");
+	return found;
+}
+	
+int
+UIConfiguration::load_state ()
+{
+	int found = load_defaults ();
+	std::string rcfile = find_config_file ("ardour2_ui.conf");
 
 	if (rcfile.length())
 	{