fix up requested color names everywhere.

Thank <deity> for emacs ... space-uncamelcase-word-at-point FTW

diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index 440b65b9821e1b83ef84b78c616e7f6b5bb64ad9..e29e0bd1037e1c5c86f12ecc2502e9f541a9f6ed 100644 (file)
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -1399,30 +1399,30 @@ AudioRegionView::set_some_waveform_colors (vector<ArdourCanvas::WaveView*>& wave
 {
        ArdourCanvas::Color fill;
        ArdourCanvas::Color outline;
-       ArdourCanvas::Color clip = ARDOUR_UI::config()->color ("waveform clip");
+       ArdourCanvas::Color clip = ARDOUR_UI::config()->color ("clipped waveform");
        ArdourCanvas::Color zero = ARDOUR_UI::config()->color ("zero line");
 
        if (_selected) {
                if (_region->muted()) {
                        /* hide outline with zero alpha */
-                       outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->color ("SelectedWaveForm"), 0);
-                       fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->color ("SelectedWaveFormFill"), MUTED_ALPHA);
+                       outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->color ("selected waveform outline"), 0);
+                       fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->color ("selected waveform fill"), MUTED_ALPHA);
                } else {
-                       outline = ARDOUR_UI::config()->color ("SelectedWaveForm");
-                       fill = ARDOUR_UI::config()->color ("SelectedWaveFormFill");
+                       outline = ARDOUR_UI::config()->color ("selected waveform outline");
+                       fill = ARDOUR_UI::config()->color ("selected waveform fill");
                }
        } else {
                if (_recregion) {
-                       outline = ARDOUR_UI::config()->color ("RecWaveForm");
-                       fill = ARDOUR_UI::config()->color ("RecWaveFormFill");
+                       outline = ARDOUR_UI::config()->color ("recording waveform outline");
+                       fill = ARDOUR_UI::config()->color ("recording waveform fill");
                } else {
                        if (_region->muted()) {
                                /* hide outline with zero alpha */
-                               outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->color ("WaveForm"), 0);       
-                               fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->color ("WaveFormFill"), MUTED_ALPHA);
+                               outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->color ("waveform outline"), 0);       
+                               fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->color ("waveform fill"), MUTED_ALPHA);
                        } else {
-                               outline = ARDOUR_UI::config()->color ("WaveForm");
-                               fill = ARDOUR_UI::config()->color ("WaveFormFill");
+                               outline = ARDOUR_UI::config()->color ("waveform outline");
+                               fill = ARDOUR_UI::config()->color ("waveform fill");
                        }
                }
        }

diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index 9c42aad07691468f95341ca2451d6ab7dd03d8ba..4a9f3bfd84a64a53eb88031d937e9c1f8de99487 100644 (file)
--- a/gtk2_ardour/audio_streamview.cc
+++ b/gtk2_ardour/audio_streamview.cc
@@ -249,12 +249,12 @@ AudioStreamView::setup_rec_box ()
                        case Normal:
                        case NonLayered:
                                xend = xstart;
-                               fill_color = ARDOUR_UI::config()->color ("RecordingRect");
+                               fill_color = ARDOUR_UI::config()->color ("recording rect");
                                break;
 
                        case Destructive:
                                xend = xstart + 2;
-                               fill_color = ARDOUR_UI::config()->color ("RecordingRect");
+                               fill_color = ARDOUR_UI::config()->color ("recording rect");
                                /* make the recording rect translucent to allow
                                   the user to see the peak data coming in, etc.
                                */
@@ -273,7 +273,7 @@ AudioStreamView::setup_rec_box ()
                        rec_rect->set_x1 (xend);
                        rec_rect->set_y1 (child_height ());
                        rec_rect->set_outline_what (ArdourCanvas::Rectangle::What (0));
-                       rec_rect->set_outline_color (ARDOUR_UI::config()->color ("TimeAxisFrame"));
+                       rec_rect->set_outline_color (ARDOUR_UI::config()->color ("time axis frame"));
                        rec_rect->set_fill_color (fill_color);
 
                        RecBoxInfo recbox;
@@ -516,15 +516,15 @@ AudioStreamView::color_handler ()
 {
        //case cAudioTrackBase:
        if (_trackview.is_track()) {
-               canvas_rect->set_fill_color (ARDOUR_UI::config()->color ("AudioTrackBase"));
+               canvas_rect->set_fill_color (ARDOUR_UI::config()->color ("audio track base"));
        }
 
        //case cAudioBusBase:
        if (!_trackview.is_track()) {
                if (Profile->get_sae() && _trackview.route()->is_master()) {
-                       canvas_rect->set_fill_color (ARDOUR_UI::config()->color ("AudioMasterBusBase"));
+                       canvas_rect->set_fill_color (ARDOUR_UI::config()->color ("audio master bus base"));
                } else {
-                       canvas_rect->set_fill_color (ARDOUR_UI::config()->color ("AudioBusBase"));
+                       canvas_rect->set_fill_color (ARDOUR_UI::config()->color ("audio bus base"));
                }
        }
 }

diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index 641a34dc4495e35e1fd394511bf0bb04c64ee3a1..cd57387ac4760fb9d752e757c229705ff7ccbc07 100644 (file)
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -124,7 +124,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (
        CANVAS_DEBUG_NAME (_base_rect, string_compose ("base rect for %1", _name));
        _base_rect->set_x1 (ArdourCanvas::COORD_MAX);
        _base_rect->set_outline (false);
-       _base_rect->set_fill_color (ARDOUR_UI::config()->color ("AutomationTrackFill"));
+       _base_rect->set_fill_color (ARDOUR_UI::config()->color ("automation track fill"));
        _base_rect->set_data ("trackview", this);
        _base_rect->Event.connect (sigc::bind (sigc::mem_fun (_editor, &PublicEditor::canvas_automation_track_event), _base_rect, this));
        if (!a) {
@@ -257,7 +257,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (
                                )
                        );
 
-               line->set_line_color (ARDOUR_UI::config()->color ("ProcessorAutomationLine"));
+               line->set_line_color (ARDOUR_UI::config()->color ("processor automation line"));
                line->queue_reset ();
                add_line (line);
        }

diff --git a/gtk2_ardour/control_point.cc b/gtk2_ardour/control_point.cc
index 6b90bdfea4cc0f7c8500b15be2307e6f62d03591..406e134e3ea025a535815c8a53a65c911654a295 100644 (file)
--- a/gtk2_ardour/control_point.cc
+++ b/gtk2_ardour/control_point.cc
@@ -45,8 +45,8 @@ ControlPoint::ControlPoint (AutomationLine& al)
 
        _item = new ArdourCanvas::Rectangle (&_line.canvas_group());
        _item->set_fill (true);
-       _item->set_fill_color (ARDOUR_UI::config()->color ("ControlPointFill"));
-       _item->set_outline_color (ARDOUR_UI::config()->color ("ControlPointOutline"));
+       _item->set_fill_color (ARDOUR_UI::config()->color ("control point fill"));
+       _item->set_outline_color (ARDOUR_UI::config()->color ("control point outline"));
        _item->set_data ("control_point", this);
        _item->Event.connect (sigc::mem_fun (this, &ControlPoint::event_handler));
 
@@ -70,7 +70,7 @@ ControlPoint::ControlPoint (const ControlPoint& other, bool /*dummy_arg_to_force
 
        _item = new ArdourCanvas::Rectangle (&_line.canvas_group());
        _item->set_fill (true);
-       _item->set_outline_color (ARDOUR_UI::config()->color ("ControlPointOutline"));
+       _item->set_outline_color (ARDOUR_UI::config()->color ("control point outline"));
 
        /* NOTE: no event handling in copied ControlPoints */
 
@@ -122,13 +122,13 @@ ControlPoint::set_color ()
        uint32_t color = 0;
 
        if (_selected) {
-               color = ARDOUR_UI::config()->color ("ControlPointSelected");
+               color = ARDOUR_UI::config()->color ("control point selected");
        } else {
-               color = ARDOUR_UI::config()->color ("ControlPointOutline");
+               color = ARDOUR_UI::config()->color ("control point outline");
        }
 
        _item->set_outline_color (color);
-       _item->set_fill_color (ARDOUR_UI::config()->color ("ControlPointFill"));
+       _item->set_fill_color (ARDOUR_UI::config()->color ("control point fill"));
 }
 
 void

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index dcf7e77b1b046ad599a570a86a60d5c5eaf07044..376745d7f726c57024443daa1cf88a34e79bcbed 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -390,11 +390,11 @@ Editor::Editor ()
 
        sfbrowser = 0;
 
-       location_marker_color = ARDOUR_UI::config()->color ("LocationMarker");
-       location_range_color = ARDOUR_UI::config()->color ("LocationRange");
-       location_cd_marker_color = ARDOUR_UI::config()->color ("LocationCDMarker");
-       location_loop_color = ARDOUR_UI::config()->color ("LocationLoop");
-       location_punch_color = ARDOUR_UI::config()->color ("LocationPunch");
+       location_marker_color = ARDOUR_UI::config()->color ("location marker");
+       location_range_color = ARDOUR_UI::config()->color ("location range");
+       location_cd_marker_color = ARDOUR_UI::config()->color ("location cd marker");
+       location_loop_color = ARDOUR_UI::config()->color ("location loop");
+       location_punch_color = ARDOUR_UI::config()->color ("location punch");
 
        zoom_focus = ZoomFocusLeft;
        _edit_point = EditAtMouse;

diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index ad808154aa09e5d67a08c0c056fb5ff7bfc18043..7f1d6f4a151b4779018305ad703a301673ed9134 100644 (file)
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -69,7 +69,7 @@ Editor::initialize_canvas ()
        _track_canvas_viewport = new ArdourCanvas::GtkCanvasViewport (horizontal_adjustment, vertical_adjustment);
        _track_canvas = _track_canvas_viewport->canvas ();
 
-        _track_canvas->set_background_color (ARDOUR_UI::config()->color ("ArrangeBase"));
+        _track_canvas->set_background_color (ARDOUR_UI::config()->color ("arrange base"));
 
        /* scroll group for items that should not automatically scroll
         *  (e.g verbose cursor). It shares the canvas coordinate space.
@@ -871,8 +871,8 @@ Editor::set_horizontal_position (double p)
 void
 Editor::color_handler()
 {
-       ArdourCanvas::Color base = ARDOUR_UI::config()->color ("RulerBase");
-       ArdourCanvas::Color text = ARDOUR_UI::config()->color ("RulerText");
+       ArdourCanvas::Color base = ARDOUR_UI::config()->color ("ruler base");
+       ArdourCanvas::Color text = ARDOUR_UI::config()->color ("ruler text");
        timecode_ruler->set_fill_color (base);
        timecode_ruler->set_outline_color (text);
        minsec_ruler->set_fill_color (base);
@@ -882,52 +882,52 @@ Editor::color_handler()
        bbt_ruler->set_fill_color (base);
        bbt_ruler->set_outline_color (text);
        
-       playhead_cursor->set_color (ARDOUR_UI::config()->color ("PlayHead"));
+       playhead_cursor->set_color (ARDOUR_UI::config()->color ("play head"));
 
-       meter_bar->set_fill_color (ARDOUR_UI::config()->color ("MeterBar"));
-       meter_bar->set_outline_color (ARDOUR_UI::config()->color ("MarkerBarSeparator"));
+       meter_bar->set_fill_color (ARDOUR_UI::config()->color ("meter bar"));
+       meter_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
 
-       tempo_bar->set_fill_color (ARDOUR_UI::config()->color ("TempoBar"));
-       tempo_bar->set_outline_color (ARDOUR_UI::config()->color ("MarkerBarSeparator"));
+       tempo_bar->set_fill_color (ARDOUR_UI::config()->color ("tempo bar"));
+       tempo_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
 
-       marker_bar->set_fill_color (ARDOUR_UI::config()->color ("MarkerBar"));
-       marker_bar->set_outline_color (ARDOUR_UI::config()->color ("MarkerBarSeparator"));
+       marker_bar->set_fill_color (ARDOUR_UI::config()->color ("marker bar"));
+       marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
 
-       cd_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("CDMarkerBar"));
-       cd_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("MarkerBarSeparator"));
+       cd_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("cd marker bar"));
+       cd_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
 
-       range_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("RangeMarkerBar"));
-       range_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("MarkerBarSeparator"));
+       range_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("range marker bar"));
+       range_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
 
-       transport_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("TransportMarkerBar"));
-       transport_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("MarkerBarSeparator"));
+       transport_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("transport marker bar"));
+       transport_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
 
-       cd_marker_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->color ("RangeDragBarRect"));
-       cd_marker_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->color ("RangeDragBarRect"));
+       cd_marker_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->color ("range drag bar rect"));
+       cd_marker_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->color ("range drag bar rect"));
 
-       range_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->color ("RangeDragBarRect"));
-       range_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->color ("RangeDragBarRect"));
+       range_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->color ("range drag bar rect"));
+       range_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->color ("range drag bar rect"));
 
-       transport_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->color ("TransportDragRect"));
-       transport_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->color ("TransportDragRect"));
+       transport_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->color ("transport drag rect"));
+       transport_bar_drag_rect->set_outline_color (ARDOUR_UI::config()->color ("transport drag rect"));
 
-       transport_loop_range_rect->set_fill_color (ARDOUR_UI::config()->color ("TransportLoopRect"));
-       transport_loop_range_rect->set_outline_color (ARDOUR_UI::config()->color ("TransportLoopRect"));
+       transport_loop_range_rect->set_fill_color (ARDOUR_UI::config()->color ("transport loop rect"));
+       transport_loop_range_rect->set_outline_color (ARDOUR_UI::config()->color ("transport loop rect"));
 
-       transport_punch_range_rect->set_fill_color (ARDOUR_UI::config()->color ("TransportPunchRect"));
-       transport_punch_range_rect->set_outline_color (ARDOUR_UI::config()->color ("TransportPunchRect"));
+       transport_punch_range_rect->set_fill_color (ARDOUR_UI::config()->color ("transport punch rect"));
+       transport_punch_range_rect->set_outline_color (ARDOUR_UI::config()->color ("transport punch rect"));
 
-       transport_punchin_line->set_outline_color (ARDOUR_UI::config()->color ("PunchLine"));
-       transport_punchout_line->set_outline_color (ARDOUR_UI::config()->color ("PunchLine"));
+       transport_punchin_line->set_outline_color (ARDOUR_UI::config()->color ("punch line"));
+       transport_punchout_line->set_outline_color (ARDOUR_UI::config()->color ("punch line"));
 
-       rubberband_rect->set_outline_color (ARDOUR_UI::config()->color ("RubberBandRect"));
-       rubberband_rect->set_fill_color ((guint32) ARDOUR_UI::config()->color ("RubberBandRect"));
+       rubberband_rect->set_outline_color (ARDOUR_UI::config()->color ("rubber band rect"));
+       rubberband_rect->set_fill_color ((guint32) ARDOUR_UI::config()->color ("rubber band rect"));
 
-       location_marker_color = ARDOUR_UI::config()->color ("LocationMarker");
-       location_range_color = ARDOUR_UI::config()->color ("LocationRange");
-       location_cd_marker_color = ARDOUR_UI::config()->color ("LocationCDMarker");
-       location_loop_color = ARDOUR_UI::config()->color ("LocationLoop");
-       location_punch_color = ARDOUR_UI::config()->color ("LocationPunch");
+       location_marker_color = ARDOUR_UI::config()->color ("location marker");
+       location_range_color = ARDOUR_UI::config()->color ("location range");
+       location_cd_marker_color = ARDOUR_UI::config()->color ("location cd marker");
+       location_loop_color = ARDOUR_UI::config()->color ("location loop");
+       location_punch_color = ARDOUR_UI::config()->color ("location punch");
 
        refresh_location_display ();
 

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index c440806d8f939ac1993c769cb82e0ae503ad8cb2..370a6936b16864beb94858bf89e82a7b7a90c0c4 100644 (file)
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -2592,7 +2592,7 @@ MeterMarkerDrag::motion (GdkEvent* event, bool first_move)
                _marker = new MeterMarker (
                        *_editor,
                        *_editor->meter_group,
-                       ARDOUR_UI::config()->color ("MeterMarker"),
+                       ARDOUR_UI::config()->color ("meter marker"),
                        name,
                        *new MeterSection (_marker->meter())
                );
@@ -2723,7 +2723,7 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move)
                _marker = new TempoMarker (
                        *_editor,
                        *_editor->tempo_group,
-                       ARDOUR_UI::config()->color ("TempoMarker"),
+                       ARDOUR_UI::config()->color ("tempo marker"),
                        name,
                        *new TempoSection (_marker->tempo())
                        );
@@ -4453,8 +4453,8 @@ RangeMarkerBarDrag::RangeMarkerBarDrag (Editor* e, ArdourCanvas::Item* i, Operat
                                                                      physical_screen_height (_editor->get_window())));
        _drag_rect->hide ();
 
-       _drag_rect->set_fill_color (ARDOUR_UI::config()->color ("RangeDragRect"));
-       _drag_rect->set_outline_color (ARDOUR_UI::config()->color ("RangeDragRect"));
+       _drag_rect->set_fill_color (ARDOUR_UI::config()->color ("range drag rect"));
+       _drag_rect->set_outline_color (ARDOUR_UI::config()->color ("range drag rect"));
 }
 
 void

diff --git a/gtk2_ardour/editor_group_tabs.cc b/gtk2_ardour/editor_group_tabs.cc
index 9c77f5ea17214a2ca201149bdaebe84128c330d5..f58c4a22d61807ee6b8148af59d5bf71d3db9412 100644 (file)
--- a/gtk2_ardour/editor_group_tabs.cc
+++ b/gtk2_ardour/editor_group_tabs.cc
@@ -95,7 +95,7 @@ EditorGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
        if (tab.group && tab.group->is_active()) {
                ArdourCanvas::color_to_rgba (tab.color, r, g, b, a);
        } else {
-               ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("InactiveGroupTab"), r, g, b, a);
+               ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("inactive group tab"), r, g, b, a);
        }
 
        a = 1.0;

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 5d0e37aedce601ebedeb7ff6607fa81f379da505..83ade5c02e9859f74733e5c5349695fedbe343f3 100644 (file)
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -1632,7 +1632,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
                if (mouse_mode == MouseDraw) {
                        ArdourCanvas::Line *line = dynamic_cast<ArdourCanvas::Line *> (item);
                        if (line) {
-                               line->set_outline_color (ARDOUR_UI::config()->color ("EnteredGainLine"));
+                               line->set_outline_color (ARDOUR_UI::config()->color ("entered gain line"));
                        }
                }
                break;
@@ -1641,7 +1641,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
                if (mouse_mode == MouseDraw || mouse_mode == MouseObject) {
                        ArdourCanvas::Line *line = dynamic_cast<ArdourCanvas::Line *> (item);
                        if (line) {
-                               line->set_outline_color (ARDOUR_UI::config()->color ("EnteredAutomationLine"));
+                               line->set_outline_color (ARDOUR_UI::config()->color ("entered automation line"));
                        }
                }
                break;
@@ -1659,7 +1659,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
                        break;
                }
                entered_marker = marker;
-               marker->set_color_rgba (ARDOUR_UI::config()->color ("EnteredMarker"));
+               marker->set_color_rgba (ARDOUR_UI::config()->color ("entered marker"));
                // fall through
        case MeterMarkerItem:
        case TempoMarkerItem:
@@ -1771,7 +1771,7 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type)
        {
                ArdourCanvas::Rectangle *rect = dynamic_cast<ArdourCanvas::Rectangle *> (item);
                if (rect) {
-                       rect->set_fill_color (ARDOUR_UI::config()->color ("InactiveFadeHandle"));
+                       rect->set_fill_color (ARDOUR_UI::config()->color ("inactive fade handle"));
                }
        }
        break;
@@ -1782,7 +1782,7 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type)
        case FeatureLineItem:
        {
                ArdourCanvas::Line *line = dynamic_cast<ArdourCanvas::Line *> (item);
-               line->set_outline_color (ARDOUR_UI::config()->color ("ZeroLine"));
+               line->set_outline_color (ARDOUR_UI::config()->color ("zero line"));
        }
        break;
 

diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index 7da2de304a650a6028a0b031157902eb0ac784d0..6afa8e71a816b8e89a9e08b126e8885a8d33e2ec 100644 (file)
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -85,7 +85,7 @@ Editor::draw_metric_marks (const Metrics& metrics)
 
                if ((ms = dynamic_cast<const MeterSection*>(*i)) != 0) {
                        snprintf (buf, sizeof(buf), "%g/%g", ms->divisions_per_bar(), ms->note_divisor ());
-                       metric_marks.push_back (new MeterMarker (*this, *meter_group, ARDOUR_UI::config()->color ("MeterMarker"), buf,
+                       metric_marks.push_back (new MeterMarker (*this, *meter_group, ARDOUR_UI::config()->color ("meter marker"), buf,
                                                                 *(const_cast<MeterSection*>(ms))));
                } else if ((ts = dynamic_cast<const TempoSection*>(*i)) != 0) {
                        if (Config->get_allow_non_quarter_pulse()) {
@@ -93,7 +93,7 @@ Editor::draw_metric_marks (const Metrics& metrics)
                        } else {
                                snprintf (buf, sizeof (buf), "%.2f", ts->beats_per_minute());
                        }
-                       metric_marks.push_back (new TempoMarker (*this, *tempo_group, ARDOUR_UI::config()->color ("TempoMarker"), buf,
+                       metric_marks.push_back (new TempoMarker (*this, *tempo_group, ARDOUR_UI::config()->color ("tempo marker"), buf,
                                                                 *(const_cast<TempoSection*>(ts))));
                }
 

diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc
index 3db31dbfdff90f05eef4558443f12da594c23b62..b07d6415eab0df586e04e5d36ac3959888a33f3e 100644 (file)
--- a/gtk2_ardour/generic_pluginui.cc
+++ b/gtk2_ardour/generic_pluginui.cc
@@ -763,8 +763,8 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter&             param,
                                0xcccc00ff, 0xcccc00ff,
                                0xffaa00ff, 0xffaa00ff,
                                0xff0000ff,
-                               ARDOUR_UI::config()->color ("MeterBackgroundBot"),
-                               ARDOUR_UI::config()->color ("MeterBackgroundTop")
+                               ARDOUR_UI::config()->color ("meter background bottom"),
+                               ARDOUR_UI::config()->color ("meter background top")
                                );
 
                info->min_unbound = desc.min_unbound;

diff --git a/gtk2_ardour/ghostregion.cc b/gtk2_ardour/ghostregion.cc
index 62af5b836437caaffc65fdc241e4297c563f4616..d1bf1e7aacafb49ba475e5dc7c8d2455eeb7843e 100644 (file)
--- a/gtk2_ardour/ghostregion.cc
+++ b/gtk2_ardour/ghostregion.cc
@@ -87,7 +87,7 @@ void
 GhostRegion::set_colors ()
 {
        if (is_automation_ghost()) {
-               base_rect->set_fill_color (ARDOUR_UI::config()->color ("GhostTrackBase"));
+               base_rect->set_fill_color (ARDOUR_UI::config()->color ("ghost track base"));
        }
 }
 
@@ -141,17 +141,17 @@ AudioGhostRegion::set_colors ()
        guint fill_color;
 
        if (is_automation_ghost()) {
-               fill_color = ARDOUR_UI::config()->color ("GhostTrackWaveFill");
+               fill_color = ARDOUR_UI::config()->color ("ghost track wave fill");
        }
        else {
                fill_color = source_track_color(200);
        }
 
        for (uint32_t n=0; n < waves.size(); ++n) {
-               waves[n]->set_outline_color (ARDOUR_UI::config()->color ("GhostTrackWave"));
+               waves[n]->set_outline_color (ARDOUR_UI::config()->color ("ghost track wave"));
                waves[n]->set_fill_color (fill_color);
-               waves[n]->set_clip_color (ARDOUR_UI::config()->color ("GhostTrackWaveClip"));
-               waves[n]->set_zero_color (ARDOUR_UI::config()->color ("GhostTrackZeroLine"));
+               waves[n]->set_clip_color (ARDOUR_UI::config()->color ("ghost track wave clip"));
+               waves[n]->set_zero_color (ARDOUR_UI::config()->color ("ghost track zero line"));
        }
 }
 
@@ -236,7 +236,7 @@ MidiGhostRegion::set_colors()
 
        for (EventList::iterator it = events.begin(); it != events.end(); ++it) {
                (*it)->rect->set_fill_color (fill);
-               (*it)->rect->set_outline_color (ARDOUR_UI::config()->color ("GhostTrackMidiOutline"));
+               (*it)->rect->set_outline_color (ARDOUR_UI::config()->color ("ghost track midi outline"));
        }
 }
 
@@ -273,7 +273,7 @@ MidiGhostRegion::add_note (NoteBase* n)
        events.push_back (event);
 
        event->rect->set_fill_color (source_track_color(200));
-       event->rect->set_outline_color (ARDOUR_UI::config()->color ("GhostTrackMidiOutline"));
+       event->rect->set_outline_color (ARDOUR_UI::config()->color ("ghost track midi outline"));
 
        MidiStreamView* mv = midi_view();
 

diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
index d39730fec844498d946fce53c8e3a95a61e10a26..13d0f6187ddb3914f9c20d6b65bdcd3d152b2e67 100644 (file)
--- a/gtk2_ardour/level_meter.cc
+++ b/gtk2_ardour/level_meter.cc
@@ -273,36 +273,36 @@ LevelMeterBase::setup_meters (int len, int initial_width, int thin_width)
                uint32_t b[4];
                float stp[4];
                int styleflags = Config->get_meter_style_led() ? 3 : 1;
-               b[0] = ARDOUR_UI::config()->color ("MeterBackgroundBot");
-               b[1] = ARDOUR_UI::config()->color ("MeterBackgroundTop");
+               b[0] = ARDOUR_UI::config()->color ("meter background bottom");
+               b[1] = ARDOUR_UI::config()->color ("meter background top");
                b[2] = 0x991122ff; // red highlight gradient Bot
                b[3] = 0x551111ff; // red highlight gradient Top
                if (n < nmidi) {
-                       c[0] = ARDOUR_UI::config()->color ("MidiMeterColor0");
-                       c[1] = ARDOUR_UI::config()->color ("MidiMeterColor1");
-                       c[2] = ARDOUR_UI::config()->color ("MidiMeterColor2");
-                       c[3] = ARDOUR_UI::config()->color ("MidiMeterColor3");
-                       c[4] = ARDOUR_UI::config()->color ("MidiMeterColor4");
-                       c[5] = ARDOUR_UI::config()->color ("MidiMeterColor5");
-                       c[6] = ARDOUR_UI::config()->color ("MidiMeterColor6");
-                       c[7] = ARDOUR_UI::config()->color ("MidiMeterColor7");
-                       c[8] = ARDOUR_UI::config()->color ("MidiMeterColor8");
-                       c[9] = ARDOUR_UI::config()->color ("MidiMeterColor9");
+                       c[0] = ARDOUR_UI::config()->color ("midi meter color0");
+                       c[1] = ARDOUR_UI::config()->color ("midi meter color1");
+                       c[2] = ARDOUR_UI::config()->color ("midi meter color2");
+                       c[3] = ARDOUR_UI::config()->color ("midi meter color3");
+                       c[4] = ARDOUR_UI::config()->color ("midi meter color4");
+                       c[5] = ARDOUR_UI::config()->color ("midi meter color5");
+                       c[6] = ARDOUR_UI::config()->color ("midi meter color6");
+                       c[7] = ARDOUR_UI::config()->color ("midi meter color7");
+                       c[8] = ARDOUR_UI::config()->color ("midi meter color8");
+                       c[9] = ARDOUR_UI::config()->color ("midi meter color9");
                        stp[0] = 115.0 *  32.0 / 128.0;
                        stp[1] = 115.0 *  64.0 / 128.0;
                        stp[2] = 115.0 * 100.0 / 128.0;
                        stp[3] = 115.0 * 112.0 / 128.0;
                } else {
-                       c[0] = ARDOUR_UI::config()->color ("MeterColor0");
-                       c[1] = ARDOUR_UI::config()->color ("MeterColor1");
-                       c[2] = ARDOUR_UI::config()->color ("MeterColor2");
-                       c[3] = ARDOUR_UI::config()->color ("MeterColor3");
-                       c[4] = ARDOUR_UI::config()->color ("MeterColor4");
-                       c[5] = ARDOUR_UI::config()->color ("MeterColor5");
-                       c[6] = ARDOUR_UI::config()->color ("MeterColor6");
-                       c[7] = ARDOUR_UI::config()->color ("MeterColor7");
-                       c[8] = ARDOUR_UI::config()->color ("MeterColor8");
-                       c[9] = ARDOUR_UI::config()->color ("MeterColor9");
+                       c[0] = ARDOUR_UI::config()->color ("meter color0");
+                       c[1] = ARDOUR_UI::config()->color ("meter color1");
+                       c[2] = ARDOUR_UI::config()->color ("meter color2");
+                       c[3] = ARDOUR_UI::config()->color ("meter color3");
+                       c[4] = ARDOUR_UI::config()->color ("meter color4");
+                       c[5] = ARDOUR_UI::config()->color ("meter color5");
+                       c[6] = ARDOUR_UI::config()->color ("meter color6");
+                       c[7] = ARDOUR_UI::config()->color ("meter color7");
+                       c[8] = ARDOUR_UI::config()->color ("meter color8");
+                       c[9] = ARDOUR_UI::config()->color ("meter color9");
 
                        switch (meter_type) {
                                case MeterK20:

diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index 2610b8baf457cc28c32e578ef2781967c3320730..33135181d5392324d6ebcae4e301291b5a15dc5e 100644 (file)
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -331,7 +331,7 @@ Marker::setup_line ()
                if (_track_canvas_line == 0) {
 
                        _track_canvas_line = new ArdourCanvas::Line (editor.get_hscroll_group());
-                       _track_canvas_line->set_outline_color (ARDOUR_UI::config()->color ("EditPoint"));
+                       _track_canvas_line->set_outline_color (ARDOUR_UI::config()->color ("edit point"));
                        _track_canvas_line->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this));
                }
 
@@ -342,7 +342,7 @@ Marker::setup_line ()
                _track_canvas_line->set_x1 (d.x);
                _track_canvas_line->set_y0 (d.y);
                _track_canvas_line->set_y1 (ArdourCanvas::COORD_MAX);
-               _track_canvas_line->set_outline_color (_selected ? ARDOUR_UI::config()->color ("EditPoint") : _color);
+               _track_canvas_line->set_outline_color (_selected ? ARDOUR_UI::config()->color ("edit point") : _color);
                _track_canvas_line->raise_to_top ();
                _track_canvas_line->show ();
 

diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index 8073cb2d2ab9d73b891aed47e25796e3759b1f05..000e5231bc1d51a0a25a09d32a683264e3adf809 100644 (file)
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -2621,7 +2621,7 @@ MidiRegionView::begin_resizing (bool /*at_front*/)
 
                        // calculate the colors: get the color settings
                        uint32_t fill_color = UINT_RGBA_CHANGE_A(
-                               ARDOUR_UI::config()->color ("MidiNoteSelected"),
+                               ARDOUR_UI::config()->color ("midi note selected"),
                                128);
 
                        // make the resize preview notes more transparent and bright
@@ -2634,7 +2634,7 @@ MidiRegionView::begin_resizing (bool /*at_front*/)
                                0.85));
 
                        resize_rect->set_outline_color (NoteBase::calculate_outline (
-                                                               ARDOUR_UI::config()->color ("MidiNoteSelected")));
+                                                               ARDOUR_UI::config()->color ("midi note selected")));
 
                        resize_data->resize_rect = resize_rect;
                        _resize_data.push_back(resize_data);
@@ -3281,9 +3281,9 @@ MidiRegionView::set_frame_color()
        }
 
        if (_selected) {
-               f = ARDOUR_UI::config()->color ("SelectedFrameBase");
+               f = ARDOUR_UI::config()->color ("selected frame base");
        } else if (high_enough_for_name) {
-               f= ARDOUR_UI::config()->color ("MidiFrameBase");
+               f= ARDOUR_UI::config()->color ("midi frame base");
        } else {
                f = fill_color;
        }

diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc
index f3087a8cca3fc5c0eaee21c1bcd04ca1d1448254..ee9e4ff5d305ea78df5c318d840a7664c8b9406c 100644 (file)
--- a/gtk2_ardour/midi_streamview.cc
+++ b/gtk2_ardour/midi_streamview.cc
@@ -320,7 +320,7 @@ MidiStreamView::draw_note_lines()
                 */
 
                if (i <= highest_note()) {
-                       _note_lines->add (y, 1.0, ARDOUR_UI::config()->color ("PianoRollBlackOutline"));
+                       _note_lines->add (y, 1.0, ARDOUR_UI::config()->color ("piano roll black outline"));
                }
 
                /* now add a thicker line/bar which covers the entire vertical
@@ -333,10 +333,10 @@ MidiStreamView::draw_note_lines()
                case 6:
                case 8:
                case 10:
-                       color = ARDOUR_UI::config()->color ("PianoRollBlack");
+                       color = ARDOUR_UI::config()->color ("piano roll black");
                        break;
                default:
-                       color = ARDOUR_UI::config()->color ("PianoRollWhite");
+                       color = ARDOUR_UI::config()->color ("piano roll white");
                        break;
                }
 
@@ -511,11 +511,11 @@ MidiStreamView::setup_rec_box ()
                        gdouble const xend = xstart;
                        uint32_t fill_color;
 
-                       fill_color = ARDOUR_UI::config()->color ("RecordingRect");
+                       fill_color = ARDOUR_UI::config()->color ("recording rect");
 
                        ArdourCanvas::Rectangle * rec_rect = new ArdourCanvas::Rectangle (_canvas_group);
                        rec_rect->set (ArdourCanvas::Rect (xstart, 1, xend, _trackview.current_height() - 1));
-                       rec_rect->set_outline_color (ARDOUR_UI::config()->color ("RecordingRect"));
+                       rec_rect->set_outline_color (ARDOUR_UI::config()->color ("recording rect"));
                        rec_rect->set_fill_color (fill_color);
                        rec_rect->lower_to_bottom();
 
@@ -588,9 +588,9 @@ MidiStreamView::color_handler ()
        draw_note_lines ();
 
        if (_trackview.is_midi_track()) {
-               canvas_rect->set_fill_color (ARDOUR_UI::config()->color ("MidiTrackBase"));
+               canvas_rect->set_fill_color (ARDOUR_UI::config()->color ("midi track base"));
        } else {
-               canvas_rect->set_fill_color (ARDOUR_UI::config()->color ("MidiBusBase"));
+               canvas_rect->set_fill_color (ARDOUR_UI::config()->color ("midi bus base"));
        }
 }
 

diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc
index 290cc30b2a94a9d2fa942e6a61b46ad0a1b3a1e9..da227fedbb1487a4fc60f9811e3014bb1cbbba20 100644 (file)
--- a/gtk2_ardour/mixer_group_tabs.cc
+++ b/gtk2_ardour/mixer_group_tabs.cc
@@ -103,7 +103,7 @@ MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
        if (tab.group && tab.group->is_active()) {
                ArdourCanvas::color_to_rgba (tab.color, r, g, b, a);
        } else {
-               ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("InactiveGroupTab"), r, g, b, a);
+               ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("inactive group tab"), r, g, b, a);
        }
        
        a = 1.0;

diff --git a/gtk2_ardour/mono_panner.cc b/gtk2_ardour/mono_panner.cc
index dfd8a91815b252e41bace511f19306c3f36a9b20..82e60b5959e1e45cbd606e7f0e1ec6907fd109fe 100644 (file)
--- a/gtk2_ardour/mono_panner.cc
+++ b/gtk2_ardour/mono_panner.cc
@@ -487,12 +487,12 @@ MonoPanner::on_key_press_event (GdkEventKey* ev)
 void
 MonoPanner::set_colors ()
 {
-        colors.fill = ARDOUR_UI::config()->color ("MonoPannerFill");
-        colors.outline = ARDOUR_UI::config()->color ("MonoPannerOutline");
-        colors.text = ARDOUR_UI::config()->color ("MonoPannerText");
-        colors.background = ARDOUR_UI::config()->color ("MonoPannerBackground");
-        colors.pos_outline = ARDOUR_UI::config()->color ("MonoPannerPositionOutline");
-        colors.pos_fill = ARDOUR_UI::config()->color ("MonoPannerPositionFill");
+        colors.fill = ARDOUR_UI::config()->color ("mono panner fill");
+        colors.outline = ARDOUR_UI::config()->color ("mono panner outline");
+        colors.text = ARDOUR_UI::config()->color ("mono panner text");
+        colors.background = ARDOUR_UI::config()->color ("mono panner bg");
+        colors.pos_outline = ARDOUR_UI::config()->color ("mono panner position outline");
+        colors.pos_fill = ARDOUR_UI::config()->color ("mono panner position fill");
 }
 
 void

diff --git a/gtk2_ardour/note_base.cc b/gtk2_ardour/note_base.cc
index a6e939635985b7c9d611ca39e3bdcee24d1bd0d5..641c1f6343e40b38b8d9a931b3c9cb2e49199e0a 100644 (file)
--- a/gtk2_ardour/note_base.cc
+++ b/gtk2_ardour/note_base.cc
@@ -96,7 +96,7 @@ NoteBase::show_velocity()
        if (!_text) {
                _text = new Text (_item->parent ());
                _text->set_ignore_events (true);
-               _text->set_color (ARDOUR_UI::config()->color ("MidiNoteVelocityText"));
+               _text->set_color (ARDOUR_UI::config()->color ("midi note velocity text"));
                _text->set_alignment (Pango::ALIGN_CENTER);
        }
 
@@ -121,8 +121,8 @@ NoteBase::on_channel_selection_change(uint16_t selection)
 {
        // make note change its color if its channel is not marked active
        if ( (selection & (1 << _note->channel())) == 0 ) {
-               set_fill_color(ARDOUR_UI::config()->color ("MidiNoteInactiveChannel"));
-               set_outline_color(calculate_outline(ARDOUR_UI::config()->color ("MidiNoteInactiveChannel")));
+               set_fill_color(ARDOUR_UI::config()->color ("midi note inactive channel"));
+               set_outline_color(calculate_outline(ARDOUR_UI::config()->color ("midi note inactive channel")));
        } else {
                // set the color according to the notes selection state
                set_selected(_selected);
@@ -150,7 +150,7 @@ NoteBase::set_selected(bool selected)
        set_fill_color (base_color());
         
        if (_selected) {
-               set_outline_color(calculate_outline(ARDOUR_UI::config()->color ("MidiNoteSelected")));
+               set_outline_color(calculate_outline(ARDOUR_UI::config()->color ("midi note selected")));
        } else {
                set_outline_color(calculate_outline(base_color()));
        }
@@ -174,13 +174,13 @@ NoteBase::base_color()
        {
                uint32_t color = _region.midi_stream_view()->get_region_color();
                return UINT_INTERPOLATE (UINT_RGBA_CHANGE_A (color, opacity), 
-                                        ARDOUR_UI::config()->color ("MidiNoteSelected"), 
+                                        ARDOUR_UI::config()->color ("midi note selected"), 
                                         0.5);
        }
 
        case ChannelColors:
                return UINT_INTERPOLATE (UINT_RGBA_CHANGE_A (NoteBase::midi_channel_colors[_note->channel()], opacity), 
-                                        ARDOUR_UI::config()->color ("MidiNoteSelected()"), 0.5);
+                                        ARDOUR_UI::config()->color ("midi note selected"), 0.5);
 
        default:
                return meter_style_fill_color(_note->velocity(), selected());

diff --git a/gtk2_ardour/note_base.h b/gtk2_ardour/note_base.h
index d4f5871063b018fe877690cfb4fa5adac5dddee5..f76c184a20cc164ffbe43e49cf94eaf7e0aa831c 100644 (file)
--- a/gtk2_ardour/note_base.h
+++ b/gtk2_ardour/note_base.h
@@ -106,25 +106,25 @@ class NoteBase : public sigc::trackable
                 if (selected) {
                         if (vel < 64) {
                                 return UINT_INTERPOLATE(
-                                       ARDOUR_UI::config()->color ("SelectedMidiNoteColorBase"),
-                                       ARDOUR_UI::config()->color ("SelectedMidiNoteColorMid"),
+                                       ARDOUR_UI::config()->color ("selected midi note color min"),
+                                       ARDOUR_UI::config()->color ("selected midi note color mid"),
                                        (vel / (double)63.0));
                         } else {
                                 return UINT_INTERPOLATE(
-                                       ARDOUR_UI::config()->color ("SelectedMidiNoteColorMid"),
-                                       ARDOUR_UI::config()->color ("SelectedMidiNoteColorTop"),
+                                       ARDOUR_UI::config()->color ("selected midi note color mid"),
+                                       ARDOUR_UI::config()->color ("selected midi note color max"),
                                        ((vel-64) / (double)63.0));
                         }
                 } else {
                         if (vel < 64) {
                                 return UINT_INTERPOLATE(
-                                       ARDOUR_UI::config()->color ("MidiNoteColorBase"),
-                                       ARDOUR_UI::config()->color ("MidiNoteColorMid"),
+                                       ARDOUR_UI::config()->color ("midi note color min"),
+                                       ARDOUR_UI::config()->color ("midi note color mid"),
                                        (vel / (double)63.0));
                         } else {
                                 return UINT_INTERPOLATE(
-                                       ARDOUR_UI::config()->color ("MidiNoteColorMid"),
-                                       ARDOUR_UI::config()->color ("MidiNoteColorTop"),
+                                       ARDOUR_UI::config()->color ("midi note color mid"),
+                                       ARDOUR_UI::config()->color ("midi note color max"),
                                        ((vel-64) / (double)63.0));
                         }
                 }

diff --git a/gtk2_ardour/patch_change.cc b/gtk2_ardour/patch_change.cc
index bdc4e71afe9230ddb4ad4d0ae1f3faba32c89638..530f903bad520c6266101ee143f06f087ec828d2 100644 (file)
--- a/gtk2_ardour/patch_change.cc
+++ b/gtk2_ardour/patch_change.cc
@@ -58,8 +58,8 @@ PatchChange::PatchChange(
        _flag = new ArdourCanvas::Flag (
                parent,
                height,
-               ARDOUR_UI::config()->color ("MidiPatchChangeOutline"),
-               ARDOUR_UI::config()->color ("MidiPatchChangeFill"),
+               ARDOUR_UI::config()->color ("midi patch change outline"),
+               ARDOUR_UI::config()->color ("midi patch change fill"),
                ArdourCanvas::Duple (x, y)
                );
        

diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index d4188334711402566fa67bb97350e726bae28ae3..11d75a161e9930d6f1f4151bcc5e73c4cb4c56b7 100644 (file)
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -235,7 +235,7 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*thr
                 return;
         }
 
-        uint32_t const color = ARDOUR_UI::config()->color ("Silence");
+        uint32_t const color = ARDOUR_UI::config()->color ("silence");
 
        for (AudioIntervalResult::const_iterator i = silences.begin(); i != silences.end(); ++i) {
 
@@ -276,7 +276,7 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*thr
         _silence_text = new ArdourCanvas::Text (group);
        _silence_text->set_ignore_events (true);
         _silence_text->set_font_description (get_font_for_style (N_("SilenceText")));
-        _silence_text->set_color (ARDOUR_UI::config()->color ("SilenceText"));
+        _silence_text->set_color (ARDOUR_UI::config()->color ("silence text"));
 
         /* both positions are relative to the region start offset in source */
 
@@ -783,7 +783,7 @@ RegionView::update_coverage_frames (LayerDisplay d)
        bool me = false;
 
        /* the color that will be used to show parts of regions that will not be heard */
-       uint32_t const non_playing_color = ARDOUR_UI::config()->color ("CoveredRegion");
+       uint32_t const non_playing_color = ARDOUR_UI::config()->color ("covered region");
 
        while (t < end) {
 

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 22928f6f5e060bcca322f0f300a629de9016424f..0669c0471c53d6a7dc6803b94d3d472b7666d010 100644 (file)
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -915,8 +915,8 @@ RouteTimeAxisView::show_timestretch (framepos_t start, framepos_t end, int layer
 
        if (timestretch_rect == 0) {
                timestretch_rect = new ArdourCanvas::Rectangle (canvas_display ());
-               timestretch_rect->set_fill_color (ARDOUR_UI::config()->color ("TimeStretchFill"));
-               timestretch_rect->set_outline_color (ARDOUR_UI::config()->color ("TimeStretchOutline"));
+               timestretch_rect->set_fill_color (ARDOUR_UI::config()->color ("time stretch fill"));
+               timestretch_rect->set_outline_color (ARDOUR_UI::config()->color ("time stretch outline"));
        }
 
        timestretch_rect->show ();
@@ -1813,11 +1813,11 @@ RouteTimeAxisView::color_handler ()
 {
        //case cTimeStretchOutline:
        if (timestretch_rect) {
-               timestretch_rect->set_outline_color (ARDOUR_UI::config()->color ("TimeStretchOutline"));
+               timestretch_rect->set_outline_color (ARDOUR_UI::config()->color ("time stretch outline"));
        }
        //case cTimeStretchFill:
        if (timestretch_rect) {
-               timestretch_rect->set_fill_color (ARDOUR_UI::config()->color ("TimeStretchFill"));
+               timestretch_rect->set_fill_color (ARDOUR_UI::config()->color ("time stretch fill"));
        }
 
        reset_meter();

diff --git a/gtk2_ardour/shuttle_control.cc b/gtk2_ardour/shuttle_control.cc
index 23e2b4e8da3db051342c9b0e09f57c5d57d36e6c..d91ba0a12a0f2c73f7ef1e72fcdc2a166fb6618c 100644 (file)
--- a/gtk2_ardour/shuttle_control.cc
+++ b/gtk2_ardour/shuttle_control.cc
@@ -113,7 +113,7 @@ ShuttleControl::on_size_allocate (Gtk::Allocation& alloc)
 
        //background
        pattern = cairo_pattern_create_linear (0, 0, 0, alloc.get_height());
-       uint32_t col = ARDOUR_UI::config()->color ("Shuttle");
+       uint32_t col = ARDOUR_UI::config()->color ("shuttle");
        int r,b,g,a;
        UINT_TO_RGBA(col, &r, &g, &b, &a);
        cairo_pattern_add_color_stop_rgb (pattern, 0.0, r/400.0, g/400.0, b/400.0);

diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc
index d986040f09ba84e2987bc57b169398f8acdbb4d0..37fa5a6b4b967fca7a12ef6e56b006f0b547f6b4 100644 (file)
--- a/gtk2_ardour/stereo_panner.cc
+++ b/gtk2_ardour/stereo_panner.cc
@@ -670,24 +670,24 @@ StereoPanner::on_key_press_event (GdkEventKey* ev)
 void
 StereoPanner::set_colors ()
 {
-       colors[Normal].fill = ARDOUR_UI::config()->color ("StereoPannerFill");
-       // colors[Normal].outline = ARDOUR_UI::config()->color ("StereoPannerOutline");
+       colors[Normal].fill = ARDOUR_UI::config()->color ("stereo panner fill");
+       // colors[Normal].outline = ARDOUR_UI::config()->color ("stereo panner outline");
        colors[Normal].outline = ArdourCanvas::HSV (colors[Normal].fill).outline().color ();
-       colors[Normal].text = ARDOUR_UI::config()->color ("StereoPannerText");
-       colors[Normal].background = ARDOUR_UI::config()->color ("StereoPannerBackground");
-       colors[Normal].rule = ARDOUR_UI::config()->color ("StereoPannerRule");
-
-       colors[Mono].fill = ARDOUR_UI::config()->color ("StereoPannerMonoFill");
-       colors[Mono].outline = ARDOUR_UI::config()->color ("StereoPannerMonoOutline");
-       colors[Mono].text = ARDOUR_UI::config()->color ("StereoPannerMonoText");
-       colors[Mono].background = ARDOUR_UI::config()->color ("StereoPannerMonoBackground");
-       colors[Mono].rule = ARDOUR_UI::config()->color ("StereoPannerRule");
-
-       colors[Inverted].fill = ARDOUR_UI::config()->color ("StereoPannerInvertedFill");
-       colors[Inverted].outline = ARDOUR_UI::config()->color ("StereoPannerInvertedOutline");
-       colors[Inverted].text = ARDOUR_UI::config()->color ("StereoPannerInvertedText");
-       colors[Inverted].background = ARDOUR_UI::config()->color ("StereoPannerInvertedBackground");
-       colors[Inverted].rule = ARDOUR_UI::config()->color ("StereoPannerRule");
+       colors[Normal].text = ARDOUR_UI::config()->color ("stereo panner text");
+       colors[Normal].background = ARDOUR_UI::config()->color ("stereo panner bg");
+       colors[Normal].rule = ARDOUR_UI::config()->color ("stereo panner rule");
+
+       colors[Mono].fill = ARDOUR_UI::config()->color ("stereo panner mono fill");
+       colors[Mono].outline = ARDOUR_UI::config()->color ("stereo panner mono outline");
+       colors[Mono].text = ARDOUR_UI::config()->color ("stereo panner mono text");
+       colors[Mono].background = ARDOUR_UI::config()->color ("stereo panner mono bg");
+       colors[Mono].rule = ARDOUR_UI::config()->color ("stereo panner rule");
+
+       colors[Inverted].fill = ARDOUR_UI::config()->color ("stereo panner inverted fill");
+       colors[Inverted].outline = ARDOUR_UI::config()->color ("stereo panner inverted outline");
+       colors[Inverted].text = ARDOUR_UI::config()->color ("stereo panner inverted text");
+       colors[Inverted].background = ARDOUR_UI::config()->color ("stereo panner inverted bg");
+       colors[Inverted].rule = ARDOUR_UI::config()->color ("stereo panner rule");
 }
 
 void

diff --git a/gtk2_ardour/sys_ex.cc b/gtk2_ardour/sys_ex.cc
index c7cf68ef9c0b6e0c397ee64418618080b3380556..2c4e2e820b1338128189b6c30ffcadd621199522 100644 (file)
--- a/gtk2_ardour/sys_ex.cc
+++ b/gtk2_ardour/sys_ex.cc
@@ -35,8 +35,8 @@ SysEx::SysEx (
        _flag = new ArdourCanvas::Flag (
                parent,
                height, 
-               ARDOUR_UI::config()->color ("MidiSysExOutline"),
-               ARDOUR_UI::config()->color ("MidiSysExFill"),
+               ARDOUR_UI::config()->color ("midi sysex outline"),
+               ARDOUR_UI::config()->color ("midi sysex fill"),
                ArdourCanvas::Duple (x, y)
                );
        

diff --git a/gtk2_ardour/tempo_lines.cc b/gtk2_ardour/tempo_lines.cc
index 5cc6641fbe825d1d0d97c114efef3f77c9f6359c..7f83065c2e20515767b6fbb4350fd24f70c30457 100644 (file)
--- a/gtk2_ardour/tempo_lines.cc
+++ b/gtk2_ardour/tempo_lines.cc
@@ -83,12 +83,12 @@ TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
        for (i = begin; i != end; ++i) {
 
                if ((*i).is_bar()) {
-                       color = ARDOUR_UI::config()->color ("MeasureLineBar");
+                       color = ARDOUR_UI::config()->color ("measure line bar");
                } else {
                        if (beat_density > 0.3) {
                                continue; /* only draw beat lines if the gaps between beats are large. */
                        }
-                       color = ARDOUR_UI::config()->color ("MeasureLineBeat");
+                       color = ARDOUR_UI::config()->color ("measure line beat");
                }
 
                ArdourCanvas::Coord xpos = PublicEditor::instance().sample_to_pixel_unrounded ((*i).frame);

diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 7ee57b3bb7bd9a9bd2291dc19e93a896cb9a9fb0..8f4f6f76caa486a6c12e84e29b899828f64f6092 100644 (file)
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -1025,7 +1025,7 @@ TimeAxisView::get_selection_rect (uint32_t id)
                rect->rect = new ArdourCanvas::TimeRectangle (selection_group);
                CANVAS_DEBUG_NAME (rect->rect, "selection rect");
                rect->rect->set_outline (false);
-               rect->rect->set_fill_color (ARDOUR_UI::config()->color ("SelectionRect"));
+               rect->rect->set_fill_color (ARDOUR_UI::config()->color ("selection rect"));
 
                rect->start_trim = new ArdourCanvas::Rectangle (selection_group);
                CANVAS_DEBUG_NAME (rect->start_trim, "selection rect start trim");
@@ -1190,26 +1190,26 @@ TimeAxisView::color_handler ()
 
        for (list<SelectionRect*>::iterator i = used_selection_rects.begin(); i != used_selection_rects.end(); ++i) {
 
-               (*i)->rect->set_fill_color (ARDOUR_UI::config()->color ("SelectionRect"));
-               (*i)->rect->set_outline_color (ARDOUR_UI::config()->color ("Selection"));
+               (*i)->rect->set_fill_color (ARDOUR_UI::config()->color ("selection rect"));
+               (*i)->rect->set_outline_color (ARDOUR_UI::config()->color ("selection"));
 
-               (*i)->start_trim->set_fill_color (ARDOUR_UI::config()->color ("Selection"));
-               (*i)->start_trim->set_outline_color (ARDOUR_UI::config()->color ("Selection"));
+               (*i)->start_trim->set_fill_color (ARDOUR_UI::config()->color ("selection"));
+               (*i)->start_trim->set_outline_color (ARDOUR_UI::config()->color ("selection"));
                
-               (*i)->end_trim->set_fill_color (ARDOUR_UI::config()->color ("Selection"));
-               (*i)->end_trim->set_outline_color (ARDOUR_UI::config()->color ("Selection"));
+               (*i)->end_trim->set_fill_color (ARDOUR_UI::config()->color ("selection"));
+               (*i)->end_trim->set_outline_color (ARDOUR_UI::config()->color ("selection"));
        }
        
        for (list<SelectionRect*>::iterator i = free_selection_rects.begin(); i != free_selection_rects.end(); ++i) {
                
-               (*i)->rect->set_fill_color (ARDOUR_UI::config()->color ("SelectionRect"));
-               (*i)->rect->set_outline_color (ARDOUR_UI::config()->color ("Selection"));
+               (*i)->rect->set_fill_color (ARDOUR_UI::config()->color ("selection rect"));
+               (*i)->rect->set_outline_color (ARDOUR_UI::config()->color ("selection"));
                
-               (*i)->start_trim->set_fill_color (ARDOUR_UI::config()->color ("Selection"));
-               (*i)->start_trim->set_outline_color (ARDOUR_UI::config()->color ("Selection"));
+               (*i)->start_trim->set_fill_color (ARDOUR_UI::config()->color ("selection"));
+               (*i)->start_trim->set_outline_color (ARDOUR_UI::config()->color ("selection"));
                
-               (*i)->end_trim->set_fill_color (ARDOUR_UI::config()->color ("Selection"));
-               (*i)->end_trim->set_outline_color (ARDOUR_UI::config()->color ("Selection"));
+               (*i)->end_trim->set_fill_color (ARDOUR_UI::config()->color ("selection"));
+               (*i)->end_trim->set_outline_color (ARDOUR_UI::config()->color ("selection"));
        }
 }
 

diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index 87e0cab3f8d17a0c66f20aa78247586460062ef1..71f8fb3dfc0ab975ecac16f6407312f25360ea6f 100644 (file)
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -201,9 +201,9 @@ TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_co
                CANVAS_DEBUG_NAME (frame, string_compose ("frame for %1", get_item_name()));
 
                if (_recregion) {
-                       frame->set_outline_color (ARDOUR_UI::config()->color ("RecordingRect"));
+                       frame->set_outline_color (ARDOUR_UI::config()->color ("recording rect"));
                } else {
-                       frame->set_outline_color (ARDOUR_UI::config()->color ("TimeAxisFrame"));
+                       frame->set_outline_color (ARDOUR_UI::config()->color ("time axis frame"));
                }
        }
        
@@ -537,7 +537,7 @@ TimeAxisViewItem::set_selected(bool yn)
                if (!selection_frame) {
                        selection_frame = new ArdourCanvas::TimeRectangle (group);
                        selection_frame->set_fill (false);
-                       selection_frame->set_outline_color (ARDOUR_UI::config()->color ("SelectedTimeAxisFrame"));
+                       selection_frame->set_outline_color (ARDOUR_UI::config()->color ("selected time axis frame"));
                        selection_frame->set_ignore_events (true);
                }
                selection_frame->set (frame->get().shrink (1.0));
@@ -729,7 +729,7 @@ TimeAxisViewItem::fill_opacity () const
                return 130;
        }
 
-       uint32_t col = ARDOUR_UI::config()->color ("FrameBase");
+       uint32_t col = ARDOUR_UI::config()->color ("region base");
        return UINT_RGBA_A (col);
 }
 
@@ -743,7 +743,7 @@ TimeAxisViewItem::get_fill_color () const
 
        if (_selected) {
 
-                f = ARDOUR_UI::config()->color ("SelectedFrameBase");
+                f = ARDOUR_UI::config()->color ("selected frame base");
 
                if (o == 0) {
                        /* some condition of this item has set fill opacity to
@@ -756,10 +756,10 @@ TimeAxisViewItem::get_fill_color () const
        } else {
 
                if (_recregion) {
-                       f = ARDOUR_UI::config()->color ("RecordingRect");
+                       f = ARDOUR_UI::config()->color ("recording rect");
                } else {
                        if ((!Config->get_show_name_highlight() || high_enough_for_name) && !ARDOUR_UI::config()->get_color_regions_using_track_color()) {
-                               f = ARDOUR_UI::config()->color ("FrameBase");
+                               f = ARDOUR_UI::config()->color ("region base");
                        } else {
                                f = fill_color;
                        }
@@ -783,7 +783,7 @@ TimeAxisViewItem::set_frame_color()
        set_frame_gradient ();
 
        if (!_recregion) {
-               uint32_t f = ARDOUR_UI::config()->color ("TimeAxisFrame");
+               uint32_t f = ARDOUR_UI::config()->color ("time axis frame");
 
                if (!rect_visible) {
                        /* make the frame outline be visible but rather transparent */
@@ -910,8 +910,8 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width)
                        if (!vestigial_frame) {
                                vestigial_frame = new ArdourCanvas::TimeRectangle (group, ArdourCanvas::Rect (0.0, 0.0, 2.0, trackview.current_height()));
                                CANVAS_DEBUG_NAME (vestigial_frame, string_compose ("vestigial frame for %1", get_item_name()));
-                               vestigial_frame->set_outline_color (ARDOUR_UI::config()->color ("VestigialFrame"));
-                               vestigial_frame->set_fill_color (ARDOUR_UI::config()->color ("VestigialFrame"));
+                               vestigial_frame->set_outline_color (ARDOUR_UI::config()->color ("vestigial frame"));
+                               vestigial_frame->set_fill_color (ARDOUR_UI::config()->color ("vestigial frame"));
                                vestigial_frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT));
                        }
 

diff --git a/gtk2_ardour/verbose_cursor.cc b/gtk2_ardour/verbose_cursor.cc
index 2b180197e732b9871e9642ed8e8ef51934c7e641..c15642bdedbb9bf2d75d7d4f41957829eb37e326 100644 (file)
--- a/gtk2_ardour/verbose_cursor.cc
+++ b/gtk2_ardour/verbose_cursor.cc
@@ -53,7 +53,7 @@ VerboseCursor::VerboseCursor (Editor* editor)
 void
 VerboseCursor::color_handler ()
 {
-       _canvas_item->set_color (ARDOUR_UI::config()->color ("VerboseCanvasCursor"));
+       _canvas_item->set_color (ARDOUR_UI::config()->color ("verbose canvas cursor"));
 }
 
 ArdourCanvas::Item *