From c57a9e6ec500f7b934e7d87faa5858c452e4eb93 Mon Sep 17 00:00:00 2001
From: VKamyshniy <VKamyshniy@wavesglobal.com>
Date: Mon, 22 Sep 2014 19:23:26 +0300
Subject: [PATCH] [Summary] Progressing UI to choose MIDI in and MIDI Out for
 markers.

---
 gtk2_ardour/icons/marker_label.png | Bin 0 -> 1349 bytes
 gtk2_ardour/ui/editor_window.xml   |  10 ++++------
 2 files changed, 4 insertions(+), 6 deletions(-)
 create mode 100644 gtk2_ardour/icons/marker_label.png

diff --git a/gtk2_ardour/icons/marker_label.png b/gtk2_ardour/icons/marker_label.png
new file mode 100644
index 0000000000000000000000000000000000000000..d16fcdf02b7d34503f9f880dc2bc5cef19e392d2
GIT binary patch
literal 1349
zcmeAS@N?(olHy`uVBq!ia0vp^MnEjU!2~34TkgIMq$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~;1FfeCihD4M^`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$9vzP@mS^NOJX1q?F%io^naLp=li++2{qz^aQ&f>IIAz^b}9q_QAY
zKPa_0zqBYB7$0fMFwMZQ!*3BtA<#8e{zaL<NJ-3b$xklLP0cIubg@+e%IKwJrdS!6
zS{N7_nwuDy8yT2c7#dm{8dy3T8=D(D8e6yl0~TfmHoeAfZsrDVriR9jrf!CYt|pFd
zZkBG2PR=eC7H-a#rf|KUdBr7(dC93TdozLdLiHNp)obNkl$uzQUlfv`p94z)0U7xv
z`NbLe1q#l=rh0}7zKO}1c_0x`1VQ}kl3J8mmYU*Ll%J~r4q>ZIEG{rGM)kR)xuuJv
zk*S-JnSr^fkvY)y5WOkngql9kG5Vn7fs|ZeLclZ#V!{(YkOR*?sd>OWQv}Q$nJyac
z3=E9Lo-U3d6}R4mF6?U#5XjM=9>BiJqQEt<ohAIZ`jy1r-WEFX4zheQp$%EGp$l&9
znq4yKEVuiuS>Cg}-6!0w-JRclQ}s;w?z?aPelV@}uF3ez9Cd%c^X<20o|8PUZ_B-G
z(!FTG>)&?0N0SPz=Dyl>O!LmV*B@fmU#|!Y6>WQHz;nh%hOhR%H%qHW!aw1tUF#mZ
zrF_oXQM4s$t%+~&<j*$C8~t9io0SA|%+_aMo8-1)qDI#vi#j_OflWHyW;~ymc@FQ0
zTc3M7s7)|$`|KM&0)g_*x;0D0f*l_f?Ob8H?)52-6QWK<eIlHj4@{ZJwmnly)1_d^
zIv0a4n{?urwuYSPX1jGlG^xSl$4MQ7n`hGwU;g})XRgEE-OLjof3%QV<WkW8yfWg{
z^nET{V(u|E3mz|2aHw;iwd_#nm8nbBrs|wlc#<KgE}du?7u3zW!Fd&T*QaBLLRVaP
z_KEZ2-#U2~#vdowJoOIYRyX|rN7#PLKMs2)9)^%*FSg#3E!hkz*gReRT-G@yGywpB
C+S$Ya

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/ui/editor_window.xml b/gtk2_ardour/ui/editor_window.xml
index 9d7c8cc434..747f7b93d4 100644
--- a/gtk2_ardour/ui/editor_window.xml
+++ b/gtk2_ardour/ui/editor_window.xml
@@ -371,18 +371,16 @@
                                   height="16"
                                   normalicon="marker_button"
                                   ui.orphan="true"/>
-                      <Label text="MARKER"
-                             width="50"
-                             height="15"
-                             winfont ="Arial 8"
-                             macfont ="Helvetica 8"/>
+                      <Icon source="marker_label.png"/>
                       <EventBox width="1"
                                 bgnormal="#424242"/>
                       <Dropdown id="midi_input_dropdown"
                                 width="65"
                                 height="16"
                                 normalicon="marker_midi_dropdown"
-                                activeicon="marker_midi_dropdown_active">
+                                activeicon="marker_midi_dropdown_active"
+                                winfont ="Arial 8"
+                                macfont ="Helvetica 8">
                         <HBox>
                           <!--
                           The following three icons should be shown/hidden according to the