tweaked panner appearance and consistency, panner line now distinct color from triangles. shift-click now reverts panner to center, left or right depending on number of channels. minor updates to osx app build script. fixed region editor re-show problem.

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

2 files changed, 52 insertions, 33 deletions

diff --git a/tools/osx_packaging/app_build.rb b/tools/osx_packaging/app_build.rb
index c81225024b..4cab635034 100755
--- a/tools/osx_packaging/app_build.rb
+++ b/tools/osx_packaging/app_build.rb
@@ -102,14 +102,16 @@ end
 Dir.chdir(odir)
 
 # copy ardour.bin to bindir/ardour
-$stdout.print("Copying bin to #{bindir} ...\n");
+
 
 if File.exist?("../../gtk2_ardour/ardour.bin") then
+   $stdout.print("Copying bin to #{bindir} ...\n");
    `cp ../../gtk2_ardour/ardour.bin #{bindir}/ardour`
 end
 
 `cp ../../libs/surfaces/*/*.dylib #{libdir}/surfaces`
 # remove the basenames from libdir that are in surfaces (copied earlier)
+`rm -f #{libdir}/surfaces/libardour_cp.dylib`
 begin
   Dir.foreach(libdir+"/surfaces") {|x| unless ( x[0] == 46 or x.include?("libardour_cp")) then File.delete(libdir + "/" +x) end}
 rescue
@@ -174,6 +176,7 @@ end
 if File.exist?(ppc_libdir) and File.exist?(i386_libdir) then
   $stdout.print("\nBoth platforms in place, lipo'ing...\n");
   `rm -rf lib/*`
+  `rm -f bin/ardour`
   lipo_platforms_recurse(ppc_libdir, i386_libdir, "lib")
   lipo_platforms_recurse(i386_libdir, ppc_libdir, "lib")
   lipo_platforms_recurse(i386_bindir+'/ardour', ppc_bindir+'/ardour', "bin/ardour")
diff --git a/tools/osx_packaging/ardour2_mac_ui.rc b/tools/osx_packaging/ardour2_mac_ui.rc
index 775a1247bf..c4d5e776ef 100644
--- a/tools/osx_packaging/ardour2_mac_ui.rc
+++ b/tools/osx_packaging/ardour2_mac_ui.rc
@@ -58,6 +58,11 @@ style "plugin_maker_text"
 	fg[NORMAL] = { 0.80, 0.80, 0.80 }
 }
 
+style "automation_track_name"
+{
+	font_name = "sans italic 8"
+}
+
 style "first_action_message" 
 {
 	font_name = "sans medium 34"
@@ -846,16 +851,16 @@ style "flashing_alert" = "very_small_text"
 style "selected_io_selector_port_list" = "medium_bold_text"
 {
 
-	GtkTreeView::even-row-color = { 0.64, 0.68, 0.54 }
-	GtkTreeView::odd-row-color = { 0.64, 0.68, 0.54 }
+	GtkTreeView::even-row-color = { 0, 0, 0 }
+	GtkTreeView::odd-row-color = { 0, 0, 0 }
 
 # fg is used to color the fg (text) of the column header button
 
-	fg[NORMAL] = { 0.80, 0.80, 0.70 }
-	fg[SELECTED] = { 0.80, 0.80, 0.70 }
-	fg[ACTIVE] = { 0.80, 0.80, 0.70 }
-	fg[PRELIGHT] = { 0.80, 0.80, 0.70 }
-	fg[INSENSITIVE] = { 0.80, 0.80, 0.70 }
+	fg[NORMAL] = { 0.85, 0.85, 0.85 }
+	fg[SELECTED] = { 0.85, 0.85, 0.85 }
+	fg[ACTIVE] = { 0.85, 0.85, 0.85 }
+	fg[PRELIGHT] = { 0.85, 0.85, 0.85 }
+	fg[INSENSITIVE] = { 0.85, 0.85, 0.85 }
 
 # bg is used used to color the background of the column header button
 
@@ -867,29 +872,30 @@ style "selected_io_selector_port_list" = "medium_bold_text"
 
 # text is used to color the treeview row text
 
-	text[NORMAL] = { 0.80, 0.80, 0.70 }
-	text[SELECTED] = { 0.80, 0.80, 0.70 }
+	text[NORMAL] = { 0.85, 0.85, 0.85 }
+	text[SELECTED] = { 0.85, 0.85, 0.85 }
 
 # base is used to color a treeview with no rows
 
-	base[NORMAL] = { 0.64, 0.68, 0.54 }
-	base[ACTIVE] = { 0.64, 0.68, 0.54 }
-	base[PRELIGHT] = { 0.64, 0.68, 0.54 }
-	base[INSENSITIVE] = { 0.64, 0.68, 0.54 }
-	base[SELECTED] = { 0.64, 0.68, 0.54 }
+	base[NORMAL] = { 0.20, 0.20, 0.25 }
+	base[ACTIVE] = { 0.20, 0.20, 0.25 }
+	base[PRELIGHT] = { 0.20, 0.20, 0.25 }
+	base[INSENSITIVE] = { 0.20, 0.20, 0.25 }
+	base[SELECTED] = { 0.20, 0.20, 0.25 }
 
 }
 
 style "io_selector_port_list" = "medium_text"
 {
-
+	GtkTreeView::even-row-color = { 0.20, 0.20, 0.25 }
+	GtkTreeView::odd-row-color = { 0.20, 0.20, 0.25 }
 # fg is used to color the fg (text) of the column header button
 
-	fg[NORMAL] = { 0.80, 0.80, 0.70 }
-	fg[SELECTED] = { 0.80, 0.80, 0.70 }
-	fg[ACTIVE] = { 0.80, 0.80, 0.70 }
-	fg[PRELIGHT] = { 0.80, 0.80, 0.70 }
-	fg[INSENSITIVE] = { 0.80, 0.80, 0.70 }
+	fg[NORMAL] = { 0.70, 0.70, 0.70 }
+	fg[SELECTED] = { 0.70, 0.70, 0.70 }
+	fg[ACTIVE] = { 0.70, 0.70, 0.70 }
+	fg[PRELIGHT] = { 0.70, 0.70, 0.70 }
+	fg[INSENSITIVE] = { 0.70, 0.70, 0.70 }
 
 # bg is used used to color the background of the column header button
 
@@ -901,22 +907,22 @@ style "io_selector_port_list" = "medium_text"
 
 # text is used to color the treeview row text
 
-	text[NORMAL] = { 0.80, 0.80, 0.70 }
-	text[SELECTED] = { 0.80, 0.80, 0.70 }
+	text[NORMAL] = { 0.80, 0.80, 0.80 }
+	text[SELECTED] = { 0.80, 0.80, 0.80 }
 
 # base is used to color a treeview with no rows
 
-	base[NORMAL] = { 0, 0, 0 }
-	base[ACTIVE] = { 0, 0, 0 }
-	base[PRELIGHT] = { 0, 0, 0 }
-	base[INSENSITIVE] = { 0, 0, 0 }
-	base[SELECTED] = { 0, 0, 0 }
+	base[NORMAL] = { 0.20, 0.20, 0.25 }
+	base[ACTIVE] = { 0.20, 0.20, 0.25 }
+	base[PRELIGHT] = { 0.20, 0.20, 0.25 }
+	base[INSENSITIVE] = { 0.20, 0.20, 0.25 }
+	base[SELECTED] = { 0.20, 0.20, 0.25 }
 }
 
 style "io_selector_notebook" = "default_base"
 {
 	fg[NORMAL] = { 1.0, 1.0, 1.0 }
-        font_name ="sans bold 10"
+        font_name ="sans bold 8"
 }
 
 style "tearoff_arrow" = "medium_bold_entry"
@@ -947,13 +953,13 @@ style "pan_slider"
 {
  	font_name = "sans 8"
 
-	fg[NORMAL] = { 0.67, 0.23, 0.22 }
-	fg[ACTIVE] = { 0.67, 0.23, 0.22 }
+	fg[NORMAL] = { 0.22, 0.73, 0.22 }
+	fg[ACTIVE] = { 0.22, 0.73, 0.22 }
 	fg[INSENSITIVE] = {0.32, 0.39, 0.45 } # matches default_base
 	fg[SELECTED] = { 0.67, 0.23, 0.22 }
 	fg[PRELIGHT] = { 0.67, 0.23, 0.22 }
 
-	bg[NORMAL] = { 0, 0, 0 }
+	bg[NORMAL] = { 0.05, 0.05, 0.05 }
 	bg[ACTIVE] = { 0, 0, 0 }
 	bg[INSENSITIVE] = {0.32, 0.39, 0.45 } # matches default_base
 	bg[SELECTED] = { 0, 0, 0 }
@@ -964,6 +970,15 @@ style "pan_slider"
 	text[INSENSITIVE] = { 0.70, 0.70, 0.70 }
 	text[SELECTED] = { 0.70, 0.70, 0.70 }
 	text[PRELIGHT] = { 0.70, 0.70, 0.70 }
+
+	# used to draw the triangular indicators 
+
+	base[NORMAL] = { 0.80, 0.80, 0.80 }
+	base[ACTIVE] =  { 0.80, 0.80, 0.80 }
+	base[INSENSITIVE] = {0.32, 0.39, 0.45 } # matches default_base
+	base[SELECTED] = { 0.80, 0.80, 0.80 }
+	base[PRELIGHT] = { 0.80, 0.80, 0.80 }
+
 }
 
 style "region_list_whole_file"
@@ -981,7 +996,7 @@ style "ardour_button" ="default_buttons_menus"
 widget "*FirstActionMessage" style "first_action_message"
 widget "*VerboseCanvasCursor" style "verbose_canvas_cursor"
 widget "*MarkerText" style "marker_text"
-widget "*TimeAxisViewItemName" style "time_axis_view_item_name"
+widget "*TimeAxisViewItemName*" style "time_axis_view_item_name"
 #widget "*ExportProgress" style "default_buttons_menus"
 widget "*ExportFileLabel" style "small_bold_text"
 widget "*ExportFormatLabel" style "medium_bold_text"
@@ -1160,6 +1175,7 @@ widget "*EditorMainCanvas" style "main_canvas_area"
 widget "*AudioTrackControlsBaseInactiveUnselected" style "track_controls_inactive"
 widget "*BusControlsBaseInactiveUnselected" style "track_controls_inactive"
 widget "*AutomationTrackControlsBaseInactiveUnselected" style "track_controls_inactive"
+widget "*AutomationTrackName" style "automation_track_name"
 widget "*AudioTrackControlsBaseInactiveSelected" style "track_controls_inactive"
 widget "*BusControlsBaseInactiveSelected" style "track_controls_inactive"
 widget "*AutomationTrackControlsBaseInactiveSelected" style "track_controls_inactive"