Implement grid line colors ( was: measure lines ). This restores measure lines to...

diff --git a/gtk2_ardour/grid_lines.cc b/gtk2_ardour/grid_lines.cc
index c091fa395cc1c4ddf839a867191135823d7d50da..bdaf8700549e697a5d08dfce37d7b6e6645ea6de 100644 (file)
--- a/gtk2_ardour/grid_lines.cc
+++ b/gtk2_ardour/grid_lines.cc
@@ -58,13 +58,21 @@ GridLines::draw (std::vector<Ruler::Mark>     marks)
 {
        lines.clear();
        
-       const uint32_t c = UIConfiguration::instance().color_mod("measure line beat", "measure line beat");
+       const uint32_t major_color = UIConfiguration::instance().color_mod("grid line major", "grid line");
+       const uint32_t minor_color = UIConfiguration::instance().color_mod("grid line minor", "grid line");
+       const uint32_t micro_color = UIConfiguration::instance().color_mod("grid line micro", "grid line");
 
        for (vector<Ruler::Mark>::const_iterator m = marks.begin(); m != marks.end(); ++m) {
 
                samplepos_t s = m->position;
-               lines.add (PublicEditor::instance().sample_to_pixel_unrounded (s), 1.0, c);
 
+               if ((*m).style == ArdourCanvas::Ruler::Mark::Major) {
+                       lines.add (PublicEditor::instance().sample_to_pixel_unrounded (s), 1.0, major_color);
+               } else if ((*m).style == ArdourCanvas::Ruler::Mark::Minor) {
+                       lines.add (PublicEditor::instance().sample_to_pixel_unrounded (s), 1.0, minor_color);
+               } else {
+                       lines.add (PublicEditor::instance().sample_to_pixel_unrounded (s), 1.0, micro_color);
+               }
        }
 }
 

diff --git a/gtk2_ardour/themes/blueberry_milk-ardour.colors b/gtk2_ardour/themes/blueberry_milk-ardour.colors
index 0f3eba93595580710d5fd5750753d61f73b3f2d4..b3b99bbb15e881d898b5cb978361f490fd2ce90b 100644 (file)
--- a/gtk2_ardour/themes/blueberry_milk-ardour.colors
+++ b/gtk2_ardour/themes/blueberry_milk-ardour.colors
@@ -5,6 +5,7 @@
     <Color name="color 10" value="0xe3dedeff"/>
     <Color name="color 100" value="0xe49c9cff"/>
     <Color name="color 101" value="0xa06000ff"/>
+    <Color name="color 102" value="0xa06000ff"/>
     <Color name="color 103" value="0x1e7727ff"/>
     <Color name="color 104" value="0x676767ff"/>
     <Color name="color 11" value="0x9496a3ff"/>
@@ -234,8 +235,9 @@
     <ColorAlias name="master monitor section button active: fill" alias="color 40"/>
     <ColorAlias name="master monitor section button active: fill active" alias="color 54"/>
     <ColorAlias name="master monitor section button normal: fill active" alias="color 42"/>
-    <ColorAlias name="measure line bar" alias="color 67"/>
-    <ColorAlias name="measure line beat" alias="color 81"/>
+    <ColorAlias name="grid line major" alias="color 67"/>
+    <ColorAlias name="grid line minor" alias="color 81"/>
+    <ColorAlias name="grid line micro" alias="color 81"/>
     <ColorAlias name="meter background bottom" alias="color 67"/>
     <ColorAlias name="meter background top" alias="color 67"/>
     <ColorAlias name="meter bar" alias="color 7"/>
@@ -501,7 +503,7 @@
     <Modifier name="inactive crossfade" modifier="= alpha:0.4666"/>
     <Modifier name="loop rectangle" modifier="= alpha:0.5"/>
     <Modifier name="marker bar" modifier="= alpha:0.5"/>
-    <Modifier name="measure line beat" modifier="= alpha:1"/>
+    <Modifier name="grid line alpha" modifier="= alpha:1"/>
     <Modifier name="midi frame base" modifier="= alpha:0.814846"/>
     <Modifier name="midi note" modifier="= alpha:0.8"/>
     <Modifier name="midi note velocity text" modifier="= alpha:0.4666"/>

diff --git a/gtk2_ardour/themes/caineville-ardour.colors b/gtk2_ardour/themes/caineville-ardour.colors
index cbe776b2666ca1d08c7c93aae497862a664c1f7b..6cfdc2e761754ae033d2896c707e6b8bbb8ae89e 100644 (file)
--- a/gtk2_ardour/themes/caineville-ardour.colors
+++ b/gtk2_ardour/themes/caineville-ardour.colors
@@ -171,6 +171,9 @@
     <ColorAlias name="ghost track wave clip" alias="color 29"/>
     <ColorAlias name="ghost track wave fill" alias="color 29"/>
     <ColorAlias name="ghost track zero line" alias="color 30"/>
+    <ColorAlias name="grid line major" alias="color 13"/>
+    <ColorAlias name="grid line minor" alias="color 62"/>
+    <ColorAlias name="grid line micro" alias="color 62"/>
     <ColorAlias name="gtk_arm" alias="color 9"/>
     <ColorAlias name="gtk_audio_bus" alias="color 42"/>
     <ColorAlias name="gtk_audio_track" alias="color 46"/>
@@ -234,8 +237,6 @@
     <ColorAlias name="master monitor section button active: fill" alias="color 40"/>
     <ColorAlias name="master monitor section button active: fill active" alias="color 54"/>
     <ColorAlias name="master monitor section button normal: fill active" alias="color 42"/>
-    <ColorAlias name="measure line bar" alias="color 4"/>
-    <ColorAlias name="measure line beat" alias="color 94"/>
     <ColorAlias name="meter background bottom" alias="color 4"/>
     <ColorAlias name="meter background top" alias="color 4"/>
     <ColorAlias name="meter bar" alias="color 7"/>
@@ -493,10 +494,10 @@
     <Modifier name="gain line inactive" modifier="= alpha:0.7725"/>
     <Modifier name="ghost track base" modifier="= alpha:0.640782"/>
     <Modifier name="ghost track midi fill" modifier="= alpha:0.3"/>
+    <Modifier name="grid line" modifier="= alpha:1.0"/>
     <Modifier name="inactive crossfade" modifier="= alpha:0.4666"/>
     <Modifier name="loop rectangle" modifier="= alpha:0.5"/>
     <Modifier name="marker bar" modifier="= alpha:0.5"/>
-    <Modifier name="measure line beat" modifier="= alpha:1"/>
     <Modifier name="midi frame base" modifier="= alpha:0.720606"/>
     <Modifier name="midi note" modifier="= alpha:0.8"/>
     <Modifier name="midi note velocity text" modifier="= alpha:0.4666"/>

diff --git a/gtk2_ardour/themes/clear_gray-ardour.colors b/gtk2_ardour/themes/clear_gray-ardour.colors
index df9c83351c4839269719baf394f50bb74e34f6a2..398a01fba11979446438baffb06cd7adc1182c08 100644 (file)
--- a/gtk2_ardour/themes/clear_gray-ardour.colors
+++ b/gtk2_ardour/themes/clear_gray-ardour.colors
@@ -170,6 +170,9 @@
     <ColorAlias name="ghost track wave clip" alias="color 29"/>
     <ColorAlias name="ghost track wave fill" alias="color 29"/>
     <ColorAlias name="ghost track zero line" alias="color 30"/>
+    <ColorAlias name="grid line major" alias="color 13"/>
+    <ColorAlias name="grid line minor" alias="color 62"/>
+    <ColorAlias name="grid line micro" alias="color 62"/>
     <ColorAlias name="gtk_arm" alias="color 13"/>
     <ColorAlias name="gtk_audio_bus" alias="color 29"/>
     <ColorAlias name="gtk_audio_track" alias="color 87"/>
@@ -234,8 +237,6 @@
     <ColorAlias name="master monitor section button active: fill" alias="color 40"/>
     <ColorAlias name="master monitor section button active: fill active" alias="color 13"/>
     <ColorAlias name="master monitor section button normal: fill active" alias="color 42"/>
-    <ColorAlias name="measure line bar" alias="color 4"/>
-    <ColorAlias name="measure line beat" alias="color 94"/>
     <ColorAlias name="meter background bottom" alias="color 4"/>
     <ColorAlias name="meter background top" alias="color 4"/>
     <ColorAlias name="meter bar" alias="color 7"/>
@@ -489,10 +490,10 @@
     <Modifier name="gain line inactive" modifier="= alpha:0.7725"/>
     <Modifier name="ghost track base" modifier="= alpha:0.640782"/>
     <Modifier name="ghost track midi fill" modifier="= alpha:0.3"/>
+    <Modifier name="grid line" modifier="= alpha:1.0"/>
     <Modifier name="inactive crossfade" modifier="= alpha:0.4666"/>
     <Modifier name="loop rectangle" modifier="= alpha:0.5"/>
     <Modifier name="marker bar" modifier="= alpha:0.5"/>
-    <Modifier name="measure line beat" modifier="= alpha:1"/>
     <Modifier name="midi frame base" modifier="= alpha:0.720606"/>
     <Modifier name="midi note" modifier="= alpha:0.8"/>
     <Modifier name="midi note velocity text" modifier="= alpha:0.4666"/>

diff --git a/gtk2_ardour/themes/cubasish-ardour.colors b/gtk2_ardour/themes/cubasish-ardour.colors
index ee33a808c1a7b22871b51c70d241818b6eb67d8b..8224ef3140f55c74fa9e2ff8370d0c4cddad36a3 100644 (file)
--- a/gtk2_ardour/themes/cubasish-ardour.colors
+++ b/gtk2_ardour/themes/cubasish-ardour.colors
@@ -171,6 +171,9 @@
     <ColorAlias name="ghost track wave clip" alias="color 29"/>
     <ColorAlias name="ghost track wave fill" alias="color 29"/>
     <ColorAlias name="ghost track zero line" alias="color 30"/>
+    <ColorAlias name="grid line major" alias="color 13"/>
+    <ColorAlias name="grid line minor" alias="color 62"/>
+    <ColorAlias name="grid line micro" alias="color 62"/>
     <ColorAlias name="gtk_arm" alias="color 9"/>
     <ColorAlias name="gtk_audio_bus" alias="color 61"/>
     <ColorAlias name="gtk_audio_track" alias="color 46"/>
@@ -234,8 +237,6 @@
     <ColorAlias name="master monitor section button active: fill" alias="color 40"/>
     <ColorAlias name="master monitor section button active: fill active" alias="color 54"/>
     <ColorAlias name="master monitor section button normal: fill active" alias="color 42"/>
-    <ColorAlias name="measure line bar" alias="color 13"/>
-    <ColorAlias name="measure line beat" alias="color 33"/>
     <ColorAlias name="meter background bottom" alias="color 4"/>
     <ColorAlias name="meter background top" alias="color 4"/>
     <ColorAlias name="meter bar" alias="color 7"/>
@@ -493,10 +494,10 @@
     <Modifier name="gain line inactive" modifier="= alpha:0.7725"/>
     <Modifier name="ghost track base" modifier="= alpha:0.640782"/>
     <Modifier name="ghost track midi fill" modifier="= alpha:0.182769"/>
+    <Modifier name="grid line" modifier="= alpha:1.0"/>
     <Modifier name="inactive crossfade" modifier="= alpha:0.4666"/>
     <Modifier name="loop rectangle" modifier="= alpha:0.219904"/>
     <Modifier name="marker bar" modifier="= alpha:0.5"/>
-    <Modifier name="measure line beat" modifier="= alpha:1"/>
     <Modifier name="midi frame base" modifier="= alpha:0.817702"/>
     <Modifier name="midi note" modifier="= alpha:0.863394"/>
     <Modifier name="midi note velocity text" modifier="= alpha:0.4666"/>

diff --git a/gtk2_ardour/themes/dark-ardour.colors b/gtk2_ardour/themes/dark-ardour.colors
index cb7844eace074b4f573d7381287b0da7de8a33cf..3e1f0ba928fad06fe04af01aef51c0fa8d79b31e 100644 (file)
--- a/gtk2_ardour/themes/dark-ardour.colors
+++ b/gtk2_ardour/themes/dark-ardour.colors
@@ -236,8 +236,9 @@
     <ColorAlias name="master monitor section button normal: fill active" alias="color 42"/>
     <ColorAlias name="master monitor section button active: fill"        alias="color 40"/>
     <ColorAlias name="master monitor section button active: fill active" alias="color 54"/>
-    <ColorAlias name="measure line bar" alias="color 13"/>
-    <ColorAlias name="measure line beat" alias="color 62"/>
+    <ColorAlias name="grid line major" alias="color 13"/>
+    <ColorAlias name="grid line minor" alias="color 62"/>
+    <ColorAlias name="grid line micro" alias="color 62"/>
     <ColorAlias name="meter background bottom" alias="color 46"/>
     <ColorAlias name="meter background top" alias="color 34"/>
     <ColorAlias name="meter bar" alias="color 7"/>
@@ -519,7 +520,7 @@
     <Modifier name="inactive crossfade" modifier="= alpha:0.4666"/>
     <Modifier name="loop rectangle" modifier="= alpha:0.5"/>
     <Modifier name="marker bar" modifier="= alpha:0.5"/>
-    <Modifier name="measure line beat" modifier="= alpha:1.0"/>
+    <Modifier name="grid line" modifier="= alpha:1.0"/>
     <Modifier name="midi frame base" modifier="= alpha:0.4"/>
     <Modifier name="midi note" modifier="= alpha:0.8"/>
     <Modifier name="midi note velocity text" modifier="= alpha:0.4666"/>

diff --git a/gtk2_ardour/themes/unastudia-ardour.colors b/gtk2_ardour/themes/unastudia-ardour.colors
index 0600b61f41f2b09611f06ae13d02b1f0d6442bda..4c302dfc40f06ba44a832041cbda8607850b685d 100644 (file)
--- a/gtk2_ardour/themes/unastudia-ardour.colors
+++ b/gtk2_ardour/themes/unastudia-ardour.colors
@@ -176,6 +176,9 @@
                <ColorAlias name="ghost track wave clip" alias="color 29"/>
                <ColorAlias name="ghost track wave fill" alias="color 29"/>
                <ColorAlias name="ghost track zero line" alias="color 30"/>
+               <ColorAlias name="grid line major" alias="color 13"/>
+               <ColorAlias name="grid line minor" alias="color 62"/>
+               <ColorAlias name="grid line micro" alias="color 62"/>
                <ColorAlias name="gtk_arm" alias="color 2"/>
                <ColorAlias name="gtk_audio_bus" alias="color 27"/>
                <ColorAlias name="gtk_audio_track" alias="color 107"/>
@@ -239,8 +242,6 @@
                <ColorAlias name="master monitor section button active: fill" alias="color 42"/>
                <ColorAlias name="master monitor section button active: fill active" alias="color 1"/>
                <ColorAlias name="master monitor section button normal: fill active" alias="color 42"/>
-               <ColorAlias name="measure line bar" alias="color 105"/>
-               <ColorAlias name="measure line beat" alias="color 105"/>
                <ColorAlias name="meter background bottom" alias="color 4"/>
                <ColorAlias name="meter background top" alias="color 4"/>
                <ColorAlias name="meter bar" alias="color 67"/>
@@ -498,10 +499,10 @@
                <Modifier name="gain line inactive" modifier="= alpha:0.782113"/>
                <Modifier name="ghost track base" modifier="= alpha:0.640782"/>
                <Modifier name="ghost track midi fill" modifier="= alpha:0.3"/>
+           <Modifier name="grid line" modifier="= alpha:1.0"/>
                <Modifier name="inactive crossfade" modifier="= alpha:0.4666"/>
                <Modifier name="loop rectangle" modifier="= alpha:0.3"/>
                <Modifier name="marker bar" modifier="= alpha:0.5"/>
-               <Modifier name="measure line beat" modifier="= alpha:1"/>
                <Modifier name="midi frame base" modifier="= alpha:0.4"/>
                <Modifier name="midi note" modifier="= alpha:1"/>
                <Modifier name="midi note velocity text" modifier="= alpha:0.4666"/>