Complete edit toolbar overhaul

git-svn-id: svn://localhost/ardour2/branches/midi@657 d708f5d6-7413-0410-9779-e7cbd77b26cf

11 files changed, 248 insertions, 34 deletions

diff --git a/gtk2_ardour/pixmaps/left_arrow.xpm b/gtk2_ardour/pixmaps/left_arrow.xpm
index c0afce57cc..819f19b75a 100644
--- a/gtk2_ardour/pixmaps/left_arrow.xpm
+++ b/gtk2_ardour/pixmaps/left_arrow.xpm
@@ -1,21 +1,22 @@
 /* XPM */
-static const gchar * left_arrow_xpm[] = {
-"12 15 3 1",
+static char * left_arrow_xpm[] = {
+"12 12 7 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF",
-"       ..+. ",
-"      ..++. ",
-"     ..+++. ",
-"    ..+++.. ",
-"   ..+++..  ",
-"  ..+++..   ",
-" ..+++..    ",
-" .+++..     ",
-" ..+++..    ",
-"  ..+++..   ",
-"   ..+++..  ",
-"    ..+++.. ",
-"     ..+++. ",
-"      ..++. ",
-"       ..+. "};
+"@	c #020202",
+"#	c #0B0B0B",
+"$	c #131313",
+"%	c #121212",
+"      ....  ",
+"     ..++.  ",
+"    ..++..  ",
+"   ..++..   ",
+"  ..++..    ",
+" ..++..     ",
+" ..++@.     ",
+"  ..++#.    ",
+"   ..++$.   ",
+"    ..++%.  ",
+"     ..++.  ",
+"      ....  "};
diff --git a/gtk2_ardour/pixmaps/right_arrow.xpm b/gtk2_ardour/pixmaps/right_arrow.xpm
index d5626f71fe..7c7730398e 100644
--- a/gtk2_ardour/pixmaps/right_arrow.xpm
+++ b/gtk2_ardour/pixmaps/right_arrow.xpm
@@ -1,21 +1,22 @@
 /* XPM */
-static const gchar * right_arrow_xpm[] = {
-"12 15 3 1",
+static char * right_arrow_xpm[] = {
+"12 12 7 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF",
-" .+..       ",
-" .++..      ",
-" .+++..     ",
-" ..+++..    ",
-"  ..+++..   ",
-"   ..+++..  ",
-"    ..+++.. ",
-"     ..+++. ",
-"    ..+++.. ",
-"   ..+++..  ",
-"  ..+++..   ",
-" ..+++..    ",
-" .+++..     ",
-" .++..      ",
-" .+..       "};
+"@	c #020202",
+"#	c #0B0B0B",
+"$	c #131313",
+"%	c #121212",
+"  ....      ",
+"  .++..     ",
+"  ..++..    ",
+"   ..++..   ",
+"    ..++..  ",
+"     ..++.. ",
+"     .@++.. ",
+"    .#++..  ",
+"   .$++..   ",
+"  .%++..    ",
+"  .++..     ",
+"  ....      "};
diff --git a/gtk2_ardour/pixmaps/tool_audition.xpm b/gtk2_ardour/pixmaps/tool_audition.xpm
new file mode 100644
index 0000000000..d6f2ccd127
--- /dev/null
+++ b/gtk2_ardour/pixmaps/tool_audition.xpm
@@ -0,0 +1,19 @@
+/* XPM */
+static char * tool_audition_xpm[] = {
+"16 12 4 1",
+" 	c None",
+".	c #000000",
+"+	c #ECECEC",
+"@	c #FFFFFF",
+"      ..        ",
+"     .+.    .   ",
+"    .++.   .@.  ",
+"....+@+...  .@. ",
+".+++@@+..@.  .@.",
+".+@@@@+. .@. .@.",
+".+@@@@+. .@. .@.",
+".+++@@+..@.  .@.",
+"....+@+...  .@. ",
+"    .++.   .@.  ",
+"     .+.    .   ",
+"      ..        "};
diff --git a/gtk2_ardour/pixmaps/tool_gain.xpm b/gtk2_ardour/pixmaps/tool_gain.xpm
new file mode 100644
index 0000000000..480426fab8
--- /dev/null
+++ b/gtk2_ardour/pixmaps/tool_gain.xpm
@@ -0,0 +1,18 @@
+/* XPM */
+static char * tool_gain_xpm[] = {
+"16 12 3 1",
+" 	c None",
+".	c #000000",
+"+	c #FFFFFF",
+"...             ",
+".++..           ",
+"...++.          ",
+"   ..+.         ",
+"     .+.        ",
+"     .+.        ",
+"      .+.       ",
+"      .+.       ",
+"       .+..     ",
+"        .++.....",
+"         ..++++.",
+"           ....."};
diff --git a/gtk2_ardour/pixmaps/tool_object.xpm b/gtk2_ardour/pixmaps/tool_object.xpm
new file mode 100644
index 0000000000..a2e6fe68c5
--- /dev/null
+++ b/gtk2_ardour/pixmaps/tool_object.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * tool_object_xpm[] = {
+"16 12 8 1",
+" 	c None",
+".	c #000000",
+"+	c #444444",
+"@	c #888888",
+"#	c #CC9966",
+"$	c #DDDDDD",
+"%	c #FFCC99",
+"&	c #FFFFFF",
+"     ...        ",
+"     .&.        ",
+"     .&.        ",
+"     .&.        ",
+"     .&.....    ",
+"     .&.&.&...  ",
+"   ...&.&.&.&.  ",
+"   .&.&&&&&&&.  ",
+"   .&&&&&&&&&.  ",
+"   ...&&&&&&..  ",
+"     ..&&&&&.   ",
+"      .&&&&&.   "};
diff --git a/gtk2_ardour/pixmaps/tool_range.xpm b/gtk2_ardour/pixmaps/tool_range.xpm
new file mode 100644
index 0000000000..75ee865ca2
--- /dev/null
+++ b/gtk2_ardour/pixmaps/tool_range.xpm
@@ -0,0 +1,18 @@
+/* XPM */
+static char * tool_range_xpm[] = {
+"16 12 3 1",
+" 	c None",
+".	c #000000",
+"+	c #FFFFFF",
+"...          ...",
+".+.  ..  ..  .+.",
+".+. .+.  .+. .+.",
+".+..+.    .+..+.",
+".+.++......++.+.",
+".++++++++++++++.",
+".+.++......++.+.",
+".+..+.    .+..+.",
+".+. .+.  .+. .+.",
+".+.  ..  ..  .+.",
+".+.          .+.",
+"...          ..."};
diff --git a/gtk2_ardour/pixmaps/tool_stretch.xpm b/gtk2_ardour/pixmaps/tool_stretch.xpm
new file mode 100644
index 0000000000..fa9fd333aa
--- /dev/null
+++ b/gtk2_ardour/pixmaps/tool_stretch.xpm
@@ -0,0 +1,18 @@
+/* XPM */
+static char * tool_stretch_xpm[] = {
+"16 12 3 1",
+" 	c None",
+".	c #000000",
+"+	c #FFFFFF",
+"  ..        ..  ",
+" .+.        .+. ",
+".++..........++.",
+"++++++++++++++++",
+".++..........++.",
+" .+.        .+. ",
+"  ..        ..  ",
+"    +   +       ",
+" +  + + + + + + ",
+"++++++++++++++++",
+"  +   +   + + + ",
+"  +       +   + "};
diff --git a/gtk2_ardour/pixmaps/tool_zoom.xpm b/gtk2_ardour/pixmaps/tool_zoom.xpm
new file mode 100644
index 0000000000..581363f3f4
--- /dev/null
+++ b/gtk2_ardour/pixmaps/tool_zoom.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * tool_zoom_xpm[] = {
+"16 12 14 1",
+" 	c None",
+".	c #000000",
+"+	c #474747",
+"@	c #E7E7E7",
+"#	c #F6F6F6",
+"$	c #DCDCDC",
+"%	c #FFFFFF",
+"&	c #DFDFDF",
+"*	c #D7D7D7",
+"=	c #D6D6D6",
+"-	c #040404",
+";	c #070707",
+">	c #060606",
+",	c #050505",
+"     ...        ",
+"   +.@#$.+      ",
+"   .%%%%%.      ",
+"  .&%%%%%*.     ",
+"  .#%%%%%#.     ",
+"  .$%%%%%&.     ",
+"   .%%%%%.+     ",
+"   +.*#=...     ",
+"     ...+...    ",
+"          -.;   ",
+"           >.-  ",
+"            ,.  "};
diff --git a/gtk2_ardour/pixmaps/zoom_full.xpm b/gtk2_ardour/pixmaps/zoom_full.xpm
new file mode 100644
index 0000000000..f902403722
--- /dev/null
+++ b/gtk2_ardour/pixmaps/zoom_full.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * zoom_full_xpm[] = {
+"12 12 14 1",
+" 	c None",
+".	c #000000",
+"+	c #474747",
+"@	c #E7E7E7",
+"#	c #F6F6F6",
+"$	c #DCDCDC",
+"%	c #FFFFFF",
+"&	c #DFDFDF",
+"*	c #D7D7D7",
+"=	c #D6D6D6",
+"-	c #040404",
+";	c #070707",
+">	c #060606",
+",	c #050505",
+"   ...      ",
+" +.@#$.+    ",
+" .%%.%%.    ",
+".&%..%%*.   ",
+".#%%.%%#.   ",
+".$%%.%%&.   ",
+" .%...%.+   ",
+" +.*#=...   ",
+"   ...+...  ",
+"        -.; ",
+"         >.-",
+"          ,."};
diff --git a/gtk2_ardour/pixmaps/zoom_in.xpm b/gtk2_ardour/pixmaps/zoom_in.xpm
new file mode 100644
index 0000000000..1f8d4e8273
--- /dev/null
+++ b/gtk2_ardour/pixmaps/zoom_in.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * zoom_in_xpm[] = {
+"12 12 14 1",
+" 	c None",
+".	c #000000",
+"+	c #474747",
+"@	c #E7E7E7",
+"#	c #F6F6F6",
+"$	c #DCDCDC",
+"%	c #FFFFFF",
+"&	c #DFDFDF",
+"*	c #D7D7D7",
+"=	c #D6D6D6",
+"-	c #040404",
+";	c #070707",
+">	c #060606",
+",	c #050505",
+"   ...      ",
+" +.@#$.+    ",
+" .%%.%%.    ",
+".&%%.%%*.   ",
+".#.....#.   ",
+".$%%.%%&.   ",
+" .%%.%%.+   ",
+" +.*#=...   ",
+"   ...+...  ",
+"        -.; ",
+"         >.-",
+"          ,."};
diff --git a/gtk2_ardour/pixmaps/zoom_out.xpm b/gtk2_ardour/pixmaps/zoom_out.xpm
new file mode 100644
index 0000000000..ea50d145ad
--- /dev/null
+++ b/gtk2_ardour/pixmaps/zoom_out.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * zoom_out_xpm[] = {
+"12 12 14 1",
+" 	c None",
+".	c #000000",
+"+	c #474747",
+"@	c #E7E7E7",
+"#	c #F6F6F6",
+"$	c #DCDCDC",
+"%	c #FFFFFF",
+"&	c #DFDFDF",
+"*	c #D7D7D7",
+"=	c #D6D6D6",
+"-	c #040404",
+";	c #070707",
+">	c #060606",
+",	c #050505",
+"   ...      ",
+" +.@#$.+    ",
+" .%%%%%.    ",
+".&%%%%%*.   ",
+".#.....#.   ",
+".$%%%%%&.   ",
+" .%%%%%.+   ",
+" +.*#=...   ",
+"   ...+...  ",
+"        -.; ",
+"         >.-",
+"          ,."};