From 3d7a0622158c8ee646e369eb5d192864844b71ed Mon Sep 17 00:00:00 2001
From: Greg Zharun <grygoriiz@wavesglobal.com>
Date: Wed, 10 Sep 2014 19:18:24 +0300
Subject: [PATCH 01/37] [Summary] Fixed main callback input data size issue:
 incorrect size of the buffer was provided during memory copy procedure

---
 libs/backends/wavesaudio/waves_audiobackend.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/backends/wavesaudio/waves_audiobackend.cc b/libs/backends/wavesaudio/waves_audiobackend.cc
index 1692030601..f966a191bc 100644
--- a/libs/backends/wavesaudio/waves_audiobackend.cc
+++ b/libs/backends/wavesaudio/waves_audiobackend.cc
@@ -1128,7 +1128,7 @@ WavesAudioBackend::_read_audio_data_from_device (const float* input_buffer, pfra
 {
 #if defined(PLATFORM_WINDOWS)
     const float **buffer = (const float**)input_buffer;
-    size_t copied_bytes = nframes*sizeof(float*);
+    size_t copied_bytes = nframes*sizeof(float);
 
     for(std::vector<WavesAudioPort*>::iterator it = _physical_audio_inputs.begin ();
         it != _physical_audio_inputs.end();

From 1022d996433a00e3d86e22585d3e6fd930e9ed78 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 10 Sep 2014 12:28:54 -0400
Subject: [PATCH 02/37] Revert "Revert "[Summary] Enable change track name when
 track is not"

This reverts commit 46a09c5cc6863e7e032fe521ad55889a8b139a9e.

Changing track names while just rec-enabled (rather than recording) is
probably OK with the current state of libardour.
---
 gtk2_ardour/route_time_axis.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index f44b8b946f..6a4086f9ae 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -2286,7 +2286,7 @@ RouteTimeAxisView::can_edit_name () const
     
 	/* we do not allow track name changes if it is record enabled
 	 */
-	return !_route->record_enabled();
+ 	return !( (ARDOUR_UI::instance()->the_session()->record_status()==Session::Recording) && (_route->record_enabled()) );
 }
 
 void

From 06f44bcdc5d575d1570535fbb248a77fc2b6b90f Mon Sep 17 00:00:00 2001
From: VKamyshniy <VKamyshniy@wavesglobal.com>
Date: Wed, 10 Sep 2014 19:46:11 +0300
Subject: [PATCH 03/37] [Summary] Now we can use alignments (vertical and
 horizontal) for <Label/> in the XML scripts.

---
 gtk2_ardour/waves_ui.cc | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gtk2_ardour/waves_ui.cc b/gtk2_ardour/waves_ui.cc
index d0adc27e5c..a8ede3d049 100644
--- a/gtk2_ardour/waves_ui.cc
+++ b/gtk2_ardour/waves_ui.cc
@@ -657,6 +657,33 @@ WavesUI::set_attributes (Gtk::Widget& widget, const XMLNode& definition, const X
 		}
 		label->set_justify (justification);
 		
+		property = xml_property (definition, "horzalignment", styles, "center");
+		std::transform(property.begin(), property.end(), property.begin(), ::tolower);
+		Gtk::AlignmentEnum xalign = Gtk::ALIGN_CENTER;
+		if (property == "start") {
+			xalign = Gtk::ALIGN_START;
+		} else if (property == "end") {
+			xalign = Gtk::ALIGN_END;
+		} else if (property == "center") {
+			xalign = Gtk::ALIGN_CENTER;
+		} else {
+			dbg_msg ("Invalid horizontal alignment for Gtk::Label !");
+		}
+
+		property = xml_property (definition, "vertalignment", styles, "center");
+		std::transform(property.begin(), property.end(), property.begin(), ::tolower);
+		Gtk::AlignmentEnum yalign = Gtk::ALIGN_CENTER;
+		if (property == "top") {
+			yalign = Gtk::ALIGN_START;
+		} else if (property == "bottom") {
+			yalign = Gtk::ALIGN_END;
+		} else if (property == "center") {
+			yalign = Gtk::ALIGN_CENTER;
+		} else {
+			dbg_msg ("Invalid vertical alignment for Gtk::Label !");
+		}
+		label->set_alignment (xalign, yalign);
+
 		property = xml_property (definition, "ellipsize", styles, "none");
 		std::transform(property.begin(), property.end(), property.begin(), ::tolower);
 		Pango::EllipsizeMode ellipsize_mode = Pango::ELLIPSIZE_NONE;

From e390b00a9063bb19eaa65e6b65508f27115db6cd Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 10 Sep 2014 16:47:49 -0400
Subject: [PATCH 04/37] add new (mostly) static class to permit lookup of
 cursor image hotspots

---
 libs/gtkmm2ext/cursors.cc          | 66 ++++++++++++++++++++++++++++++
 libs/gtkmm2ext/gtkmm2ext/cursors.h | 29 +++++++++++++
 libs/gtkmm2ext/wscript             |  1 +
 3 files changed, 96 insertions(+)
 create mode 100644 libs/gtkmm2ext/cursors.cc
 create mode 100644 libs/gtkmm2ext/gtkmm2ext/cursors.h

diff --git a/libs/gtkmm2ext/cursors.cc b/libs/gtkmm2ext/cursors.cc
new file mode 100644
index 0000000000..3377a7cda9
--- /dev/null
+++ b/libs/gtkmm2ext/cursors.cc
@@ -0,0 +1,66 @@
+#include <sstream>
+#include <fstream>
+
+#include "gtkmm2ext/cursors.h"
+
+using namespace Gtkmm2ext;
+
+CursorInfo::Infos CursorInfo::infos;
+
+CursorInfo::CursorInfo (const std::string& n, int hotspot_x, int hotspot_y)
+        : name (n)
+        , x (hotspot_x)
+        , y (hotspot_y)
+{
+}
+
+int
+CursorInfo::load_cursor_info (const std::string& path)
+{
+        std::ifstream infofile (path.c_str());
+
+        if (!infofile) {
+                return -1;
+        }
+
+        std::stringstream s;
+        std::string name;
+        int x;
+        int y;
+
+        do {
+                s << infofile;
+                if (!infofile) {
+                        break;
+                }
+                s >> name;
+                s >> x;
+                s >> y;
+                if (!s) {
+                        break;
+                }
+                
+                CursorInfo* ci = new CursorInfo (name, x, y);
+                infos[name] = ci;
+
+        } while (true);
+
+        return 0;
+}
+
+void
+CursorInfo::drop_cursor_info ()
+{
+        infos.clear ();
+}
+
+CursorInfo*
+CursorInfo::lookup_cursor_info (const std::string& name)
+{
+        Infos::iterator i = infos.find (name);
+
+        if (i == infos.end()) {
+                return 0;
+        }
+        return i->second;
+}
diff --git a/libs/gtkmm2ext/gtkmm2ext/cursors.h b/libs/gtkmm2ext/gtkmm2ext/cursors.h
new file mode 100644
index 0000000000..d628c13cd8
--- /dev/null
+++ b/libs/gtkmm2ext/gtkmm2ext/cursors.h
@@ -0,0 +1,29 @@
+#ifndef __gtkmm2ext_cursor_info_h___
+#define __gtkmm2ext_cursor_info_h___
+
+#include <string>
+#include <map>
+
+namespace Gtkmm2ext {
+
+class CursorInfo 
+{
+    public:
+        static CursorInfo* lookup_cursor_info (const std::string& image_name);
+        static int load_cursor_info (const std::string& path);
+        static void drop_cursor_info ();
+
+    private:
+        CursorInfo (const std::string& image_name, int hotspot_x, int hotspot_y);
+        
+        typedef std::map<std::string,CursorInfo*> Infos;
+        static Infos infos;
+
+        std::string name;
+        int x;
+        int y;
+};
+
+} /* namespace */
+
+#endif /* __gtkmm2ext_cursor_info_h___ */
diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript
index 930e0f2624..af4e45f78f 100644
--- a/libs/gtkmm2ext/wscript
+++ b/libs/gtkmm2ext/wscript
@@ -36,6 +36,7 @@ gtkmm2ext_sources = [
         'cell_renderer_pixbuf_toggle.cc',
         'choice.cc',
         'click_box.cc',
+        'cursors.cc',
         'debug.cc',
         'dndtreeview.cc',
         'fader.cc',

From 4be17800802f550d0d21b399f487582fea494d53 Mon Sep 17 00:00:00 2001
From: VKamyshniy <VKamyshniy@wavesglobal.com>
Date: Wed, 10 Sep 2014 23:55:35 +0300
Subject: [PATCH 05/37] [Summary] Making preferences based on icon buttons (as
 is in PRD)

---
 ...ference_name_track_after_driver_active.png | Bin 0 -> 2037 bytes
 ...ference_name_track_after_driver_button.png | Bin 0 -> 1997 bytes
 ...rence_name_track_after_driver_prelight.png | Bin 0 -> 2053 bytes
 gtk2_ardour/icons/preference_no_button.png    | Bin 0 -> 1247 bytes
 .../icons/preference_no_button_active.png     | Bin 0 -> 1254 bytes
 .../icons/preference_no_button_prelight.png   | Bin 0 -> 1252 bytes
 .../preference_reset_track_names_button.png   | Bin 0 -> 2081 bytes
 ...erence_reset_track_names_button_active.png | Bin 0 -> 2101 bytes
 ...ence_reset_track_names_button_prelight.png | Bin 0 -> 2137 bytes
 gtk2_ardour/icons/preference_yes_button.png   | Bin 0 -> 1295 bytes
 .../icons/preference_yes_button_active.png    | Bin 0 -> 1285 bytes
 .../icons/preference_yes_button_prelight.png  | Bin 0 -> 1298 bytes
 .../icons/preferences_apply_button.png        | Bin 0 -> 1322 bytes
 .../icons/preferences_apply_button_active.png | Bin 0 -> 1317 bytes
 .../preferences_apply_button_prelight.png     | Bin 0 -> 1327 bytes
 .../icons/preferences_cancel_button.png       | Bin 0 -> 1390 bytes
 .../preferences_cancel_button_active.png      | Bin 0 -> 1383 bytes
 .../preferences_cancel_button_prelight.png    | Bin 0 -> 1402 bytes
 ...references_device_control_panel_button.png | Bin 0 -> 2188 bytes
 ...ces_device_control_panel_button_active.png | Bin 0 -> 2208 bytes
 ...s_device_control_panel_button_prelight.png | Bin 0 -> 2222 bytes
 .../icons/preferences_multi_out_button.png    | Bin 0 -> 1402 bytes
 .../preferences_multi_out_button_active.png   | Bin 0 -> 1442 bytes
 .../preferences_multi_out_button_prelight.png | Bin 0 -> 729 bytes
 gtk2_ardour/icons/preferences_ok_button.png   | Bin 0 -> 1276 bytes
 .../icons/preferences_ok_button_active.png    | Bin 0 -> 1272 bytes
 .../icons/preferences_ok_button_prelight.png  | Bin 0 -> 1286 bytes
 .../icons/preferences_stereo_out_button.png   | Bin 0 -> 1570 bytes
 .../preferences_stereo_out_button_active.png  | Bin 0 -> 1588 bytes
 ...preferences_stereo_out_button_prelight.png | Bin 0 -> 901 bytes
 gtk2_ardour/ui/tracks_preferences.xml         | 209 ++++++++++++------
 31 files changed, 136 insertions(+), 73 deletions(-)
 create mode 100644 gtk2_ardour/icons/preference_name_track_after_driver_active.png
 create mode 100644 gtk2_ardour/icons/preference_name_track_after_driver_button.png
 create mode 100644 gtk2_ardour/icons/preference_name_track_after_driver_prelight.png
 create mode 100644 gtk2_ardour/icons/preference_no_button.png
 create mode 100644 gtk2_ardour/icons/preference_no_button_active.png
 create mode 100644 gtk2_ardour/icons/preference_no_button_prelight.png
 create mode 100644 gtk2_ardour/icons/preference_reset_track_names_button.png
 create mode 100644 gtk2_ardour/icons/preference_reset_track_names_button_active.png
 create mode 100644 gtk2_ardour/icons/preference_reset_track_names_button_prelight.png
 create mode 100644 gtk2_ardour/icons/preference_yes_button.png
 create mode 100644 gtk2_ardour/icons/preference_yes_button_active.png
 create mode 100644 gtk2_ardour/icons/preference_yes_button_prelight.png
 create mode 100644 gtk2_ardour/icons/preferences_apply_button.png
 create mode 100644 gtk2_ardour/icons/preferences_apply_button_active.png
 create mode 100644 gtk2_ardour/icons/preferences_apply_button_prelight.png
 create mode 100644 gtk2_ardour/icons/preferences_cancel_button.png
 create mode 100644 gtk2_ardour/icons/preferences_cancel_button_active.png
 create mode 100644 gtk2_ardour/icons/preferences_cancel_button_prelight.png
 create mode 100644 gtk2_ardour/icons/preferences_device_control_panel_button.png
 create mode 100644 gtk2_ardour/icons/preferences_device_control_panel_button_active.png
 create mode 100644 gtk2_ardour/icons/preferences_device_control_panel_button_prelight.png
 create mode 100644 gtk2_ardour/icons/preferences_multi_out_button.png
 create mode 100644 gtk2_ardour/icons/preferences_multi_out_button_active.png
 create mode 100644 gtk2_ardour/icons/preferences_multi_out_button_prelight.png
 create mode 100644 gtk2_ardour/icons/preferences_ok_button.png
 create mode 100644 gtk2_ardour/icons/preferences_ok_button_active.png
 create mode 100644 gtk2_ardour/icons/preferences_ok_button_prelight.png
 create mode 100644 gtk2_ardour/icons/preferences_stereo_out_button.png
 create mode 100644 gtk2_ardour/icons/preferences_stereo_out_button_active.png
 create mode 100644 gtk2_ardour/icons/preferences_stereo_out_button_prelight.png

diff --git a/gtk2_ardour/icons/preference_name_track_after_driver_active.png b/gtk2_ardour/icons/preference_name_track_after_driver_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0b084d8a6678f697f5ba82d832f0788df7d23cf
GIT binary patch
literal 2037
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

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preference_name_track_after_driver_button.png b/gtk2_ardour/icons/preference_name_track_after_driver_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..10a08126dec8793073956e6bea6c91b3c10fa7b8
GIT binary patch
literal 1997
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
GgZ}|I$0iN{

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preference_name_track_after_driver_prelight.png b/gtk2_ardour/icons/preference_name_track_after_driver_prelight.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ab7e87e0442412ce0fcb69b72a01eb5bf8c3e92
GIT binary patch
literal 2053
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
G?|%W?Z9L2X

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preference_no_button.png b/gtk2_ardour/icons/preference_no_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..92d0e11ac98a9f8e2549db83e36d926fd4f6d5ef
GIT binary patch
literal 1247
zcmeAS@N?(olHy`uVBq!ia0vp^ra-LD!3HGP|6q6kq$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~;1FfglRhD4M^`1)8S=jZArg4F0$<Q4#RGcefLR}>^BXQ!4Z
zB&DWj=GiK}-@RW+Av48RDcsc8z_-9TH6zobswg$M$}c3jDm&RSMakYy!KT6rXh3di
zNuokUZcbjYRfVk**jy_h8zii+qySb@l5ML5aa4qFfP!;=QL2Keo`G(%ftjI#nTejE
ziGihwrH+D;fuVuEp^?6Uxvrssm8rRvfuRBvC;@FNN=dT{a&d#&1?1T(Wt5Z@Sn2DR
zmzV368|&p4rRy77T3YHG80i}s=>k>g7FXt#Bv$C=6)VF`a7isrF3Kz@$;{7F0GXJW
zlwVq6s|0i@#0$9vaAWg|p}_<UF#U?e0)0b01CW<s3VnU?E6vS?t1d1HN=3LAtHH$~
zl?AE#L8-<0rA5iWh)YujSyf==T$Gwvl3x^(pPvH@#ej_blKkR~`~n5%U{gIq1>eNv
z%sh|?Sck8#m1kaYNn&1ds;7&s63`62%*+%kBMSpFV^<ebM^i&LLqk_%M`tG>+rY)Z
z(89#X(#aC0*Cju>G&eP`1g19yq1OzjUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnqfY
zG!Lpb1-DyFaO%|uIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1z{-add%)r1H=;`7Z
zQgQ3e%!Pd|4m@qUXEQs0V`6J`P7KI4c%wY$k!giY9CPdOhJy_U7Zhk4OxT?eCR<;;
zJ5hg!wW0T|C7CaLJoax37JBC3vfQH2K2v>?%E{k_8~NUP%Q(y}V=J|~#OJzz#S4aB
zz5n!WzJ77+^mEURpH})kw%Bz3v(2{H>k|_tL|7OjryaF>lR4|z#_*e7ck|5o{%n7-
z%WwMW)@PN=Onf7kXD%|}sr1d%VCg#Zd*A;j+jD2<hKBOT$6n{@<kGHRb|Hx43m=o?
zYsLg^&WK<+F5Mg3bm!~)UcSM;VC@6n%XeBri++8rJ)c{Vzcx|g#=7&;3mCih>Kk7Q
zTwD6JYf(anMps1O(oH&*zBecK^{n6Ax9!xXH!me0$Jy;;QVl>sTbV6&y6Pk3?Y~`J
r8g0TX@~%eq*73XVuP?fu&&b9g{JFv-CfWEHsL1hj^>bP0l+XkKPEWBW

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preference_no_button_active.png b/gtk2_ardour/icons/preference_no_button_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..0bc306abd7ef9df103892204956d10edea9789be
GIT binary patch
literal 1254
zcmeAS@N?(olHy`uVBq!ia0vp^ra-LD!3HGP|6q6kq$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~;1FfglRhD4M^`1)8S=jZArg4F0$<Q4#RGcefLR}>^BXQ!4Z
zB&DWj=GiK}-@RW+Av48RDcsc8z_-9TH6zobswg$M$}c3jDm&RSMakYy!KT6rXh3di
zNuokUZcbjYRfVk**jy_h8zii+qySb@l5ML5aa4qFfP!;=QL2Keo`G(%ftjI#nTejE
ziGihwrH+D;fuVuEp^?6Uxvrssm8rRvfuRBvC;@FNN=dT{a&d#&1?1T(Wt5Z@Sn2DR
zmzV368|&p4rRy77T3YHG80i}s=>k>g7FXt#Bv$C=6)VF`a7isrF3Kz@$;{7F0GXJW
zlwVq6s|0i@#0$9vaAWg|p}_<UF#U?e0)0b01CW<s3VnU?E6vS?t1d1HN=3LAtHH$~
zl?AE#L8-<0rA5iWh)YujSyf==T$Gwvl3x^(pPvH@#ej_blKkR~`~n5%U{gIq1>eNv
z%sh|?Sck8#m1kaYNn&1ds;7&s63`62%*+%kBMSpFV^<eTM^i&LLqk_%M`tHfM^ghA
z149cFBTFYsm|mCs<kH;Kyb_q+6og(!oO(ftA-4c%vrB4GW?5>ATTy<l0@%}5nYi6z
zj?+A--W1$!vB0TUALtl;P}CwtHB1PYen3ok!Ub~RNk26YnBI$k342rD^w|syj1itL
zjv*Dd-ppK>*Ww`1_FPX?LaLy_IdpOitI$TKK*mY#JJ}x?PKa<37SNv1!Brx<?t#Ku
z$7wS~CdIw3%G`1G&&iZYH#ukaONyP4V{j06+S9BwDd?WO`1^*aA_1>(9xwZ*rX-Cv
zIQq5w-MUJ{^Pd%XoKI}xX-ix%<Nfa^vzIX*Hc;qG-k{T+G$VN0(`mbJ`<?yl(;Dw}
z*~DWK%dx^16W^1+_AQrK_g0FF+m*ZNLG+!{*iWv3IU854N|>eg>chMFnmS_Kv5o;2
zRX3L2&tqEmR*uVk!@BIMeb+7?>YK6br}Fh}xly}2@2<~{es#zyD)#!s{zVz59W&kt
zJ$qO7eYZ$iwyfiuxOvaFbj~^dJoo!yiFL8T?MMBbI>bZo1qPjR|F<Xs$rm8+tf&|G
z=Wna??aR~r*!A7E$|CcAS}izs^ZoIp{P|2g3>i83>E}*OJr62*JYD@<);T3K0RV~C
ByAA*V

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preference_no_button_prelight.png b/gtk2_ardour/icons/preference_no_button_prelight.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5c75d9782b6379542c335b4e7ff33baad2b941d
GIT binary patch
literal 1252
zcmeAS@N?(olHy`uVBq!ia0vp^ra-LD!3HGP|6q6kq$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~;1FfglRhD4M^`1)8S=jZArg4F0$<Q4#RGcefLR}>^BXQ!4Z
zB&DWj=GiK}-@RW+Av48RDcsc8z_-9TH6zobswg$M$}c3jDm&RSMakYy!KT6rXh3di
zNuokUZcbjYRfVk**jy_h8zii+qySb@l5ML5aa4qFfP!;=QL2Keo`G(%ftjI#nTejE
ziGihwrH+D;fuVuEp^?6Uxvrssm8rRvfuRBvC;@FNN=dT{a&d#&1?1T(Wt5Z@Sn2DR
zmzV368|&p4rRy77T3YHG80i}s=>k>g7FXt#Bv$C=6)VF`a7isrF3Kz@$;{7F0GXJW
zlwVq6s|0i@#0$9vaAWg|p}_<UF#U?e0)0b01CW<s3VnU?E6vS?t1d1HN=3LAtHH$~
zl?AE#L8-<0rA5iWh)YujSyf==T$Gwvl3x^(pPvH@#ej_blKkR~`~n5%U{gIq1>eNv
z%sh|?Sck8#m1kaYNn&1ds;7&s63`62%*+%k6GIDQ3v+W5M^i&LLqk_%M`tHfM^ghA
z149cFBTFYsm|mCs<kH;Kyb_q+6og)&dK`K|i6OTDXtPUdQD#|cid#{Bt^(N8R++fn
zVuaH?sNNLZZZXEGS0CsYeNfaQMKw$an0`P^c)|s8;7LC<518JIfC+n&OhW?$17nz{
zi(^Q|tv55*=CwEo9DlAip@E?>hUd{FC4mn-FYNfwANU-Syn#c2LqJ8sPszcdNz?fH
zq}|!E+TYAR`>P30<Gp#mMrVR8W5d*CFIl=YJcWMmsb<XbRG6|<VoE6+>(KxnIQm+i
z`TwWE_0ogiYc;x<mc9J;@O`D+&wcL?n)q@wG34A{W;o~awzr1iw|sJMyK&b~TlZSP
zRZ!<NQ{=RXXFu~KN?fvCxv*fN#Lv@DKN-BU;QP62UH`^qnH)mKI<@|Zo}7w&0wUAo
znEr^d95#5;en{xeuD)O1m-BMF9XP%{etvvYLhSYHH~zLIE-*UMv+!7<O8xzOj@|_p
z;kWL-kDRggz0i?2Q&T+y3T5PX$A^ZN_(y5<{HVRM@yREf`W?sK&WqoN@Cd|5OB?)l
y?|u92-_!Wmw|Vj$t?B!iu2}q@TfV!F%YY%Js@m)2idn^=a>vuv&t;ucLK6U^C%IVw

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preference_reset_track_names_button.png b/gtk2_ardour/icons/preference_reset_track_names_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..d70531d0538024065ea484096d4825b3fda50545
GIT binary patch
literal 2081
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

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preference_reset_track_names_button_active.png b/gtk2_ardour/icons/preference_reset_track_names_button_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..0fe86f6d466c552258865debb5f49ea0bda57bdd
GIT binary patch
literal 2101
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
JF5vSs{{!9KXyyO_

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preference_reset_track_names_button_prelight.png b/gtk2_ardour/icons/preference_reset_track_names_button_prelight.png
new file mode 100644
index 0000000000000000000000000000000000000000..b08d09146e0eec185d65e723a1a54b300f9b6134
GIT binary patch
literal 2137
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

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preference_yes_button.png b/gtk2_ardour/icons/preference_yes_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..93d1fa16a6010ee8371f2b6dea98100c49012590
GIT binary patch
literal 1295
zcmeAS@N?(olHy`uVBq!ia0vp^ra-LD!3HGP|6q6kq$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~;1FfglRhD4M^`1)8S=jZArg4F0$<Q4#RGcefLR}>^BXQ!4Z
zB&DWj=GiK}-@RW+Av48RDcsc8z_-9TH6zobswg$M$}c3jDm&RSMakYy!KT6rXh3di
zNuokUZcbjYRfVk**jy_h8zii+qySb@l5ML5aa4qFfP!;=QL2Keo`G(%ftjI#nTejE
ziGihwrH+D;fuVuEp^?6Uxvrssm8rRvfuRBvC;@FNN=dT{a&d#&1?1T(Wt5Z@Sn2DR
zmzV368|&p4rRy77T3YHG80i}s=>k>g7FXt#Bv$C=6)VF`a7isrF3Kz@$;{7F0GXJW
zlwVq6s|0i@#0$9vaAWg|p}_<UF#U?e0)0b01CW<s3VnU?E6vS?t1d1HN=3LAtHH$~
zl?AE#L8-<0rA5iWh)YujSyf==T$Gwvl3x^(pPvH@#ej_blKkR~`~n5%U{gIq1>eNv
z%sh|?Sck8#m1kaYNn&1ds;7&s63`62%*+%k17{}-XLDy)M^i&LLqk_%M`tHfM^ghA
z149cFBTFYsm|mCs<kH;Kyb_q+6og(koO(ftA-4c%vrB4GW?5>ATTy<l0@%}5nONN7
zVrt}KY~bVsG|w5kTOfK<u($=P*BPf?eV}9XK~ako)i5Do`T;TF2^YwLC;iksV0teC
zChQsB@{br87#lrZ978H@y_u=s-)tap?7r@H$wNYCSY|q&O$ad75P7zbQ@(wDqZM;n
znz4kzjFplWjW>(Ld1gG$T$ghDuc5M}^83jqx=U66eyzR5FjrvWtIB)qy)OIS>o3b)
zcX`JWW-nREDOO7byB12o(W|<>cYZVYUOurc_td7IzT=BmM6V4?i4=SLy}C%|x%+$r
zo|6VVQR}Zi+O<ln>+uY~<(CZ>7zi-TT;}N-*kLv0vdPk2>#R9={uC)OY`L4~T0g~n
zc5j9`hX#jWl-_hEHU)`{dC!+<oLc|(q8pQQ`{Bm4&5~!Ie_s8o-N~_I+LkC0*YNK#
z*WaE>jl7h%T{zIGCBd0t?)m3&4OOj8dzbvpV=vFPcM%oynY3i};g$vSW2XCW|8454
zyoSqy!>sk|1UAu?|4TCMB`sYzXE(DPlsa-tO6JPaxl2@=6@C;KzdW4v$L(MM&ruY_
ze`$&D5C5;f=GyQ6F!d*!#+;w8O!_w8KX10Tp3{I~M(d2osDE#~K}D3OtDnm{r-UW|
DF=ESM

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preference_yes_button_active.png b/gtk2_ardour/icons/preference_yes_button_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfd21124d6dd49267be07ea97008b1ce5385714a
GIT binary patch
literal 1285
zcmeAS@N?(olHy`uVBq!ia0vp^ra-LD!3HGP|6q6kq$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~;1FfglRhD4M^`1)8S=jZArg4F0$<Q4#RGcefLR}>^BXQ!4Z
zB&DWj=GiK}-@RW+Av48RDcsc8z_-9TH6zobswg$M$}c3jDm&RSMakYy!KT6rXh3di
zNuokUZcbjYRfVk**jy_h8zii+qySb@l5ML5aa4qFfP!;=QL2Keo`G(%ftjI#nTejE
ziGihwrH+D;fuVuEp^?6Uxvrssm8rRvfuRBvC;@FNN=dT{a&d#&1?1T(Wt5Z@Sn2DR
zmzV368|&p4rRy77T3YHG80i}s=>k>g7FXt#Bv$C=6)VF`a7isrF3Kz@$;{7F0GXJW
zlwVq6s|0i@#0$9vaAWg|p}_<UF#U?e0)0b01CW<s3VnU?E6vS?t1d1HN=3LAtHH$~
zl?AE#L8-<0rA5iWh)YujSyf==T$Gwvl3x^(pPvH@#ej_blKkR~`~n5%U{gIq1>eNv
z%sh|?Sck8#m1kaYNn&1ds;7&s63`62%*+%k17{}-XLA=LM^i&LLqk_%M`tHfM^ghA
z149cFBTFYsm|mCs<kH;Kyb_q+6og)5oO(ftA-4c%vrB4GW?5>ATTy<l0@%}5nYi6z
zfYUsv-W1$!F~q4?ALtl;P}CwtHB1PYen3ok!Ub~RNk26YnBI$k3H!7O!)^u!#&S;=
z$B>F!Z)PscZ*~wl7C*aFN=#)X(^dsfv%ttgCc{7#p_B40E<x=x9Tc>*)wE8E<gHbi
z&0x9j^g6|ynVK&(D&s#D9e>()=l#8MmK~CUnNA)2vpPQ6?4Q5=>7->#RTpgObj&QC
zwLqe4Asp#lzq{1jfTy|U{_?wd?(K&ix82<4yY6++Boz^sgZ+kqA`>55Y>8U?q%<^i
z$}-Kle#;9T5|tRD)?W`1Y0YuAJ#CaV>lsgDXSq0&L!r#+k1ML@ssHX};&N*9xje;y
z!BVbYDB$|n_}`2BncBYnw$&Bmmc09|zO`wBZtB*5UG0e#>!zoA-hLaF=6RFf;KU69
zhi0dPai{A3p8WbYJ#yL>1)WtbtOqT&>gT_E8Ge217Oe*gH$raahs^xt9s7Ib8Ab2e
zXP@yj=_Kd#E{v4!cj~y#`M09-kvUgek_HOe)%3yk>xE;V%PU`3Wj|&Ou=pH%$>dy}
e{q2hXLJ15z+Ikz~RxB<A6-=J4elF{r5}E+#2*(is

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preference_yes_button_prelight.png b/gtk2_ardour/icons/preference_yes_button_prelight.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2cbef0374af9f2f2b31d244842b929b540e80c9
GIT binary patch
literal 1298
zcmeAS@N?(olHy`uVBq!ia0vp^ra-LD!3HGP|6q6kq$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~;1FfglRhD4M^`1)8S=jZArg4F0$<Q4#RGcefLR}>^BXQ!4Z
zB&DWj=GiK}-@RW+Av48RDcsc8z_-9TH6zobswg$M$}c3jDm&RSMakYy!KT6rXh3di
zNuokUZcbjYRfVk**jy_h8zii+qySb@l5ML5aa4qFfP!;=QL2Keo`G(%ftjI#nTejE
ziGihwrH+D;fuVuEp^?6Uxvrssm8rRvfuRBvC;@FNN=dT{a&d#&1?1T(Wt5Z@Sn2DR
zmzV368|&p4rRy77T3YHG80i}s=>k>g7FXt#Bv$C=6)VF`a7isrF3Kz@$;{7F0GXJW
zlwVq6s|0i@#0$9vaAWg|p}_<UF#U?e0)0b01CW<s3VnU?E6vS?t1d1HN=3LAtHH$~
zl?AE#L8-<0rA5iWh)YujSyf==T$Gwvl3x^(pPvH@#ej_blKkR~`~n5%U{gIq1>eNv
z%sh|?Sck8#m1kaYNn&1ds;7&s63`62%*+%kBMSpFV^<eLM^i&LLqk_%M`tHfM^ghA
z149cFBTFYsm|mCs<kH;Kyb_q+6og(QoO(ftA-4c%vrB4GW?5>ATTy<l0@%}5nONLn
z;Ou1KZ0=%#(>$o&6x?nxz^PXs=oo!a)FMSSObD2MKumbT1#;j?KQ#}S-iv?<o58mv
zn}LC`#nZ(xq~g|_nR~mM9Yk95n>2Mql9XpCHMRD(`bynToUeX<!t<L}YsJJiZs=&8
zaEvv0NdYT&@S5}+oSxs7cM2$fKahH?(Cyjm>NJ5gCzo4kn^$J2M6JL6Ym2t7)N~z(
zOy%ZF%S@aMMV#TtR`2OW{ujIa_Pr0D_dG<THN)6<a?JImDxMizqy9<=w<+q1aYyM*
zf3!1G%Ior!RjZ`fMAVoRju*bDu<0_pvRP;Gwp@LI89%-{F=+H98{XTN`^m=ti!_T!
z3(wi-#f-&v^N+fm-lP&5TK|?mf|Ey<k3C4FHEr`v-`~Lt6;iyTbh{SKE_W1&dA0m<
zXW8z#CxkYoMowc`^?H~1g1ChV`kDKGpS*kfya7+*!M}C&nTMMa=G>XCU;gXhq77OP
z6mE!IbLP<s{{Qk;ol)@#AwG7_Cfkm^rWPx*tv$W-w%@krpKiD2SiK0((Et?mRmFE#
z!S0IRdhxN5;_n*{&0X*Mc*pO*Zyr7NZeV0+_MACU%sQ(VR7!ce`njxgN@xNAubadi

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preferences_apply_button.png b/gtk2_ardour/icons/preferences_apply_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c3c926980f892844019e6bc1e7b4cca4c95dfa8
GIT binary patch
literal 1322
zcmeAS@N?(olHy`uVBq!ia0vp^?m#TV!3HFae=gDnQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07?@QuLn2Bde0{8v^K<nQL2C3WatnaE85nHrD+&^mvr|hH
zl2X$%^K6yg@7}MZkeOnu6mIHk;9KCFnvv;IRg@ZB<rk7%m7Q#vqGWHUU{hfQG$1#%
zBvGLvHz%*ys=`(YY_1iM4HDK@QUEI{$+lI3I4Z(7K*2e`C{@8!&p<cXz|2s=%tX)7
z#K6+TQb)naz|cV7&`96FT-VUR%GBJ-z)%4Slz_GsrKDK}xwt{?0`hE?GD=Dctn~HE
z%ggo3jrH=2()A53EiLs8jP#9+bb%^#i!1X=5-W7`ij`p|xTF>*7iAWdWaj57fJ{tG
z$}cUkRRX#c;)UD-xUqS~&|m@vn0`fKfxe-h0mw@*g}%P{mFDKcRTq~8r6Sym)!^cg
z%7Rq=pw#00(xPNw#HA^NtSYc_E=o--$uA1Y&(DE{Vn9ZINq%ugeu08>u&JJ*f^TAS
zW*$fcti#vW$}_LHBrz{J)zigR32261W@d_&n}wUXo1vMbqp6{jp`oj>qqCE#qp5+5
zfuV(ok)@L*Os`9Ra%paAUI|QZ3PP_FPQ9SSkXrz>*(J3ovn(~mttdZN0qkk3Ox$j<
zz-b;-ZwhX=SmM;H4|I$^C~A?S8YToxKOiPN;Q~4Eq@S7xOz%a&gnj;P`~(ID#yOrY
zjv*Dd-pn-2Zg!Ap+ut(DHR#bQy~s(b-cGwyi;4<A<^L%Dqpr6ros%^-#wzt9pPo~9
zx8B#i-<rBwos@5UtA1$lchB!fw)d*z3fx@0ub0MmUY+>7^84py*CdWEFgXxu)b6PJ
z{LF)FLz%Y21rmIR6D=-ZzZ=nc{k5qqAA8rL4!!B!9hzNE(^5-siMl#2zuZ|8EB^Mj
zll>R>b#KeO9R)getXfrKBd6&(DLe15LB{_3-7zODGc9)9v^npp%dXJsI4#w)`)HHT
zWs&CftGtffVklU9Kb(nm#@#&k$Z4GteUB~nNzS;K(<-?sYVC^}yKbrH+r<_z+AYX2
zlV())z5MbvmocMx|IG&V?qZwFmD{!&Xl!X+%W$!94j)4d`vXNq^)zvjwukQ{iW!)v
z9kgO(43h5K5*nWyUF)8qpWAwWhK)?a%Ga}M?(aXAb6c$N#)J6%YnLqj_4=^?L!L;!
z{7r_Y*{7Oc@ABWX`sJz5d))7_eBzt=&;S}1KUW`86R2-^bAHy>h0mA$XlU-QlKOaj
h@3wohK7G<Vz>w0p$y{LCu_{pM<>~6@vd$@?2>_lr-~s>u

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preferences_apply_button_active.png b/gtk2_ardour/icons/preferences_apply_button_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..6321ba601b6064d79c07fff1b3a29b21b9047162
GIT binary patch
literal 1317
zcmeAS@N?(olHy`uVBq!ia0vp^?m#TV!3HFae=gDnQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07?@QuLn2Bde0{8v^K<nQL2C3WatnaE85nHrD+&^mvr|hH
zl2X$%^K6yg@7}MZkeOnu6mIHk;9KCFnvv;IRg@ZB<rk7%m7Q#vqGWHUU{hfQG$1#%
zBvGLvHz%*ys=`(YY_1iM4HDK@QUEI{$+lI3I4Z(7K*2e`C{@8!&p<cXz|2s=%tX)7
z#K6+TQb)naz|cV7&`96FT-VUR%GBJ-z)%4Slz_GsrKDK}xwt{?0`hE?GD=Dctn~HE
z%ggo3jrH=2()A53EiLs8jP#9+bb%^#i!1X=5-W7`ij`p|xTF>*7iAWdWaj57fJ{tG
z$}cUkRRX#c;)UD-xUqS~&|m@vn0`fKfxe-h0mw@*g}%P{mFDKcRTq~8r6Sym)!^cg
z%7Rq=pw#00(xPNw#HA^NtSYc_E=o--$uA1Y&(DE{Vn9ZINq%ugeu08>u&JJ*f^TAS
zW*$fcti#vW$}_LHBrz{J)zigR32261W@d_&n}wUXo1wXpqp6{jp`oj>qqCE#qp5+5
zfuV(ok)@L*Os`9Ra%paAUI|QZ3Q(_sg_(<qqpK@WuQOJ?pu~_{0JPa9wJ5VJHN~wc
zKUV?lX{$`!ZZW{^7Kq*yEN+4N!w{!leV}9XK~ako)i5Do`T;TF2^YwLC;iksV0teC
zCTutJ6D$l2jMF_`978H@y_vZ%uf;*2?YW+)#H`5&xJ6VvwI^_}EYdF!>U8-e;33CY
z{fH%rl|P{HQ&8*cxhiWdBmd=2XISVtS&lRJxxX3r;dck>tT*Ru(pI|EtWcqP&B3YT
zc4>5UPg0QBgBNEKgMQ7DtkG>dTp+=BIMIS9{pYTkr#HUdCDNuiHPy5Iu;VSW*}O*!
zZ8FO3=C9P?Dw1*E_MZFi1^In8=NH?YUwYSo=T_eKkkHWQ(O=v3f5e!`+}^fwU3TPZ
zMvcS?zLzH~%M@{)DD&rO(Zp?b3^vl=Lme28eXq5W>%Y{N-LOY&#?4Dyf=RQ~-j-QM
zKK^%$$>adLh|ATNC9fQGt=0-~{-|(awv+fiBXen8R^qaYVwsE`nX~v99#}H?bJ_{U
zYDv`}oy9ESA$dlF#iQ0jYwfXD%deKVeA9~h(0BB3;A{73sdIHbg)-fx{=D8l)obO)
zUmt=kf;HP&EBw~pDw1b8DEvOFO~}dSgW81h6Flt?4P-#Ua4ufdtg$?|^3R$``Kr9r
qas>q|(go$;ef@fE+VpZpHiqhD8(ulilAj7HxIA6`T-G@yGywphrOYw_

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preferences_apply_button_prelight.png b/gtk2_ardour/icons/preferences_apply_button_prelight.png
new file mode 100644
index 0000000000000000000000000000000000000000..247417d9abf783e478af0d882b6f4359a8d0d560
GIT binary patch
literal 1327
zcmeAS@N?(olHy`uVBq!ia0vp^?m#TV!3HFae=gDnQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07?@QuLn2Bde0{8v^K<nQL2C3WatnaE85nHrD+&^mvr|hH
zl2X$%^K6yg@7}MZkeOnu6mIHk;9KCFnvv;IRg@ZB<rk7%m7Q#vqGWHUU{hfQG$1#%
zBvGLvHz%*ys=`(YY_1iM4HDK@QUEI{$+lI3I4Z(7K*2e`C{@8!&p<cXz|2s=%tX)7
z#K6+TQb)naz|cV7&`96FT-VUR%GBJ-z)%4Slz_GsrKDK}xwt{?0`hE?GD=Dctn~HE
z%ggo3jrH=2()A53EiLs8jP#9+bb%^#i!1X=5-W7`ij`p|xTF>*7iAWdWaj57fJ{tG
z$}cUkRRX#c;)UD-xUqS~&|m@vn0`fKfxe-h0mw@*g}%P{mFDKcRTq~8r6Sym)!^cg
z%7Rq=pw#00(xPNw#HA^NtSYc_E=o--$uA1Y&(DE{Vn9ZINq%ugeu08>u&JJ*f^TAS
zW*$fcti#vW$}_LHBrz{J)zigR32261W@d_&n}wUXo1vMjqp6{jp`oj>qqCE#qp5+5
zfuV(ok)@L*Os`9Ra%paAUI|QZ3PP_NPQ9SSkXrz>*(J3ovn(~mttdZN0qkk3Ox$j9
z#%Uf@ZwhX=xZu>Q4|I$^C~A?S8YToxKOiPN;Q~4Eq@S7xOz%a&gzflvLm>kL<3djt
z$B>F!Z)PgyH#>+NkDslm<>17`)W{HN$io!8_x$1X2cO?aD>$4{5SSps>8UN?6S5`g
zPyXV@K2`59p>2EXi!9&W{W$CU?(Yvg!d+C_6K@D*FHzu_QhNP$Pg0Q8gA->GgFelY
ztkG>dTp+=BIMIS9{b$vT(;E{do>=fbt@H~G<-DD?S@Ha5x7W9}Ej97=3=Q2_r*WtK
z_rudBzFm(aZiu=rd|T$78W~rcJ<DxdE_eKgof#G!+cKpterNpRG-3JWP8Cn3>!q$A
zo_~(K(Z*m9e*LTZeGa(<ozsgRf7Hm?q1W{&FCk4^JEcSC^pw<@FAVo>XOQ{8$QsG2
z(SA7bXKJg@fj(vF4Vxw2fB*gZ&xS1mB22DrjF0lROEVs@Vesd?+5DzylFCon^D?p5
zT~8*sD>_IWdU^U)*x^mT`Zny-*Zy<t(L)7qz3JSpfhAji?$dvx(Omy`o71&Bb}oi(
zf7J_?dGY0MvfTRWR<cB!e$6ULZ4RdC{EanEX%;-~4-I61!SZia0mqiz-@aVjd@r=*
qtz^N6ldFaQ?=-)ny|3yXiv+Mp+q5;jY_~F~2=jFHb6Mw<&;$U#Bi;4@

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preferences_cancel_button.png b/gtk2_ardour/icons/preferences_cancel_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c26ec9f9f208f17a5f5a2e3d6ed3a74e71811ab
GIT binary patch
literal 1390
zcmeAS@N?(olHy`uVBq!ia0vp^?m#TV!3HFae=gDnQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07?@QuLn2Bde0{8v^K<nQL2C3WatnaE85nHrD+&^mvr|hH
zl2X$%^K6yg@7}MZkeOnu6mIHk;9KCFnvv;IRg@ZB<rk7%m7Q#vqGWHUU{hfQG$1#%
zBvGLvHz%*ys=`(YY_1iM4HDK@QUEI{$+lI3I4Z(7K*2e`C{@8!&p<cXz|2s=%tX)7
z#K6+TQb)naz|cV7&`96FT-VUR%GBJ-z)%4Slz_GsrKDK}xwt{?0`hE?GD=Dctn~HE
z%ggo3jrH=2()A53EiLs8jP#9+bb%^#i!1X=5-W7`ij`p|xTF>*7iAWdWaj57fJ{tG
z$}cUkRRX#c;)UD-xUqS~&|m@vn0`fKfxe-h0mw@*g}%P{mFDKcRTq~8r6Sym)!^cg
z%7Rq=pw#00(xPNw#HA^NtSYc_E=o--$uA1Y&(DE{Vn9ZINq%ugeu08>u&JJ*f^TAS
zW*$fcti#vW$}_LHBrz{J)zigR32261W@d_&frXiiiKCmTqp6{@p`oj>qq7r`ZQx>H
zXklVx>0}Ah>yn>bnwy$e0@Is<&})WMFDNnO765H_NiE7OOHFYr%Fk5*d)g`!w_A*H
zng`XJg4-=7IQ8lS9itD5TBN9k2?5g&hzU=)Kn^_Vr{)3Edl4{UFH-dX&A`C;z|+Ms
zq~g|_nfvn&Iq)3g&59718qwI=smi@Vlv|ivr*^Up-}-}BSjEI50#qX+5)wVFHmGDx
zRn<A0{_w?*%gZKenXdigxt#m?5v%{_{Q8zSxQHGvyysE6>|#bqe9!M$i*~G(dJr<@
zuy1JBsRzZHGOddXMEVW|TKv3z*Wco0+3qVDCO>X`uZ>!N{Z6;lTt3s;zO#JPMA{Vl
zADSOa-yB(#xBBX%y4`o{UT%-kyIf$gXBPXP?*6M;Uw;<}D5z;SCKv6E>tA+R(>2g#
zX;9~@uU4{r?0g|i?FsA*F|&`Z=X6eZzHW_xg%N|c)?}9tyYKcfH?!~@D_plyfx|*L
z=k~cb=HF9Qg-yLr=x}Swv#>e{Y&u?g_Xr<D^Ff7;^~cxWID6^P*Uvv~><dytS6_V<
zsqnXM{<q(@>1;U~vL+{0g!#O(H{UFfO#D+}v+S4Xgq?cYENz|JZof@2EzCc#@p<JO
zQ;swnx#GiT#b*{rN?EWAEO~S3&%c?=uNLimqM&kA@JZ4}h0~iXyc5I^stM?Y%iL@}
z<MElh;6rU>*d))OQ_ueL`s?X9go!@-_Q2v?_q(ihab>oz)B?&+aJfI!0EgwddQr2+
z3dT<*uR@pq-%(i2CR1}|^~Ab6#$V;OU*~6JWAG6b|1Tof;tDDOJzf1=);T3K0RYUw
B_Lcwu

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preferences_cancel_button_active.png b/gtk2_ardour/icons/preferences_cancel_button_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e2ea70951fdf3c4085dc5e1a9bc452087d8566f
GIT binary patch
literal 1383
zcmeAS@N?(olHy`uVBq!ia0vp^?m#TV!3HFae=gDnQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07?@QuLn2Bde0{8v^K<nQL2C3WatnaE85nHrD+&^mvr|hH
zl2X$%^K6yg@7}MZkeOnu6mIHk;9KCFnvv;IRg@ZB<rk7%m7Q#vqGWHUU{hfQG$1#%
zBvGLvHz%*ys=`(YY_1iM4HDK@QUEI{$+lI3I4Z(7K*2e`C{@8!&p<cXz|2s=%tX)7
z#K6+TQb)naz|cV7&`96FT-VUR%GBJ-z)%4Slz_GsrKDK}xwt{?0`hE?GD=Dctn~HE
z%ggo3jrH=2()A53EiLs8jP#9+bb%^#i!1X=5-W7`ij`p|xTF>*7iAWdWaj57fJ{tG
z$}cUkRRX#c;)UD-xUqS~&|m@vn0`fKfxe-h0mw@*g}%P{mFDKcRTq~8r6Sym)!^cg
z%7Rq=pw#00(xPNw#HA^NtSYc_E=o--$uA1Y&(DE{Vn9ZINq%ugeu08>u&JJ*f^TAS
zW*$fcti#vW$}_LHBrz{J)zigR32261W@d_&k(rURv5|>|qp6{@p`oj>qqCE#qp5+5
zfuV(ok)@L*Os`9Ra%paAUI|QZ3PP_XPQ9SSkXrz>*(J3ovn(~mttdZN0qkk3Oe}6O
zurPBmadb1sX&zK>3Kq9O_2Tx2KF~4xpr}QPYM2l({eYP8gbU=rlYVL*FufN66L#~)
zPIU$b#+#lljv*Dd-bAj?KNKKfcY>vjRp#JAwn-_%9xklDYF#c$Kb?OFPdE{#G)<(@
z!O1Alb6J$>gtKWAUYFlC?U#>s-;{E<D88t&wpM?7`Te`)doC~uPSrhKrFfK4tovxG
zq2z0?qmfq}{UR$Zx{CrWf5>?CO<Md!!xBhMu8;ZKB7D4X#nr5jpYygW-~V1I@}<f)
zYx`}JnLZkQ$#w0P_xzV%F3Deh`C;MKsM?p?gH~S1FtM^^|I^+7v*zFLCkh9$w$5Vf
zJIu?*Jn#MYYOSeWG6@oGHeL@HuKoUN_kQn@^`31L=2}N87KAVuX|=n2Fh~&>NV@jg
z^u6iEyLmTv-F<hou2^5&a)qX1u$Yqk8OI3|w%*LSR6508MacEy_P?igY3ly?ZliDi
z#3L+w>n%rx!w)AkDLhzpK&pzJC&O$u`xA$#(@!U*wtSzF{!?^Ov92~tQ}eBDbJK+P
zGM?uU32ja|_SjH*mcG{W2q~u}C-hFgpZ{~~tg~rzN;L~pZk68MBA6W8U@GBZan54Z
z@{1WMzox3y>u9f3nYiiZeT7(+2SFl2ySM7R4$L=IuP?j%QZ*p|1S0r8$2WRE@J;$I
wzxa`?f2VDOOwE<mlk4snf1GvW^K1rYhKh9}MZbBUy#W<{p00i_>zopr0D{B$4FCWD

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preferences_cancel_button_prelight.png b/gtk2_ardour/icons/preferences_cancel_button_prelight.png
new file mode 100644
index 0000000000000000000000000000000000000000..172f51d2d92efa9e332a6e4760958ab1176862d6
GIT binary patch
literal 1402
zcmeAS@N?(olHy`uVBq!ia0vp^?m#TV!3HFae=gDnQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07?@QuLn2Bde0{8v^K<nQL2C3WatnaE85nHrD+&^mvr|hH
zl2X$%^K6yg@7}MZkeOnu6mIHk;9KCFnvv;IRg@ZB<rk7%m7Q#vqGWHUU{hfQG$1#%
zBvGLvHz%*ys=`(YY_1iM4HDK@QUEI{$+lI3I4Z(7K*2e`C{@8!&p<cXz|2s=%tX)7
z#K6+TQb)naz|cV7&`96FT-VUR%GBJ-z)%4Slz_GsrKDK}xwt{?0`hE?GD=Dctn~HE
z%ggo3jrH=2()A53EiLs8jP#9+bb%^#i!1X=5-W7`ij`p|xTF>*7iAWdWaj57fJ{tG
z$}cUkRRX#c;)UD-xUqS~&|m@vn0`fKfxe-h0mw@*g}%P{mFDKcRTq~8r6Sym)!^cg
z%7Rq=pw#00(xPNw#HA^NtSYc_E=o--$uA1Y&(DE{Vn9ZINq%ugeu08>u&JJ*f^TAS
zW*$fcti#vW$}_LHBrz{J)zigR32261W@d_&k(rURv5~2Pqp6{@p`oj>qqCE#qp5+5
zfuV(ok)@L*Os`9Ra%paAUI|QZ3PP_TPQ9SSkXrz>*(J3ovn(~mttdZN0qkk3Oq^~p
zam8sKRBsASx0tx$)T<A4j6Nu8k)j$V1WZ35COqK+Iq;;Png>kpMZknzcY&#tfr0Uj
zr;B4q#jQ6p_jes~5IE-E+1jefBAT?YRe+nj+k4^rg7c4!pH!~fX6nkNtFuKQ#9%?I
ztB%f=9W~9uLjUKe%f!5!!Qa-KXY}SzS=wgLBA1Y&SaX$7ujYdX&bY5#s`2g=)0{~~
zJ5~q9N!m<16llTa{!l}vb#kqw{lg`fUk0oVd;HjdC(~|zv3Az>+ac?(XPQV|{8;hi
z{|D*+zxT<{znx>YGgfbU{4ZUx?kn%V=O1JI-|N=gpT7C#`@@b65^Grc7<S*)tDNV)
z{BkE(D^uv|&|B}n%dBAGTPV*^@K(ESvH?rkvr}A+%FG6fjXYTP$E~+C@Hnt0OncLs
zFOyF_EO_9Pu{BEn_t~1rlMa(rr|59kIdnECXfQNQu)Y1(>>YbU+<Niv^~cwLQTOJ)
z-hce@n*$RgO?{0;J04qzurQ{x{R*%$SP`^x$%6%3#JX9hU(DOS`18*{SJpS2DT!1x
z;JLExZH3uJvj-B5O4(+!d3oEN&2;vinDhG50m}x3)bD5B&)*sCyF8fBDM-fAPfgf}
zr}?_{m+lMfhpUQgAD@_4wDZpu{R0QTmqvQ3ot!J6c4#iQ@P}1J6Zh_1_xkm^XU|fn
zFP`miS5aH0b#Z}6A24+Phu&bhHF0lz)YYez7Mu7F9CWws{_;5PRjyac!Q~9h3_eW~
UdqU<h`~a1Pp00i_>zopr0K+E(O#lD@

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preferences_device_control_panel_button.png b/gtk2_ardour/icons/preferences_device_control_panel_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a565602a2eaeb7cf74fc675ae22d11b0898dc9c
GIT binary patch
literal 2188
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
E0j0`;&;S4c

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preferences_device_control_panel_button_active.png b/gtk2_ardour/icons/preferences_device_control_panel_button_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..a112b6b05c5dbc1854ca0a4902eb748150dbc1a1
GIT binary patch
literal 2208
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
Qy6|S;aRr>FfY|*10-k+@VE_OC

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preferences_device_control_panel_button_prelight.png b/gtk2_ardour/icons/preferences_device_control_panel_button_prelight.png
new file mode 100644
index 0000000000000000000000000000000000000000..356c6d4ec02ca9ec0e538353b2666c355115aad0
GIT binary patch
literal 2222
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

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preferences_multi_out_button.png b/gtk2_ardour/icons/preferences_multi_out_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..146bc1a534a89e2ee9985bd92466cffbdc347cc6
GIT binary patch
literal 1402
zcmeAS@N?(olHy`uVBq!ia0vp^SwJkq!3HEdqqMw%lw^r(L`iUdT1k0gQ7VIDN`6wR
zf@f}GdTLN=VoGJ<$y6H#24<Dakcg59UmvUF{9L_6kQ%*;+ybC(1_m4Zih{)C?9>v4
zq}24xJX@vryZ0+8WTx0Eg`4^s_!c;)W@LI)6{QAO`Gq7`WhYyvDB0U7*i={n4aiL`
zNmQuF&B-gas<2f8n`;GRgM{^!6u?SKvTc<hj*9RNP;kyKN>wn`Gtf;oFf&vzGto0N
zF|ahT)KM@pFf`CNG}1RP*EKY-GBvj{FjRm7C7^9ZDQQ+gE^bh}fIM5JjFOT9D}DX)
z@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7^KE~&-IMVSR9nfZANAQKal
z@=Hr>m4GgVcp<j{ZfssLG?;(^reBd*pl_&W0P+${p|3A~rMbCq)x{-2sR;LCHMlsW
zvLIDID784hv?v)EacRmRs|u`~i&7Iy@{2<9^K)RK7?6=)l3$#WU!dR|Y^rCd;G3A7
znFkU9>+top^2{qPNz6-5^>ndS0-B+hnVDkc=;&<ZWajGTXlm$aXy|I}=<H<bXlmeM
zU}#}tWa(rH)9aF-T$-DjR|3<U0@v$ifKx9hG2|8iZFWg5$}CGwaVyHtRRDY1DigO`
zTyUBP)tiFTEv~LO_38s1qYsK&q^O1o0n-nN2~W5{4m|0n<^j`t5intI+HZHAfr0Uj
zr;B4q#jQ89Hs&2N5NP8Mi4c&DaPZg=wqb*cuyu5~oKpYf=Lsi|ojY=b>D2+IAXaW?
zZf>2k>0eh(nX=GzY2!Wh$Z5HgjKAN0?mcBr$CPG;3PI(~Er}KL`(N+csr31Z;HsRu
z6E;ux{Cr?#u+T^2aEsAG9^q343;!{f@6TOu`>ogFixckVsRxSew7d1?aDhch>H6!F
zZ|0~?KKbNwY4bscRaaMK_q!=a>P^qvb2ZCz`DM?WkL6~cRr~r|<z)8E>m^oGf7Z;~
zwEO=1r9mre&h&oMoNe`fwWycoRIi}bS5vk|?fex}z~}0EJa9{?;+#X@Yt7FwIR>~a
z<_}pj|Hhuq3&*{dY%snuam|zc47cAHxdc5oo?f;)H(lhxoV3j^WkPkt?w;Fa(qfpi
zIb)JS)WQIRg&`V;<QK9X&)I&v`+sDPl2DQ?cZG$Fk46H!U{b-UkBt2VJ((FH&o9>R
z`E{Q6;ElBK;(A}52nQ7rtLaZHmlt39H~Z|bNjhTO&m~I3gp5qie_nF`{qAp7d#8P@
zm~%>D@}sO{KV)~PTX*~T9aYx6;L>E=E$iO2(39<Pd}{x66>)KWj;4*aD^sQ$@YGg6
z*lI4^#+m9QsWv6iX=VVBS@XZ~yP{tI`>hjg=RFcq6p>H3cGT|38Ljn&m36`i497!0
UX=N1u)&`Y^p00i_>zopr05mNIdH?_b

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preferences_multi_out_button_active.png b/gtk2_ardour/icons/preferences_multi_out_button_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..f69e0c95587b2ecbfee173bb52befcd8705d9eba
GIT binary patch
literal 1442
zcmeAS@N?(olHy`uVBq!ia0vp^SwJkq!3HEdqqMw%lw^r(L`iUdT1k0gQ7VIDN`6wR
zf@f}GdTLN=VoGJ<$y6H#24<Dakcg59UmvUF{9L_6kQ%*;+ybC(1_m4Zih{)C?9>v4
zq}24xJX@vryZ0+8WTx0Eg`4^s_!c;)W@LI)6{QAO`Gq7`WhYyvDB0U7*i={n4aiL`
zNmQuF&B-gas<2f8n`;GRgM{^!6u?SKvTc<hj*9RNP;kyKN>wn`Gtf;oFf&vzGto0N
zF|ahT)KM@pFf`CNG}1RP*EKY-GBvj{FjRm7C7^9ZDQQ+gE^bh}fIM5JjFOT9D}DX)
z@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7^KE~&-IMVSR9nfZANAQKal
z@=Hr>m4GgVcp<j{ZfssLG?;(^reBd*pl_&W0P+${p|3A~rMbCq)x{-2sR;LCHMlsW
zvLIDID784hv?v)EacRmRs|u`~i&7Iy@{2<9^K)RK7?6=)l3$#WU!dR|Y^rCd;G3A7
znFkU9>+top^2{qPNz6-5^>ndS0-B+hnVDi`=;UHz>}+J_Xlm$WXy|I}=<H<bXlmeM
zU}#}tWa(rH)9aF-T$-DjR|3<Ug3xP@Q!gkn<Q4#Jc1bPDEK5ysE6UGR0DIah6SrGT
zaGD3zn}XXdK)2)Yhd$6T`k<&qifWh;F#Uj-@PrHGz>|Jz9x%NZ0TXuawLOds3``=P
zE{-7;x8BS;>%|l(a@;>qPf7X(bI=koR>5fkqO7L+0>9X{uAjGH-h!&eDu&F<S{GW(
zbc;j<9hC&HF7hl1zVv152H(&7OLKCHE>8EYsw<Fq7We$#<Dc`Z-%D=n>)6wn@n#y!
z^+_{3w_J%1-`{fR>kq{#;g23v?fELy{J)Vy)rnJS3WsV(KodtOx5=MxEZM&dT6fo`
z+_ArO<XK<VVcS~=LzGso>(rbZcKP|1l8Ts5cMcpgd%3Ty)PB0nf*-DaU(d5wXB4iu
zZzzAv<7vLk{O!s0Vs&emozM7trQl4q*u0Dlq1wOF#JEzQr|kc~HozymcrsUoQMv2n
zxw7}=_zyO2e8C~|&QkEyMjNr9zaA4p?u9H`$h#pTe&%MaZFVVYJ*<yJzlkU0tug92
za<E<h^T9aF#SBf&3I|R67e_@-WxFl$%<a+*%Ux!nyE#%frlwr|)_%s-O!_;&=>JU-
zmI5#LYAiH6s~C5dt5vkcL2>nC@tc$Oi9eLPDw)PFcdOp0L83d{?9YQkOq?xEkB&~C
zJ*l{__R+UhYk%F#ujk-lKYi}aJI1v=?JtU~VnoUk-=7F{T=z2nQPI&Kk_KvF##)wQ
z{H~1RLKd4%`rSn(Vp10TU;Jw0q$`nTLLJAxJ@q}hHziGJ@ux%D`+YcIp$rc24?o54
z*_~EeAAYcQPJ~!<zz^nS^Plw3$a{Kj)0@o<%nVxBKWRG#%Weaenx3wHF6*2UngB#V
B6SM#T

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preferences_multi_out_button_prelight.png b/gtk2_ardour/icons/preferences_multi_out_button_prelight.png
new file mode 100644
index 0000000000000000000000000000000000000000..02e1218025b681fbbf0d49cf8803c3da1a7536c3
GIT binary patch
literal 729
zcmV;~0w(>5P)<h;3K|Lk000e1NJLTq003$L000~a1^@s6iCQX400007bV*G`2i^$^
z5+EOeV+*4I000SaNLh0L03N~s03N~tZqRi;00004XF*Lt006O%3;baP0007LNkl<Z
zc-rlnJxC)#6vv-pQbcm7=S7WTtQ1xYPh4$m1Pf2F5i1L=EiA0W#=^$Z?yRn{wh`qn
zg(#wpM#Mq`cL+v}9~i&TBt_CV{~;@hIX|K}n}PR(VVRli%**`e&3n6S0TH>orl#+R
z$y=7jN52$`tJiKrm{;*aD7W2KFt6e+wA%vaZLm<9z(Q#P3#ADxlqRrHn!rM7LeXbW
zFx=5jt+my38H>}{ykEAVj&?BVUy;{|?oRp>{6}*;yBYV5%q@~p`Aybm);DPD=tTDa
zFzTtlxhZQtj1juN$@+ad>G#5}-+O;)b^jo1-gqKGzOvFs+hU^r+?<x(+6rY+UhE>H
z%0t1k3$gGOA07{jgJOw}g+d*m?KuY9TF4ar*dT{OP>43z_FeW_V!db1&qm477f&Q*
zF)BQ=Zl*lU4ls8>co{?jSZLVN)7W5(J#R%>jKboWz8bk3T}}t>3C~gujxo%QBQ2fK
z)eX5E4(0abf-<4Dj>Gc!>oFR{ZoZ{RG^+g1Mxrt4*)FFuqrL8HDaDgX<@V%)GNBNg
zaK!k^N`!ZXGx~50q0gxFJhox+An4QG{}C{j^lahP@GgKDg$;y+0)$dWqM3?wNMzF6
z?Lt{H0Ro3%xiHAYo(BA%Ya28qg8Hw4K3NZ*M`(6)JL5N2rU)S7q<=YQ8!#rk8JQe_
zhaoAj5(&htV&QQ}Fsvj4{r}4zRZ<{IYuD6tz*Z}m7g-t~HTi*86IdusV4*aDh0+8T
zN)uQpO<<ukfrZipJn-VRac}C%<R5sqwE&^;0j8JuL(F{TUX;@ZwQ=#nc?cv@00000
LNkvXXu0mjf+OA47

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preferences_ok_button.png b/gtk2_ardour/icons/preferences_ok_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..49e08cdacf3b806bd3bddc630e85a36f4fb854b8
GIT binary patch
literal 1276
zcmeAS@N?(olHy`uVBq!ia0vp^?m#TV!3HFae=gDnQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07?@QuLn2Bde0{8v^K<nQL2C3WatnaE85nHrD+&^mvr|hH
zl2X$%^K6yg@7}MZkeOnu6mIHk;9KCFnvv;IRg@ZB<rk7%m7Q#vqGWHUU{hfQG$1#%
zBvGLvHz%*ys=`(YY_1iM4HDK@QUEI{$+lI3I4Z(7K*2e`C{@8!&p<cXz|2s=%tX)7
z#K6+TQb)naz|cV7&`96FT-VUR%GBJ-z)%4Slz_GsrKDK}xwt{?0`hE?GD=Dctn~HE
z%ggo3jrH=2()A53EiLs8jP#9+bb%^#i!1X=5-W7`ij`p|xTF>*7iAWdWaj57fJ{tG
z$}cUkRRX#c;)UD-xUqS~&|m@vn0`fKfxe-h0mw@*g}%P{mFDKcRTq~8r6Sym)!^cg
z%7Rq=pw#00(xPNw#HA^NtSYc_E=o--$uA1Y&(DE{Vn9ZINq%ugeu08>u&JJ*f^TAS
zW*$fcti#vW$}_LHBrz{J)zigR32261W@d_&nW2f9i?g|jqp6{jp`oj>qqCE#qp5+5
zfuV(ok)@L*Os`9Ra%paAUI|QZ3PLYXJr2E~#E@G6wAm%KD6=dz#jPkmR{`v4t4!Q(
zF~VscRBsAyw;1Eps}FRHJ}7FDq8cUyOg|tdJmCU4@T8xb2Tbopz=VB&!A>Ct2F5&3
z7srr_TW@AA>}z%qXj^`EY1@{CY>Zs3D;b*?_BT8-t&q9*gl82S4_7cV+fh!QCwdYF
z*X!SBJa9VO`8epAzuD}$IZoeB+Z#)lIlENf|9-#IG*E!0{cUcT<k2-D2W}d-N50*D
z=D|h@zQc(YJnat+=KNnjUDa-t23O=X*GVd!rJ<oyR5(jx-FK~<oG2mE_ONz+?(Heh
zEmI@E-6`lht~~dA`mVV3k2dVS+b45ekYSO=tT(JHF28gslnIW#etv$~tYv|LBIV)-
zbS-RTm<o~&3NAb?iex#XRKTzx_qHcbgTUm}$Tbu58k!}~Mfp0makoVob1(>G&q{lw
zwnXkyuBJmh-*TPP)u(t80*V8sw10W|JC4EWm15egXH|2W4{<xpdp_~?E+)2JSLa+Z
z5nb8wZd+Fv-*ld}zm^BAF+BG5#l^UNET4F1J~WVNJ6sR}^xq%9*|!ha-upW*GX9W$
qbNGRSi|2X$*<pU|c<!EBE(3<ruN{6|_s)I?l}DbgelF{r5}E+_7sR6g

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preferences_ok_button_active.png b/gtk2_ardour/icons/preferences_ok_button_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..a88330d464a1b8eca2a99c6674d390542d921510
GIT binary patch
literal 1272
zcmeAS@N?(olHy`uVBq!ia0vp^?m#TV!3HFae=gDnQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07?@QuLn2Bde0{8v^K<nQL2C3WatnaE85nHrD+&^mvr|hH
zl2X$%^K6yg@7}MZkeOnu6mIHk;9KCFnvv;IRg@ZB<rk7%m7Q#vqGWHUU{hfQG$1#%
zBvGLvHz%*ys=`(YY_1iM4HDK@QUEI{$+lI3I4Z(7K*2e`C{@8!&p<cXz|2s=%tX)7
z#K6+TQb)naz|cV7&`96FT-VUR%GBJ-z)%4Slz_GsrKDK}xwt{?0`hE?GD=Dctn~HE
z%ggo3jrH=2()A53EiLs8jP#9+bb%^#i!1X=5-W7`ij`p|xTF>*7iAWdWaj57fJ{tG
z$}cUkRRX#c;)UD-xUqS~&|m@vn0`fKfxe-h0mw@*g}%P{mFDKcRTq~8r6Sym)!^cg
z%7Rq=pw#00(xPNw#HA^NtSYc_E=o--$uA1Y&(DE{Vn9ZINq%ugeu08>u&JJ*f^TAS
zW*$fcti#vW$}_LHBrz{J)zigR32261W@d_&i;0V&v#X<}qp6{jp`oj>qqCE#qp5+5
zfuV(ok)@L*Os`9Ra%paAUI|QZ3PP_VPQ9SSkXrz>*(J3ovn(~mttdZN0qkk3Oe}6O
zGc+-CaW*%@X&zK>3U0Sp;MA)Rbc{YIYLTKECIn1BASOKF0y*%cpPC0u??u3bEnWKR
z3j+gVmZytjNX4x;Hy7qL2Z*pexSYmxd8tsr3RcfeoGMI#hK{k7JzjDwk(@$?jXRh+
zXE;n+xvNoSwnovP^5!WmH#c7RtghZ7J*iFq`JH<$qJp_G*Z(S<({SqeU0Qy1W|EOr
zf!P~_nP+G5*6}|!-~*#`|Igo*vCooVds}9GD{uR!e>HZ&lT@y3(~X?wx-B<YqV4eJ
zdCvpqJ>MkOyLgqBEFb%+O+Ne9EYf)Ldml^3<BBgj3uKNj)aY8V?)B6DshP7vM2=oy
zeId5T#)_rjy1|PDmtUH2pV6^k$e5M3g-u~i<}9`MhIt1Liq0)HmNwe8;C}Wm28Qg=
z(B55~i?`o@pU(WNc+MuB_K7bOH#|=Wes`SRLZe6Sz=q2EKF<>#vjzyTl-S6<EZTXZ
ze)Y;FnOetl`4)tR_pf`s@6*aO8O0;Q@=QNl&RFyu2BXba9tixnaP{-~sh{U=Ul-TV
n++St&@%Y}?HDzD_sUBeP7OH)^@|S@Us4Vhy^>bP0l+XkK_$J8p

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preferences_ok_button_prelight.png b/gtk2_ardour/icons/preferences_ok_button_prelight.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8094a148d4b3e3f1ecdf09024ce2b34cf3f971f
GIT binary patch
literal 1286
zcmeAS@N?(olHy`uVBq!ia0vp^?m#TV!3HFae=gDnQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07?@QuLn2Bde0{8v^K<nQL2C3WatnaE85nHrD+&^mvr|hH
zl2X$%^K6yg@7}MZkeOnu6mIHk;9KCFnvv;IRg@ZB<rk7%m7Q#vqGWHUU{hfQG$1#%
zBvGLvHz%*ys=`(YY_1iM4HDK@QUEI{$+lI3I4Z(7K*2e`C{@8!&p<cXz|2s=%tX)7
z#K6+TQb)naz|cV7&`96FT-VUR%GBJ-z)%4Slz_GsrKDK}xwt{?0`hE?GD=Dctn~HE
z%ggo3jrH=2()A53EiLs8jP#9+bb%^#i!1X=5-W7`ij`p|xTF>*7iAWdWaj57fJ{tG
z$}cUkRRX#c;)UD-xUqS~&|m@vn0`fKfxe-h0mw@*g}%P{mFDKcRTq~8r6Sym)!^cg
z%7Rq=pw#00(xPNw#HA^NtSYc_E=o--$uA1Y&(DE{Vn9ZINq%ugeu08>u&JJ*f^TAS
zW*$fcti#vW$}_LHBrz{J)zigR32261W@d_&i;0V&v#XP#qp6{jp`oj>qqCE#qp5+5
zfuV(ok)@L*Os`9Ra%paAUI|QZ3PP_DPQ9SSkXrz>*(J3ovn(~mttdZN0qkk3Oq_0U
zbi-*LRBsAyw;15ms}FRHJ}7FDq8cUyOg|tdJmCU4@T8xb2Tbopz=R!q;DHPS17n4!
zi(^Q|tv53_b~QT)w5dOASrWm`%^j?gFi}MF3v14r_mwql^Pk^S^ySjc(P>ebap;f}
zH>>WsdQTNO&*Gz%M}8(o#E7TZKbt@ID61gn{qNpMy-zCV?Rw+h9B4C@(W1%HW@>~{
z^YtVPp7w_ZGHr(o{_VG0_G87e%n}QkjJ<KEpD)tT=u*nMJ<V)3Z|?SJtGRxMZ$19#
zkvZ$q)1u0Ji&d*8<=&p6(s^giB8`;DX)FRP2QzdXW-jwgln9EP_C8-b_PXZjO^VzT
zbZ^)gu{@AFsL*`w`Dc{`wMONZ1<NwsiWx$#Z>?cJnAetgLU5+(?53Dd(Y0Z#F9Q9}
za?dtRcn$k*U)C4rA3mwn)7^agEt|m#ON~?Ize{4(84p&?xc&b7=Z5C9i#{AOTlad>
zV+$cRzt!nok0Y)r&B@zracZLK_r<@K2dok7|N7!;R36h#=QM~n#SSN0?7zH-|I4%a
x+b5Q0pZWcRNhYS1_tE_7#lH*XujezeG1yJ+m{9pA|1PLx@^tlcS?83{1OURy$O`}f

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preferences_stereo_out_button.png b/gtk2_ardour/icons/preferences_stereo_out_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..851f3ff2167d3d91d44c0282bc33c57890c50927
GIT binary patch
literal 1570
zcmeAS@N?(olHy`uVBq!ia0vp^SwJkq!3HEdqqMw%lw^r(L`iUdT1k0gQ7VIDN`6wR
zf@f}GdTLN=VoGJ<$y6H#24<Dakcg59UmvUF{9L_6kQ%*;+ybC(1_m4Zih{)C?9>v4
zq}24xJX@vryZ0+8WTx0Eg`4^s_!c;)W@LI)6{QAO`Gq7`WhYyvDB0U7*i={n4aiL`
zNmQuF&B-gas<2f8n`;GRgM{^!6u?SKvTc<hj*9RNP;kyKN>wn`Gtf;oFf&vzGto0N
zF|ahT)KM@pFf`CNG}1RP*EKY-GBvj{FjRm7C7^9ZDQQ+gE^bh}fIM5JjFOT9D}DX)
z@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7^KE~&-IMVSR9nfZANAQKal
z@=Hr>m4GgVcp<j{ZfssLG?;(^reBd*pl_&W0P+${p|3A~rMbCq)x{-2sR;LCHMlsW
zvLIDID784hv?v)EacRmRs|u`~i&7Iy@{2<9^K)RK7?6=)l3$#WU!dR|Y^rCd;G3A7
znFkU9>+top^2{qPNz6-5^>ndS0-B+hnVDi`Y+_<+>}+W0Xlm$WXy|I}=<H<bXlmeM
zU}#}tWa(rH)9aF-T$-DjR|3<Ug3xP(Q!gkn<Q4#Jc1bPDEK5ysE6UGR0DIah6Q^4Y
z+;Ex))tiFbEe1IC>H{644~kl(sD=pv(+`LVPq;u1Jn5(A0n>XCFk#21?Ji?rV4C9T
z;uunK>&-0N)l!ZkZO`Kt^-5iE6Ug1tF?FiumW#*SI5HluzcK&u`VD~|nTvbHE*?82
za!Z3zy46KG_mS}vo$9|n2U_-;KW|MefByK)nacB(<zY2O$6REN|I8EF=eqf3&HtJ`
zYF9+}xic+Ndc}TU`O_M^3fX`~Q#4wImbz$ysIT@9?k?s{+Z;Lh^wT@fPo^X-yS#Gc
z_19_w9CN<DFR@w{qBS$a<kzBkhCORTw9<2vjHi0dbXr(&@mbye?T;h8ZRECpJ^l1j
zkDK!CvaSS!j88xJc&bhQR=G9mW~JHe-rBUkx8GhX*?m|1w+vr<nXJ({?ptErt^Yd?
zDeA<@oV0B{yX|)FZT92shZDa?I>;9u(%h4KH0k24BQLkh9Flojbkl0j)vQP*4vtex
zD_4A<bjGG<xjxI?LkR{O!mqJ5_6RoB>ef0*q&!ra^VI`rL3iXsRzW{DVUvb`pMTy-
zi&UFz8Lj_yOLy!sL%HMoEnf=n6xf+K*(GfM{r#^aWUgkI=%t;^lxBRewf#>gi`TcK
zNruxE4p!~mc0HI=Ec5F()ou<BqmO3=Tf;URZsK^^xT3@=m;2n_*85ZKmQ3!M;ImV$
zRw;aqJBPq0g#+Dp^PYeE>ZRUtk9$LS<ty%1r)e@=eN|VwuW;u)I#4~aug9@NCg+9!
z0f%2XX4acMZQmwMFYKAl;H<0Aue9Xyzl_NL>XJv7-RO`}+M~Xu+G46XANQw8`@YHT
zQK@x^d$u?3{5t11kFI>IsJSTj>CDRYVXJpWp5Y8Mnq2*CMcC>*u{dkTf4nxb-uDXU
z=>J;!DBfiD+5TS#SMT@Hn4+QTwGb59VCvtW=I@6$*8D0B{lOpK|J2y!Bm0?_i}p#s
hMD6>Y-u7o?W3cc{JkDJC^e?E?_H^}gS?83{1OO%YUoZdw

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preferences_stereo_out_button_active.png b/gtk2_ardour/icons/preferences_stereo_out_button_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..def873c427c960edaaed910447fa204c9991a3a9
GIT binary patch
literal 1588
zcmeAS@N?(olHy`uVBq!ia0vp^SwJkq!3HEdqqMw%lw^r(L`iUdT1k0gQ7VIDN`6wR
zf@f}GdTLN=VoGJ<$y6H#24<Dakcg59UmvUF{9L_6kQ%*;+ybC(1_m4Zih{)C?9>v4
zq}24xJX@vryZ0+8WTx0Eg`4^s_!c;)W@LI)6{QAO`Gq7`WhYyvDB0U7*i={n4aiL`
zNmQuF&B-gas<2f8n`;GRgM{^!6u?SKvTc<hj*9RNP;kyKN>wn`Gtf;oFf&vzGto0N
zF|ahT)KM@pFf`CNG}1RP*EKY-GBvj{FjRm7C7^9ZDQQ+gE^bh}fIM5JjFOT9D}DX)
z@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7^KE~&-IMVSR9nfZANAQKal
z@=Hr>m4GgVcp<j{ZfssLG?;(^reBd*pl_&W0P+${p|3A~rMbCq)x{-2sR;LCHMlsW
zvLIDID784hv?v)EacRmRs|u`~i&7Iy@{2<9^K)RK7?6=)l3$#WU!dR|Y^rCd;G3A7
znFkU9>+top^2{qPNz6-5^>ndS0-B+hnVDi`W@uvO;%w&ZXlm$WXy|I}=<H<bXlmeM
zU}#}tWa(rH)9aF-T$-DjR|3<Ug3#-NQ!gkn<Q4#Jc1bPDEK5ysE6UGR0DIah6N_7n
zO-xLUoej-#ng`XJg2gRRy%sq2>H{644~kl(sD=pv(+`LVPq;u1Jn5(A0n>XCFkzRw
z869U}U|Qzs;uunK>&>k5-XVb^$JYnxo$(B0md%M-;WDFX#*IZcT?A$@uVV`Q&+wP~
zjsA)K4*wY@FL>MIbRmy}tMkAlj%>rpXL7V8y2W;VtbJD@SANeXoo89at)GWdpZ&9V
ze((F=dBuDDmz|UlejV*EFX5W9asPx}x8Bqqo7#0kxi7%*sp6*&Q*HL=%vw{pmIf>g
z(P#xx|JY-)wj5siknwZHn`QUwKfPNVdG~LUolRB3t!TaQwfn#RX{{{#-zWJpXT8L6
zw%co0rd*x#W6rzxrr9Sy2Fzc2SULN6<fOfK%WNiV&w6TZU8cuzZkv&1R&7(x$JuwE
z|Lvdjw)o$l_4m`Vw4*=H>At!BS)$Ur+dC8bY?akTS_&!@C%re36Z^z)MEzFO-+c|H
zPEG>vWDY&Jtg6r>@J)e1;m@zjJ)%u^x;gU4Vkh2ozorzRyW#($=aY&R70i?hmU!R4
zJ1_g&h1I*~>v~SO>fw+Q5w=6&kYM`)!P&ig=bYWNbD>LUgW<V7KaTSKUi$E0clfU*
zF&;Y=cXh0}Ieq<WA@0EV=gXZpt5~>i+x4&G-`14WZ@ndDKbSbn_D%m|B!0(w$26Tq
z@?q=F?+tjWk+(6@<)xxjXPnfNYlkAe<(CTAPtsgI)lM^9K$oefER<U)=Jhnc>))L2
z{yO!D=f<(a`Omm{?F-bxH?UmmF40Ub+L-wFPQZTA+GKtC50P6QpXrW&vtfCS_tpnL
zGoI?a+3>kn@AZF`#V2OD+!p;W^zhz=SBeq$6#9KumKJhq*E;;05nN>1{-ZS{uQoA3
zce`C)`J|(3rsh1h{=H|`&gbb5GtE!zZ&X`<_g%Dq{_ELZCBWF9bwNDt@A(#|)}VzV
zT2r9Zqx10<`4zgQpH_Cr*;VTH2K-?#&im3nBk-vIdeJ^s35NOW5}fBRZ2bl*$30#B
KT-G@yGywoD265^D

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preferences_stereo_out_button_prelight.png b/gtk2_ardour/icons/preferences_stereo_out_button_prelight.png
new file mode 100644
index 0000000000000000000000000000000000000000..98c7ba8e245e0c183fed92e1bcd9319f07e6d1dd
GIT binary patch
literal 901
zcmV;01A6?4P)<h;3K|Lk000e1NJLTq003$L000~a1^@s6iCQX400007bV*G`2i^$^
z5+nkK38H=g000SaNLh0L03N~s03N~tZqRi;00004XF*Lt006O%3;baP0009NNkl<Z
zc-rlnO-NKx6vvN}vlyFDL6hlYCi=ojuwb%<Vk8ntxrk}grd119g1B<g%EhciaOI*^
zE!s4+sIWkkL>H-GflX9GS|pO8Qq3%8Hr@Xj@0&Nz=RAq$%)4-ZaCvjT&i(k`bKZS0
z6+{&1ijVvzjc1t{>_1W|p22cYMB_*hLIuh_3ymXz%5u*@vp=*@ilBv31TB;zXrUBA
z3#ABJC`CBrw!!YmIf}JhF!G7_A80)JnMUv2B7arYuJ(P2mo(7XMxol8g7Wc?Unucz
zi5}dzwyRFsjGjD3y=|?wHq)65h3aa=T$(A;SkL7P-`D8T+#=Um@%wyquk{i|PvpM;
zlj|E|oF!V_+~z#yzwtLkL$9U^);TsiC+2b7=w}9X3*UZtPpC*^15aLVWb9%y=dswn
zr!Tk-HopFFwUL*sZfzTzV8vY5+kS;@nm531LomibXFG5B{U^^@2pk9`yKzu%78&E9
zKiWc|VvNna<tNtL-E@|QUQZbUyTyTozNVuMJZXr9O-io+bk%-3o267HTeJ<l4IT`y
z<UV5ar<YgQJFlKORnQg(4CSbo-iChY56|%eu6h&%fj8mABi!J0!5fArXKllc8En+U
zySI(J*-NZ-2#aQW9R6|+VR&Dtu9ov=L02}n`04i*hG2xqT-&@&co7Z+JkbldDioh$
zu`qZMLJv-3$LX**!D05UV(d5cA#}o?^b}wh`eeAO7NST|!#m=oE#8=Kn->N1hetUb
zuu|b_=woq&7eOE_-mMp@8Q8=II-T_C<*)1!2*CjDJA}Xx{f(%z+C(|(rCszxe|f<0
zuEY9}06Z4;C@%%BdK4Cgg&_3Fo1eT`IAINMxS`3Hv>oy$2h5=l$d~!><P6{Xq+M+4
z<M~BfdkD|C^^L}Eavs9rhA6!azcEg{=Q`(qrP6!eAP<5Hk)mDkk@=F0rui=>2Kz7T
z4_-ykLMeh4N)fbBilBv31TB;zXrUBA3#AD7;5{!=&(2fhJwA!_975p_m_gEi#PlkE
bL|Xd?EQnuVE~4Kj00000NkvXXu0mjf6ey#}

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/ui/tracks_preferences.xml b/gtk2_ardour/ui/tracks_preferences.xml
index d684263d1b..b193c95287 100644
--- a/gtk2_ardour/ui/tracks_preferences.xml
+++ b/gtk2_ardour/ui/tracks_preferences.xml
@@ -13,7 +13,7 @@
     bghover="#898989"
     fgdisabled ="#959595"
     bordercolor="#7E7E7E"
-    borderwidth="1 1 0 0" />
+    borderwidth="1 1 0 0"/>
 
   <Layout bgnormal="#1F1F1F" x="0" y="0" width="619" height="623">
     <VBox x="2" y="1">
@@ -57,21 +57,33 @@
     </VBox>
 
     <Layout bgnormal="#565656" x="113" y="559" width="505" height="63">
-      <Button
-        id="ok_button"
-        text="OK"
-        style="generic_button"
-        x="275" y="18" width="71" height="28"/>
-      <Button
-        id="cancel_button"
-        text="CANCEL"
-        style="generic_button"
-        x="347" y="18" width="71" height="28"/>
-      <Button
-        id="apply_button"
-        text="APPLY"
-        style="generic_button"
-        x="419" y="18" width="71" height="28"/>
+      <Iconbutton id="ok_button"
+                  style="generic_button"
+                  x="275"
+                  y="18"
+                  width="71"
+                  height="28"
+                  normalicon="preferences_ok_button"
+                  activeicon="preferences_ok_button_active"
+                  prelighticon="preferences_ok_button_prelight"/>
+      <Iconbutton id="cancel_button"
+                  style="generic_button"
+                  x="347"
+                  y="18"
+                  width="71"
+                  height="28"
+                  normalicon="preferences_cancel_button"
+                  activeicon="preferences_cancel_button_active"
+                  prelighticon="preferences_cancel_button_prelight"/>
+      <Iconbutton id="apply_button"
+                  style="generic_button"
+                  x="419"
+                  y="18"
+                  width="71"
+                  height="28"
+                  normalicon="preferences_apply_button"
+                  activeicon="preferences_apply_button_active"
+                  prelighticon="preferences_apply_button_prelight"/>
     </Layout>
     <Layout id="midi_settings_layout" bgnormal="#565656" x="113" y="1" width="505" height="557" visible="true">
       <Layout bgnormal="#000000" x="21" y="20" width="291" height="19">
@@ -108,8 +120,18 @@
                x="7"
                y="3"/>
       </Layout>
-      <Layout bgnormal="#000000" x="447" y="20" width="14" height="19" />
-      <ScrolledWindow x="21" y="62" bgnormal="#565656" width="440" height="218" hscroll="never" vscroll="auto">
+      <Layout bgnormal="#000000"
+              x="447"
+              y="20"
+              width="14"
+              height="19"/>
+      <ScrolledWindow bgnormal="#565656"
+                      x="21"
+                      y="62"
+                      width="440"
+                      height="218"
+                      hscroll="never"
+                      vscroll="auto">
         <HBox>
           <VBox id="midi_device_list">
           </VBox>
@@ -117,11 +139,20 @@
       </ScrolledWindow>
     </Layout>
     <Layout id="audio_settings_layout" bgnormal="#000000" x="113" y="1" width="505" height="558" visible="true">
-      <Layout bgnormal="#565656" x="0" y="0" width="505" height="100">
-        <Label style="generic_control" text="AUDIO ENGINE" x="12" y="17"/>
+      <Layout bgnormal="#565656"
+              x="0"
+              y="0"
+              width="505"
+              height="100">
+        <Label style="generic_control"
+               text="AUDIO ENGINE"
+               x="0"
+               y="15"
+               width="88"
+               horzalignment="end"/>
         <Dropdown style="generic_button"
                   id="engine_dropdown"
-                  x="97"
+                  x="96"
                   y="12"
                   width="126"
                   height="20"
@@ -130,18 +161,28 @@
                   prelighticon="preference_device_dropdown_prelight"
                   inactiveicon="preference_device_dropdown_inactive"/>
 
-        <Label style="generic_control" text="INTERFACE" x="12" y="47"/>
+        <Label style="generic_control"
+               text="INTERFACE"
+               x="0"
+               y="43"
+               width="88"
+               horzalignment="end"/>
         <Dropdown style="generic_button"
                   id="device_dropdown"
-                  x="97"
+                  x="96"
                   y="40"
                   width="126"
                   height="20"
                   normalicon="preference_device_dropdown"
                   activeicon="preference_device_dropdown_active"
-                  prelighticon="preference_device_dropdown_prelight"                  
+                  prelighticon="preference_device_dropdown_prelight"
                   inactiveicon="preference_device_dropdown_inactive"/>
-        <Label style="generic_control" text="SAMPLE RATE" x="231" y="17"/>
+        <Label style="generic_control"
+               text="SAMPLE RATE"
+               x="223"
+               y="15"
+               width="80"
+               horzalignment="end"/>
         <Dropdown style="generic_button"
                   id="sample_rate_dropdown"
                   x="311"
@@ -152,11 +193,16 @@
                   activeicon="preference_rate_buffer_dropdown_active"
                   prelighticon="preference_rate_buffer_dropdown_prelight"
                   inactiveicon="preference_rate_buffer_dropdown_inactive"/>
-          <Label style="generic_control" text="BUFFER SIZE" x="231" y="47"/>
+        <Label style="generic_control"
+               text="BUFFER SIZE"
+               x="223"
+               y="43"
+               width="80"
+               horzalignment="end"/>
         <Dropdown style="generic_button"
                   id="buffer_size_dropdown"
                   x="311"
-                  y="42"
+                  y="40"
                   width="90"
                   height="20"
                   normalicon="preference_rate_buffer_dropdown"
@@ -164,10 +210,15 @@
                   prelighticon="preference_rate_buffer_dropdown_prelight"
                   inactiveicon="preference_rate_buffer_dropdown_inactive"/>
 
-        <Button id="control_panel_button"
-          style="generic_button"
-          text="DEVICE\nCONTROL\nPANEL"
-          x="407" y="12" width="84" height="48"/>
+        <Iconbutton id="control_panel_button"
+                    style="generic_button"
+                    x="407"
+                    y="12"
+                    width="85"
+                    height="49"
+                    normalicon="preferences_device_control_panel_button"
+                    activeicon="preferences_device_control_panel_button_active"
+                    prelighticon="preferences_device_control_panel_button_prelight"/>
 
         <Label id="latency_label" style="generic_control" text="INPUT LATENCY:" x="16" y="74  " width="476"/>
       </Layout>
@@ -176,26 +227,23 @@
                winfont ="Arial Bold 10"
                macfont ="Helvetica Bold 10"
                x="17" y="15"/>
-        <Button id="multi_out_button"
-                style="generic_button"
-                text="MULTI OUT"
-                fgnormal="#C2C2C2"
-                fgactive="#FFFFFF"
-                bgactive="#1CA3B3"
-                fghover="#CECECE"
-                winfont ="Arial Bold 10"
-                macfont ="Helvetica Bold 10"
-                x="280" y="6" width="106" height="28"/>
-        <Button id="stereo_out_button"
-                text="STEREO OUT"
-                style="generic_button"
-                fgnormal="#C2C2C2"
-                fgactive="#FFFFFF"
-                bgactive="#1CA3B3"
-                fghover="#CECECE"
-                winfont ="Arial Bold 10"
-                macfont ="Helvetica Bold 10"
-          x="387" y="6" width="106" height="28"/>
+        <iconbutton id="multi_out_button"
+                    text="MULTI OUT"
+                    x="280"
+                    y="6"
+                    width="106"
+                    height="28"
+                    normalicon="preferences_multi_out_button"
+                    activeicon="preferences_multi_out_button_active"
+                    prelighticon="preferences_multi_out_button_prelight"/>
+        <Iconbutton id="stereo_out_button"
+                    x="387"
+                    y="6"
+                    width="106"
+                    height="28"
+                    normalicon="preferences_stereo_out_button"
+                    activeicon="preferences_stereo_out_button_active"
+                    prelighticon="preferences_stereo_out_button_prelight"/>
       </Layout>
       <Layout bgnormal="#565656" x="0" y="141" width="505" height="416">
         <Layout bgnormal="#862579" x="16" y="13" width="3" height="41"/>
@@ -285,26 +333,41 @@
             </VBox>
           </HBox>
         </ScrolledWindow>
-        <Button
-          id="name_tracks_after_driver_button"
-          text="NAME TRACK\nAFTER DRIVER"
-          style="generic_button"
-          x="16" y="369" width="136" height="39"/>
-        <Button
-          id="reset_tracks_name_to_default_button"
-          text="RESET TRACK\nNAMES TO DEFAULT"
-          style="generic_button"
-          x="153" y="369" width="136" height="39"/>
-        <Button
-          id="yes_button"
-          text="YES"
-          style="generic_button"
-          x="292" y="369" width="52" height="39"/>
-        <Button
-          id="no_button"
-          text="NO"
-          style="generic_button"
-          x="345" y="369" width="52" height="39"/>
+        <Iconbutton id="name_tracks_after_driver_button"
+                    style="generic_button"
+                    x="16"
+                    y="369"
+                    width="136"
+                    height="39"
+                    normalicon="preference_name_track_after_driver_button"
+                    activeicon="preference_name_track_after_driver_active"
+                    prelighticon="preference_name_track_after_driver_prelight"/>
+        <Iconbutton id="reset_tracks_name_to_default_button"
+                    x="153"
+                    y="369"
+                    width="136"
+                    height="39"
+                    normalicon="preference_reset_track_names_button"
+                    activeicon="preference_reset_track_names_button_active"
+                    prelighticon="preference_reset_track_names_button_prelight"/>
+        <Iconbutton id="yes_button"
+                    text="YES"
+                    x="292"
+                    y="369"
+                    width="52"
+                    height="39"
+                    normalicon="preference_yes_button"
+                    activeicon="preference_yes_button_active"
+                    prelighticon="preference_yes_button_prelight"/>
+        <Iconbutton id="no_button"
+                    text="NO"
+                    x="345"
+                    y="369"
+                    width="52"
+                    height="39"
+                    normalicon="preference_no_button"
+                    activeicon="preference_no_button_active"
+                    prelighticon="preference_no_button_prelight"/>
       </Layout>
     </Layout>
     <Layout id="session_settings_layout" bgnormal="#565656" x="113" y="1" width="505" height="557" visible="false">
@@ -407,13 +470,13 @@
         <dropdownitem title="2 Min"/>
       </Dropdown>
 
-      <Label style="generic_control" text="DEFAULT FOLDER FOR NEW SESSION" x = "24" y = "290" />
+      <Label style="generic_control" text="DEFAULT FOLDER FOR NEW SESSION" x = "24" y = "290"/>
       <Button
         id = "browse_default_folder"
         text = "Browse"
         style = "generic_button"
         x = "24" y = "310" width = "100" height = "28"/>
-      <Label id="default_open_path" style="generic_control" text="" x = "135" y = "315" />
+      <Label id="default_open_path" style="generic_control" text="" x = "135" y = "315"/>
     </Layout>
   </Layout>
 </Dialog>

From 936aa565a09bf9c371ecc4075280f916710462b7 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 10 Sep 2014 18:38:30 -0400
Subject: [PATCH 06/37] move CursorInfo members into public access

---
 libs/gtkmm2ext/gtkmm2ext/cursors.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/gtkmm2ext/gtkmm2ext/cursors.h b/libs/gtkmm2ext/gtkmm2ext/cursors.h
index d628c13cd8..069684f514 100644
--- a/libs/gtkmm2ext/gtkmm2ext/cursors.h
+++ b/libs/gtkmm2ext/gtkmm2ext/cursors.h
@@ -13,15 +13,15 @@ class CursorInfo
         static int load_cursor_info (const std::string& path);
         static void drop_cursor_info ();
 
+        std::string name;
+        int x;
+        int y;
+
     private:
         CursorInfo (const std::string& image_name, int hotspot_x, int hotspot_y);
         
         typedef std::map<std::string,CursorInfo*> Infos;
         static Infos infos;
-
-        std::string name;
-        int x;
-        int y;
 };
 
 } /* namespace */

From 3a9adbd01e14565b0c01d634345372bbf094b1c2 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 10 Sep 2014 18:50:58 -0400
Subject: [PATCH 07/37] add copyright header comments

---
 libs/gtkmm2ext/cursors.cc          | 19 +++++++++++++++++++
 libs/gtkmm2ext/gtkmm2ext/cursors.h | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/libs/gtkmm2ext/cursors.cc b/libs/gtkmm2ext/cursors.cc
index 3377a7cda9..a99a457032 100644
--- a/libs/gtkmm2ext/cursors.cc
+++ b/libs/gtkmm2ext/cursors.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2014 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <sstream>
 #include <fstream>
 
diff --git a/libs/gtkmm2ext/gtkmm2ext/cursors.h b/libs/gtkmm2ext/gtkmm2ext/cursors.h
index 069684f514..6a5308b2b6 100644
--- a/libs/gtkmm2ext/gtkmm2ext/cursors.h
+++ b/libs/gtkmm2ext/gtkmm2ext/cursors.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2014 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __gtkmm2ext_cursor_info_h___
 #define __gtkmm2ext_cursor_info_h___
 

From a22b189e1fc2b65c742167f31029765bb1a7a1ae Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 10 Sep 2014 18:52:04 -0400
Subject: [PATCH 08/37] improve code for cursor creation; nominally use
 CursorInfo even though we have no info files yet

---
 gtk2_ardour/mouse_cursors.cc | 192 ++++++++++-------------------------
 gtk2_ardour/mouse_cursors.h  |   1 +
 2 files changed, 54 insertions(+), 139 deletions(-)

diff --git a/gtk2_ardour/mouse_cursors.cc b/gtk2_ardour/mouse_cursors.cc
index 13cf74f780..37a0118b33 100644
--- a/gtk2_ardour/mouse_cursors.cc
+++ b/gtk2_ardour/mouse_cursors.cc
@@ -18,6 +18,9 @@
 */
 
 #include <gdkmm/cursor.h>
+
+#include "gtkmm2ext/cursors.h"
+
 #include "utils.h"
 #include "mouse_cursors.h"
 #include "editor_xpms"
@@ -111,27 +114,66 @@ MouseCursors::drop_all ()
 	delete expand_up_down; expand_up_down = 0;
 }
 
+Gdk::Cursor*
+MouseCursors::make_cursor (const char* name, int hotspot_x, int hotspot_y)
+{
+	Gtkmm2ext::CursorInfo* info = Gtkmm2ext::CursorInfo::lookup_cursor_info (name);
+
+	if (info) {
+		hotspot_x = info->x;
+		hotspot_y = info->y;
+	}
+
+	Glib::RefPtr<Gdk::Pixbuf> p (::get_icon (name, _cursor_set));
+	return new Gdk::Cursor (Gdk::Display::get_default(), p, hotspot_x, hotspot_y);
+}
+
 void
 MouseCursors::set_cursor_set (const std::string& name)
 {
 	using namespace Glib;
 	using namespace Gdk;
-	
+
 	drop_all ();
 	_cursor_set = name;
 
-	{
-		RefPtr<Pixbuf> p (::get_icon ("zoom_in_cursor", _cursor_set));
-		zoom_in = new Cursor (Display::get_default(), p, 10, 5);
-	}
+	/* these will throw exceptions if their images cannot be found.
+	   
+	   the default hotspot coordinates will be overridden by any 
+	   data found by Gtkmm2ext::Cursors::load_cursor_info(). the values
+	   here from the set of cursors used by Ardour; new cursor/icon
+	   sets should come with a hotspot info file.
+	*/
 
-	{
-		RefPtr<Pixbuf> p (::get_icon ("zoom_out_cursor", _cursor_set));
-		zoom_out = new Cursor (Display::get_default(), p, 5, 5);
-	}
+	zoom_in = make_cursor ("zoom_in_cursor", 10, 5);
+	zoom_out = make_cursor ("zoom_out_cursor", 5, 5);
+	scissors = make_cursor ("scissors", 5, 0);
+	grabber = make_cursor ("grabber", 5, 0);
+	grabber_note = make_cursor ("grabber_note", 5, 10);
+	grabber_edit_point = make_cursor ("grabber_edit_point", 5, 17);
+	left_side_trim = make_cursor ("trim_left_cursor", 5, 11);
+	anchored_left_side_trim = make_cursor ("anchored_trim_left_cursor", 5, 11);
+	right_side_trim = make_cursor ("trim_right_cursor", 23, 11);
+	anchored_right_side_trim = make_cursor ("anchored_trim_right_cursor", 23, 11);
+	left_side_trim_right_only = make_cursor ("trim_left_cursor_right_only", 5, 11);
+	right_side_trim_left_only = make_cursor ("trim_right_cursor_left_only", 23, 11);
+	fade_in = make_cursor ("fade_in_cursor", 0, 0);
+	fade_out = make_cursor ("fade_out_cursor", 29, 0);
+	resize_left = make_cursor ("resize_left_cursor", 3, 10);
+	resize_top_left = make_cursor ("resize_top_left_cursor", 3, 3);
+	resize_top = make_cursor ("resize_top_cursor", 10, 3);
+	resize_top_right = make_cursor ("resize_top_right_cursor", 18, 3);
+	resize_right = make_cursor ("resize_right_cursor", 24, 10);
+	resize_bottom_right = make_cursor ("resize_bottom_right_cursor", 18, 18);
+	resize_bottom = make_cursor ("resize_bottom_cursor", 10, 24);
+	resize_bottom_left = make_cursor ("resize_bottom_left_cursor", 3, 18);
+	move = make_cursor ("move_cursor", 11, 11);
+	expand_left_right = make_cursor ("expand_left_right_cursor", 11, 4);
+	expand_up_down = make_cursor ("expand_up_down_cursor", 4, 11);
+	selector = make_cursor ("i_beam_cursor", 4, 11);
 
-	Color fbg ("#ffffff");
-	Color ffg ("#000000");
+	Gdk::Color fbg ("#ffffff");
+	Gdk::Color ffg ("#000000");
 
 	{
 		RefPtr<Bitmap> source = Bitmap::create ((char const *) fader_cursor_bits, fader_cursor_width, fader_cursor_height);
@@ -152,136 +194,8 @@ MouseCursors::set_cursor_set (const std::string& name)
 		transparent = new Cursor (bits, bits, c, c, 0, 0);
 	}
 
-	{
-		char pix[4] = { 0, 0, 0, 0 };
-		RefPtr<Bitmap> bits = Bitmap::create (pix, 2, 2);
-		Color c;
-		transparent = new Cursor (bits, bits, c, c, 0, 0);
-	}
-
-	{
-		RefPtr<Pixbuf> p (::get_icon ("scissors", _cursor_set));
-		scissors = new Cursor (Display::get_default(), p, 5, 0);
-	}
-
-	{
-		RefPtr<Pixbuf> p (::get_icon ("grabber", _cursor_set));
-		grabber = new Cursor (Display::get_default(), p, 5, 0);
-	}
-
-	{
-		RefPtr<Pixbuf> p (::get_icon ("grabber_note", _cursor_set));
-		grabber_note = new Cursor (Display::get_default(), p, 5, 10);
-	}
-
-	{
-		RefPtr<Pixbuf> p (::get_icon ("grabber_edit_point", _cursor_set));
-		grabber_edit_point = new Cursor (Display::get_default(), p, 5, 17);
-	}
-
 	cross_hair = new Cursor (CROSSHAIR);
 	trimmer =  new Cursor (SB_H_DOUBLE_ARROW);
-
-	{
-		RefPtr<Pixbuf> p (::get_icon ("trim_left_cursor", _cursor_set));
-		left_side_trim = new Cursor (Display::get_default(), p, 5, 11);
-	}
-
-	{
-		RefPtr<Pixbuf> p (::get_icon ("anchored_trim_left_cursor", _cursor_set));
-		anchored_left_side_trim = new Cursor (Display::get_default(), p, 5, 11);
-	}
-
-	{
-		RefPtr<Pixbuf> p (::get_icon ("trim_right_cursor", _cursor_set));
-		right_side_trim = new Cursor (Display::get_default(), p, 23, 11);
-	}
-
-	{
-		RefPtr<Pixbuf> p (::get_icon ("anchored_trim_right_cursor", _cursor_set));
-		anchored_right_side_trim = new Cursor (Display::get_default(), p, 23, 11);
-	}
-
-	{
-		RefPtr<Pixbuf> p (::get_icon ("trim_left_cursor_right_only", _cursor_set));
-		left_side_trim_right_only = new Cursor (Display::get_default(), p, 5, 11);
-	}
-
-	{
-		RefPtr<Pixbuf> p (::get_icon ("trim_right_cursor_left_only", _cursor_set));
-		right_side_trim_left_only = new Cursor (Display::get_default(), p, 23, 11);
-	}
-
-	{
-		RefPtr<Pixbuf> p (::get_icon ("fade_in_cursor", _cursor_set));
-		fade_in = new Cursor (Display::get_default(), p, 0, 0);
-	}
-
-	{
-		RefPtr<Pixbuf> p (::get_icon ("fade_out_cursor", _cursor_set));
-		fade_out = new Cursor (Display::get_default(), p, 29, 0);
-	}
-
-	{
-		RefPtr<Pixbuf> p (::get_icon ("resize_left_cursor", _cursor_set));
-		resize_left = new Cursor (Display::get_default(), p, 3, 10);
-	}
-
-	{
-		RefPtr<Pixbuf> p (::get_icon ("resize_top_left_cursor", _cursor_set));
-		resize_top_left = new Cursor (Display::get_default(), p, 3, 3);
-	}
-
-	{
-		RefPtr<Pixbuf> p (::get_icon ("resize_top_cursor", _cursor_set));
-		resize_top = new Cursor (Display::get_default(), p, 10, 3);
-	}
-
-	{
-		RefPtr<Pixbuf> p (::get_icon ("resize_top_right_cursor", _cursor_set));
-		resize_top_right = new Cursor (Display::get_default(), p, 18, 3);
-	}
-
-	{
-		RefPtr<Pixbuf> p (::get_icon ("resize_right_cursor", _cursor_set));
-		resize_right = new Cursor (Display::get_default(), p, 24, 10);
-	}
-
-	{
-		RefPtr<Pixbuf> p (::get_icon ("resize_bottom_right_cursor", _cursor_set));
-		resize_bottom_right = new Cursor (Display::get_default(), p, 18, 18);
-	}
-
-	{
-		RefPtr<Pixbuf> p (::get_icon ("resize_bottom_cursor", _cursor_set));
-		resize_bottom = new Cursor (Display::get_default(), p, 10, 24);
-	}
-
-	{
-		RefPtr<Pixbuf> p (::get_icon ("resize_bottom_left_cursor", _cursor_set));
-		resize_bottom_left = new Cursor (Display::get_default(), p, 3, 18);
-	}
-
-	{
-		RefPtr<Pixbuf> p (::get_icon ("move_cursor", _cursor_set));
-		move = new Cursor (Display::get_default(), p, 11, 11);
-	}
-
-	{
-		RefPtr<Pixbuf> p (::get_icon ("expand_left_right_cursor", _cursor_set));
-		expand_left_right = new Cursor (Display::get_default(), p, 11, 4);
-	}
-
-	{
-		RefPtr<Pixbuf> p (::get_icon ("expand_up_down_cursor", _cursor_set));
-		expand_up_down = new Cursor (Display::get_default(), p, 4, 11);
-	}
-
-	{
-		RefPtr<Pixbuf> p (::get_icon ("i_beam_cursor", _cursor_set));
-		selector = new Cursor (Display::get_default(), p, 4, 11);
-	}
-
 	time_fx = new Cursor (SIZING);
 	wait = new Cursor (WATCH);
 	timebar = new Cursor(LEFT_PTR);
diff --git a/gtk2_ardour/mouse_cursors.h b/gtk2_ardour/mouse_cursors.h
index 14ce90347e..6c5c94b5e9 100644
--- a/gtk2_ardour/mouse_cursors.h
+++ b/gtk2_ardour/mouse_cursors.h
@@ -77,6 +77,7 @@ public:
 	std::string _cursor_set;
 	void drop_all ();
 
+	Gdk::Cursor* make_cursor (const char* name, int hotspot_x = 0, int hotspot_y = 0);
 };
 
 #endif /* __gtk2_ardour_mouse_cursors__ */

From 5613ca9ff0f5eb85c154844a502d5e745c714512 Mon Sep 17 00:00:00 2001
From: VKamyshniy <VKamyshniy@wavesglobal.com>
Date: Thu, 11 Sep 2014 09:21:57 +0300
Subject: [PATCH 09/37] [Summary] Replacing combobox with dropdown in the
 adding track dialog.

---
 gtk2_ardour/add_tracks_dialog.cc              |  18 +-
 gtk2_ardour/add_tracks_dialog.h               |   4 +-
 .../icons/added_track_format_dropdown.png     | Bin 0 -> 352 bytes
 .../added_track_format_dropdown_active.png    | Bin 0 -> 357 bytes
 .../added_track_format_dropdown_inactive.png  | Bin 0 -> 241 bytes
 .../added_track_format_dropdown_prelight.png  | Bin 0 -> 352 bytes
 gtk2_ardour/ui/add_tracks_dialog.xml          | 155 ++++++++++--------
 7 files changed, 91 insertions(+), 86 deletions(-)
 create mode 100644 gtk2_ardour/icons/added_track_format_dropdown.png
 create mode 100644 gtk2_ardour/icons/added_track_format_dropdown_active.png
 create mode 100644 gtk2_ardour/icons/added_track_format_dropdown_inactive.png
 create mode 100644 gtk2_ardour/icons/added_track_format_dropdown_prelight.png

diff --git a/gtk2_ardour/add_tracks_dialog.cc b/gtk2_ardour/add_tracks_dialog.cc
index 77241639f3..78eaa45a44 100644
--- a/gtk2_ardour/add_tracks_dialog.cc
+++ b/gtk2_ardour/add_tracks_dialog.cc
@@ -34,10 +34,10 @@ AddTracksDialog::AddTracksDialog ()
 , _increment_button (get_waves_button ("increment_button"))
 , _cancel_button (get_waves_button ("cancel_button"))
 , _ok_button (get_waves_button ("ok_button"))
-, _tracks_format_combo (get_combo_box_text ("tracks_format_combo"))
+, _tracks_format_dropdown (get_waves_dropdown ("tracks_format_dropdown"))
 , _tracks_counter_entry (get_entry("tracks_counter_entry"))
 {
-    populate_tracks_format_combo();
+    populate_tracks_format_dropdown();
     _tracks_counter_entry.set_text("1");
     
     _cancel_button.signal_clicked.connect (sigc::mem_fun (*this, &AddTracksDialog::on_cancel_button));
@@ -47,15 +47,9 @@ AddTracksDialog::AddTracksDialog ()
 }
 
 void
-AddTracksDialog::populate_tracks_format_combo ()
+AddTracksDialog::populate_tracks_format_dropdown ()
 {
-    std::vector<std::string> track_format_strings;
-    track_format_strings.push_back(TrackFormat::FormatMono);
-    track_format_strings.push_back(TrackFormat::FormatStereo);
-
-    set_popdown_strings (_tracks_format_combo, track_format_strings);
-    _tracks_format_combo.set_sensitive (track_format_strings.size() > 1);
-    _tracks_format_combo.set_active_text(TrackFormat::FormatMono);
+    _tracks_format_dropdown.set_text(TrackFormat::FormatMono);
 }
 
 void
@@ -127,7 +121,7 @@ AddTracksDialog::input_channels ()
 {
     ChanCount channel_count;
     
-    string track_format = _tracks_format_combo.get_active_text();
+    string track_format = _tracks_format_dropdown.get_text();
     
     if( track_format == TrackFormat::FormatMono )
         channel_count.set(DataType::AUDIO, 1);
@@ -143,6 +137,6 @@ void
 AddTracksDialog::setup ()
 {
     set_track_count(1);
-    _tracks_format_combo.set_active_text(TrackFormat::FormatMono);
+    _tracks_format_dropdown.set_text(TrackFormat::FormatMono);
 }
 
diff --git a/gtk2_ardour/add_tracks_dialog.h b/gtk2_ardour/add_tracks_dialog.h
index 3e4bed019a..49db8b89ba 100644
--- a/gtk2_ardour/add_tracks_dialog.h
+++ b/gtk2_ardour/add_tracks_dialog.h
@@ -32,10 +32,10 @@ private:
     WavesButton& _cancel_button;
     WavesButton& _ok_button;
     
-    Gtk::ComboBoxText& _tracks_format_combo;
+	WavesDropdown& _tracks_format_dropdown;
     Gtk::Entry& _tracks_counter_entry;
     
-    void populate_tracks_format_combo();
+    void populate_tracks_format_dropdown();
     
     void on_cancel_button (WavesButton*);
     void on_ok_button (WavesButton*);
diff --git a/gtk2_ardour/icons/added_track_format_dropdown.png b/gtk2_ardour/icons/added_track_format_dropdown.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a0703d9f3852c6ec9d69f47b84cc66585b04d7f
GIT binary patch
literal 352
zcmeAS@N?(olHy`uVBq!ia0vp^O+YNd!3HE9ZJsU$QtTz3zOL-|IJsH*q@r)DOaKaT
z7I;J!GcX91fH32|H2DgkAWOQVuOkD)#(wTUiL5~Wdrud~kcwMxZ#i-`8wj*M3|wtp
z%}~CsYSz6Yk1Hn6TgJX&k%CjV2FI~80bEC0xmu@utQBZ-QkWoLy3pOFa9XN=)8SK}
z|Gc?vS-4lQK<}YI()Ha8&y((d<$GYSz#_oGc;w_)wg=`-3JWy4#J=|$n(!QcRn@Y9
zMZRLzGLg22*Z=NXw^HZy)vpz%8iu}?A00SexMbBTv$gIVU0ZU!W3Sh)v*h7R;ci*r
z6DVR-EFg0%?1x*xviH?lv(my@coa2`__O}2xWl}jt@WGR0RbkC76vB81_urW8*9C?
vnES>u=kNAOw;!-yrqUuG()TL$crqKKyZfbzaM4nr*BLxr{an^LB{Ts5UzUUq

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/added_track_format_dropdown_active.png b/gtk2_ardour/icons/added_track_format_dropdown_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6033414911c99ac745a4a32f57aea4d79122591
GIT binary patch
literal 357
zcmeAS@N?(olHy`uVBq!ia0vp^O+YNd!3HE9ZJsU$QtTz3zOL-|IJsH*b$``vxCa#C
zEbxddW?&F10b#~_Y4R07L6&q!Uq=Rpjs4tz5?O)#FP<)rAr-gY-ZJEBHV`@XaXCxL
zM)nU(N1H9aZIQM0WOohhdXN@a5HS0@hRDkWO%sIn%d;p7bbL78@j@U_;CP{TL6qmD
zn3!5#-+Y!HZp)SfU-S;_IAFS$`3FA-Ba0KmLZ5twzJ*hi?tia;wmfsuzW3L!&)&yq
zam?nth^t`byzMjePfzMv6cO9M_@K~Zi=cVWyLTo^tXQ?m_qAY?>#Su9xBab?eqvxT
zL06zD^^(cd<fi5a2HOr<H>K`cw|LjOa@PX_O|6@BCNDoEXCbAt#hj^4z(IjU0BrTc
z7ll_Jf7^NJr_Glg#T<W<y*z$6K3x-6Wph8@)r&Lw-Q&AJ|1)^H`njxgN@xNAmz#|F

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/added_track_format_dropdown_inactive.png b/gtk2_ardour/icons/added_track_format_dropdown_inactive.png
new file mode 100644
index 0000000000000000000000000000000000000000..db718f217d721d3422e150c037577048bc0efc2c
GIT binary patch
literal 241
zcmeAS@N?(olHy`uVBq!ia0vp^O+YNd!3HE9ZJsU$QtTz3zOL-|IJsE`x&Ih){Q(Mb
z7I;J!GcX91fH32|H2DgkAWOQVuOkD)#(wTUiL5|=gQtsQNX4zUw>I)N81S$Ls@F;=
za2t4fEn9j<Mdtv+28TKNWd=d-Jf}sAhg;2z%v@{RmiqPH_BXrT<eLgg+X5D?ci1s$
zvHk&j0j3rKg%$=y77j%R4n`*q0jCC3p-DAm^B>=iIRCWxoWQeWFH^aYu&=-FFn@C4
W*!n(b%MqYk7(8A5T-G@yGywpblS?cB

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/added_track_format_dropdown_prelight.png b/gtk2_ardour/icons/added_track_format_dropdown_prelight.png
new file mode 100644
index 0000000000000000000000000000000000000000..d65bdbc10364adc0da584d5800fda01a1a5b6e65
GIT binary patch
literal 352
zcmeAS@N?(olHy`uVBq!ia0vp^O+YNd!3HE9ZJsU$QtTz3zOL-|IJsG6R37<xz5ohw
z7I;J!GcX91fH32|H2DgkAWOQVuOkD)#(wTUiL5~Wdrud~kcwMxZ#i-`8wj*M3|wtp
z%}~CsYSz6Yk1Hn6TgJX&k%CjV2FI~80bEC0xmu@utQBZ-QkWoLy3pOFa9XN=)8SK}
z|Gc?vS-4lQK<}YI()Ha8&y((d<$GYSz#_oGc;w_)wg=`-3JWy4#J=|$n(!QcRn@Y9
zMZRLzGLg22*Z=NXw^HZy)vpz%8iu}?A00SexMbBTv$gIVU0ZU!W3Sh)v*h7R;ci*r
z6DVR-EFg0%?1x*xviH?lv(my@coa2`__O}2xWl}jt@WGR0RbkC76vB81_urW8*9C?
vnES>u=kNAOw;!-yrqUuG()TL$crqKKyZfbzaM4nr*BLxr{an^LB{Ts52-bw2

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/ui/add_tracks_dialog.xml b/gtk2_ardour/ui/add_tracks_dialog.xml
index a8f7d585a4..ab401e6a1a 100644
--- a/gtk2_ardour/ui/add_tracks_dialog.xml
+++ b/gtk2_ardour/ui/add_tracks_dialog.xml
@@ -1,76 +1,87 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Dialog title=" " resizeable="False">
-    <style name="generic_control"
-           winfont ="Arial 10"
-           macfont ="Helvetica 10"/>
-    <style name="generic_button"
-    style="generic_control"
-    fgnormal="#BFBFBF"
-    bgnormal="#6C6C6C"
-    fgactive="#BFBFBF"
-    bgactive="#454545"
-    fghover="#CCCCCC"
-    bghover="#898989"
-    fgdisabled ="#959595"
-    bordercolor="#7E7E7E"
-    borderwidth="0 0 0 0" />
-    
-    <Layout width="140" height="180">
-       
-        <Label style ="generic_control"
-                justify="center"
-                text="Add Track"
-                x="0"
-                y="0"
-                width="140"
-                height="25"/>
-        
-        <ComboBoxText style="generic_control"
-                      id="tracks_format_combo"
-                      x="5"
-                      y="40"
-                      width="130"
-                      height="25" />
-        
-        <Button style="generic_button"
-                id="decrement_button"
-                text="-"
-                x="5"
-                y="105"
-                width="25"
-                height="25"/>
+  <style name="generic_control"
+         winfont ="Arial 10"
+         macfont ="Helvetica 10"
+         fgnormal="#BFBFBF"
+         bgnormal="#6C6C6C"
+         fgactive="#BFBFBF"
+         bgactive="#454545"
+         fghover="#CCCCCC"
+         bghover="#898989"/>
+  <style name="generic_button"
+  style="generic_control"
+  fgnormal="#BFBFBF"
+  bgnormal="#6C6C6C"
+  fgactive="#BFBFBF"
+  bgactive="#454545"
+  fghover="#CCCCCC"
+  bghover="#898989"
+  fgdisabled ="#959595"
+  bordercolor="#7E7E7E"
+  borderwidth="0 0 0 0"/>
+  <Layout width="140"
+          height="180">
+    <Label style ="generic_control"
+           justify="center"
+           text="Add Track"
+           x="0"
+           y="0"
+           width="140"
+           height="25"/>
+    <Dropdown id="tracks_format_dropdown"
+              style="generic_control"
+              x="5"
+              y="40"
+              width="130"
+              height="25"
+              normalicon="added_track_format_dropdown"
+              activeicon="added_track_format_dropdown_active"
+              prelighticon="added_track_format_dropdown_prelight"
+              inactiveicon="added_track_format_dropdown_inactive">
+      <dropdownitem title="MONO"/>
+      <dropdownitem title="STEREO"/>
+    </Dropdown>
 
-        <Entry  style="generic_control"
-                id="tracks_counter_entry"
-                text="1"
-                justify="center"
-                x="35"
-                y="105"
-                width="70"
-                height="25"/>
-                
-        <Button style="generic_button"
-                id="increment_button"
-                text="+"
-                x="110"
-                y="105"
-                width="25"
-                height="25"/>
-        
-        <Button style="generic_button"
-                id="cancel_button"
-                text="CANCEL"
-                x="0"
-                y="155"
-                width="69"
-                height="25"/>
-        
-        <Button style="generic_button"
-                id="ok_button"
-                text="OK"
-                x="70"
-                y="155"
-                width="69"
-                height="25"/>
-    </Layout>
+    <Button style="generic_button"
+              id="decrement_button"
+              text="-"
+              x="5"
+              y="105"
+              width="25"
+              height="25"/>
+
+    <Entry  style="generic_control"
+            id="tracks_counter_entry"
+            text="1"
+            justify="center"
+            x="35"
+            y="105"
+            width="70"
+            height="25"/>
+
+    <Button style="generic_button"
+            id="increment_button"
+            text="+"
+            x="110"
+            y="105"
+            width="25"
+            height="25"/>
+
+    <Button style="generic_button"
+            id="cancel_button"
+            text="CANCEL"
+            x="0"
+            y="155"
+            width="69"
+            height="25"/>
+
+    <Button style="generic_button"
+            id="ok_button"
+            text="OK"
+            x="70"
+            y="155"
+            width="69"
+            height="25"/>
+  </Layout>
 </Dialog>
\ No newline at end of file

From 0157d87bf1623b2a635e484ffbeff9d2df9b4466 Mon Sep 17 00:00:00 2001
From: VKamyshniy <VKamyshniy@wavesglobal.com>
Date: Thu, 11 Sep 2014 10:42:47 +0300
Subject: [PATCH 10/37] [Summary] Making BROWSE iconbutton

---
 .../icons/preferences_browse_button.png       | Bin 0 -> 786 bytes
 .../preferences_browse_button_active.png      | Bin 0 -> 815 bytes
 .../preferences_browse_button_prelight.png    | Bin 0 -> 769 bytes
 gtk2_ardour/ui/tracks_preferences.xml         |  22 ++++++++++++------
 4 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 gtk2_ardour/icons/preferences_browse_button.png
 create mode 100644 gtk2_ardour/icons/preferences_browse_button_active.png
 create mode 100644 gtk2_ardour/icons/preferences_browse_button_prelight.png

diff --git a/gtk2_ardour/icons/preferences_browse_button.png b/gtk2_ardour/icons/preferences_browse_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..abe878fdf83bcbbcd35f180a6f89b19dd78e29ca
GIT binary patch
literal 786
zcmeAS@N?(olHy`uVBq!ia0vp^?m#TV!3HFae=gDnQtTz3zOL-|IJw!CxVi7`UIY~4
zEbxddW?+yz2*QkqGed%bf-LEdzK#qG8~eHcB(gFvFfH_SaSW-r^>(K3y4eOIt>>#>
zi5R!1#4PcNKEgC9(LG1`^hq;`QVFq!ONAj;Y{tiP794LAsOaC7C9>CLYJUsIzun)S
zSFd-hWPI@Udo}CwnSAZd6;Ev|zPQW_X>5CJTP5bN_5SNc<BBv(3o&F=yKCk2{Ri`;
z9eui<XgUY#Uf(D*bEV1LjW=@zJHMB{R&mv6FKl~$Lwln9`3(KC<OfUUU+27JQIr4Q
z*K$F?Gxs^S`<s$;{M33)CzZ7KK2i~Tt(5bpOZd$}7T>-%H~JVZv9L{eC9?3RPOk6%
z2??jp880a9-2dozR<Toc<CN4D$Ii~WF+ca%+g<SyE7`t2dKWSw=zwrqX^pIY;jEnG
z&^Zc+Cundi$h%;ECATs^>q?98y5C9<UoKj>{*^)9=Pl_nn{V$qyzI8EyUUGB%5H_*
zyN<SfX$V;O`{sJT5~0tg8~hA;dJlit&giOtDQ?l0@1;+cYO@}Hsn9#o*j7vSjdxW*
z<IMRjhL=p_+U8e%bU*kr_=QeGaBANo)7QVdw@l9ruyb(`sO?#Bd+mekC0d&99HE9S
zQ#PKxW77I1Cef60F1N+AW}V~{7mU*u9&r1&X8pV4pR$GRHuFs15O}Lxp~R;&>tdN>
zbmdFMTR(Ozf5+n9-q%vIJ#tRPJ%t-;YRe5)E^utA*wj%f^tokMRm(~1K$iZW%bs6d
zlxK5fV|nWu|0N|7mroqm5=be(zodBkoW=c@T;0<)>8ReV+uoQYF|XgUVoSoCUuG;b
z%D>!*z3JCwRV;r!PV~glzHg-#UoS1JHgUInX30J|`JepPL$6QQ?f+jG{^WlnU;E+k
z?`=5~o0GAiI?g|5Uf(V#fAzKddO5HA|CQng{_ZrN`Y$fCj(Jat`I@j~Yjt4aW$<+M
Kb6Mw<&;$U|0B%SC

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preferences_browse_button_active.png b/gtk2_ardour/icons/preferences_browse_button_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..23a0f8cbb22e3dc0b9450f42730cb7f9edbbf949
GIT binary patch
literal 815
zcmeAS@N?(olHy`uVBq!ia0vp^?m#TV!3HFae=gDnQtTz3zOL-|IJw!Cd3qMgI{<|^
z3p^r=85raafiPp<g;G19AWOQVuOkD)#(wTUiL49^O#3`t978H@y`AaUH`_p@?Z0H{
z>^zx>Ck&3B+uo`r9aKBb)q6xx=_#K~gSE>e4v)Yqs<T%}ZG1UP!NNhj!Tc@juN)62
zwJV{EGlW9_skY=K+yDMteO_T61CLnuQU8p&nthM^&zH#Gtybb+HL<~X$9EmMkml#r
z=O0X5`cPvD68iFRRot@Xt3`a*R%&fyT(o6>uaw{kx0{mZvN|ny=gh9OQ;W3ri!O_7
zD%k5>x#2fcj!WgUgXPDkf4hH$S;lk6v2`{27MIe}FU>gkIlMq?mP`I@-s3)*O}rA?
z{DNCHi!#*k3k8H0-)QsPy7Y~?q5-G;p^WS^D_NgNPhpzGozu+lvT(E2xASI?tM2Np
zspzYH|8B_%uC|4W;q2U;W^;3W7VCC>YzYu(sO@{^_)+KXXWMV4hf}VFNIC~z{r1#!
z)nSFFe6Jr^y$^U<bw06J=kL#zKD$M~+Ih$sJX^8fbak@L;h$1kSMInyHW1yx;u@#2
zXNl0g;|Eg~D;__&WTI@`&il9YPc$pd`FZk2>-*ihN7jk&7oTI_>c?*}ucgCl=f3?O
z6*C!94{hLRk<np}_f344c|*zC$z!qEk|nvPd}BTOMZ@M^uxwadBfuhJwB_^hfE8H<
zX$NdxXD6JnSan(1gzxG@0kbEOAx17fS3}po?Z|26Y<@dq$I?6&_ZGj#H%Xf_9wqW+
zzdSj|$&=OcS;b48q-Q%N%59vU$=+sLTyyz@*2eRaG1KQNbPJ!%KR(6CaH~W`>Fp)O
zo98I^U5ayGmhv-d!tM1kAtG(NOF68f3f}xOW6^luv2i!IuD0I$<Eu=ZGS-~f$FbZ^
zspR@6jpLQ)9G}nl?{0hXYv#s?n*Exe{yP-P)L+X#!If!&1$9n$`1R-L^l$5~cI-?1
p5PCq+{;S&s`|rDcxnA$T@8w}q`DE>^Fks4N@O1TaS?83{1OVPoYgzyR

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preferences_browse_button_prelight.png b/gtk2_ardour/icons/preferences_browse_button_prelight.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce389960636eb626156d8b7e607cf6371406b24f
GIT binary patch
literal 769
zcmeAS@N?(olHy`uVBq!ia0vp^?m#TV!3HFae=gDnQtTz3zOL-|IJwzXEFOi_8Uckk
z3p^r=85raafiPp<g;G19AWOQVuOkD)#(wTUiL49^OcOj^978H@y`8zgZ?=QLvHjLd
zqvr^zlwVlVs5kM&%Fi}7%;zW1lG9YpyENmS$~K=HcK3B84$sUH;l3Mru})~y-v4RO
zw;ONvsADQvvFerjo-nP`pB@|A_rKpek^O4m1DSi(;{2-)f3AN2VB*t<7Eh4Smxt>j
zwH)Ui59n5_U3Kx>?b<gkxz=w}R4V%-?tXKPYz**!?Xy4l>cY%(2I9LVFPwU>;XJWz
z`?vV5&BnWz9lW_mR3^K4W2VcAE}4@Dd~?1X^$0o7+n3;Ucfq_eZ3ZqYod&jK4&TW3
zlsFFq+2<_5-CZxX<R!8Mam{%p^|vO1`}gX@JK}#YoqF+wx&QL^Yg}3z?kT#omlgKZ
zRyXlEFM1%f_n1Y%F`-HCb}n<0==E*Po%KxUiNS5V#Vg-;^G$!(FC(g)?sDc)=GNKF
zoGK=p>R-=QI<l3Y`EQRQ8_)5`fF7kzA?1tdH`M1g#=1u<r@Mt1-n`zkKy0-IXRwH?
zRb#Z<$LNDUgJ0z|7{@kWi}?RfsdLkfLjg>SHeN~m#1SLq^;**DzMp1l?q)MxMcc3_
z-Js`8eP0)>^M7>9RFv&lqs6{i(gJN07wqJDXq9tVHJ7bZmSs|K+KnxDFNIy!Jkoh+
z-Yw3)C4JL`3U_~WQ+^_ve7a51<;V#!KbOc;Otrln(d9{Q{NmD;l3!TnFMGumnYSb<
z>av$2SLfw7(IsW8EsLh+u^GK~TQ2#nvZ*n%;@Q?yt64u^xvr_ew`%L+>F<k!?=K3p
zeCuuHn>=Gz@7_}z*I7oyeEz>e-ERKsRloLWfBNr`8d>)-{{&y91r~JD`+>S${Br;G
tf%ZRYge^WTzbE+b{NAN?A1i<I&MdK1*;F<!2bfkFJYD@<);T3K0RSRBSTX<r

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/ui/tracks_preferences.xml b/gtk2_ardour/ui/tracks_preferences.xml
index b193c95287..953984a903 100644
--- a/gtk2_ardour/ui/tracks_preferences.xml
+++ b/gtk2_ardour/ui/tracks_preferences.xml
@@ -226,7 +226,7 @@
         <Label style="generic_control" text="CHANNEL CONFIGURATION MODE" fgnormal="#ffffff"
                winfont ="Arial Bold 10"
                macfont ="Helvetica Bold 10"
-               x="17" y="15"/>
+               x="18" y="12"/>
         <iconbutton id="multi_out_button"
                     text="MULTI OUT"
                     x="280"
@@ -471,12 +471,20 @@
       </Dropdown>
 
       <Label style="generic_control" text="DEFAULT FOLDER FOR NEW SESSION" x = "24" y = "290"/>
-      <Button
-        id = "browse_default_folder"
-        text = "Browse"
-        style = "generic_button"
-        x = "24" y = "310" width = "100" height = "28"/>
-      <Label id="default_open_path" style="generic_control" text="" x = "135" y = "315"/>
+      <Iconbutton style = "generic_button"
+                  id = "browse_default_folder"
+                  x = "24"
+                  y = "310"
+                  width = "71"
+                  height = "28"
+                  normalicon="preferences_browse_button"
+                  activeicon="preferences_browse_button_active"
+                  prelighticon="preferences_browse_button_prelight"/>
+      <Label id="default_open_path"
+             style="generic_control"
+             text=""
+             x = "105"
+             y = "315"/>
     </Layout>
   </Layout>
 </Dialog>

From 3cc0c8d569057b859fc2b9b6973b22d74f60c63e Mon Sep 17 00:00:00 2001
From: Greg Zharun <grygoriiz@wavesglobal.com>
Date: Thu, 11 Sep 2014 11:12:19 +0300
Subject: [PATCH 11/37] [Summary] Added handlers for events in Port Audio which
 where not handled. For all "Resynck Request", "Latency Changed" and "Buffer
 size Changed" events restart is required. NOTE: Other devices, unlike Sound
 Grid, trigger "Restart Request" event for all above cases.

---
 .../WCMRPortAudioDeviceManager.cpp            | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp
index b499425683..d057b056cd 100644
--- a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp
+++ b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp
@@ -1116,10 +1116,22 @@ long WCMRPortAudioDevice::ASIOMessageHook (long selector, long WCUNUSEDPARAM(val
 {
 	switch(selector)
 	{
+		case kAsioResyncRequest:
+			m_ResyncRequested++;
+			std::cout << "\t\t\tWCMRPortAudioDevice::ASIOMessageHook -- kAsioResyncRequest" << std::endl;
+			m_pMyManager->NotifyClient (WCMRAudioDeviceManagerClient::RequestReset);
+			break;
+
+		case kAsioLatenciesChanged:
+			m_BufferSizeChangeRequested++;
+			std::cout << "\t\t\tWCMRPortAudioDevice::ASIOMessageHook -- kAsioLatenciesChanged" << std::endl;
+			m_pMyManager->NotifyClient (WCMRAudioDeviceManagerClient::RequestReset);
+			break;
+
 		case kAsioBufferSizeChange:
 			m_BufferSizeChangeRequested++;
 			std::cout << "\t\t\tWCMRPortAudioDevice::ASIOMessageHook -- m_BufferSizeChangeRequested" << std::endl;
-			SetEvent(m_hBufferSizeChangedEvent);
+			m_pMyManager->NotifyClient (WCMRAudioDeviceManagerClient::RequestReset);
 			break;
 
 		case kAsioResetRequest:
@@ -1128,20 +1140,10 @@ long WCMRPortAudioDevice::ASIOMessageHook (long selector, long WCUNUSEDPARAM(val
 			m_pMyManager->NotifyClient (WCMRAudioDeviceManagerClient::RequestReset);
 			break;
 
-		case kAsioResyncRequest:
-			std::cout << "\t\t\tWCMRPortAudioDevice::ASIOMessageHook -- kAsioResyncRequest" << std::endl;
-			m_ResyncRequested++;
-			break;
-
-		case kAsioLatenciesChanged:
-			std::cout << "\t\t\tWCMRPortAudioDevice::ASIOMessageHook -- kAsioLatenciesChanged" << std::endl;
-			SetEvent(m_hBufferSizeChangedEvent);
-			m_BufferSizeChangeRequested++;
-			break;
-
         case kAsioOverload:
+			m_DropsDetected++;
 			std::cout << "\t\t\tWCMRPortAudioDevice::ASIOMessageHook -- kAsioOverload" << std::endl;
-            m_DropsDetected++;
+			m_pMyManager->NotifyClient (WCMRAudioDeviceManagerClient::Dropout);
             break;
 	}
 	return 0;
@@ -1399,6 +1401,8 @@ int WCMRPortAudioDevice::AudioCallback( const float *pInputBuffer, float *pOutpu
 			m_IgnoreThisDrop = false; //We'll ignore once, just once!
 		else
 			m_DropsDetected++;
+
+		m_pMyManager->NotifyClient (WCMRAudioDeviceManagerClient::Dropout);
 	}
 
 	m_pInputData = pInputBuffer;

From 0421e9591a7ca4b02181867182cdff0995cb448e Mon Sep 17 00:00:00 2001
From: VKamyshniy <VKamyshniy@wavesglobal.com>
Date: Thu, 11 Sep 2014 10:59:54 +0300
Subject: [PATCH 12/37] [Summary] Removing hovering png-s from all the buttons
 in top bar and transport bar

---
 gtk2_ardour/ui/editor_window.xml | 151 +++++++++++++------------------
 1 file changed, 61 insertions(+), 90 deletions(-)

diff --git a/gtk2_ardour/ui/editor_window.xml b/gtk2_ardour/ui/editor_window.xml
index c0838eb722..e639016ea2 100644
--- a/gtk2_ardour/ui/editor_window.xml
+++ b/gtk2_ardour/ui/editor_window.xml
@@ -30,9 +30,7 @@
             <iconbutton id="tracks_button"
                         width="48" height="51"
                         normalicon="tracks"
-                        activeicon="tracks_active"
-                        prelighticon="tracks_prelight"/>
-            
+                        activeicon="tracks_active"/>
             <Layout width="407" height="51">
               <icon source="top_bar_background.png"/>
               <HBox id="time_info_box_home"
@@ -41,21 +39,19 @@
               <HBox id="primary_clock_home"
                     x="132"
                     y="6"/>
-                <dropdown id="display_format_dropdown"
-                          bgnormal="#43919A"
-                          fgnormal="#ffffff"
-                          fgactive="#ffffff"
-                          fghover="#ffffff"
-                          winfont ="Arial 8"
-                          macfont ="Helvetica 8"
-                          x="200"
-                          y="28"
-                          width="63"
-                          height="18"
-                          normalicon="topbar_button"
-                          activeicon="topbar_button_active"
-                          prelighticon="topbar_button_prelight"/>
-                
+              <dropdown id="display_format_dropdown"
+                        bgnormal="#43919A"
+                        fgnormal="#ffffff"
+                        fgactive="#ffffff"
+                        fghover="#ffffff"
+                        winfont ="Arial 8"
+                        macfont ="Helvetica 8"
+                        x="200"
+                        y="28"
+                        width="63"
+                        height="18"
+                        normalicon="topbar_button"
+                        activeicon="topbar_button_active"/>
               <Iconbutton id="bit_depth_button"
                           fgnormal="#ffffff"
                           fgactive="#ffffff"
@@ -67,8 +63,7 @@
                           width="63"
                           height="18"
                           normalicon="topbar_button_upper"
-                          activeicon="topbar_button_upper_active"
-                          prelighticon="topbar_button_upper_prelight"/>
+                          activeicon="topbar_button_upper_active"/>
               <Iconbutton id="frame_rate_button"
                           winfont ="Arial 8"
                           fgnormal="#ffffff"
@@ -80,37 +75,33 @@
                           width="63"
                           height="18"
                           normalicon="topbar_button"
-                          activeicon="topbar_button_active"
-                          prelighticon="topbar_button_prelight"/>
-                <dropdown id="sample_rate_dropdown"
-                          bgnormal="#43919A"
-                          fgnormal="#ffffff"
-                          fgactive="#ffffff"
-                          fghover="#ffffff"
-                          winfont ="Arial 8"
-                          macfont ="Helvetica 8"
-                          x="269"
-                          y="28"
-                          width="63"
-                          height="18"
-                          normalicon="topbar_button"
-                          activeicon="topbar_button_active"
-                          prelighticon="topbar_button_prelight"/>
-                
-                <dropdown id="timecode_selector_dropdown"
-                          bgnormal="#43919A"
-                          fgnormal="#ffffff"
-                          fgactive="#ffffff"
-                          fghover="#ffffff"
-                          winfont ="Arial 8"
-                          macfont ="Helvetica 8"
-                          x="338"
-                          y="5"
-                          width="63"
-                          height="18"
-                          normalicon="topbar_button_upper"
-                          activeicon="topbar_button_upper_active"
-                          prelighticon="topbar_button_upper_prelight"/>                
+                          activeicon="topbar_button_active"/>
+              <dropdown id="sample_rate_dropdown"
+                        bgnormal="#43919A"
+                        fgnormal="#ffffff"
+                        fgactive="#ffffff"
+                        fghover="#ffffff"
+                        winfont ="Arial 8"
+                        macfont ="Helvetica 8"
+                        x="269"
+                        y="28"
+                        width="63"
+                        height="18"
+                        normalicon="topbar_button"
+                        activeicon="topbar_button_active"/>
+              <dropdown id="timecode_selector_dropdown"
+                        bgnormal="#43919A"
+                        fgnormal="#ffffff"
+                        fgactive="#ffffff"
+                        fghover="#ffffff"
+                        winfont ="Arial 8"
+                        macfont ="Helvetica 8"
+                        x="338"
+                        y="5"
+                        width="63"
+                        height="18"
+                        normalicon="topbar_button_upper"
+                        activeicon="topbar_button_upper_active"/>
             </Layout>
             <EventBox bgnormal="#383838"
                       width="17"
@@ -198,14 +189,12 @@
                           width="79" height="25"
                           normalicon="mode_stereo_out"
                           activeicon="mode_stereo_out_active"
-                          prelighticon="mode_stereo_out_prelight"
                           active="true"/>
               <iconbutton id="mode_multi_out_button"
                           tooltip="Multi Out Mode"
                           width="79" height="25"
                           normalicon="mode_multi_out"
-                          activeicon="mode_multi_out_active"
-                          prelighticon="mode_multi_out_prelight"/>
+                          activeicon="mode_multi_out_active"/>
             </VBox>
           </HBox>
         </EventBox>
@@ -216,20 +205,17 @@
                         tooltip="Show/Hide Inspector"
                         width="48" height="26"
                         normalicon="inspector_on"
-                        activeicon="inspector_on_active"
-                        prelighticon="inspector_on_prelight"/>
+                        activeicon="inspector_on_active"/>
             <iconbutton id="mixer_on_button"
                         tooltip="Show/Hide Mixer"
                         width="48" height="26"
                         normalicon="mixer_on"
-                        activeicon="mixer_on_active"
-                        prelighticon="mixer_on_prelight"/>
+                        activeicon="mixer_on_active"/>
             <iconbutton id="meter_bridge_on_button"
                         tooltip="Show/Hide Meter Bridge"
                         width="48" height="26"
                         normalicon="meter_bridge_on"
-                        activeicon="meter_bridge_on_active"
-                        prelighticon="meter_bridge_on_prelight"/>
+                        activeicon="meter_bridge_on_active"/>
             <Layout width="54"
                     height="26"
                     bgnormal="#3E3E3E"/>
@@ -237,44 +223,37 @@
                         tooltip="Rewind"
                         width="34" height="26"
                         normalicon="transport_start"
-                        activeicon="transport_start_active"
-                        prelighticon="transport_start_prelight"/>
+                        activeicon="transport_start_active"/>
             <iconbutton id="transport_end_button"
                         tooltip="Forward"
                         width="34" height="26"
                         normalicon="transport_end"
-                        activeicon="transport_end_active"
-                        prelighticon="transport_end_prelight"/>
+                        activeicon="transport_end_active"/>
             <iconbutton id="transport_play_button"
                         tooltip="Play"
                         width="34" height="26"
                         normalicon="transport_play"
-                        activeicon="transport_play_active"
-                        prelighticon="transport_play_prelight"/>
+                        activeicon="transport_play_active"/>
             <iconbutton id="transport_record_button"
                         tooltip="Record"
                         width="34" height="26"
                         normalicon="transport_record"
-                        activeicon="transport_record_active"
-                        prelighticon="transport_record_prelight"/>
+                        activeicon="transport_record_active"/>
             <iconbutton id="transport_stop_button"
                         tooltip="Stop"
                         width="34" height="26"
                         normalicon="transport_stop"
-                        activeicon="transport_stop_active"
-                        prelighticon="transport_stop_prelight"/>
+                        activeicon="transport_stop_active"/>
             <iconbutton id="transport_loop_button"
                         tooltip="Loop"
                         width="34" height="26"
                         normalicon="transport_loop"
-                        activeicon="transport_loop_active"
-                        prelighticon="transport_loop_prelight"/>
+                        activeicon="transport_loop_active"/>
             <iconbutton id="lock_session_button"
                         tooltip="Lock"
                         width="34" height="26"
                         normalicon="lock_session"
-                        activeicon="lock_session_active"
-                        prelighticon="lock_session_prelight"/>
+                        activeicon="lock_session_active"/>
             <Layout width="60"
                     height="26"
                     bgnormal="#3E3E3E"/>
@@ -282,26 +261,22 @@
                         tooltip="Range Select Tool"
                         width="34" height="26"
                         normalicon="tool_marker"
-                        activeicon="tool_marker_active"
-                        prelighticon="tool_marker_prelight"/>
+                        activeicon="tool_marker_active"/>
             <iconbutton id="tool_arrow_button"
                         tooltip="Pointer Tool"
                         width="34" height="26"
                         normalicon="tool_arrow"
-                        activeicon="tool_arrow_active"
-                        prelighticon="tool_arrow_prelight"/>
+                        activeicon="tool_arrow_active"/>
             <iconbutton id="tool_cut_button"
                         tooltip="Split Tool"
                         width="34" height="26"
                         normalicon="tool_cut"
-                        activeicon="tool_cut_active"
-                        prelighticon="tool_cut_prelight"/>
+                        activeicon="tool_cut_active"/>
             <iconbutton id="tool_zoom_button"
                         tooltip="Zoom Tool"
                         width="34" height="26"
                         normalicon="tool_zoom"
-                        activeicon="tool_zoom_active"
-                        prelighticon="tool_zoom_prelight"/>
+                        activeicon="tool_zoom_active"/>
             <HBox box.pack="end" spacing ="1">
               <Adjustment id="temporal_zoom_adjustment"
                           minvalue="0"
@@ -340,8 +315,7 @@
                           tooltip="Media Button"
                           width="48" height="26"
                           normalicon="media_button"
-                          activeicon="media_button_active"
-                          prelighticon="media_button_prelight"/>
+                          activeicon="media_button_active"/>
             </HBox>
           </HBox>
         </EventBox>
@@ -385,8 +359,7 @@
                           winfont ="Arial 8"
                           macfont ="Helvetica 8"
                           normalicon="top_bar_button"
-                          activeicon="top_bar_button"
-                          prelighticon="top_bar_button"/>
+                          activeicon="top_bar_button"/>
                   <iconbutton id="add_marker_button"
                           text="+"
                           x="200"
@@ -396,8 +369,7 @@
                           winfont ="Arial 8"
                           macfont ="Helvetica 8"
                           normalicon="add_marker_button"
-                          activeicon="add_marker_button"
-                          prelighticon="add_marker_button"/>
+                          activeicon="add_marker_button"/>
                   <Button id="skip_button"
                          text="SKIP"
                          x="0"
@@ -415,8 +387,7 @@
                           width="139"
                           height="18"
                           normalicon="global_tracks_button"
-                          activeicon="global_tracks_button"
-                          prelighticon="global_tracks_button"/>
+                          activeicon="global_tracks_button"/>
                   <EventBox id="master_bus_ui_home"
                             x="0"
                             y="54"

From 1cecced12a767bbcd78176fd7f4d12fd43091d39 Mon Sep 17 00:00:00 2001
From: VKamyshniy <VKamyshniy@wavesglobal.com>
Date: Thu, 11 Sep 2014 12:49:45 +0300
Subject: [PATCH 13/37] [Summary] When the WavesDropdown's menu is dropped
 down, the button should become active and remain active until the menu is
 hidden.

---
 gtk2_ardour/waves_dropdown.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gtk2_ardour/waves_dropdown.cc b/gtk2_ardour/waves_dropdown.cc
index 43d7b34b09..a36d9d0c39 100644
--- a/gtk2_ardour/waves_dropdown.cc
+++ b/gtk2_ardour/waves_dropdown.cc
@@ -23,6 +23,8 @@ WavesDropdown::WavesDropdown (const std::string& title)
   : WavesIconButton (title)
 {
 	signal_button_press_event().connect (sigc::mem_fun(*this, &WavesDropdown::on_mouse_pressed));
+	_menu.signal_hide ().connect (sigc::bind (sigc::mem_fun (*this, &CairoWidget::set_active), false));
+	_menu.signal_show ().connect (sigc::bind (sigc::mem_fun (*this, &CairoWidget::set_active), true));
 }
 
 WavesDropdown::~WavesDropdown ()

From e77745223e47797507f814d70dc1f8f6a598ea21 Mon Sep 17 00:00:00 2001
From: VKamyshniy <VKamyshniy@wavesglobal.com>
Date: Thu, 11 Sep 2014 13:12:17 +0300
Subject: [PATCH 14/37] [Summary] Making the preferences dialog tab buttons
 iconbuttons

---
 .../preferences_audio_settings_tab_button.png | Bin 0 -> 2290 bytes
 ...ences_audio_settings_tab_button_active.png | Bin 0 -> 2254 bytes
 ...ces_audio_settings_tab_button_prelight.png | Bin 0 -> 2315 bytes
 .../preferences_midi_settings_tab_button.png  | Bin 0 -> 2178 bytes
 ...rences_midi_settings_tab_button_active.png | Bin 0 -> 2192 bytes
 ...nces_midi_settings_tab_button_prelight.png | Bin 0 -> 2190 bytes
 ...references_session_settings_tab_button.png | Bin 0 -> 2038 bytes
 ...ces_session_settings_tab_button_active.png | Bin 0 -> 2073 bytes
 ...s_session_settings_tab_button_prelight.png | Bin 0 -> 2080 bytes
 gtk2_ardour/ui/tracks_preferences.xml         |  59 +++++++-----------
 10 files changed, 22 insertions(+), 37 deletions(-)
 create mode 100644 gtk2_ardour/icons/preferences_audio_settings_tab_button.png
 create mode 100644 gtk2_ardour/icons/preferences_audio_settings_tab_button_active.png
 create mode 100644 gtk2_ardour/icons/preferences_audio_settings_tab_button_prelight.png
 create mode 100644 gtk2_ardour/icons/preferences_midi_settings_tab_button.png
 create mode 100644 gtk2_ardour/icons/preferences_midi_settings_tab_button_active.png
 create mode 100644 gtk2_ardour/icons/preferences_midi_settings_tab_button_prelight.png
 create mode 100644 gtk2_ardour/icons/preferences_session_settings_tab_button.png
 create mode 100644 gtk2_ardour/icons/preferences_session_settings_tab_button_active.png
 create mode 100644 gtk2_ardour/icons/preferences_session_settings_tab_button_prelight.png

diff --git a/gtk2_ardour/icons/preferences_audio_settings_tab_button.png b/gtk2_ardour/icons/preferences_audio_settings_tab_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7b2c4ed2be91065753b481d0c158b90af5a5c04
GIT binary patch
literal 2290
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
IIGcC;8{jdcVgLXD

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preferences_audio_settings_tab_button_active.png b/gtk2_ardour/icons/preferences_audio_settings_tab_button_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..feddcc4f05ae984017ed00d51a5f97525df13df2
GIT binary patch
literal 2254
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

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preferences_audio_settings_tab_button_prelight.png b/gtk2_ardour/icons/preferences_audio_settings_tab_button_prelight.png
new file mode 100644
index 0000000000000000000000000000000000000000..59316bf2fd5cef2de1aeb5be8e9778d53ec6d917
GIT binary patch
literal 2315
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

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preferences_midi_settings_tab_button.png b/gtk2_ardour/icons/preferences_midi_settings_tab_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd79a3e85a85560fe6bbfb067b2485debc8f2410
GIT binary patch
literal 2178
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

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preferences_midi_settings_tab_button_active.png b/gtk2_ardour/icons/preferences_midi_settings_tab_button_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..6afa20b88622bfa17d23381411a00657990e4f10
GIT binary patch
literal 2192
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

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preferences_midi_settings_tab_button_prelight.png b/gtk2_ardour/icons/preferences_midi_settings_tab_button_prelight.png
new file mode 100644
index 0000000000000000000000000000000000000000..8977746440f1e718554cc7c5a005487716f6561a
GIT binary patch
literal 2190
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

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preferences_session_settings_tab_button.png b/gtk2_ardour/icons/preferences_session_settings_tab_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b4edb661b079fffceee53599f2c937aa45410b3
GIT binary patch
literal 2038
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
PJbz-DL?Lb#W)}Yk=gA_0

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preferences_session_settings_tab_button_active.png b/gtk2_ardour/icons/preferences_session_settings_tab_button_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..153beb730e348d90b92484e41965637e269daa54
GIT binary patch
literal 2073
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
G7XAmErAP(<

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/preferences_session_settings_tab_button_prelight.png b/gtk2_ardour/icons/preferences_session_settings_tab_button_prelight.png
new file mode 100644
index 0000000000000000000000000000000000000000..ecf78c7e6d6915c4d0e00df55327370479e48ab3
GIT binary patch
literal 2080
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
MlgPy_iElXm3(faGbpQYW

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/ui/tracks_preferences.xml b/gtk2_ardour/ui/tracks_preferences.xml
index 953984a903..c9988241bc 100644
--- a/gtk2_ardour/ui/tracks_preferences.xml
+++ b/gtk2_ardour/ui/tracks_preferences.xml
@@ -17,43 +17,28 @@
 
   <Layout bgnormal="#1F1F1F" x="0" y="0" width="619" height="623">
     <VBox x="2" y="1">
-      <Layout bgnormal="#A0A0A0" width="107" height="1"/>
-      <Button
-        id="audio_settings_tab_button"
-        text="AUDIO\nSYSTEM\nSETTINGS"
-        fgnormal="#C1C1C1"
-        fgactive="#CDCDCD"
-        bgnormal="#1F1F1F"
-        bgactive="#565656"
-        bghover="#2f2f2f"
-        winfont ="Arial Bold 10"
-        macfont ="Helvetica Bold 10"
-        width="107" height="65"/>
-      <Layout bgnormal="#A0A0A0" width="107" height="1"/>
-      <Button
-        id="midi_settings_tab_button"
-        text="MIDI\nSYSTEM\nSETTINGS"
-        fgnormal="#C1C1C1"
-        fgactive="#CDCDCD"
-        bgnormal="#1F1F1F"
-        bgactive="#565656"
-        bghover="#2f2f2f"
-        winfont ="Arial Bold 10"
-        macfont ="Helvetica Bold 10"
-        width="107" height="65"/>
-      <Layout bgnormal="#A0A0A0" width="107" height="1"/>
-      <Button
-        id="session_settings_tab_button"
-        text="SESSION\nSETTINGS"
-        fgnormal="#C1C1C1"
-        fgactive="#CDCDCD"
-        bgnormal="#1F1F1F"
-        bgactive="#565656"
-        bghover="#2f2f2f"
-        winfont ="Arial Bold 10"
-        macfont ="Helvetica Bold 10"
-        width="107" height="65"/>
-      <Layout bgnormal="#A0A0A0" width="107" height="1"/>
+      <EventBox bgnormal="#A0A0A0" width="107" height="1"/>
+      <Iconbutton id="audio_settings_tab_button"
+                  width="107"
+                  height="65"
+                  normalicon="preferences_audio_settings_tab_button"
+                  activeicon="preferences_audio_settings_tab_button_active"
+                  prelighticon="preferences_audio_settings_tab_button_prelight"/>
+      <EventBox bgnormal="#A0A0A0" width="107" height="1"/>
+      <Iconbutton id="midi_settings_tab_button"
+                  width="107"
+                  height="65"
+                  normalicon="preferences_midi_settings_tab_button"
+                  activeicon="preferences_midi_settings_tab_button_active"
+                  prelighticon="preferences_midi_settings_tab_button_prelight"/>
+      <EventBox bgnormal="#A0A0A0" width="107" height="1"/>
+      <Iconbutton id="session_settings_tab_button"
+                  width="107"
+                  height="65"
+                  normalicon="preferences_session_settings_tab_button"
+                  activeicon="preferences_session_settings_tab_button_active"
+                  prelighticon="preferences_session_settings_tab_button_prelight"/>
+      <EventBox bgnormal="#A0A0A0" width="107" height="1"/>
     </VBox>
 
     <Layout bgnormal="#565656" x="113" y="559" width="505" height="63">

From 3eb336fcf8400b6c601b4259dee4bc2ed6b30513 Mon Sep 17 00:00:00 2001
From: nikolay <MPolianovskyi@wavesglobal.com>
Date: Thu, 11 Sep 2014 14:44:04 +0300
Subject: [PATCH 15/37] [Summary] Stop rename track when it starts recording
 [Reviewed] GZharun

---
 gtk2_ardour/mixer_strip.cc     | 21 ++++++++++++++++++++-
 gtk2_ardour/mixer_strip.h      |  4 ++++
 gtk2_ardour/route_time_axis.cc | 17 +++++++++++++++++
 gtk2_ardour/route_time_axis.h  |  3 +++
 4 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 63eb0b96ee..8b10419c9d 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -259,6 +259,7 @@ MixerStrip::init ()
 
 	_session->engine().Stopped.connect (*this, invalidator (*this), boost::bind (&MixerStrip::engine_stopped, this), gui_context());
 	_session->engine().Running.connect (*this, invalidator (*this), boost::bind (&MixerStrip::engine_running, this), gui_context());
+    _session->RecordStateChanged.connect (*this, invalidator (*this), boost::bind (&MixerStrip::on_record_state_changed, this), gui_context());
 
 	/* ditto for this button and busses */
 
@@ -422,6 +423,9 @@ MixerStrip::begin_name_edit ()
     if( _route->is_master () )
         return;
     
+    if ( (ARDOUR_UI::instance()->the_session()->record_status()==Session::Recording) && (_route->record_enabled()) )
+        return;
+    
     boost::shared_ptr<AudioTrack> audio_track = boost::dynamic_pointer_cast<AudioTrack>(_route);
     if( audio_track && audio_track->is_master_track() )
         return;
@@ -436,6 +440,13 @@ MixerStrip::begin_name_edit ()
     _name_entry.start_editing (0);
 }
 
+void
+MixerStrip::on_record_state_changed ()
+{
+    if ( (ARDOUR_UI::instance()->the_session()->record_status()==Session::Recording) && (_route->record_enabled()) )
+        end_name_edit (RESPONSE_CANCEL);
+}
+
 void
 MixerStrip::end_name_edit (int response)
 {
@@ -486,7 +497,15 @@ void
 MixerStrip::set_route (boost::shared_ptr<Route> rt)
 {
 	RouteUI::set_route (rt);
-
+    
+    boost::shared_ptr<Track> t;
+    if ((t = boost::dynamic_pointer_cast<Track>(rt)) != 0) {
+        t->RecordEnableChanged.connect (_route_state_connections,
+                                        invalidator (*this),
+                                        boost::bind (&MixerStrip::on_record_state_changed, this),
+                                        gui_context() );
+    }
+    
 	/* ProcessorBox needs access to _route so that it can read
 	   GUI object state.
 	*/
diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index d3202d3aef..7e47227d7d 100644
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -173,6 +173,10 @@ class MixerStrip : public RouteUI
 	
     WavesButton&   name_button;
     
+    PBD::ScopedConnectionList _route_state_connections;
+    void on_record_state_changed ();
+    
+    
     Gtk::Entry& _name_entry;
     void begin_name_edit ();
     void end_name_edit (int);
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 6a4086f9ae..7bae8f68d8 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -119,6 +119,7 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed,
     , upper_drop_indicator(get_event_box ("upper_drop_indicator"))
     , lower_drop_indicator(get_event_box ("lower_drop_indicator"))
 {
+    sess->RecordStateChanged.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::on_record_state_changed, this), gui_context());
 }
 
 void
@@ -127,6 +128,15 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
     disable_header_dnd ();
     
 	RouteUI::set_route (rt);
+    
+    boost::shared_ptr<Track> t;
+    if ((t = boost::dynamic_pointer_cast<Track>(rt)) != 0) {
+        t->RecordEnableChanged.connect (_route_state_connections,
+                                        invalidator (*this),
+                                        boost::bind (&RouteTimeAxisView::on_record_state_changed, this),
+                                        gui_context() );
+    }
+    
 
 	CANVAS_DEBUG_NAME (_canvas_display, string_compose ("main for %1", rt->name()));
 	CANVAS_DEBUG_NAME (selection_group, string_compose ("selections for %1", rt->name()));
@@ -2693,3 +2703,10 @@ RouteTimeAxisView::control_ebox_resize_ended()
         enable_header_dnd ();
     }
 }
+
+void
+RouteTimeAxisView::on_record_state_changed ()
+{
+    if ( (ARDOUR_UI::instance()->the_session()->record_status()==Session::Recording) && (_route->record_enabled()) )
+        end_name_edit (RESPONSE_CANCEL);
+}
diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h
index 33d34f5ada..f65339ffbc 100644
--- a/gtk2_ardour/route_time_axis.h
+++ b/gtk2_ardour/route_time_axis.h
@@ -329,6 +329,9 @@ private:
 	void remove_child (boost::shared_ptr<TimeAxisView>);
 	void update_playlist_tip ();
 	void display_route_color ();
+    
+    void on_record_state_changed ();
+    PBD::ScopedConnectionList _route_state_connections;
 };
 
 #endif /* __ardour_route_time_axis_h__ */

From d8e7cdb4ad37e34279e8a312a278cf18d28f281a Mon Sep 17 00:00:00 2001
From: nikolay <MPolianovskyi@wavesglobal.com>
Date: Thu, 11 Sep 2014 16:08:19 +0300
Subject: [PATCH 16/37] [Summary] Bug fix [Reviewed] GZharun

---
 gtk2_ardour/route_time_axis.cc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 7bae8f68d8..e003e3b4db 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -2294,9 +2294,15 @@ RouteTimeAxisView::can_edit_name () const
     if( audio_track && audio_track->is_master_track() )
         return false;
     
+    Session *session = ARDOUR_UI::instance()->the_session();
+    
+    if (session == 0) {
+        return false;
+    }
+    
 	/* we do not allow track name changes if it is record enabled
 	 */
- 	return !( (ARDOUR_UI::instance()->the_session()->record_status()==Session::Recording) && (_route->record_enabled()) );
+ 	return !( (session->record_status() == Session::Recording) && (_route->record_enabled()) );
 }
 
 void

From e925a54a5ed583e19fe4f6ce6a5c54526682ca0f Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 11 Sep 2014 15:17:15 -0400
Subject: [PATCH 17/37] change verbose cursor font size (from LargeBold to
 Normal)

---
 gtk2_ardour/verbose_cursor.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gtk2_ardour/verbose_cursor.cc b/gtk2_ardour/verbose_cursor.cc
index 7410792e55..0029600da7 100644
--- a/gtk2_ardour/verbose_cursor.cc
+++ b/gtk2_ardour/verbose_cursor.cc
@@ -44,7 +44,7 @@ VerboseCursor::VerboseCursor (Editor* editor)
 {
 	_canvas_item = new ArdourCanvas::TrackingText (_editor->get_noscroll_group());
 	CANVAS_DEBUG_NAME (_canvas_item, "verbose canvas cursor");
-	_canvas_item->set_font_description (Pango::FontDescription (ARDOUR_UI::config()->get_canvasvar_LargerBoldFont()));
+	_canvas_item->set_font_description (Pango::FontDescription (ARDOUR_UI::config()->get_canvasvar_NormalFont()));
 	color_handler ();
 
 	ARDOUR_UI_UTILS::ColorsChanged.connect (sigc::mem_fun (*this, &VerboseCursor::color_handler));

From 7198ac659e4dd5a23ebf256e0b8501cc923470f6 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 11 Sep 2014 15:17:53 -0400
Subject: [PATCH 18/37] remove outline from now-small verbose cursor
 (TrackingText) text

---
 libs/canvas/tracking_text.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/canvas/tracking_text.cc b/libs/canvas/tracking_text.cc
index ea44102f8f..05f718e258 100644
--- a/libs/canvas/tracking_text.cc
+++ b/libs/canvas/tracking_text.cc
@@ -46,7 +46,7 @@ TrackingText::init ()
 {
 	_canvas->MouseMotion.connect (sigc::mem_fun (*this, &TrackingText::pointer_motion));
 	set_ignore_events (true);
-	set_outline (true);
+	set_outline (false);
 	hide ();
 }
 

From c7cd2d0f460290c2ff6f814597a7278cf123cda6 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 11 Sep 2014 15:18:26 -0400
Subject: [PATCH 19/37] switch verbose cursor color to white (as per Igor's
 request

---
 gtk2_ardour/default_ui_config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gtk2_ardour/default_ui_config.in b/gtk2_ardour/default_ui_config.in
index f1ddaa520a..880a7244b9 100644
--- a/gtk2_ardour/default_ui_config.in
+++ b/gtk2_ardour/default_ui_config.in
@@ -173,7 +173,7 @@
     <Option name="transport punch rect" value="6d2828e5"/>
     <Option name="trim handle locked" value="ea0f0f28"/>
     <Option name="trim handle" value="1900ff44"/>
-    <Option name="verbose canvas cursor" value="fffd2ebc"/>
+    <Option name="verbose canvas cursor" value="ffffffbc"/>
     <Option name="vestigial frame" value="0000000f"/>
     <Option name="video timeline bar" value="303030ff"/>
     <Option name="region base" value="7FA82Bff"/>

From 9b8b30b55be15d3666d6985768ad6d6a9e9b3874 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 11 Sep 2014 16:56:16 -0400
Subject: [PATCH 20/37] new and updated images for global tracks, taken from
 Igor's screenshot and resized as per discussion with him

---
 gtk2_ardour/icons/global_rec_button.png    | Bin 0 -> 752 bytes
 gtk2_ardour/icons/global_solo_button.png   | Bin 0 -> 529 bytes
 gtk2_ardour/icons/global_tracks_button.png | Bin 1166 -> 1160 bytes
 gtk2_ardour/icons/marker_button.png        | Bin 0 -> 1012 bytes
 gtk2_ardour/icons/skip_button.png          | Bin 0 -> 466 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 gtk2_ardour/icons/global_rec_button.png
 create mode 100644 gtk2_ardour/icons/global_solo_button.png
 create mode 100644 gtk2_ardour/icons/marker_button.png
 create mode 100644 gtk2_ardour/icons/skip_button.png

diff --git a/gtk2_ardour/icons/global_rec_button.png b/gtk2_ardour/icons/global_rec_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..803f27db411ee7a4816fd741dd8f4c53e3ee12e8
GIT binary patch
literal 752
zcmV<M0uTL(P)<h;3K|Lk000e1NJLTq001fg000;W1^@s6jB#)M00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-vq3k@V6O36)+0000TX;fHrLvL+uWo~o;00000Lvm$d
zbY)~9cWHEJAV*0}P-HG;2LJ#9W=TXrR7l6|mM?STFc8Imy*W}*nOfAPqBT{iO&uDV
z(w5{Sga-FJBs8W8HEpO&Wl*BP9+Jk6bNzF3>0IZs$d*>t?%Un>d^MlXU-<_16X50L
z<)07q2j9dlfu5yDk1a_OwAKJTKR?s9EdY0ScWgGBk$;+|+}zv%&@>Isx#-`w{$AL(
z*0SI40m!lpAilqeXqu)}RfTg7=NyyCBnDj+#pnZho>P`3)>@o%Os7-QG>!h&TCBAI
z%x1H}Jw;KF=XqRHN}-hc7^0KOgw<*lvufKmW_oNw2#hf-77M)h0C?{y%aY}CIY6gv
zTZ}P-1lQ{|#u$VU@%)ENpQh=k6akS_zFpT1F4^z*+~42F_wX#Gq^|3@uC->dSRkb&
z&-0Tl^=6>n`<S6p3MnN?l0<|~`5vR(4?LU`Lh$hLK+`m_HMG_UAy7)a8|bJ<x7%&(
zo6TlJ*LA-=9EL3PFn}?J?RI-Isl(xbloG8qbzNhvjlLoH4<lOFHO3eoA0Ok?_pM*n
z)oR6ZxumM9n4Gni^?E(>7eYh^$+C>6r>6lMXstOM4&2_}4q7gJ>uNrqzg{Ht+=Tz0
z<#|3BqCnbNmW_BY3`t)^j*0(lh=vRMB%dTnWQjoXf!4AtV>+GUoWpz1Y&IiFlJg_l
zM=>BQr39esx{(ByWjPQL?>$n=Poet9foiQ$N^yOC9jQtwb#iL^A`(jfB|RFDv(_Sn
z81(FJw;PdnUqs&f`S|NoA4=ae4Q<=T(x0-vhyYYo^>v7z`ZWXwr4JHX*EK~^L=oBT
icArA?Liqo6puYfQLR#E2e(ZYy0000<MNUMnLSTZ3N>%d!

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/global_solo_button.png b/gtk2_ardour/icons/global_solo_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..78cfc8ff9f40cd6c928fac4591237eb73932514a
GIT binary patch
literal 529
zcmV+s0`C2ZP)<h;3K|Lk000e1NJLTq001fg000;W1^@s6jB#)M00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-vq3k@SCT8&dc0000TX;fHrLvL+uWo~o;00000Lvm$d
zbY)~9cWHEJAV*0}P-HG;2LJ#8he<?1R7l6|mLY8GFc5~nJq?*Q)TJp6jcG!SgM(XG
z6ck!qTpS#lkOGHBDhsV?3QAnKp+@VrYMEB>D&^qG`u*MgzLQ_FEPLY#;uYY0KL7Wi
z|9Fy^Kqt@%^pWf7r-<Vitu+AFT6Vh~ec$8zK1q_`c^&{|SyENiD4o9VDT;!w>mCCt
zgg|S}X0yRsOOhl+QAAmmq-jcB*Hl%7l#(<}an1oCrKBi|LC5!fq9|g!-O_a(N-37h
zC3&9H_x)q6zg`Yd*EOfp38fU)+M$EiTAHRI2!d}llv31nJ#^3*L)*4@&;Pok&N=ct
zM{A7`0_PmY7#54gmrfjyN5U|?>&(Z3uf@$~v&VpXo<|S_gN>f&v0ks)@At#oyvBS!
z=W@B+Em#O~lao@8vVD~G&N-qe!uS0_TnNG8a6n2)9LGaG3`2}D-|Dn&d!wV2A_xMS
zrWpnLl4aT3PoI*{(_It=#+bWPuaqK5k{gZHYW1h79|bxs{0Vddoj@nh=LdZUlw7$3
TJ(IN700000NkvXXu0mjf5`W<R

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/global_tracks_button.png b/gtk2_ardour/icons/global_tracks_button.png
index 02ef907e9e633c5d5140f05de9d64e0a802efc1d..2b74667c6d7ea4e53f5303daee902ad81a726a20 100644
GIT binary patch
delta 1124
zcmV-q1e^Pg35W@h7YY~%1^@s6%Igjikw74S3k@eSBs)Sm0000TX;fHrLvL+uWo~o;
z00000Lvm$dbY)~9cWHEJAV*0}P-HG;2LJ#A{z*hZRA}DqnK4iEIuwTA@9H9V0Czyn
z)GRbpGNn^GrA*nfvGGs(ci6gRYo~N-rc_Xj5NgDbPDzDGy40w^H^pjz0{4S^g>?OY
zNFCzX$L`7NbB>c={eJ%$3dJY*8vu%;P@YhH$Y06@3MCeW5{p8KMWMu^P-0R1e~-=|
z!5Blg+XW#6X_{g>ok9o!#uzkB1LyqJm`<mIcDoHB1UTnNl0@3-^?I^jQ4|=D#}Gou
zHsALV$1xU*g&ebM9ssZ`3#Mt-+OjNv!+1Q#$;nBreKMIyy8z%g4jvvJ5XbSGHeasa
zbzO|dV*mglL|zLa;5ZI+U55|?lgR{mp8v>)zPGoB{r&w{?T?R-D9iHC#X>1Xuh+wH
zI7C^N=yW=8T^FO#2!s$E92~qF<GL<Zs}%-=fpjPUBuOF#7e$d2m1SA-VYS<TZ4^ZT
z(=_En-8D}I=Nz1Kv|25+S}ke2VlWs;J0~Y6I6FI&*P5n*5K<G1<2ay{A_xKifaiG-
zLSV62K-09E=)*9C5CWEE$+;L~@H|h>^V4{Kenz+3MWfNEwcp&_;PUeF&(n}?+X%x@
zDlU#=ESJlj{RtsxHk;D<LI{k1Mk91Oot<O0UkbL{ZA_<AG@DHjLcY~WLWo)fGYkVs
zk|4`6v|26MuIoBRqmk@iZItau>-#>!FqF|_d#!n%V>lfC*mSblY%rV6YHjQF8rRp?
zUrR%prpd7Dx~|+=FT?h>BeN`f*QRAz&~;rpxpHhJw6ZLbBnb?|*qM5NJ_}<^rXory
zrqijsXPPF0AV8L7ux-1Rp57Cg@B6ju${&v7$hoeru6}G90)RA4addQq!^1-Wz-%_d
zX0!R4ScDLul%gz4DVmpcz&2%Bf>QdfP0qPY6@(CYo`)a^U|E(-71h13iY3o;nTD#`
zD~@9@#y}~B@B8vzReQXDjA)cnFveuv5(I%<ca>@wV~C;%Q51m?0>^P+S=N`=|8H`B
zevaegW8B@{Ax+b-pN2T+a2%($Q@2C*TViQ68eojoBFV1BFvhT6ujNi33<mP|8R7j?
z;Z*A~O%q`l%DJK_f?*i4IIe1ts)pIl?|GhMu~=X}pUZm8wr%Nu7a;_e%jLJH(eLK|
z{vNltx1SdDhmj>o5;PhOoSvRS2!Wy~YW0Y&>oTQO1>SHtgy(tES=GtptufVUh*FCA
zd|nIhoO2k4fiz9uoae15xLU1Vor+$DUqT27Au>_`z<fT3<2c})V>}+i^E}wL4Iu=w
zERzo1wiiVaeBYN(QOWZ>^m;w%r|LidWG*f)@bvWbslLDZ{r<E1>a0*N<rGRR3MCeW
q5{p8KMWMu^P$;n|lvou19lrt4KOg4OIuld?0000<MNUMnLSTY~91WfT

delta 1130
zcmV-w1eN=U362Sn7by}51^@s6Yj7=e00001b5ch_0Itp)=>Px#24YJ`L;(K){{a7>
zy{D6rAs~MT4IBpq?ADq9000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}
z000B&Nkl<ZXx{BuF;DYI5Pje2(58S*f!0;r5Lb5PR8HkkxpS9}f0DmLm(E>M*;QOQ
zg0KjoSQJiWM+iGj76tNEUd2Fw``~m)=O?A`?CyWeX8d;EtbYv#gDq;*_yqn2fIQFZ
zOw{-gf7L0dQIn-cO_mz}anJG*7-Q&myC8%hNfJz_QwSlz7=xlH;GDl&)9G~3Znq(X
z0OuTW97|ulUQf=;^Bh4CKnNjiuInO-A}kgQxn^G+05A*#x~^AjX__Jk0`&X+ihVMf
zNWXsoU|AL(A0H7#(VISB?%%d;1VI1*AcV+gAp|VTf~u+zLSQnPAj`5J`O*&#4sdvQ
z_{#qD^n{`){+uk7QuKN~j7B3AMS)JI1KYMS9*;o?!O_vtt2MT5W3^ggI2_7^0ze$c
zl5k-dN>UkyAzxOz-A110&~;tD)O~SEaL#|hIY+D2LaWu1zDo>;L+PjA@8kUZTs|v`
z0zycIES6<~QVP%W0055TKnQ`wVgW@_Dx~*)A3_Kih9P4y#^5-PjPuj5-EPtCcF|}w
zD)!skTU=dT{kaU8rU~EoCF7zf!g9IXJD(7OX0s`iFNDB&JVvL}*}G=<Hr8&pF`a)-
z(QGzB2>I3|2_Y&KOw%;Paf~!g(Q37%T~$?#$74CaJSe-B)^%O@zAvlC?q0Jj!)P@6
zv2wE6Y%rV6Dz^1{jhmaBugQ?2D6;I@wk=QA%d)+j$TUsg^=TLeR8^HpE)!c4ttbk_
zaSTn<_DauZ!5EWLL@C8|I+bI(uET%xJfvv~(=;pc^d8Av*R4F4`LHZY#=5?~{;@Iy
z07;VI<m3d$$HxGG*=&Z*X7e?&2q8czMNt%zG%x#rT@*zDO6j{kIp<O;2qADB2cGA_
zFbpXb<=9url4Y5cp|baiq6myJP)gytt{f|SkCzpVQVPbH>{~p~llv~EhB1GJFbolf
zAqXL`EDMHVe0l%>CN3^6aC&-*`}=z&N%HmE5a%40WmQh<ZpnU&ER9A3jIl~3*|!<S
z7}o2xJn6&XQ2stcynjlZa$mZx!}om|D-1(unkJj$vIi-9m|cC(vJ8vG0`vJ?_G6}L
z%Df06uv{*`T}Hnf4-XHxySsn;G@(DNEO8v8(P-f8><mH(<au7{M^sgnl2SH!qtOVC
z<H%%{H<P#4l(!*DDdzKerMz>_p=lbDBzZH=TUBtiTD`gzy)3_k5D-FSr2v5Wd=AU9
zz&S?{1aKS&rfEV5fiz8JLU;XzVF=fCWmR$<2fbcT=BfP8KN**omv}aQe*V<lUxUG5
wTYv7aQGb-HQIn-cO_mxpS!&c|sqw$VZ!Sw8+H+yr9RL6T07*qoM6N<$f-0E@Pyhe`

diff --git a/gtk2_ardour/icons/marker_button.png b/gtk2_ardour/icons/marker_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb743f85947332e5c66bd1836246607a1c7ece3c
GIT binary patch
literal 1012
zcmV<Q0}K3#P)<h;3K|Lk000e1NJLTq006N7000mO1^@s6S!te*00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-vq3k*3Qv}a4C0000TX;fHrLvL+uWo~o;00000Lvm$d
zbY)~9cWHEJAV*0}P-HG;2LJ#AYDq*vRA}DqnLSVPTo{0_$GkujO=x4%4ibqB)TIn2
zBs#$6#>nXA&)~PXIqEOKjSUhLTLy{)k&giqLopJeqP$a2TJ`0@JU-+_drhZz&JE4U
z)w}oU`Bf^F=7fZ-G5-LJMx$^gLe^X2??ka!T-kqJTwH_(g%Yo?T&sLoLKd?TE<wnT
zsKh5HC!C+3FN`IVNi<EPTCIv$E|(KyNs?%{+t{{^rfC55`+Wd1nG67?X;LT@0zJBA
zSvZaph)a@$X__Mczu4T|B#}tqx-P9&3jkGBQ51#Ya0q~+DA=~m-rgS3XjJ45heHN~
z0RXzL2d+cbP~vzzP9~GVG)*C0JRT3sNvG4qVzGC*l}bg73xxuX;~+_rh-ESvBuNtT
zk4B?Fj>p^h>FFtFXJ@~a*f0zLdc7X5>!RyAnx<h{7667}VB0o{L_)|NjYcsHgGQr4
zy<W#K3@pnECH{*<A`!N>w%)~GUS4>3c=&UPP19s|cUMU49|Op;%w#g5-EIeDf6H__
z4P1K_*k8Su<?U}R!gXDCc6R9XdT5%4>$)G#8xDu!K{+@$V1Iv~X0sU@wgTq!IY&oF
zfdU86Y&NOa>tD06n@*?5vdq)d(>sB@O69%wJ&EJ-xM(T7o9p-cB$G)D!$6XxcakKN
z$qy^JKdxySwOVcI1?qOYqJ<fc$2>khE|rr?rI2MgG;9UTW-~0yBAd;M*km%H(P(_#
z*NIxKMmn7qWA8QXN#!5QvW(+6ffgVZi*bB>EanXc1FF?3g+hUTzc2dRySuv&+X;VM
zmSwWpEVgYgb?<}0fWyN>B9RE4P6tI%ew*X<$Is8tp<yec)9H{(rP$uy7W<*uZ1#0u
zCmhE?RaI0~#c>=F*L9s{vq_~=p;D=Ed3hNS++WH48#Yhca=A<{m;11vUUV;$$>dX&
z*mYerO{3TAEfiN(RT7B=x~?-GkHrQsWHsE}+%TWdxxc@s)9HNO#?F)P_V)H&OjXrD
z<@5{w_9SpL8j1edFZb2e75RLga=9F6LHu7Q{`6GQYbh2<sVEBhd|o_c*VosfRV&7E
z99pdw-EMd3oL{9<Y5tv#or}fd$__ii6T82|#>NJ(udmC`50@<D|Hfwo{?x{9-KufO
i&*9ri9KPaz9{&Q=hPE<_PR|Aa0000<MNUMnLSTYu7tja*

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/skip_button.png b/gtk2_ardour/icons/skip_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e62e82e814558de32f466a4a5d97c139f536172
GIT binary patch
literal 466
zcmeAS@N?(olHy`uVBq!ia0vp^FMwEpgAGW^WEk@RDb50q$YKTtZeb8+WSBKa0w~B{
z;_2(kevgxz$BMt{F9$PFNH#MhqQp5rH#aq}1juDza4t$sEJ;mKD9<d(P;mG34M@>T
zWoKYu^zd|X49U3n_SV|G!v+$q54T^Au%B0O-!)<BH>N{pgYTWz$ggY;&buegQC@iF
ztofA{6Tb!f25$9zzOa+m?&XQ&fnuw#zTy@9IW^9NNsu+fMI-=3&U^CpqWIk6kkHnd
z7r)z1Kh4^3HqDuXk->Ozrc~c?W!FFkf#f6A_V1F@S_C=_vwkTRvu;_X<+ogz;a+u8
z56@u(wvS@xw&k9*d^~6Nn*D28Z@evg^S#<PK4o2lm}}$AiN()q?EL55oj=F&dH#1V
z&CE|q#cW%0Z*N?+Y|4vWc|v~1zm4vEHw|YLooTorHIk{oLgv`-jM(cXvB!&c%DkWB
zd$}eeHrQ)&m$p)W<qz$5ReS$!S@&#Cr{SgVwxzMztCY^$IJPG~sM@>fZr*Y0XK!8h
ztY59jvgf<SbG7oo(5Q*?BVWYFOso$mbai1A1^V|%eg%8k-0B_56^ng9f$iz)=d#Wz
Gp$P!FW4t>6

literal 0
HcmV?d00001


From bf69e92e2b1a365ba98a6384993d9d5f8eae373a Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 11 Sep 2014 16:56:49 -0400
Subject: [PATCH 21/37] add new Gtkmm2ext::pixel_size() to conveniently get
 width&height for a given font + string

---
 libs/gtkmm2ext/gtkmm2ext/utils.h |  1 +
 libs/gtkmm2ext/utils.cc          | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/libs/gtkmm2ext/gtkmm2ext/utils.h b/libs/gtkmm2ext/gtkmm2ext/utils.h
index bad9ca75d6..dd18c69487 100644
--- a/libs/gtkmm2ext/gtkmm2ext/utils.h
+++ b/libs/gtkmm2ext/gtkmm2ext/utils.h
@@ -52,6 +52,7 @@ namespace Gtkmm2ext {
 	LIBGTKMM2EXT_API std::string fit_to_pixels (const std::string&, int pixel_width, Pango::FontDescription& font, int& actual_width, bool with_ellipses = false);
 	LIBGTKMM2EXT_API std::pair<std::string, double> fit_to_pixels (cairo_t *, std::string, double);
 	LIBGTKMM2EXT_API int pixel_width (const std::string& str, Pango::FontDescription& font);
+	LIBGTKMM2EXT_API void pixel_size (const std::string& str, Pango::FontDescription& font, int& width, int& height);
 
 	LIBGTKMM2EXT_API void get_ink_pixel_size (Glib::RefPtr<Pango::Layout>, 
 						  int& width, int& height);
diff --git a/libs/gtkmm2ext/utils.cc b/libs/gtkmm2ext/utils.cc
index 37ed4ba66b..ed6a23f7c0 100644
--- a/libs/gtkmm2ext/utils.cc
+++ b/libs/gtkmm2ext/utils.cc
@@ -586,6 +586,18 @@ Gtkmm2ext::pixel_width (const string& str, Pango::FontDescription& font)
 	return width;
 }
 
+void
+Gtkmm2ext::pixel_size (const string& str, Pango::FontDescription& font, int& width, int& height)
+{
+	Gtk::Label foo;
+	Glib::RefPtr<Pango::Layout> layout = foo.create_pango_layout ("");
+
+	layout->set_font_description (font);
+	layout->set_text (str);
+
+	Gtkmm2ext::get_ink_pixel_size (layout, width, height);
+}
+
 #if 0
 string
 Gtkmm2ext::fit_to_pixels (const string& str, int pixel_width, Pango::FontDescription& font, int& actual_width, bool with_ellipses)

From c75b7a3f0f4694f2696ea683b001dea5eba47fae Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 11 Sep 2014 16:58:02 -0400
Subject: [PATCH 22/37] tweak marker drawing and add default_new_marker_prefix
 string to consolidate default name of new GUI-created markers

---
 gtk2_ardour/marker.cc | 41 ++++++++++++++++++++++++-----------------
 gtk2_ardour/marker.h  |  2 ++
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index 1288b9c87c..275cec8f3e 100644
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -55,7 +55,8 @@ using namespace Gtkmm2ext;
 
 PBD::Signal1<void,Marker*> Marker::CatchDeletion;
 
-const double Marker::_marker_height = 18.0;
+const double Marker::_marker_height = 17.0;
+const char * Marker::default_new_marker_prefix = N_("MARKER");
 
 static const double name_padding = 10.0;
 
@@ -99,8 +100,12 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba,
 
 	set_color_rgba (rgba);
 
+        if (type == Mark) {
+                _line_shown = true;
+        }
+        
 	/* setup name pixbuf sizes */
-	name_font = get_font_for_style (N_("MarkerText"));
+	name_font = Pango::FontDescription (ARDOUR_UI::config()->get_canvasvar_SmallFont());
 
 	Gtk::Label foo;
 
@@ -115,9 +120,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba,
 	_name_item->set_font_description (name_font);
         /* white with 95% opacity */
 	_name_item->set_color (ArdourCanvas::rgba_to_color (1.0,1.0,1.0,0.95));
-	_name_item->set_position (ArdourCanvas::Duple (_label_offset, (_marker_height / 2.0) - (name_height / 2.0) - 2.0));
-
-        set_has_scene_change (true);
+	_name_item->set_position (ArdourCanvas::Duple (_label_offset, (_marker_height / 2.0) - (name_height / 2.0)));
 
 	set_name (annotation.c_str());
 
@@ -338,7 +341,7 @@ Marker::set_show_line (bool s)
 void
 Marker::setup_line ()
 {
-	if (_shown && (_selected || _line_shown || ARDOUR::Profile->get_trx())) {
+	if ((Profile->get_trx() && _type == Mark) || (_shown && ((!Profile->get_trx() && _selected) || _line_shown))) {
 
 		if (_track_canvas_line == 0) {
 
@@ -414,16 +417,16 @@ Marker::setup_name_display ()
 
         if (_have_scene_change) {
 
-                name_width = (double) pixel_width (_("MIDI"), name_font);
-
-                /* coordinates of rect that will surround "MIDI */
+                /* coordinates of rect that will surround "MIDI" */
 
                 ArdourCanvas::Rect r;
+                int midi_height;
+
+                pixel_size (X_("MIDI"), name_font, name_width, midi_height);
+
                 r.x0 = 2.0;
                 r.x1 = r.x1 + name_width + 7.0;
-                r.y0 = 2.0;
-                r.y1 = r.y0 + _marker_height - 4.0;
-                
+
                 if (_scene_change_text == 0) {
                         _scene_change_rect = new ArdourCanvas::Rectangle (group);
                         _scene_change_text = new ArdourCanvas::Text (group);
@@ -437,14 +440,18 @@ Marker::setup_name_display ()
                 
                 _scene_change_text->set_font_description (name_font);
                 _scene_change_text->set_color (ArdourCanvas::rgba_to_color (1.0, 1.0, 1.0, 0.95));
-                _scene_change_text->set (_("MIDI"));
+                _scene_change_text->set (X_("MIDI"));
                         
-                _scene_change_text->set_position (ArdourCanvas::Duple (4.0, (_marker_height / 2.0) - (name_height / 2.0) - 2.0));
-                
+                /* 4 pixels left margin, place it in the vertical middle.
+                 */
+                _scene_change_text->set_position (ArdourCanvas::Duple (4.0, (_marker_height / 2.0) - (name_height / 2.0)));
+
+                r.y0 = _scene_change_text->position().y - 2.0;
+                r.y1 = r.y0 + name_height + 4.0;
+
                 _scene_change_rect->set (r);
-
                 scene_change_width = r.x1;
-
+                
         } else {
                 if (_scene_change_text) {
                         delete _scene_change_text;
diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h
index 76b73e1bdf..ebe47ceb36 100644
--- a/gtk2_ardour/marker.h
+++ b/gtk2_ardour/marker.h
@@ -97,6 +97,8 @@ class Marker : public sigc::trackable
 
         static double marker_height() { return _marker_height; }
 
+        static const char * default_new_marker_prefix;
+
   protected:
 	PublicEditor& editor;
         ARDOUR::Location* _location;

From 21c94e2e2b9b039dd332373f6742513a41c72201 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 11 Sep 2014 16:58:13 -0400
Subject: [PATCH 23/37] modified add_marker_button image

---
 gtk2_ardour/icons/add_marker_button.png | Bin 245 -> 218 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/gtk2_ardour/icons/add_marker_button.png b/gtk2_ardour/icons/add_marker_button.png
index 42478ebbe216d4810bc902420ac6eef1b2d7f8fc..8a654c9e1186e523e1905a5d1e3b2f25720874ba 100644
GIT binary patch
delta 62
zcmey$c#Cm@%0y>bLvCJHS&axw2L=WP+02lL66gHf+|;}hAeVu`xhOTUBsE2$JhLQ2
Q!QIn0AVn{gePVA002JyGxc~qF

delta 87
zcmcb`_?2;jiVS0Mkh>GZx^prw85kJYlDyqr82*Fcg1yTpPgGRUW#{D(z4^PK9VjbV
o;u=xnoS&PUnpeW$T$GwvlA5AWo>`Ki;O^-g5Z=fqKCvhR053@$`2YX_


From b5491ad6d3b2fc7c7496e3aa14f4e26235c2302f Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 11 Sep 2014 16:59:01 -0400
Subject: [PATCH 24/37] use Marker::default_new_marker_prefix

---
 gtk2_ardour/editor_ops.cc  | 4 ++--
 gtk2_ardour/location_ui.cc | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 2aabefec71..858f53eef7 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -1950,7 +1950,7 @@ Editor::add_location_mark (framepos_t where)
 
 	select_new_marker = true;
 
-	_session->locations()->next_available_name(markername,"mark");
+	_session->locations()->next_available_name(markername,_(Marker::default_new_marker_prefix));
 	if (!choose_new_marker_name(markername)) {
 		return;
 	}
@@ -2101,7 +2101,7 @@ Editor::set_mark ()
 	framepos_t const pos = _session->audible_frame ();
 
 	string markername;
-	_session->locations()->next_available_name (markername, "mark");
+	_session->locations()->next_available_name (markername, _(Marker::default_new_marker_prefix));
 
 	if (!choose_new_marker_name (markername)) {
 		return;
diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc
index f4a9b7ea07..8550aaad95 100644
--- a/gtk2_ardour/location_ui.cc
+++ b/gtk2_ardour/location_ui.cc
@@ -1011,7 +1011,7 @@ LocationUI::add_new_location()
 
 	if (_session) {
 		framepos_t where = _session->audible_frame();
-		_session->locations()->next_available_name(markername,"mark");
+		_session->locations()->next_available_name(markername,_(Marker::default_new_marker_prefix));
 		Location *location = new Location (*_session, where, where, markername, Location::IsMark);
 		if (Config->get_name_new_markers()) {
 			newest_location = location;

From 908bffa5a1a7b8039cd2d25222a56eaec6f66d3c Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 11 Sep 2014 16:59:52 -0400
Subject: [PATCH 25/37] use Marker::default_new_marker_prefix

---
 gtk2_ardour/editor_markers.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 96fe465d50..998a1da564 100644
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -648,7 +648,7 @@ Editor::mouse_add_new_marker (framepos_t where, bool is_cd, bool is_xrun)
 		markerprefix = "xrun";
 		flags = Location::IsMark;
 	} else {
-		markerprefix = "mark";
+		markerprefix = _(Marker::default_new_marker_prefix);
 	}
 
 	if (_session) {

From 00931a22b15415a65a83034e661cb9a2ff899769 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 11 Sep 2014 17:00:07 -0400
Subject: [PATCH 26/37] tweak,rearrange and otherwise iteratively approach PRD
 for DYNAMIC area at upper right of arrange view

---
 gtk2_ardour/editor.cc            |  4 ++
 gtk2_ardour/editor.h             |  4 ++
 gtk2_ardour/editor_rulers.cc     |  4 ++
 gtk2_ardour/ui/editor_window.xml | 97 ++++++++++++++++----------------
 4 files changed, 59 insertions(+), 50 deletions(-)

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 7de0775028..e545a5406c 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -266,6 +266,10 @@ Editor::Editor ()
 	, inspector_home (get_container ("inspector_home"))
 	, _master_bus_ui_home (get_container ("master_bus_ui_home"))
 	, vpacker (get_v_box ("vpacker"))
+        , timebars_vbox (get_v_box ("timebars_vbox"))
+	, marker_lane_hbox (get_h_box ("marker_lane_hbox"))
+	, skip_button (get_waves_button ("skip_button"))
+        , global_tracks_button (get_waves_button ("global_tracks_button"))
         , add_marker_button (get_waves_button ("add_marker_button"))
 	, _tool_marker_button (get_waves_button ("tool_marker_button"))
 	, _tool_arrow_button (get_waves_button ("tool_arrow_button"))
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index b5f922badd..b1ccb2e8d9 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -714,6 +714,10 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	Gtk::Container& _master_bus_ui_home;
 	MasterBusUI*    _master_bus_ui;
 	Gtk::VBox&      vpacker;
+        Gtk::VBox&      timebars_vbox;
+        Gtk::HBox&      marker_lane_hbox;
+        WavesButton&    skip_button;
+        WavesButton&    global_tracks_button;
 
 	std::stack<Gdk::Cursor*> _cursor_stack;
 	Gdk::Cursor*          current_canvas_cursor;
diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index d149730cea..b21fc90d28 100644
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -392,9 +392,11 @@ Editor::update_ruler_visibility ()
                 if (pos != old_unit_pos) {
                         marker_group->move (ArdourCanvas::Duple (0.0, pos - old_unit_pos));
                 }
+                marker_lane_hbox.show ();
                 marker_group->show();
                 pos += Marker::marker_height(); // marker_bar->y0() - marker_bar->y1();
         } else {
+                marker_lane_hbox.hide ();
                 marker_group->hide();
         }
 
@@ -403,9 +405,11 @@ Editor::update_ruler_visibility ()
                 if (pos != old_unit_pos) {
                         skip_group->move (ArdourCanvas::Duple (0.0, pos - old_unit_pos));
                 }
+                skip_button.show ();
                 skip_group->show();
                 pos += Marker::marker_height(); // skip_bar->y1() - skip_bar->y0();
         } else {
+                skip_button.hide ();
                 skip_group->hide();
         }
 
diff --git a/gtk2_ardour/ui/editor_window.xml b/gtk2_ardour/ui/editor_window.xml
index e639016ea2..2e5238219c 100644
--- a/gtk2_ardour/ui/editor_window.xml
+++ b/gtk2_ardour/ui/editor_window.xml
@@ -343,58 +343,55 @@
             <Table id="edit_packer"
                    rows="2"
                    columns="2">
-              <Layout width="234" height="86"
-                      table.leftattach="0"
-                      table.rightattach="1"
-                      table.topattach="0"
-                      table.bottomattach="1"
-                      table.xfill="false"
-                      table.yfill="false">
-                <Button id="markers_dropdown"
-                          text="Marker"
-                          x="0"
-                          y="0"
-                          width="200"
-                          height="16"
-                          winfont ="Arial 8"
-                          macfont ="Helvetica 8"
-                          normalicon="top_bar_button"
-                          activeicon="top_bar_button"/>
+              <VBox id="timebars_vbox" spacing="1"
+                    borderwidth="1"
+		      table.leftattach="0"
+		      table.rightattach="1"
+		      table.topattach="0"
+		      table.bottomattach="1"
+		      table.xfill="false"
+		      table.yfill="false">
+                <HBox id="marker_lane_hbox" spacing="1">
+                  <iconbutton id="marker_button"
+                            width="177"
+                            height="16"
+                            normalicon="marker_button"
+                            activeicon="marker_button"/>
                   <iconbutton id="add_marker_button"
-                          text="+"
-                          x="200"
-                          y="0"
-                          width="34"
-                          height="16"
-                          winfont ="Arial 8"
-                          macfont ="Helvetica 8"
-                          normalicon="add_marker_button"
-                          activeicon="add_marker_button"/>
-                  <Button id="skip_button"
-                         text="SKIP"
-                         x="0"
-                         y="18"
-                         width="234"
-                         height="12"
-                         winfont ="Arial 8"
-                         macfont ="Helvetica 8"/>
-                  <iconbutton id="global_tracks_dropdown"
-                          text="GLOBAL TRACKS"
-                          winfont ="Arial 8"
-                          macfont ="Helvetica 8"
-                          x="0"
-                          y="36"
-                          width="139"
-                          height="18"
-                          normalicon="global_tracks_button"
-                          activeicon="global_tracks_button"/>
-                  <EventBox id="master_bus_ui_home"
-                            x="0"
-                            y="54"
-                            height="32"
+                              width="53"
+                              height="16"
+                              normalicon="add_marker_button"
+                              activeicon="add_marker_button"/>
+                </HBox>
+                <iconbutton id="skip_button"
                             width="234"
-                            bgnormal="#ff00ff"/>
-                </Layout>
+                            height="18"
+                            normalicon="skip_button"
+                            activeicon="skip_button"/>
+                <HBox id="global_tracks_hbox" spacing="1">
+                  <iconbutton id="global_tracks_button"
+                              height="24"
+                              width="139"
+                              normalicon="global_tracks_button"
+                              activeicon="global_tracks_button"/>
+                  <iconbutton id="global_rec_button"
+                              height="24"
+                              width="42"
+                              normalicon="global_rec_button"
+                              activeicon="global_rec_button"/>
+                  <iconbutton id="global_solo_button"
+                              height="24"
+                              width="42"
+                              normalicon="global_solo_button"
+                              activeicon="global_solo_button"/>
+                </HBox>
+		<EventBox id="master_bus_ui_home"
+                          x="0"
+                          y="19"
+                          height="24"
+                          width="234"
+                          bgnormal="#ff00ff"/>
+              </VBox>
               <Layout id="controls_layout"
                       hadjustment="unused_adjustment"
                       vadjustment="vertical_adjustment"

From beab22602a9267ecfe58c3c0f8644518476cf57d Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 11 Sep 2014 17:02:04 -0400
Subject: [PATCH 27/37] added new 2 files to .gitignore to clean up output of
 git status

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 8df0975da4..febe0aabfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,7 +45,8 @@ tags
 /doc/html/
 /doc/latex/
 /tools/osx_packaging/Resources/
-
+/tools/osx_packaging/Tracks
+/tools/osx_packaging/Info.plist
 
 # translations
 /gtk2_ardour/po/*.mo

From 230a701e934098076e935c466901e08df1e31e64 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 11 Sep 2014 17:34:20 -0400
Subject: [PATCH 28/37] make global solo button blink to indicate
 something-soloed.

Color choices in icons/global_solo_button_active.png need "artist"
attention especially since "SOLO" text is pre-rendered.
---
 gtk2_ardour/editor.cc                         |  22 ++++++++++++++++++
 gtk2_ardour/editor.h                          |   3 +++
 .../icons/global_solo_button_active.png       | Bin 0 -> 603 bytes
 gtk2_ardour/ui/editor_window.xml              |   2 +-
 4 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 gtk2_ardour/icons/global_solo_button_active.png

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index e545a5406c..e2bfa99c27 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -271,6 +271,8 @@ Editor::Editor ()
 	, skip_button (get_waves_button ("skip_button"))
         , global_tracks_button (get_waves_button ("global_tracks_button"))
         , add_marker_button (get_waves_button ("add_marker_button"))
+        , global_solo_button (get_waves_button ("global_solo_button"))
+        , global_rec_button (get_waves_button ("global_rec_button"))
 	, _tool_marker_button (get_waves_button ("tool_marker_button"))
 	, _tool_arrow_button (get_waves_button ("tool_arrow_button"))
 	, _tool_zoom_button (get_waves_button ("tool_zoom_button"))
@@ -645,6 +647,8 @@ Editor::Editor ()
 
 	setup_toolbar ();
 
+        ARDOUR_UI::Blink.connect (sigc::mem_fun(*this, &Editor::solo_blink));
+
 	set_zoom_focus (zoom_focus);
 	set_visible_track_count (_visible_track_count);
 	_snap_type = SnapToBeat;
@@ -5654,3 +5658,21 @@ Editor::ui_parameter_changed (string parameter)
 		}
 	}
 }
+
+void
+Editor::solo_blink (bool onoff)
+{
+	if (_session == 0) {
+		return;
+	}
+
+	if (_session->soloing() || _session->listening()) {
+		if (onoff) {
+			global_solo_button.set_active (true);
+		} else {
+			global_solo_button.set_active (false);
+		}
+	} else {
+		global_solo_button.set_active (false);
+	}
+}
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index b1ccb2e8d9..59c4e066f1 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -1623,6 +1623,9 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	Gtk::Label               toolbar_selection_cursor_label;
 
         WavesButton& add_marker_button;
+        WavesButton& global_solo_button;
+        void solo_blink (bool);
+        WavesButton& global_rec_button;
 
 	Gtkmm2ext::TearOff*      _mouse_mode_tearoff;
 	WavesButton& _tool_marker_button;
diff --git a/gtk2_ardour/icons/global_solo_button_active.png b/gtk2_ardour/icons/global_solo_button_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..ced889cb37688648e79785afd08d9889ed13b5f7
GIT binary patch
literal 603
zcmV-h0;K(kP)<h;3K|Lk000e1NJLTq001fg000;W1^@s6jB#)M00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-vq3l$#=ew2g)0000TX;fHrLvL+uWo~o;00000Lvm$d
zbY)~9cWHEJAV*0}P-HG;2LJ#8(Md!>R7l6|mcMJ;Kp2J}w}lwd$r7C^Z(g#bT3R7(
zt-u|ENIGe7Ah>iB)X>d;Kn6ie3Wg3IYG|RNg}RswF=+8%k)a^)5DeL*PN|h8u76DJ
zCZfinrg$;vosPSgm*>0t?zr6h*`wdAfo`!T%0M&F3^W5>phCCK{>BOW8z($D|3ZAc
z3Bb5nVf*qZSu1qwOXqA~9x-lKRtsvHCXVCKnyZ9ih$=k?pjxfs`#!C?isLwFnnu1|
zBj2u3`u;kVF>Y2c41-3aL2It!c^<ZHCq=IWbTXMFWB<no;y9+ztrJBN7v%#0?!Ekq
z@B1i<vM@u}bv)1G?u(BA%yth6f`C$PXLX>TZ$C!Yb+%65q21qOI2-~n8jVuEFbokz
zabboa2&sYrqA0r2|F`b^%Mc%LQp)XcR(=J*&u<T~?Kkv#JtRru?25NoEHa%=Z#)%2
z5SU$=lV$l@vH!iJ;?q+M!$=xm{Phq)5Eu*w$g-SVp!2uS&@_#HzrQdi2!d2jzFk96
z6b6$|OM&K=`8|!B6)ej_k|Y3J*JZYQcx}GZ>2Og#Am6TGSyn2eHCHKg>zJmQw2kY!
pNzbkXG<)zf&<r#K%|O>5^bcL5unG|vuap1)002ovPDHLkV1nQZ{pJ7w

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/ui/editor_window.xml b/gtk2_ardour/ui/editor_window.xml
index 2e5238219c..7af2358b40 100644
--- a/gtk2_ardour/ui/editor_window.xml
+++ b/gtk2_ardour/ui/editor_window.xml
@@ -383,7 +383,7 @@
                               height="24"
                               width="42"
                               normalicon="global_solo_button"
-                              activeicon="global_solo_button"/>
+                              activeicon="global_solo_button_active"/>
                 </HBox>
 		<EventBox id="master_bus_ui_home"
                           x="0"

From 603e36f705302fe0632e93149ace9791f646aee2 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 11 Sep 2014 17:50:22 -0400
Subject: [PATCH 29/37] make click on global solo button disable soloing

---
 gtk2_ardour/editor.cc | 15 +++++++++++++++
 gtk2_ardour/editor.h  |  1 +
 2 files changed, 16 insertions(+)

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index e2bfa99c27..9227dc1a0a 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -648,6 +648,7 @@ Editor::Editor ()
 	setup_toolbar ();
 
         ARDOUR_UI::Blink.connect (sigc::mem_fun(*this, &Editor::solo_blink));
+	global_solo_button.signal_clicked.connect (sigc::mem_fun(*this,&Editor::global_solo_clicked));
 
 	set_zoom_focus (zoom_focus);
 	set_visible_track_count (_visible_track_count);
@@ -5676,3 +5677,17 @@ Editor::solo_blink (bool onoff)
 		global_solo_button.set_active (false);
 	}
 }
+
+void
+Editor::global_solo_clicked (WavesButton*)
+{
+	if (!_session) {
+                return;
+        }
+
+        if (_session->soloing()) {
+                _session->set_solo (_session->get_routes(), false);
+        } else if (_session->listening()) {
+                _session->set_listen (_session->get_routes(), false);
+        }
+}
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 59c4e066f1..5240b4ba24 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -1626,6 +1626,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
         WavesButton& global_solo_button;
         void solo_blink (bool);
         WavesButton& global_rec_button;
+        void global_solo_clicked (WavesButton*);
 
 	Gtkmm2ext::TearOff*      _mouse_mode_tearoff;
 	WavesButton& _tool_marker_button;

From 0b855f1b025894719e2d4ada1f6803451f6071db Mon Sep 17 00:00:00 2001
From: nikolay <MPolianovskyi@wavesglobal.com>
Date: Fri, 12 Sep 2014 11:36:34 +0300
Subject: [PATCH 30/37] [Summary] Progressing timer format drop down and
 timecode source drop down [Reviewed] GZharun

---
 gtk2_ardour/ardour_ui_ed.cc                   | 47 ++++++++-----------
 .../ardour/session_configuration_vars.h       |  2 -
 2 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index c89a617a24..cf31dbb9f3 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -121,6 +121,7 @@ ARDOUR_UI::populate_display_format_dropdown ()
 {
     static std::vector<string> display_formats;
     _display_format_dropdown->clear_items ();
+    display_formats.clear ();
     
     display_formats.push_back("Timecode");
     display_formats.push_back("Time");
@@ -134,45 +135,38 @@ ARDOUR_UI::populate_display_format_dropdown ()
     if( !_session )
         return;
     
-    string format = _session->config.get_display_format();
-    AudioClock::Mode mode;
-    
-    if ( format == "Time" )
-        mode = AudioClock::MinSec;
-    else if ( format == "Samples" )
-        mode = AudioClock::Frames;
-    if( format == "Timecode" )
-        mode = AudioClock::Timecode;
-    
-    if( time_info_box )
-        time_info_box->set_mode (mode);
-    if ( big_clock )
-        primary_clock->set_mode (mode);
-    
+    AudioClock::Mode mode = primary_clock->mode();
+ 
+    string format;
+    if (AudioClock::Timecode == mode)
+        format = display_formats[0];
+    else if (AudioClock::MinSec == mode)
+        format = display_formats[1];
+    else format = display_formats[2];
+        
     _display_format_dropdown->set_text( format );
 }
 
 void
 ARDOUR_UI::populate_timecode_source_dropdown ()
 {
-    static std::vector<string> timecode_selector;
+    static std::vector<string> timecode_source;
     _timecode_source_dropdown->clear_items ();
     
-    timecode_selector.push_back("Internal");
-    timecode_selector.push_back("MTC");
-    timecode_selector.push_back("LTC");
-    
-    for(int i = 0; i < timecode_selector.size(); ++i)
+    timecode_source.clear();
+    timecode_source.push_back("Internal");
+    timecode_source.push_back("MTC");
+    timecode_source.push_back("LTC");
+        
+    for(int i = 0; i < timecode_source.size(); ++i)
     {
-        _timecode_source_dropdown->add_menu_item (timecode_selector[i], &timecode_selector[i]);
+        _timecode_source_dropdown->add_menu_item (timecode_source[i], &timecode_source[i]);
     }
     
     if( !_session )
         return;
     
-    string timecode_source = _session->config.get_timecode_source();
-    
-    _timecode_source_dropdown->set_text( timecode_source );
+    _timecode_source_dropdown->set_text (timecode_source[0]);
 }
 
 void
@@ -187,8 +181,6 @@ ARDOUR_UI::on_display_format_dropdown_item_clicked (WavesDropdown* from_which, v
         mode = AudioClock::MinSec;
     else if ( format == "Samples" )
         mode = AudioClock::Frames;
-
-    _session->config.set_display_format(format);
     
     if( time_info_box )
         time_info_box->set_mode (mode);
@@ -200,7 +192,6 @@ void
 ARDOUR_UI::on_timecode_source_dropdown_item_clicked (WavesDropdown* from_which, void* my_cookie)
 {
     string timecode_source = *((string*)my_cookie);
-    _session->config.set_timecode_source(timecode_source);
 }
 
 void
diff --git a/libs/ardour/ardour/session_configuration_vars.h b/libs/ardour/ardour/session_configuration_vars.h
index 56ccb61fa4..8739e69c86 100644
--- a/libs/ardour/ardour/session_configuration_vars.h
+++ b/libs/ardour/ardour/session_configuration_vars.h
@@ -30,8 +30,6 @@ CONFIG_VARIABLE (bool, use_region_fades, "use-region-fades", true)
 CONFIG_VARIABLE (bool, show_region_fades, "show-region-fades", true)
 CONFIG_VARIABLE (SampleFormat, native_file_data_format,  "native-file-data-format", ARDOUR::FormatFloat)
 CONFIG_VARIABLE (HeaderFormat, native_file_header_format,  "native-file-header-format", ARDOUR::WAVE)
-CONFIG_VARIABLE (std::string, display_format, "display-format", std::string("Timecode"))
-CONFIG_VARIABLE (std::string, timecode_source, "timecode-source", std::string("Internal"))
 CONFIG_VARIABLE (bool, auto_play, "auto-play", false)
 CONFIG_VARIABLE (bool, auto_return, "auto-return", false)
 CONFIG_VARIABLE (bool, auto_input, "auto-input", true)

From 3898b5746b4198c0dc50d263f39fedbb9d0ac267 Mon Sep 17 00:00:00 2001
From: nikolay <MPolianovskyi@wavesglobal.com>
Date: Fri, 12 Sep 2014 11:37:33 +0300
Subject: [PATCH 31/37] [Summary] Reworked disable tracks rename until it is
 recording [Reviewed] GZharun

---
 gtk2_ardour/mixer_strip.cc     | 20 +++++++++++---------
 gtk2_ardour/mixer_strip.h      |  5 ++---
 gtk2_ardour/route_time_axis.cc | 19 ++++++++++---------
 gtk2_ardour/route_time_axis.h  |  3 ++-
 gtk2_ardour/route_ui.h         |  2 +-
 5 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 8b10419c9d..7ea4103f84 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -440,9 +440,19 @@ MixerStrip::begin_name_edit ()
     _name_entry.start_editing (0);
 }
 
+void
+MixerStrip::route_rec_enable_changed ()
+{
+    RouteUI::route_rec_enable_changed ();
+    on_record_state_changed ();
+}
+
 void
 MixerStrip::on_record_state_changed ()
 {
+    if ( !ARDOUR_UI::instance()->the_session() )
+        return;
+    
     if ( (ARDOUR_UI::instance()->the_session()->record_status()==Session::Recording) && (_route->record_enabled()) )
         end_name_edit (RESPONSE_CANCEL);
 }
@@ -497,15 +507,7 @@ void
 MixerStrip::set_route (boost::shared_ptr<Route> rt)
 {
 	RouteUI::set_route (rt);
-    
-    boost::shared_ptr<Track> t;
-    if ((t = boost::dynamic_pointer_cast<Track>(rt)) != 0) {
-        t->RecordEnableChanged.connect (_route_state_connections,
-                                        invalidator (*this),
-                                        boost::bind (&MixerStrip::on_record_state_changed, this),
-                                        gui_context() );
-    }
-    
+
 	/* ProcessorBox needs access to _route so that it can read
 	   GUI object state.
 	*/
diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index 7e47227d7d..dc03d6fbd6 100644
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -128,6 +128,8 @@ class MixerStrip : public RouteUI
 
     static const char* XMLColor[15];
     
+    void route_rec_enable_changed();
+    
   protected:
 	friend class Mixer_UI;
 	void set_packed (bool yn);
@@ -172,11 +174,8 @@ class MixerStrip : public RouteUI
     void selection_click (GdkEventButton* ev);
 	
     WavesButton&   name_button;
-    
-    PBD::ScopedConnectionList _route_state_connections;
     void on_record_state_changed ();
     
-    
     Gtk::Entry& _name_entry;
     void begin_name_edit ();
     void end_name_edit (int);
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index e003e3b4db..675c4d7abb 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -128,15 +128,6 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
     disable_header_dnd ();
     
 	RouteUI::set_route (rt);
-    
-    boost::shared_ptr<Track> t;
-    if ((t = boost::dynamic_pointer_cast<Track>(rt)) != 0) {
-        t->RecordEnableChanged.connect (_route_state_connections,
-                                        invalidator (*this),
-                                        boost::bind (&RouteTimeAxisView::on_record_state_changed, this),
-                                        gui_context() );
-    }
-    
 
 	CANVAS_DEBUG_NAME (_canvas_display, string_compose ("main for %1", rt->name()));
 	CANVAS_DEBUG_NAME (selection_group, string_compose ("selections for %1", rt->name()));
@@ -2710,9 +2701,19 @@ RouteTimeAxisView::control_ebox_resize_ended()
     }
 }
 
+void
+RouteTimeAxisView::route_rec_enable_changed()
+{
+    RouteUI::route_rec_enable_changed ();
+    on_record_state_changed ();
+}
+
 void
 RouteTimeAxisView::on_record_state_changed ()
 {
+    if ( !ARDOUR_UI::instance()->the_session() )
+        return;
+    
     if ( (ARDOUR_UI::instance()->the_session()->record_status()==Session::Recording) && (_route->record_enabled()) )
         end_name_edit (RESPONSE_CANCEL);
 }
diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h
index f65339ffbc..05d8f51d11 100644
--- a/gtk2_ardour/route_time_axis.h
+++ b/gtk2_ardour/route_time_axis.h
@@ -157,6 +157,8 @@ public:
 
     PBD::Signal3<void, const PBD::ID&, const PBD::ID&, bool> relative_tracks_reorder_request;
     
+    void route_rec_enable_changed();
+    
 protected:
 	friend class StreamView;
 
@@ -331,7 +333,6 @@ private:
 	void display_route_color ();
     
     void on_record_state_changed ();
-    PBD::ScopedConnectionList _route_state_connections;
 };
 
 #endif /* __ardour_route_time_axis_h__ */
diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h
index b2076b0ebd..3ed7cdaacc 100644
--- a/gtk2_ardour/route_ui.h
+++ b/gtk2_ardour/route_ui.h
@@ -185,7 +185,7 @@ class RouteUI : public Gtk::EventBox, public WavesUI, public virtual AxisView
 	void mute_changed(void*);
 	void listen_changed(void*);
 	virtual void processors_changed (ARDOUR::RouteProcessorChange) {}
-	void route_rec_enable_changed();
+	virtual void route_rec_enable_changed();
 	void session_rec_enable_changed();
 
 	void build_solo_menu ();

From d5f73ee0acc2b2cafc299a0df5c2c061fdd82eeb Mon Sep 17 00:00:00 2001
From: nikolay <MPolianovskyi@wavesglobal.com>
Date: Fri, 12 Sep 2014 12:15:11 +0300
Subject: [PATCH 32/37] [Summary] Finished UI and some logic for timecode
 source drop down [Reviewed] GZharun

---
 gtk2_ardour/ardour_ui_ed.cc | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index cf31dbb9f3..70e6e38c6f 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -166,7 +166,18 @@ ARDOUR_UI::populate_timecode_source_dropdown ()
     if( !_session )
         return;
     
-    _timecode_source_dropdown->set_text (timecode_source[0]);
+    bool use_external_timecode_source = _session->config.get_external_sync ();
+    
+    if (use_external_timecode_source)
+    {
+        if ( Config->get_sync_source() == MTC )
+            _timecode_source_dropdown->set_text (timecode_source[1]);//"MTC"
+        else
+            _timecode_source_dropdown->set_text (timecode_source[2]);//"LTC"
+    } else
+    {
+        _timecode_source_dropdown->set_text (timecode_source[0]);//Internal
+    }
 }
 
 void
@@ -192,6 +203,19 @@ void
 ARDOUR_UI::on_timecode_source_dropdown_item_clicked (WavesDropdown* from_which, void* my_cookie)
 {
     string timecode_source = *((string*)my_cookie);
+    
+    if ( timecode_source == "Intermal" )
+    {
+        _session->config.set_external_sync (false);
+    } else if ( timecode_source == "MTC" )
+    {
+        Config->set_sync_source (MTC);
+        _session->config.set_external_sync (true);
+    } else if ( timecode_source == "LTC" )
+    {
+        Config->set_sync_source (LTC);
+        _session->config.set_external_sync (true);        
+    }
 }
 
 void

From 2600038032b26ddad88ddd3a16c91f7aeeb4165d Mon Sep 17 00:00:00 2001
From: VKamyshniy <VKamyshniy@wavesglobal.com>
Date: Fri, 12 Sep 2014 12:11:45 +0300
Subject: [PATCH 33/37] [Summary] Propagating expose to a child (if exists) of
 CairoWidget based object.

---
 libs/gtkmm2ext/cairo_widget.cc | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/libs/gtkmm2ext/cairo_widget.cc b/libs/gtkmm2ext/cairo_widget.cc
index ba14448b44..d600052bad 100644
--- a/libs/gtkmm2ext/cairo_widget.cc
+++ b/libs/gtkmm2ext/cairo_widget.cc
@@ -47,15 +47,15 @@ CairoWidget::on_expose_event (GdkEventExpose *ev)
 	cairo_clip (cr);
         
 	/* paint expose area the color of the parent window bg 
-         */
+     */
 	
-        if (get_visible_window ()) {
-                Gdk::Color bg (get_parent_bg());
+    if (get_visible_window ()) {
+        Gdk::Color bg (get_parent_bg());
                 
-                cairo_rectangle (cr, ev->area.x, ev->area.y, ev->area.width, ev->area.height);
-                cairo_set_source_rgb (cr, bg.get_red_p(), bg.get_green_p(), bg.get_blue_p());
-                cairo_fill (cr);
-        }
+        cairo_rectangle (cr, ev->area.x, ev->area.y, ev->area.width, ev->area.height);
+        cairo_set_source_rgb (cr, bg.get_red_p(), bg.get_green_p(), bg.get_blue_p());
+        cairo_fill (cr);
+    }
 
 	cairo_rectangle_t expose_area;
 	expose_area.x = ev->area.x;
@@ -67,6 +67,11 @@ CairoWidget::on_expose_event (GdkEventExpose *ev)
         
 	cairo_destroy (cr);
 
+	Gtk::Widget* child = get_child ();
+	if (child) {
+		propagate_expose (*child, ev);
+	}
+
 	return true;
 }
 

From 1ab0ad553235af44bc491c2ff42b3da55f74741a Mon Sep 17 00:00:00 2001
From: VKamyshniy <VKamyshniy@wavesglobal.com>
Date: Fri, 12 Sep 2014 12:47:41 +0300
Subject: [PATCH 34/37] [Summary] Colors, refined frm prd's mockups

---
 gtk2_ardour/icons/global_solo_button.png | Bin 529 -> 557 bytes
 gtk2_ardour/ui/session_dialog.xml        |  13 ++++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/gtk2_ardour/icons/global_solo_button.png b/gtk2_ardour/icons/global_solo_button.png
index 78cfc8ff9f40cd6c928fac4591237eb73932514a..bdac5523e62ef7b8ad045dd75849b68e9574a90e 100644
GIT binary patch
delta 472
zcmV;}0Vn>E1g!*+BrgGTQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000tn
z000tn0p4aGc#$?ge}+j!K~z{r?Uu2M!axv)|2q-ObVgr51dG&yjlM$~-@ztmWg&`H
zu+x{26oP#$(py*vmUf9YY9%Uq#|&AEySRt4g$MgJGrOCA_utuU$Va=~{=z?ijUEn%
zxcR<(#_{dZMpdJYszw`C&7a@VdcBTvxg58EAPC@j9!%3jf2-9(CX?a*^ZATkuLqh-
zjIGyej7B3K7szxnq!q2zYHV^m9;4A{px^J~bUNJ^qsg1iCLG7X@pweH+eM*Jh}FM&
zRYypT=5jfX)oPV1u-R-dola3ImAJiHt=RbGa=~miLn@VmWm&9A;#D0XHR}65PngYS
zF&GRm91c;be^l-p2*Z#gA#$qPBVN@JQlnHsIwCsu$z;NPRNei4&v`zd=SYa0G>?d)
zh~u+5LTc2uZ5W2Z`Et4B>h5+s%;$5?i^U=zWjdYa_xXCgVzF58^GS#~p4Ac3TmSRM
zZ?{{xuFH$jBArg>zLBI`Pi6!{d%N8p>SXBOJk@BU9;(qsRilln1^5Qq`s2^VVR&c&
O0000<MNUMnLSTa9VB=i?

delta 444
zcmV;t0Ym<+1d#-gBoYa5NLh0L01FcU01FcV0GgZ_kyAf^he<?1R7l6|mLY8GFc5~n
zJq?*Q)TJp6jcG!SgM(XG6ck!qTpS#lkOGHBDhsV?3QAnKp+@VrYMEB>D&^qG`u*Mg
zzLQ_FEPLY#;uYY0KL7Wi|9Fy^Kqt@%^pWf7r-<Vitu+AFT6Vh~ec$8zK1q_`c^&{|
zSyENiD4o84?<tCcuInBHDuh65&1SQ~T1%27L{UUpmZWJ)UDs4qg_M#sO>xcvAf==z
zib2QseWEC0yWP@t9ZD&d%O!c9)A#*jtiN6kP}eo5(+Q;%*4m+i)>@jTAqawRHI!1+
zbv<;@7(?5(chCR2qs}?<JV$Gd5CZ2M#uyfh#g|Th9FIrBFud!`$AYiL&1SR5fO?)s
z5Cnsbp69V%ui5YS!`r;Zd_L!Lx!f&S2yv5>QjW5Hl=aRzqA0@m{Xtv^!QpT~N=Y2Y
zLp}^cj4|Kpv~7E%qm&{D0-B~71^SX@+1pQ_lF!p!6a~hZyHl@}B1w`Pjn!)Pr>P$W
mIxYMk33LLTKqt`W2Ym;WT)6{1leE?V0000<MNUMnLSTXkd(gT7

diff --git a/gtk2_ardour/ui/session_dialog.xml b/gtk2_ardour/ui/session_dialog.xml
index 4727f67e4d..6de617532f 100644
--- a/gtk2_ardour/ui/session_dialog.xml
+++ b/gtk2_ardour/ui/session_dialog.xml
@@ -20,7 +20,7 @@
          fgnormal="#DDDDDD"
          fgactive="#DDDDDD"
          borderwidth="0 0 0 0"/>
-  <Layout bgnormal="#000000" width="451" height="252">
+  <Layout bgnormal="000000" width="451" height="252">
     <Layout bgnormal="#404040" x="1" y="1" width="449" height="250">
       <Button style="generic_button"
               id="new_session_button"
@@ -152,4 +152,15 @@
       </Layout>
     </Layout>
   </Layout>
+  <Layout height="50">
+    <Iconbutton id="engine_dropdown" bgnormal="#778797"
+              width="126"
+              height="50"
+              normalicon="preference_device_dropdown"
+              activeicon="preference_device_dropdown_active"
+              prelighticon="preference_device_dropdown_prelight"
+              inactiveicon="preference_device_dropdown_inactive">
+      <Label text="123456" vertalignment="bottom" horzalignment="end" height="50"/>
+    </Iconbutton>
+  </Layout>
 </Dialog>

From df46a583ec5e44b66d0b39d46e35845677f03a14 Mon Sep 17 00:00:00 2001
From: VKamyshniy <VKamyshniy@wavesglobal.com>
Date: Fri, 12 Sep 2014 14:09:57 +0300
Subject: [PATCH 35/37] [Summary] Refining image from PRD

---
 gtk2_ardour/icons/global_solo_button_active.png | Bin 603 -> 519 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/gtk2_ardour/icons/global_solo_button_active.png b/gtk2_ardour/icons/global_solo_button_active.png
index ced889cb37688648e79785afd08d9889ed13b5f7..8798b2622a65ba66dc670d762195e47e48fc4261 100644
GIT binary patch
delta 433
zcmV;i0Z#tg1cwBWBrgGTQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000tn
z000tn0p4aGc#$?ge_%;OK~z{rW4zsG{GVY60I);9KRFBK4qm_nr3XD2bttvLs6(j@
zMjc9RK+vJT!oD)RtApT=juuc+5J+P90u_hg^$fqDGBCL>I#4bOz^4y4!0%A8E{5+K
zcNsWma5D(4+r{wLb{4~TF^~kvvdIj84?8mmH38*-nE$Xce^88&rR3@(D(aOPerW?k
z@=74kU_A!TR}2h)9SeX4?_%KGe*&t8fq{Ad1O_$+H-_&hp^gg3)dvFj9r~(_f#>jD
zU`X!8jHWlY8JM9=2)M?;{07Rz2guY%FhrU6>p`Mv##EpMNIn-)W%vtWL4g*-UlAx1
zA0Sg7UWfj5cf5oM#aB1LA;J9m1U$OFge8GwzyMpcq62dEfdGNllLf=~ti251VLpB{
zm4Sa+88qr383U0Cb}{fY1p*xc0_bu;M*=etKiDz&^x+1h%{*#@QHN3+j5?IsVAP@1
b1q=)TA<eC@z+#TU00000NkvXXu0mjfY+$nT

delta 518
zcmV+h0{Q)i1lt6VBoYa5NLh0L01FcU01FcV0GgZ_kyAf^(Md!>R7l6|mcMJ;Kp2J}
zw}lwd$r7C^Z(g#bT3R7(t-u|ENIGe7Ah>iB)X>d;Kn6ie3Wg3IYG|RNg}RswF=+8%
zk)a^)5DeL*PN|h8u76DJCZfinrg$;vosPSgm*>0t?zr6h*`wdAfo`!T%0M&F3^W5>
zphCCK{>BM^`x_@bIsZa@ya~X#Sz-I~C|N6X>r3ZsUmh`TR#ppYnkJ6p(3-1+VTdX{
z2cTN5;`=_Wxr*aBXqra8T_fMFQTqNml`(EsFbso6qd{w~;&~pnZ6`&q1avZ)BxC=_
z2jV!U(5(|i5f|kH0Pel~itqa<in1_6*L6J4<L--pj{wYe4+(;RQf_B;pr3C)M%Q(=
zPT!&3-(xr&0x%klQob+@5k+xfh9C&3f&ro^y3zl)?)=LTA8%61?Qm9p1;Ed553ubw
z^m;ucN#g8^w^%GPolb8&6+sY~U73?*`C766y`$pOQw+mM8ejbN5J3<a3<k)uoLr#u
zx6jaNG>v}0zc42Vf>chvT|-e629r-qf##O^J&l_cEXzWYBmi93Wwv{GZNAg#a8W)W
z->zX<Rw|=4S1EMsn5LPujqAEe&#nYCd+;;R3^W7HK-VAi4_%|M3K1BulmGw#07*qo
IM6N<$f_LQZ3IG5A


From c3b18752e94d5fe0c36b738c63810c1d1aefdb77 Mon Sep 17 00:00:00 2001
From: VKamyshniy <VKamyshniy@wavesglobal.com>
Date: Fri, 12 Sep 2014 14:40:13 +0300
Subject: [PATCH 36/37] [Summary] For some unexplainable reason, in editor
 window all drop downs start with emitting signal_show with no following
 signal_hide. This required a trick to set_active(tru/false) more correct way.

---
 gtk2_ardour/waves_dropdown.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gtk2_ardour/waves_dropdown.cc b/gtk2_ardour/waves_dropdown.cc
index a36d9d0c39..fb547dc653 100644
--- a/gtk2_ardour/waves_dropdown.cc
+++ b/gtk2_ardour/waves_dropdown.cc
@@ -24,7 +24,6 @@ WavesDropdown::WavesDropdown (const std::string& title)
 {
 	signal_button_press_event().connect (sigc::mem_fun(*this, &WavesDropdown::on_mouse_pressed));
 	_menu.signal_hide ().connect (sigc::bind (sigc::mem_fun (*this, &CairoWidget::set_active), false));
-	_menu.signal_show ().connect (sigc::bind (sigc::mem_fun (*this, &CairoWidget::set_active), true));
 }
 
 WavesDropdown::~WavesDropdown ()
@@ -35,6 +34,7 @@ bool
 WavesDropdown::on_mouse_pressed (GdkEventButton*)
 {
 	_menu.popup (sigc::mem_fun(this, &WavesDropdown::_on_popup_menu_position), 1, gtk_get_current_event_time());
+	set_active (true);
 	return true;
 }
 

From e5c87df6cc4ebef877f5d0e002ce543f2a3f563f Mon Sep 17 00:00:00 2001
From: nikolay <MPolianovskyi@wavesglobal.com>
Date: Fri, 12 Sep 2014 14:47:29 +0300
Subject: [PATCH 37/37] [Summary] Revert of session_dialog.xml

---
 gtk2_ardour/ui/session_dialog.xml | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/gtk2_ardour/ui/session_dialog.xml b/gtk2_ardour/ui/session_dialog.xml
index 6de617532f..4727f67e4d 100644
--- a/gtk2_ardour/ui/session_dialog.xml
+++ b/gtk2_ardour/ui/session_dialog.xml
@@ -20,7 +20,7 @@
          fgnormal="#DDDDDD"
          fgactive="#DDDDDD"
          borderwidth="0 0 0 0"/>
-  <Layout bgnormal="000000" width="451" height="252">
+  <Layout bgnormal="#000000" width="451" height="252">
     <Layout bgnormal="#404040" x="1" y="1" width="449" height="250">
       <Button style="generic_button"
               id="new_session_button"
@@ -152,15 +152,4 @@
       </Layout>
     </Layout>
   </Layout>
-  <Layout height="50">
-    <Iconbutton id="engine_dropdown" bgnormal="#778797"
-              width="126"
-              height="50"
-              normalicon="preference_device_dropdown"
-              activeicon="preference_device_dropdown_active"
-              prelighticon="preference_device_dropdown_prelight"
-              inactiveicon="preference_device_dropdown_inactive">
-      <Label text="123456" vertalignment="bottom" horzalignment="end" height="50"/>
-    </Iconbutton>
-  </Layout>
 </Dialog>