add theme files to default target, and install using target names

git-svn-id: svn://localhost/ardour2/trunk@2222 d708f5d6-7413-0410-9779-e7cbd77b26cf

gtk2_ardour/SConscript

@@ -282,6 +282,82 @@ itest = gtkardour.Program(target = 'itest', source = itest_files)
 rcu = gtkardour.Program(target = 'rcu', source = rcu_files)
 tt = gtkmmtests.Program(target = 'tt', source = tt_files)
 
+my_font_dict = { }
+
+if gtkardour['DIST_TARGET'] == 'panther' or gtkardour['DIST_TARGET'] == 'tiger':
+	#
+	# OS X font rendering is different even with X11
+	#
+	my_font_dict['%FONT_TINY%'] = 'sans 7'
+	my_font_dict['%FONT_SMALLER%'] = 'sans 9'
+	my_font_dict['%FONT_SMALL%'] = 'sans 10'
+	my_font_dict['%FONT_NORMAL%'] = 'sans 11'
+	my_font_dict['%FONT_BIG%'] = 'sans 15'
+	my_font_dict['%FONT_BIGGER%'] = 'sans 16'
+	my_font_dict['%FONT_LARGE%'] = 'sans 20'
+	my_font_dict['%FONT_LARGER%'] = 'sans 28'
+	my_font_dict['%FONT_HUGER%'] = 'sans 36'
+	my_font_dict['%FONT_MASSIVE%'] = 'sans 60'
+	my_font_dict['%FONT_BOLD_TINY%'] = 'sans bold 7'
+	my_font_dict['%FONT_BOLD_SMALLER%'] = 'sans bold 9'
+	my_font_dict['%FONT_BOLD_SMALL%'] = 'sans bold 10'
+	my_font_dict['%FONT_BOLD_NORMAL%'] = 'sans bold 11'
+	my_font_dict['%FONT_BOLD_BIG%'] = 'sans bold 15'
+	my_font_dict['%FONT_BOLD_BIGGER%'] = 'sans bold 16'
+	my_font_dict['%FONT_BOLD_LARGE%'] = 'sans bold 20'
+	my_font_dict['%FONT_BOLD_LARGER%'] = 'sans bold 28'
+	my_font_dict['%FONT_BOLD_HUGER%'] = 'sans bold 36'
+	my_font_dict['%FONT_BOLD_MASSIVE%'] = 'sans bold 60'
+	my_font_dict['%FONT_ITALIC_TINY%'] = 'sans italic 7'
+	my_font_dict['%FONT_ITALIC_SMALLER%'] = 'sans italic 9'
+	my_font_dict['%FONT_ITALIC_SMALL%'] = 'sans italic 10'
+	my_font_dict['%FONT_ITALIC_NORMAL%'] = 'sans italic 11'
+	my_font_dict['%FONT_ITALIC_BIG%'] = 'sans italic 15'
+	my_font_dict['%FONT_ITALIC_BIGGER%'] = 'sans italic 16'
+	my_font_dict['%FONT_ITALIC_LARGE%'] = 'sans italic 20'
+	my_font_dict['%FONT_ITALIC_LARGER%'] = 'sans italic 28'
+	my_font_dict['%FONT_ITALIC_HUGER%'] = 'sans italic 36'
+	my_font_dict['%FONT_ITALIC_MASSIVE%'] = 'sans italic 60'
+else:
+	#
+	# Linux/X11 font rendering
+	#
+	my_font_dict['%FONT_TINY%'] = 'sans 4'
+	my_font_dict['%FONT_SMALLER%'] = 'sans 6'
+	my_font_dict['%FONT_SMALL%'] = 'sans 7'
+	my_font_dict['%FONT_NORMAL%'] = 'sans 8'
+	my_font_dict['%FONT_BIG%'] = 'sans 12'
+	my_font_dict['%FONT_BIGGER%'] = 'sans 14'
+	my_font_dict['%FONT_LARGE%'] = 'sans 18'
+	my_font_dict['%FONT_LARGER%'] = 'sans 24'
+	my_font_dict['%FONT_HUGER%'] = 'sans 34'
+	my_font_dict['%FONT_MASSIVE%'] = 'sans 60'
+	my_font_dict['%FONT_BOLD_TINY%'] = 'sans bold 4'
+	my_font_dict['%FONT_BOLD_SMALLER%'] = 'sans bold 6'
+	my_font_dict['%FONT_BOLD_SMALL%'] = 'sans bold 7'
+	my_font_dict['%FONT_BOLD_NORMAL%'] = 'sans bold 8'
+	my_font_dict['%FONT_BOLD_BIG%'] = 'sans bold 12'
+	my_font_dict['%FONT_BOLD_BIGGER%'] = 'sans bold 14'
+	my_font_dict['%FONT_BOLD_LARGE%'] = 'sans bold 18'
+	my_font_dict['%FONT_BOLD_LARGER%'] = 'sans bold 24'
+	my_font_dict['%FONT_BOLD_HUGE%'] = 'sans bold 25'
+	my_font_dict['%FONT_BOLD_HUGER%'] = 'sans bold 34'
+	my_font_dict['%FONT_BOLD_MASSIVE%'] = 'sans bold 60'
+	my_font_dict['%FONT_ITALIC_TINY%'] = 'sans italic 4'
+	my_font_dict['%FONT_ITALIC_SMALLER%'] = 'sans italic 6'
+	my_font_dict['%FONT_ITALIC_SMALL%'] = 'sans italic 7'
+	my_font_dict['%FONT_ITALIC_NORMAL%'] = 'sans italic 8'
+	my_font_dict['%FONT_ITALIC_BIG%'] = 'sans italic 12'
+	my_font_dict['%FONT_ITALIC_BIGGER%'] = 'sans italic 14'
+	my_font_dict['%FONT_ITALIC_LARGE%'] = 'sans italic 18'
+	my_font_dict['%FONT_ITALIC_LARGER%'] = 'sans italic 24'
+	my_font_dict['%FONT_ITALIC_HUGE%'] = 'sans italic 25'
+	my_font_dict['%FONT_ITALIC_HUGER%'] = 'sans italic 34'
+	my_font_dict['%FONT_ITALIC_MASSIVE%'] = 'sans italic 60'
+
+ardour_dark_theme = env.SubstInFile ('ardour2_ui_dark.rc', 'ardour2_ui_dark.rc.in', SUBST_DICT = my_font_dict)
+ardour_light_theme = env.SubstInFile ('ardour2_ui_light.rc', 'ardour2_ui_light.rc.in', SUBST_DICT = my_font_dict)
+
 my_subst_dict = { }
 
 #
@@ -303,6 +379,8 @@ env.AddPostAction (ardourdev, Chmod ('$TARGET', 0755))
 Default(ardourbindings)
 Default(ardourdev)
 Default(ardoursh)
+Default(ardour_dark_theme)
+Default(ardour_light_theme)
 
 if env['VST']:
 	Default(ardourlib)
@@ -326,8 +404,8 @@ if env['NLS']:
 	i18n (gtkardour, gtkardour_files+skipped_files+fft_analysis_files, env)
     
 # configuration files
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour2_ui_dark.rc'))
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour2_ui_light.rc'))
+env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), ardour_dark_theme))
+env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), ardour_light_theme))
 env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.menus'))
 env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.bindings'))
 env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour2_ui_default.conf'))

gtk2_ardour/ardour_ui2.cc

@@ -837,7 +837,6 @@ ARDOUR_UI::sync_option_changed ()
 	if (session) {
 		ustring txt = sync_option_combo.get_active_text ();
 		if (txt.length()) {
-			cerr << "Changing to slave source based on " << txt << endl;
 			session->request_slave_source (string_to_slave_source (txt));
 		}
 	}

tools/osx_packaging/ardour2_mac_ui.rc

@@ -15,12 +15,12 @@ style "small_text"
 
 style "small_bold_text"
 {
- 	font_name = "sans bold 10"
+ 	font_name = "@SANS_BOLD_Big@"
 }
 
 style "medium_bold_text"
 {
- 	font_name = "sans bold 11"
+ 	font_name = "@SANS_BOLD_BIG@"
 }
 
 style "medium_text"
@@ -858,7 +858,7 @@ style "automation_track_controls_base"
 # Plugin Editors
 style "plugin_slider" 
 {
-	font_name ="sans bold 10"
+	font_name ="@SANS_BOLD_Big@"
 
 	# the slider itself. the inactive part is INSENSITIVE,
 	# the active part is something else.