all new implementation of audio clocks, with entirely new editing model. not entirely finished, but lookable, and usable

git-svn-id: svn://localhost/ardour2/branches/3.0@10662 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 20 insertions, 26 deletions

diff --git a/gtk2_ardour/ardour3_widget_list.rc b/gtk2_ardour/ardour3_widget_list.rc
index 2c04bc97f0..2c74737dd5 100644
--- a/gtk2_ardour/ardour3_widget_list.rc
+++ b/gtk2_ardour/ardour3_widget_list.rc
@@ -125,24 +125,21 @@ widget "*ErrorMessage" style:highest "error_message"
 widget "*FatalMessage" style:highest "fatal_message"
 widget "*InfoMessage" style:highest "info_message"
 widget "*WarningMessage" style:highest "warning_message"
-widget "*BigClockNonRecording" style:highest "non_recording_big_clock_display"
-widget "*BigClockRecording" style:highest "recording_big_clock_display"
-widget "*SelectionClockDisplay" style:highest "selection_clock_display"
-widget "*PunchClockDisplay" style:highest "punch_clock_display"
-widget "*TransportClockDisplay" style:highest "transport_clock_display"
-widget "*SecondaryClockDisplay" style:highest "transport_clock_display"
-widget "*TransportClockDisplayDelta" style:highest "transport_clock_display_delta"
-widget "*SecondaryClockDisplayDelta" style:highest "transport_clock_display_delta"
-widget "*SelectionStartClock" style:highest "default_clock_display"
-widget "*SelectionEndClock" style:highest "default_clock_display"
-widget "*SilenceDurationClock" style:highest "white_on_black_clock_display"
-widget "*EditPointClock" style:highest "default_clock_display"
-widget "*PreRollClock" style:highest "default_clock_display"
-widget "*PostRollClock" style:highest "default_clock_display"
-widget "*NudgeClock" style:highest "default_clock_display"
-widget "*MenuBarClock" style:highest "default_clock_display"
-widget "*ZoomRangeClock" style:highest "default_clock_display"
-widget "*TimecodeOffsetClock" style:highest "default_clock_display"
+
+widget "*big clock" style:highest "massive_text"
+widget "*selection clock" style:highest "small_text"
+widget "*punch clock" style:highest "small_text"
+widget "*transport clock" style:highest "large_bold_text"
+widget "*secondary clock" style:highest "large_bold_text"
+widget "*transport delta clock" style:highest "large_bold_text"
+widget "*secondary delta clock" style:highest "large_bold_text"
+widget "*silence duration clock" style:highest "medium_text"
+widget "*edit point clock" style:highest "medium_text"
+widget "*nudge clock" style:highest "medium_text"
+widget "*menubar clock" style:highest "medium_text"
+widget "*zoomrange clock" style:highest "medium_text"
+widget "*timecodeoffset clock" style:highest "medium_text"
+
 widget "*TransportLabel" style:highest "small_bold_text"
 widget "*TakeLabel" style:highest "small_bold_text"
 widget "*LocationLabel" style:highest "small_bold_text"
@@ -250,7 +247,6 @@ widget "*MixerGroupList" style:highest "treeview_display"
 widget "*RegionEditorLabel" style:highest "medium_text"
 widget "*RegionEditorSmallLabel" style:highest "small_text"
 widget "*RegionEditorEntry" style:highest "medium_entry"
-widget "*RegionEditorClock" style:highest "default_clock_display"
 widget "*RegionEditorToggleButton" style:highest "paler_bright_when_active"
 widget "*RegionEditorToggleButton*" style:highest "paler_bright_when_active"
 widget "*MixerStripSpeedBase" style:highest "small_entry"
@@ -330,7 +326,7 @@ widget "*NewSessionChannelChoice" style:highest "medium_bold_entry"
 widget "*NewSessionMainButton" style:highest "large_bold_text"
 widget "*NewSessionMainButton*" style:highest "large_bold_text"
 widget "*NewSessionMainLabel" style:highest "large_bold_text"
-widget "*LocationEditRowClock" style:highest "location_rows_clock"
+widget "*location edit row clock" style:highest "medium_text"
 widget "*LocationEditNameLabel" style:highest "medium_text"
 widget "*LocationEditSetButton" style:highest "location_row_button"
 widget "*LocationEditSetButton*" style:highest "location_row_button"
@@ -365,15 +361,13 @@ widget "*solo safe" style:highest "solo_safe"
 widget "*ContrastingPopup" style:highest "contrasting_popup"
 widget "*ContrastingPopup*" style:highest "contrasting_popup"
 widget "*MidiChannelSelectorButton" style:highest "midi_channel_selector_button"
-widget "*TimeInfoSelectionTitle" style:highest "very_small_bright_when_active"
-widget "*TimeInfoSelectionLabel" style:highest "very_small_bright_when_active"
-widget "*TimeInfoPunchTitle" style:highest "very_small_bright_when_active"
-widget "*TimeInfoPunchLabel" style:highest "very_small_bright_when_active"
-widget "*TimeInfoPunchButton" style:highest "punch_button"
+widget "*TimeInfoSelectionTitle" style:highest "very_small_text"
+widget "*TimeInfoSelectionLabel" style:highest "very_small_text"
+widget "*TimeInfoPunchTitle" style:highest "very_small_text"
+widget "*TimeInfoPunchButton" style:highest "very_small_text"
 widget "*RouteNameEditorEntry" style:highest "text_cell_entry"
 widget "*RegionNameEditorEntry" style:highest "text_cell_entry"
 widget "*MixerMidiInputEnableButton" style:highest "mouse_mode_button"
-widget "*InsertTimeClock" style:highest "default_clock_display"
 widget "*EditorRouteGroupsAllGroupButton" style:highest "default_toggle_button"
 widget "*MidiSoundNotesButton" style:highest "default_toggle_button"
 widget "*MeasureLatencyButton" style:highest "default_toggle_button"