final fix for IOSelector widget: clicking on port header will now make that port...

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

diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc
index 9c13f49dc78a34d61f8b18fcde59a210b8475f5a..94284f58d413f08b87b6774bd4eb4028081f6b04 100644 (file)
--- a/gtk2_ardour/about.cc
+++ b/gtk2_ardour/about.cc
@@ -142,14 +142,14 @@ static const char* authors[] = {
 };
 
 static const char* translators[] = {
-       N_("French:\n\tAlain Fréhel <alain.frehel@free.fr>"),
-       N_("German:\n\tKarsten Petersen <kapet@kapet.de>"),
-       N_("Italian:\n\tFilippo Pappalardo <filippo@email.it>"),
-       N_("Portuguese:\n\tRui Nuno Capela <rncbc@rncbc.org>"),
+       N_("French:\n\tAlain Fréhel <alain.frehel@free.fr>\n"),
+       N_("German:\n\tKarsten Petersen <kapet@kapet.de>\n"),
+       N_("Italian:\n\tFilippo Pappalardo <filippo@email.it>\n"),
+       N_("Portuguese:\n\tRui Nuno Capela <rncbc@rncbc.org>\n"),
        N_("Brazilian Portuguese:\n\tAlexander da Franca Fernandes <alexander@nautae.eti.br>\
-\n\tChris Ross <chris@tebibyte.org>"),
-       N_("Spanish:\n\t Alex Krohn <alexkrohn@fastmail.fm>"),
-       N_("Russian:\n\t Igor Blinov <pitstop@nm.ru>"),
+\n\tChris Ross <chris@tebibyte.org>\n"),
+       N_("Spanish:\n\t Alex Krohn <alexkrohn@fastmail.fm>\n"),
+       N_("Russian:\n\t Igor Blinov <pitstop@nm.ru>\n"),
        0
 };
 

diff --git a/gtk2_ardour/ardour2_ui.rc b/gtk2_ardour/ardour2_ui.rc
index e5199db6407ef8b1563b7d3c204e8e2628cec472..27431a8427dcad6522f87227f2c2d6d426cd82ff 100644 (file)
--- a/gtk2_ardour/ardour2_ui.rc
+++ b/gtk2_ardour/ardour2_ui.rc
@@ -5,7 +5,7 @@
 
 style "very_small_text"
 {
-       font_name = "sans 6"
+       font_name = "sans 7"
 }
 
 style "small_text"
@@ -140,7 +140,7 @@ style "default_buttons_menus"
 
 style "very_small_button" = "default_buttons_menus"
 {
-       font_name = "sans 6"
+       font_name = "sans 7"
 }
 
 style "small_button" = "default_buttons_menus"
@@ -173,7 +173,7 @@ style "track_rec_enable_button" = "small_button"
 
 style "mixer_rec_enable_button" = "track_rec_enable_button"
 {
-       font_name = "sans 6"
+       font_name = "sans 7"
 }
 
 style "solo_button" = "small_button"
@@ -187,7 +187,7 @@ style "solo_button" = "small_button"
 
 style "mixer_solo_button" = "solo_button"
 {
-       font_name = "sans 6"
+       font_name = "sans 7"
 }
 
 
@@ -201,7 +201,7 @@ style "mute_button" = "small_button"
 
 style "mixer_mute_button" = "mute_button"
 {
-       font_name = "sans 6"
+       font_name = "sans 7"
 }
 
 style "track_loop_button" = "small_button"
@@ -826,24 +826,6 @@ 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 "EditorBase" style "default_base"
-widget "*TimebarLabelBase" style "default_base"
-widget "*WipeWindow" style "default_base"
-widget "*TakeWindow" style "default_base"
-widget "*TrackCanvasScroller" style "default_base"
-widget "*TimeCanvasScroller" style "default_base"
-widget "*SendUIWindow" style "default_base"
-widget "*SendUIFrame" style "default_base"
-widget "*MouseModeBase" style "default_base"
-widget "*SelectionModeBase" style "default_base"
-widget "*MeterBridgeWindow"    style "default_base"
-widget "*ControlWindow"        style "default_base"
-widget "*RegionWindow"         style "default_base"
-widget "*ClickWindow" style "default_base"
-widget "*RegionRenameWindow" style "default_base"
-widget "*BackupRecoveryWindow" style "default_base"
-widget "*PluginDisplayWindow" style "default_base"
-widget "*ExportWindow" style "default_base"
 #widget "*ExportProgress" style "default_buttons_menus"
 widget "*ExportFileLabel" style "small_bold_text"
 widget "*ExportFormatLabel" style "medium_bold_text"
@@ -852,43 +834,10 @@ widget "*ExportFileDisplay" style "medium_entry"
 widget "*ExportFormatDisplay" style "medium_entry"
 widget "*ExportCheckbox" style "small_entry"
 widget "*ExportTrackSelector" style "medium_entry_noselection_bg"
-widget "*MeterScrollBase" style "default_base"
-widget "*MixerWindow" style "default_base"
-widget "*RegionEditorWindow" style "default_base"
-widget "*AudioEngineControl" style "default_base"
-widget "*PeakFileWaitWindow" style "default_base"
-widget "*OptionsWindow" style "default_base"
-widget "*TimeStretchDialog" style "default_base"
-widget "*ChoiceWindow" style "default_base"
-widget "*PluginManagerWindow" style "default_base"
-widget "*CrossfadeEditWindow" style "default_base"
-widget "*ErrorText" style "default_base"
-widget "*LocationWindow" style "default_base"
-widget "*EditControlsBase" style "default_base"
-widget "*ToolBar" style "default_base"
 widget "*EditModeSelector" style "medium_bold_entry"
 widget "*SnapTypeSelector" style "medium_bold_entry"
 widget "*SnapModeSelector" style "medium_bold_entry"
 widget "*ZoomFocusSelector" style "medium_bold_entry"
-widget "*BigClockBase" style "default_base"
-widget "*AboveMeterZone" style "default_base"
-widget "*BelowMeterZone" style "default_base"
-widget "*ButtonTable" style "default_base"
-widget "*AdjusterTable" style "default_base"
-widget "*PluginEditor" style "default_base"
-widget "*PluginNameBox" style "default_base"
-widget "*IOSelectorWindow" style "default_base"
-widget "*ConnectionEditorWindow" style "default_base"
-widget "*RouteParamsWindow" style "default_base"
-widget "*RouteParamsBaseFrame" style "default_base"
-widget "*MetricDialog" style "default_base"
-widget "AddRouteDialog" style "default_base"
-widget "*LocationLocRowsScroller*" style "default_base"
-widget "*LocationRangeRowsScroller*" style "default_base"
-widget "*LocationRangeRows" style "default_base"
-widget "*LocationLocRows" style "default_base"
-widget "*LocationFrameBox" style "default_base"
-widget "*PanScrollerBase" style "default_base"
 widget "*ArdourContextMenu*" style "default_buttons_menus"
 widget "*EditGroupTitleButton*" style "default_buttons_menus"
 widget "*MixerGroupTitleButton*" style "default_buttons_menus"
@@ -974,8 +923,6 @@ widget "*ShuttleDisplay*" style "transport_button"
 widget "*ShuttleControl" style "shuttle_control"
 widget "*TransportRecButton" style "transport_rec_button"
 widget "*TransportRecButton*" style "transport_rec_button"
-widget "*TransportBase" style "default_base"
-widget "*TransportWindow" style "default_base"
 widget "*RecordingXrunWarningWindow" style "xrun_warn"
 widget "*RecordingXrunWarningWindow*" style "xrun_warn"
 widget "*MainMenuBar" style "menu_bar_base"
@@ -1047,7 +994,6 @@ widget "*CrossfadeEditLabel" style "medium_text"
 widget "*CrossfadeEditFrame" style "base_frame"
 widget "*MouseModeButton" style "default_buttons_menus"
 widget "*MouseModeButton*" style "default_buttons_menus"
-widget "*EditorWindow" style "default_base"
 widget "*EditorMainCanvas" style "main_canvas_area"
 widget "*AudioTrackControlsBaseInactiveUnselected" style "track_controls_inactive"
 widget "*BusControlsBaseInactiveUnselected" style "track_controls_inactive"
@@ -1080,7 +1026,6 @@ widget "*RegionListDisplay" style "small_bold_entry"
 widget "*RegionListDisplay.*" style "small_bold_text"
 widget "*RedirectSelector" style "redirect_list_display"
 widget "*RedirectSelector.*" style "redirect_list_display"
-widget "*MixerTrackNameArea" style "default_base"
 widget "*MixerTrackCommentArea" style "option_entry"
 widget "*MixerPanZone" style "pan_zone"
 widget "*MixerTrackDisplayList" style "track_list_display"
@@ -1116,10 +1061,6 @@ widget "*TransportSoloAlert" style "flashing_alert"
 widget "*TransportSoloAlert.*" style "flashing_alert"
 widget "*TransportAuditioningAlert" style "flashing_alert"
 widget "*TransportAuditioningAlert.*" style "flashing_alert"
-widget "*Prompter" style "default_base"
-widget "*PrompterLabel" style "default_base"
-widget "*CleanupDialog" style "default_base"
-widget "*CleanupDialog*" style "default_base"
 widget "*FadeCurve" style "medium_bold_entry"
 widget "*FadeCurve*" style "medium_bold_entry"
 widget "*IOSelectorButton" style "default_buttons_menus"
@@ -1225,715 +1166,3 @@ class "GtkButton" style "default_buttons_menus"
 class "GtkArrow" style "tearoff_arrow"
 class "GtkProgressBar" style "ardour_progressbars"
 
-#
-#----------------------------------------------------------------------
-#
-# Below this point, all styles refer to colors used by canvas items
-# not actual widgets. The "red" value of the active state is used
-# to define the "alpha" value for the RGBA value. Other color values
-# for the active state are ignored.
-#
-
-style "cWaveForm" 
-{
-      fg[NORMAL] = { 0.0, 0.0, 0.0 }
-      fg[ACTIVE] = { 0.80, 0, 0 }
-}
-widget "*cWaveForm" style "cWaveForm"
-
-style "cMutedWaveForm" 
-{
-      fg[NORMAL] = { 0.35, 0.35, 0.35 }
-      #fg[NORMAL] = { 0.80, 0.80, 0.80 }
-      fg[ACTIVE] = { 1.0, 0, 0 }
-}
-widget "*cMutedWaveForm" style "cMutedWaveForm"
-
-style "cSelectedFrameBase"
-{
-       fg[NORMAL] = { 0.71, 0.57, 0.66 }
-       #fg[NORMAL] = { 0.10, 0.10, 0.10 }
-        fg[ACTIVE] = { 1.0, 0, 0 } # Not used, opacity set by region editor
-}
-widget "*cSelectedFrameBase" style "cSelectedFrameBase"
-
-style "cFrameBase"
-{
-       fg[NORMAL] = { 0.75, 0.75, 0.76 }
-        fg[ACTIVE] = { 1.0, 0, 0 } # Not used, opacity set by region editor
-}
-widget "*cFrameBase" style "cFrameBase"
-
-style "cAudioTrackBase"
-{
-       fg[NORMAL] = { 0.79, 0.80, 0.85 }
-       #fg[NORMAL] = { 0, 0, 0 }
-        fg[ACTIVE] = { 0.41, 0, 0 }
-       #fg[ACTIVE] = { 0.70, 0, 0 }
-}
-widget "*cAudioTrackBase" style "cAudioTrackBase"
-
-style "cAudioTrackOutline"
-{
-       fg[NORMAL] = { 0.00, 0.00, 0.00 }
-        fg[ACTIVE] = { 1.00, 0, 0 }
-}
-widget "*cAudioTrackOutline" style "cAudioTrackOutline"
-
-style "cAudioBusBase"
-{
-       fg[NORMAL] = { 0.90, 0.82, 0.90 }
-        fg[ACTIVE] = { 0.41, 0, 0 }
-}
-widget "*cAudioBusBase" style "cAudioBusBase"
-
-style "cTempoBar"
-{
-       fg[NORMAL] = { 0.64, 0.64, 0.66 }
-        fg[ACTIVE] = { 1.0, 0, 0 }
-}
-widget "*TempoBar" style "cTempoBar"
-
-style "cMeterBar"
-{
-       fg[NORMAL] = { 0.75, 0.75, 0.80 }
-        fg[ACTIVE] = { 1.0, 0, 0 }
-}
-widget "*cMeterBar" style "cMeterBar"
-
-style "cMarkerBar"
-{
-       fg[NORMAL] = { 0.54, 0.54, 0.56 }
-        fg[ACTIVE] = { 1.0, 0, 0 }
-}
-widget "*cMarkerBar" style "cMarkerBar"
-
-style "cRangeMarkerBar"
-{
-       fg[NORMAL] = { 0.48, 0.48, 0.50 }
-        fg[ACTIVE] = { 1.0, 0, 0 }
-}
-widget "*cRangeMarkerBar" style "cRangeMarkerBar"
-
-style "cTransportMarkerBar"
-{
-       fg[NORMAL] = { 0.40, 0.40, 0.42  }
-        fg[ACTIVE] = { 1.0, 0, 0 }
-}
-widget "*cTransportMarkerBar" style "cTransportMarkerBar"
-
-style "cTimeStretchFill"
-{
-       fg[NORMAL] = { 0.89, 0.71, 0.71  }
-        fg[ACTIVE] = { 0.59, 0, 0 }
-}
-widget "*cTimeStretchFill" style "cTimeStretchFill"
-
-style "cTimeStretchOutline"
-{
-       fg[NORMAL] = { 0.39, 0.39, 0.39  }
-        fg[ACTIVE] = { 0.59, 0, 0 }
-}
-widget "*cTimeStretchOutline" style "cTimeStretchOutline"
-
-style "cAutomationLine"
-{
-       fg[NORMAL] = { 0.27, 0.74, 0.35  }
-        fg[ACTIVE] = { 1.0, 0, 0 }
-}
-widget "*cAutomationLine" style "cAutomationLine"
-
-style "cLeftPanAutomationLine"
-{
-       fg[NORMAL] = { 0.77, 0.24, 0.01  }
-        fg[ACTIVE] = { 1.0, 0, 0 }
-}
-widget "*cLeftPanAutomationLine" style "cLeftPanAutomationLine"
-
-style "cRightPanAutomationLine"
-{
-       fg[NORMAL] = { 0.03, 0.26, 0.73 }
-        fg[ACTIVE] = { 1.0, 0, 0 }
-}
-widget "*cRightPanAutomationLine" style "cRightPanAutomationLine"
-
-style "cRedirectAutomationLine"
-{
-       fg[NORMAL] = { 0.28, 0.34, 0.74  }
-        fg[ACTIVE] = { 1.0, 0, 0 }
-}
-widget "*cRedirectAutomationLine" style "cRedirectAutomationLine"
-
-style "cControlPointFill"
-{
-       fg[NORMAL] = { 0, 0, 0 }
-        fg[ACTIVE] = { 1.0, 0, 0 }
-}
-widget "*cControlPointFill" style "cControlPointFill"
-
-style "cControlPointOutline"
-{
-       fg[NORMAL] = { 0, 0, 0 }
-        fg[ACTIVE] = { 1.0, 0, 0 }
-}
-widget "*cControlPointOutline" style "cControlPointOutline"
-
-style "cEnteredControlPointOutline"
-{
-       fg[NORMAL] = { 1.0, 0.21, 0.21  }
-        fg[ACTIVE] = { 1.0, 0, 0 }
-}
-widget "*cEnteredControlPointOutline" style "cEnteredControlPointOutline"
-
-style "cEnteredControlPointSelected"
-{
-       fg[NORMAL] = { 0.00, 1.00, 0.00 }
-        fg[ACTIVE] = { 1.00, 0, 0 }
-}
-widget "*cEnteredControlPointSelected" style "cEnteredControlPointSelected"
-
-style "cEnteredControlPoint"
-{
-       fg[NORMAL] = { 1.00, 0.00, 0.00 }
-        fg[ACTIVE] = { 1.00, 0, 0 }
-}
-widget "*cEnteredControlPoint" style "cEnteredControlPoint"
-
-style "cControlPointSelected"
-{
-       fg[NORMAL] = { 0.91, 0.04, 0.04 }
-        fg[ACTIVE] = { 1.00, 0, 0 }
-}
-widget "*cControlPointSelected" style "cControlPointSelected"
-
-style "cControlPoint"
-{
-       fg[NORMAL] = { 0.00, 0.00, 0.00 }
-        fg[ACTIVE] = { 1.00, 0, 0 }
-}
-widget "*cControlPoint" style "cControlPoint"
-
-style "cAutomationTrackFill"
-{
-       fg[NORMAL] = { 0.63, 0.63, 0.81  }
-        fg[ACTIVE] = { 0.41, 0, 0 }
-}
-widget "*cAutomationTrackFill" style "cAutomationTrackFill"
-
-style "cAutomationTrackOutline"
-{
-       fg[NORMAL] = { 0.16, 0.16, 0.16  }
-        fg[ACTIVE] = { 1.0, 0, 0 }
-}
-widget "*cAutomationTrackOutline" style "cAutomationTrackOutline"
-
-style "cCrossfadeEditorBase"
-{
-       fg[NORMAL] = { 0.16, 0.18, 0.29  }
-        fg[ACTIVE] = { 1.0, 0, 0 }
-}
-widget "*cCrossfadeEditorBase" style "cCrossfadeEditorBase"
-
-style "cCrossfadeEditorLine"
-{
-fg[NORMAL] = { 0, 0, 0  }
-fg[ACTIVE] = { 1.0, 0, 0 }
-}
-widget "*cCrossfadeEditorLine" style "cCrossfadeEditorLine"
-
-style "cSelectedCrossfadeEditorLine"
-{
-       fg[NORMAL] = { 0, 0.86, 0.86  }
-        fg[ACTIVE] = { 1.0, 0, 0 }
-}
-widget "*cSelectedCrossfadeEditorLine" style "cSelectedCrossfadeEditorLine"
-
-style "cCrossfadeEditorLineShading"
-{
-       fg[NORMAL] = { 0, 0.63, 0.82  }
-        fg[ACTIVE] = { 0.33, 0, 0 }
-}
-widget "*cCrossfadeEditorLineShading" style "cCrossfadeEditorLineShading"
-
-style "cCrossfadeEditorPointFill"
-{
-       fg[NORMAL] = { 0, 1.0, 0  }
-        fg[ACTIVE] = { 1.0, 0, 0 }
-}
-widget "*cCrossfadeEditorPointFill" style "cCrossfadeEditorPointFill"
-
-style "cCrossfadeEditorPointOutline"
-{
-       fg[NORMAL] = { 0, 0, 1.0  }
-        fg[ACTIVE] = { 1.0, 0, 0 }
-}
-widget "*cCrossfadeEditorPointOutline" style "cCrossfadeEditorPointOutline"
-
-style "cCrossfadeEditorWave"
-{
-       fg[NORMAL] = { 1.0, 1.0, 1.0 }
-        fg[ACTIVE] = { 0.16, 0, 0 }
-}
-widget "*cCrossfadeEditorWave" style "cCrossfadeEditorWave"
-
-style "cSelectedCrossfadeEditorWave"
-{
-       fg[NORMAL] = { 0.98, 0.92, 0.08  }
-        fg[ACTIVE] = { 0.63, 0, 0 }
-}
-widget "*cSelectedCrossfadeEditorWave" style "cSelectedCrossfadeEditorWave"
-
-style "cCrossfadeLine"
-{
-       fg[NORMAL] = { 0, 0, 0  }
-        fg[ACTIVE] = { 1.0, 0, 0 }
-}
-widget "*cCrossfadeLine" style "cCrossfadeLine"
-
-style "cActiveCrossfade"
-{
-       fg[NORMAL] = { 0.91, 0.93, 0.24  }
-        fg[ACTIVE] = { 0.47, 0, 0 }
-}
-widget "*cActiveCrossfade" style "cActiveCrossfade"
-
-style "cInactiveCrossfade"
-{
-       fg[NORMAL] = { 0, 0, 0  }
-        fg[ACTIVE] = { 0, 0, 0 }
-}
-widget "*cInactiveCrossfade" style "cInactiveCrossfade"
-
-style "cLocationMarker"
-{
-       fg[NORMAL] = { 0.77, 0.96, 0.07  }
-        fg[ACTIVE] = { 1.0, 0, 0 }
-}
-widget "*cLocationMarker" style "cLocationMarker"
-
-style "cLocationRange"
-{
-       fg[NORMAL] = { 0.29, 0.48, 0.35  }
-        fg[ACTIVE] = { 1.0, 0, 0 }
-}
-widget "*cLocationRange" style "cLocationRange"
-
-style "cLocationCDMarker"
-{
-       fg[NORMAL] = { 0.12, 0.91, 0.77  }
-        fg[ACTIVE] = { 1.0, 0, 0 }
-}
-widget "*cLocationCDMarker" style "cLocationCDMarker"
-
-style "cLocationLoop"
-{
-       fg[NORMAL] = { 0.21, 0.59, 0.31  }
-        fg[ACTIVE] = { 1.0, 0, 0 }
-}
-widget "*cLocationLoop" style "cLocationLoop"
-
-style "cLocationPunch"
-{
-       fg[NORMAL] = { 0.49, 0.23, 0.23  }
-        fg[ACTIVE] = { 1.0, 0, 0 }
-}
-widget "*cLocationPunch" style "cLocationPunch"
-
-style "cVerboseCanvasCursor"
-{
-       fg[NORMAL] = { 0, 0, 0  }
-        fg[ACTIVE] = {0.74, 0, 0 }
-}
-widget "*cVerboseCanvasCursor" style "cVerboseCanvasCursor"
-
-style "cRangeDragBarRect"
-{
-       fg[NORMAL] = { 0.59, 0.59, 0.59  }
-        fg[ACTIVE] = { 0.78, 0, 0 }
-}
-widget "*cRangeDragBarRect" style "cRangeDragBarRect"
-
-style "cRangeDragBarRectFill"
-{
-       fg[NORMAL] = { 0.78, 0.82, 0.70  }
-        fg[ACTIVE] = { 0.43, 0, 0 }
-}
-widget "*cRangeDragBarRectFill" style "cRangeDragBarRectFill"
-
-style "cRangeDragRect"
-{
-       fg[NORMAL] = { 0.59, 0.59, 0.59  }
-        fg[ACTIVE] = { 0.78, 0, 0 }
-}
-widget "*cRangeDragRect" style "cRangeDragRect"
-
-style "cRangeDragRectFill"
-{
-       fg[NORMAL] = { 0.51, 0.78, 0.59  }
-        fg[ACTIVE] = { 0.78, 0, 0 }
-}
-widget "*cRangeDragRectFill" style "cRangeDragRectFill"
-
-style "cTransportDragRect"
-{
-       fg[NORMAL] = { 0.59, 0.59, 0.59  }
-        fg[ACTIVE] = { 0.78, 0, 0 }
-}
-widget "*cTransportDragRect" style "cTransportDragRect"
-
-style "cTransportDragRectFill"
-{
-       fg[NORMAL] = { 0.78, 0.78, 0.78  }
-        fg[ACTIVE] = { 1.43, 0, 0 }
-}
-widget "*cTransportDragRectFill" style "cTransportDragRectFill"
-
-style "cMarkerDragLine"
-{
-       fg[NORMAL] = { 0, 0.31, 0  }
-        fg[ACTIVE] = { 0.98, 0, 0 }
-}
-widget "*cMarkerDragLine" style "cMarkerDragLine"
-
-style "cTransportLoopRect"
-{
-        fg[NORMAL] = { 0.12, 0.47, 0.16 }
-        fg[ACTIVE] = { 0.98, 0, 0 }
-}
-widget "*cTransportLoopRect" style "cTransportLoopRect"
-
-style "cTransportLoopRectFill"
-{
-       fg[NORMAL] = { 0.12, 0.47, 0.16 }
-        fg[ACTIVE] = { 0.98, 0, 0 }
-}
-widget "*cTransportLoopRectFill" style "cTransportLoopRectFill"
-
-style "cTransportPunchRect"
-{
-       fg[NORMAL] = { 0.43, 0.16, 0.16 }
-       fg[ACTIVE] = { 0.90, 0, 0 }
-}
-widget "*cTransportPunchRect" style "cTransportPunchRect"
-
-style "cTransportPunchRectFill"
-{
-       fg[NORMAL] = { 0.43, 0.16, 0.16 }
-       fg[ACTIVE] = { 0.90, 0, 0 }
-}
-widget "*cTransportPunchRectFill" style "cTransportPunchRectFill"
-
-style "cPunchInLine"
-{
-       fg[NORMAL] = { 0.66, 0.00, 0.00 }
-        fg[ACTIVE] = { 1.00, 0, 0 }
-}
-widget "*cPunchInLine" style "cPunchInLine"
-
-style "cPunchOutLine"
-{
-       fg[NORMAL] = { 0.66, 0.00, 0.00 }
-        fg[ACTIVE] = { 1.00, 0, 0 }
-}
-widget "*cPunchOutLine" style "cPunchOutLine"
-
-style "cZoomRect"
-{
-       fg[NORMAL] = { 0.59, 0.59, 0.59 }
-        fg[ACTIVE] = { 0.78, 0, 0 }
-}
-widget "*cZoomRect" style "cZoomRect"
-
-style "cZoomRectFill"
-{
-       fg[NORMAL] = { 0.78, 0.82, 0.70 }
-        fg[ACTIVE] = { 0.43, 0, 0 }
-}
-widget "*cZoomRectFill" style "cZoomRectFill"
-
-style "cRubberBandRect"
-{
-       fg[NORMAL] = { 0.08, 1.00, 0.52 }
-        fg[ACTIVE] = { 0.59, 0, 0 }
-}
-widget "*cRubberBandRect" style "cRubberBandRect"
-
-style "cRubberBandRectFill"
-{
-       fg[NORMAL] = { 0.78, 0.78, 0.78 }
-        fg[ACTIVE] = { 0.35, 0, 0 }
-}
-widget "*cRubberBandRectFill" style "cRubberBandRectFill"
-
-style "cFirstActionMessage"
-{
-       fg[NORMAL] = { 0.00, 0.00, 0.00 }
-        fg[ACTIVE] = { 1.00, 0, 0 }
-}
-widget "*cFirstActionMessage" style "cFirstActionMessage"
-
-style "cEnteredGainLine"
-{
-       fg[NORMAL] = { 0.87, 0.39, 0.39 }
-        fg[ACTIVE] = { 1.00, 0, 0 }
-}
-widget "*cEnteredGainLine" style "cEnteredGainLine"
-
-style "cEnteredAutomationLine"
-{
-       fg[NORMAL] = { 0.87, 0.39, 0.39 }
-        fg[ACTIVE] = { 1.00, 0, 0 }
-}
-widget "*cEnteredAutomationLine" style "cEnteredAutomationLine"
-
-style "cEnteredMarker"
-{
-       fg[NORMAL] = { 0.87, 0.39, 0.39 }
-        fg[ACTIVE] = { 1.00, 0, 0 }
-}
-widget "*cEnteredMarker" style "cEnteredMarker"
-
-style "cMeterMarker"
-{
-       fg[NORMAL] = { 0.95, 0.26, 0.36 }
-        fg[ACTIVE] = { 1.00, 0, 0 }
-}
-widget "*cMeterMarker" style "cMeterMarker"
-
-style "cTempoMarker"
-{
-       fg[NORMAL] = { 0.95, 0.26, 0.36 }
-        fg[ACTIVE] = { 1.00, 0, 0 }
-}
-widget "*cTempoMarker" style "cTempoMarker"
-
-style "cMeasureLineBeat"
-{
-       fg[NORMAL] = { 0.51, 0.59, 0.87 }
-        fg[ACTIVE] = { 0.98, 0, 0 }
-}
-widget "*cMeasureLineBeat" style "cMeasureLineBeat"
-
-style "cMeasureLineBar"
-{
-       fg[NORMAL] = { 0.68, 0.68, 0.59 }
-        fg[ACTIVE] = { 0.94, 0, 0 }
-}
-widget "*cMeasureLineBar" style "cMeasureLineBar"
-
-style "cGhostTrackBaseOutline"
-{
-       fg[NORMAL] = { 0.00, 0.00, 0.00 }
-        fg[ACTIVE] = { 1.00, 0, 0 }
-}
-widget "*cGhostTrackBaseOutline" style "cGhostTrackBaseOutline"
-
-style "cGhostTrackBaseFill"
-{
-       fg[NORMAL] = { 0.27, 0.00, 0.49 }
-        fg[ACTIVE] = { 0.50, 0, 0 }
-}
-widget "*cGhostTrackBaseFill" style "cGhostTrackBaseFill"
-
-style "cImageTrackBase"
-{
-       fg[NORMAL] = { 0.87, 0.87, 0.85 }
-        fg[ACTIVE] = { 1.00, 0, 0 }
-}
-widget "*cImageTrackBase" style "cImageTrackBase"
-
-style "cImageTrackOutline"
-{
-       fg[NORMAL] = { 0.00, 0.00, 0.00 }
-        fg[ACTIVE] = { 1.00, 0, 0 }
-}
-widget "*cImageTrackOutline" style "cImageTrackOutline"
-
-style "cMarkerTrackBase"
-{
-       fg[NORMAL] = { 0.87, 0.87, 0.85 }
-        fg[ACTIVE] = { 1.00, 0, 0 }
-}
-widget "*cMarkerTrackBase" style "cMarkerTrackBase"
-
-style "cMarkerTrackOutline"
-{
-       fg[NORMAL] = { 0.00, 0.00, 0.00 }
-        fg[ACTIVE] = { 1.00, 0, 0 }
-}
-widget "*cMarkerTrackOutline" style "cMarkerTrackOutline"
-
-style "cZeroLine"
-{
-       fg[NORMAL] = { 0.71, 0.71, 0.71 }
-        fg[ACTIVE] = { 1.00, 0, 0 }
-}
-widget "*cZeroLine" style "cZeroLine"
-
-style "cGainLine"
-{
-       fg[NORMAL] = { 0.00, 1.00, 0.00 }
-        fg[ACTIVE] = { 1.00, 0, 0 }
-}
-widget "*cGainLine" style "cGainLine"
-
-style "cGainLineInactive"
-{
-       fg[NORMAL] = { 0.06, 0.06, 0.06 }
-        fg[ACTIVE] = { 1.00, 0, 0 }
-}
-widget "*cGainLineInactive" style "cGainLineInactive"
-
-style "cRecordingRectFill"
-{
-       fg[NORMAL] = { 0.90, 0.78, 0.78 }
-        fg[ACTIVE] = { 1.00, 0, 0 }
-}
-widget "*cRecordingRectFill" style "cRecordingRectFill"
-
-style "cRecordingRectOutline"
-{
-       fg[NORMAL] = { 0.31, 0.16, 0.16 }
-        fg[ACTIVE] = { 1.00, 0, 0 }
-}
-widget "*cRecordingRectOutline" style "cRecordingRectOutline"
-
-style "cSelectionRectFill"
-{
-       fg[NORMAL] = { 0.91, 0.96, 0.83 }
-        fg[ACTIVE] = { 0.47, 0, 0 }
-}
-widget "*cSelectionRectFill" style "cSelectionRectFill"
-
-style "cSelectionRectOutline"
-{
-       fg[NORMAL] = { 0.39, 0.39, 0.39 }
-        fg[ACTIVE] = { 0.59, 0, 0 }
-}
-widget "*cSelectionRectOutline" style "cSelectionRectOutline"
-
-style "cSelectionEndFill"
-{
-       fg[NORMAL] = { 0.39, 0.39, 0.39 }
-        fg[ACTIVE] = { 0.70, 0, 0 }
-}
-widget "*cSelectionEndFill" style "cSelectionEndFill"
-
-style "cSelectionEndOutline"
-{
-       fg[NORMAL] = { 0.39, 0.39, 0.39 }
-        fg[ACTIVE] = { 1.0, 0, 0 }
-}
-widget "*cSelectionEndOutline" style "cSelectionEndOutline"
-
-style "cSelectionStartFill"
-{
-       fg[NORMAL] = { 0.39, 0.39, 0.39 }
-        fg[ACTIVE] = { 0.70, 0, 0 }
-}
-widget "*cSelectionStartFill" style "cSelectionStartFill"
-
-style "cSelectionStartOutline"
-{
-       fg[NORMAL] = { 0.39, 0.39, 0.39 }
-        fg[ACTIVE] = { 1.0, 0, 0 }
-}
-widget "*cSelectionStartOutline" style "cSelectionStartOutline"
-
-style "cVestigialFrameFill"
-{
-       fg[NORMAL] = { 0.27, 0.00, 0.49 }
-        fg[ACTIVE] = { 0.06, 0, 0 }
-}
-widget "*cVestigialFrameFill" style "cVestigialFrameFill"
-
-style "cVestigialFrameOutline"
-{
-       fg[NORMAL] = { 0.00, 0.00, 0.00 }
-        fg[ACTIVE] = { 1.00, 0, 0 }
-}
-widget "*cVestigialFrameOutline" style "cVestigialFrameOutline"
-
-style "cTimeAxisFrameFill"
-{
-       fg[NORMAL] = { 0.27, 0.00, 0.49 }
-        fg[ACTIVE] = { 0.06, 0, 0 }
-}
-widget "*cTimeAxisFrameFill" style "cTimeAxisFrameFill"
-
-style "cTimeAxisFrameOutline"
-{
-       fg[NORMAL] = { 0.00, 0.00, 0.00 }
-        fg[ACTIVE] = { 1.00, 0, 0 }
-}
-widget "*cTimeAxisFrameOutline" style "cTimeAxisFrameOutline"
-
-style "cNameHighlightFill"
-{
-       fg[NORMAL] = { 0.00, 0.00, 1.00 }
-        fg[ACTIVE] = { 1.00, 0, 0 }
-}
-widget "*cNameHighlightFill" style "cNameHighlightFill"
-
-style "cNameHighlightOutline"
-{
-       fg[NORMAL] = { 0.49, 0.00, 1.00 }
-        fg[ACTIVE] = { 0.59, 0, 0 }
-}
-widget "*cNameHighlightOutline" style "cNameHighlightOutline"
-
-style "cFrameHandleStartFill"
-{
-       fg[NORMAL] = { 0.49, 0.00, 1.00 }
-        fg[ACTIVE] = { 0.59, 0, 0 }
-}
-widget "*cFrameHandleStartFill" style "cFrameHandleStartFill"
-
-style "cFrameHandleStartOutline"
-{
-       fg[NORMAL] = { 0.00, 0.00, 0.00 }
-        fg[ACTIVE] = { 1.00, 0, 0 }
-}
-widget "*cFrameHandleStartOutline" style "cFrameHandleStartOutline"
-
-style "cFrameHandleEndFill"
-{
-       fg[NORMAL] = { 0.49, 0.00, 1.00 }
-        fg[ACTIVE] = { 0.59, 0, 0 }
-}
-widget "*cFrameHandleEndFill" style "cFrameHandleEndFill"
-
-style "cFrameHandleEndOutline"
-{
-       fg[NORMAL] = { 0.00, 0.00, 0.00 }
-        fg[ACTIVE] = { 1.00, 0, 0 }
-}
-widget "*cFrameHandleEndOutline" style "cFrameHandleEndOutline"
-
-style "cTrimHandleLockedStart"
-{
-       fg[NORMAL] = { 0.92, 0.06, 0.06 }
-        fg[ACTIVE] = { 0.16, 0, 0 }
-}
-widget "*cTrimHandleLockedStart" style "cTrimHandleLockedStart"
-
-style "cTrimHandleLockedEnd"
-{
-       fg[NORMAL] = { 0.92, 0.06, 0.06 }
-        fg[ACTIVE] = { 0.16, 0, 0 }
-}
-widget "*cTrimHandleLockedEnd" style "cTrimHandleLockedEnd"
-
-style "cTrimHandleStart"
-{
-       fg[NORMAL] = { 0.10, 0.00, 1.00 }
-        fg[ACTIVE] = { 0.27, 0, 0 }
-}
-widget "*cTrimHandleStart" style "cTrimHandleStart"
-
-style "cTrimHandleEnd"
-{
-       fg[NORMAL] = { 0.10, 0.00, 1.00 }
-        fg[ACTIVE] = { 0.27, 0, 0 }
-}
-widget "*cTrimHandleEnd" style "cTrimHandleEnd"

diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc
index 2d910519b9dff62b7adf5c19c898d8699fc5ebcb..247ad602bd8082c5841f362a7cc98990bfdc8e86 100644 (file)
--- a/gtk2_ardour/io_selector.cc
+++ b/gtk2_ardour/io_selector.cc
@@ -466,10 +466,9 @@ IOSelector::display_ports ()
                        TreeViewColumn* col = tview->get_column (0);
                        
                        col->set_clickable (true);
-                       
-                       /* handle button events on the column header and within the treeview itself */
 
-                       //col->signal_button_release_event().connect (bind (mem_fun(*this, &IOSelector::port_column_button_release), tview));
+                       /* handle button events on the column header and within the treeview itself */
+                       col->signal_clicked().connect (bind (mem_fun(*this, &IOSelector::select_treeview), tview));
                        tview->signal_button_release_event().connect (bind (mem_fun(*this, &IOSelector::connection_button_release), tview));
                }
 
@@ -646,8 +645,6 @@ IOSelector::connection_button_release (GdkEventButton *ev, TreeView *treeview)
 
                /* path is valid */
                ustring connected_port_name = (*iter)[port_display_columns.full_name];
-               cerr << "selected row displayed_name: " << (*iter)[port_display_columns.displayed_name] << endl;
-               cerr << "selected row string was " << connected_port_name << endl;
                Port *port = reinterpret_cast<Port *> (treeview->get_data (_("port")));
                
                if (for_input) {