From 50eb428c448b3eef25e6534d8c5a16908cba09c5 Mon Sep 17 00:00:00 2001
From: manu <manulanglois@free.fr>
Date: Mon, 21 Oct 2013 19:41:43 +0000
Subject: [PATCH] macro

---
 DMX-2.0/SeqLinUI.cs              |   2 -
 DMX-2.0/gtk-gui/DMX2.SeqLinUI.cs |   2 +-
 DMX-2.0/gtk-gui/gui.stetic       | 217 ++++++++++++++++---------------
 3 files changed, 111 insertions(+), 110 deletions(-)

diff --git a/DMX-2.0/SeqLinUI.cs b/DMX-2.0/SeqLinUI.cs
index 208d8a4..0ecc226 100644
--- a/DMX-2.0/SeqLinUI.cs
+++ b/DMX-2.0/SeqLinUI.cs
@@ -419,8 +419,6 @@ namespace DMX2
 		{
 			if (fullUpdFlag)return;
 			sequenceur.Master = (int)(seqMasterScale.Value);
-
-
 		}		
 
 
diff --git a/DMX-2.0/gtk-gui/DMX2.SeqLinUI.cs b/DMX-2.0/gtk-gui/DMX2.SeqLinUI.cs
index f3ac682..cb6593c 100644
--- a/DMX-2.0/gtk-gui/DMX2.SeqLinUI.cs
+++ b/DMX-2.0/gtk-gui/DMX2.SeqLinUI.cs
@@ -131,7 +131,7 @@ namespace DMX2
 			this.seqMasterScale.Adjustment.Upper = 100;
 			this.seqMasterScale.Adjustment.PageIncrement = 10;
 			this.seqMasterScale.Adjustment.StepIncrement = 1;
-			this.seqMasterScale.Adjustment.Value = 87;
+			this.seqMasterScale.Adjustment.Value = 100;
 			this.seqMasterScale.DrawValue = true;
 			this.seqMasterScale.Digits = 0;
 			this.seqMasterScale.ValuePos = ((global::Gtk.PositionType)(1));
diff --git a/DMX-2.0/gtk-gui/gui.stetic b/DMX-2.0/gtk-gui/gui.stetic
index d59c650..37a6afa 100644
--- a/DMX-2.0/gtk-gui/gui.stetic
+++ b/DMX-2.0/gtk-gui/gui.stetic
@@ -785,7 +785,7 @@
                             <property name="Upper">100</property>
                             <property name="PageIncrement">10</property>
                             <property name="StepIncrement">1</property>
-                            <property name="Value">87</property>
+                            <property name="Value">100</property>
                             <property name="DrawValue">True</property>
                             <property name="Digits">0</property>
                             <property name="ValuePos">Right</property>
@@ -1538,8 +1538,23 @@
       </widget>
     </child>
   </widget>
-  <widget class="Gtk.Bin" id="DMX2.SeqMacroUI" design-size="474 402">
+  <widget class="Gtk.Bin" id="DMX2.SeqMacroUI" design-size="511 468">
     <action-group name="Default">
+      <action id="closeAction">
+        <property name="Type">Toggle</property>
+        <property name="Label" translatable="yes"> </property>
+        <property name="ShortLabel" translatable="yes"> </property>
+        <property name="StockId">gtk-close</property>
+        <property name="DrawAsRadio">False</property>
+        <property name="Active">False</property>
+        <signal name="Activated" handler="OnCloseActionActivated" />
+      </action>
+      <action id="circuitsAction">
+        <property name="Type">Action</property>
+        <property name="Label" translatable="yes" />
+        <property name="StockId">circuits</property>
+        <signal name="Activated" handler="OnCircuitsActionActivated" />
+      </action>
       <action id="goForwardAction">
         <property name="Type">Action</property>
         <property name="Label" translatable="yes" />
@@ -1560,33 +1575,13 @@
         <property name="Label" translatable="yes" />
         <property name="StockId">gtk-media-next</property>
       </action>
-      <action id="closeAction">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes"> </property>
-        <property name="ShortLabel" translatable="yes">_</property>
-        <property name="StockId">gtk-close</property>
-      </action>
-      <action id="circuitsAction">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes" />
-        <property name="StockId">circuits</property>
-      </action>
-      <action id="addAction">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes" />
-        <property name="StockId">gtk-add</property>
-      </action>
-      <action id="removeAction">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes" />
-        <property name="StockId">gtk-remove</property>
-      </action>
     </action-group>
     <property name="MemberName" />
+    <property name="Visible">False</property>
     <child>
       <widget class="Gtk.Frame" id="frame1">
         <property name="MemberName" />
-        <property name="ShadowType">In</property>
+        <property name="ShadowType">None</property>
         <child>
           <widget class="Gtk.Alignment" id="GtkAlignment">
             <property name="MemberName" />
@@ -1594,25 +1589,52 @@
             <property name="Yalign">0</property>
             <property name="LeftPadding">12</property>
             <child>
-              <widget class="Gtk.VBox" id="vbox2">
+              <widget class="Gtk.Alignment" id="alignment1">
                 <property name="MemberName" />
-                <property name="Spacing">6</property>
                 <child>
-                  <widget class="Gtk.HBox" id="hbox146">
+                  <widget class="Gtk.VBox" id="vbox2">
                     <property name="MemberName" />
                     <property name="Spacing">6</property>
                     <child>
-                      <widget class="Gtk.VBox" id="vbox3">
+                      <widget class="Gtk.HBox" id="hbox1">
                         <property name="MemberName" />
                         <property name="Spacing">6</property>
                         <child>
-                          <widget class="Gtk.HBox" id="hbox2">
+                          <widget class="Gtk.VBox" id="vbox3">
                             <property name="MemberName" />
-                            <property name="Spacing">6</property>
                             <child>
-                              <widget class="Gtk.Label" id="posLabel">
+                              <widget class="Gtk.HBox" id="hbox2">
                                 <property name="MemberName" />
-                                <property name="LabelProp" translatable="yes">n° 0</property>
+                                <property name="Spacing">6</property>
+                                <child>
+                                  <widget class="Gtk.Label" id="posLabel">
+                                    <property name="MemberName" />
+                                    <property name="Xpad">10</property>
+                                    <property name="LabelProp" translatable="yes">&lt;big&gt;n° 0&lt;/big&gt;</property>
+                                    <property name="UseMarkup">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="Position">0</property>
+                                    <property name="AutoSize">True</property>
+                                    <property name="Expand">False</property>
+                                    <property name="Fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="Gtk.Label" id="label56">
+                                    <property name="MemberName" />
+                                    <property name="Xpad">10</property>
+                                    <property name="LabelProp" translatable="yes">&lt;big&gt;00.0&lt;/big&gt;</property>
+                                    <property name="UseMarkup">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="PackType">End</property>
+                                    <property name="Position">1</property>
+                                    <property name="AutoSize">True</property>
+                                    <property name="Expand">False</property>
+                                    <property name="Fill">False</property>
+                                  </packing>
+                                </child>
                               </widget>
                               <packing>
                                 <property name="Position">0</property>
@@ -1622,18 +1644,54 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="Gtk.Label" id="label3">
+                              <widget class="Gtk.HScale" id="seqMasterScale">
                                 <property name="MemberName" />
-                                <property name="LabelProp" translatable="yes">0.00</property>
+                                <property name="CanFocus">True</property>
+                                <property name="Upper">100</property>
+                                <property name="PageIncrement">10</property>
+                                <property name="StepIncrement">1</property>
+                                <property name="Value">100</property>
+                                <property name="DrawValue">True</property>
+                                <property name="Digits">0</property>
+                                <property name="ValuePos">Right</property>
                               </widget>
                               <packing>
-                                <property name="PackType">End</property>
                                 <property name="Position">1</property>
                                 <property name="AutoSize">True</property>
                                 <property name="Expand">False</property>
                                 <property name="Fill">False</property>
                               </packing>
                             </child>
+                            <child>
+                              <widget class="Gtk.ProgressBar" id="pbTrans">
+                                <property name="MemberName" />
+                                <property name="HeightRequest">15</property>
+                              </widget>
+                              <packing>
+                                <property name="Position">2</property>
+                                <property name="AutoSize">True</property>
+                                <property name="Expand">False</property>
+                                <property name="Fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="Gtk.Toolbar" id="toolbar2">
+                                <property name="MemberName" />
+                                <property name="ShowArrow">False</property>
+                                <node name="__gtksharp_66_Stetic_Editor_ActionToolbar" type="Toolbar">
+                                  <node type="Toolitem" action="goForwardAction" />
+                                  <node type="Toolitem" action="goBackAction" />
+                                  <node type="Toolitem" action="mediaPauseAction" />
+                                  <node type="Toolitem" action="mediaNextAction" />
+                                </node>
+                              </widget>
+                              <packing>
+                                <property name="Position">3</property>
+                                <property name="AutoSize">True</property>
+                                <property name="Expand">False</property>
+                                <property name="Fill">False</property>
+                              </packing>
+                            </child>
                           </widget>
                           <packing>
                             <property name="Position">0</property>
@@ -1642,52 +1700,21 @@
                             <property name="Fill">False</property>
                           </packing>
                         </child>
-                        <child>
-                          <widget class="Gtk.HScale" id="hscale1">
-                            <property name="MemberName" />
-                            <property name="CanFocus">True</property>
-                            <property name="Upper">100</property>
-                            <property name="PageIncrement">10</property>
-                            <property name="StepIncrement">1</property>
-                            <property name="Value">100</property>
-                            <property name="DrawValue">True</property>
-                            <property name="Digits">0</property>
-                            <property name="ValuePos">Right</property>
-                          </widget>
-                          <packing>
-                            <property name="Position">1</property>
-                            <property name="AutoSize">True</property>
-                            <property name="Expand">False</property>
-                            <property name="Fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="Gtk.ProgressBar" id="progressbar1">
-                            <property name="MemberName" />
-                          </widget>
-                          <packing>
-                            <property name="Position">2</property>
-                            <property name="AutoSize">True</property>
-                            <property name="Expand">False</property>
-                            <property name="Fill">False</property>
-                          </packing>
-                        </child>
                         <child>
                           <widget class="Gtk.Toolbar" id="toolbar1">
                             <property name="MemberName" />
+                            <property name="Orientation">Vertical</property>
                             <property name="ShowArrow">False</property>
-                            <node name="toolbar1" type="Toolbar">
-                              <node type="Toolitem" action="goForwardAction" />
-                              <node type="Toolitem" action="goBackAction" />
-                              <node type="Toolitem" action="mediaPauseAction" />
-                              <node type="Toolitem" action="mediaNextAction" />
-                              <node type="Toolitem" action="addAction" />
-                              <node type="Toolitem" action="removeAction" />
+                            <property name="ButtonStyle">Icons</property>
+                            <property name="IconSize">SmallToolbar</property>
+                            <node name="__gtksharp_66_Stetic_Editor_ActionToolbar" type="Toolbar">
+                              <node type="Toolitem" action="closeAction" />
+                              <node type="Toolitem" action="circuitsAction" />
                             </node>
                           </widget>
                           <packing>
                             <property name="PackType">End</property>
-                            <property name="Position">3</property>
+                            <property name="Position">1</property>
                             <property name="AutoSize">True</property>
                             <property name="Expand">False</property>
                             <property name="Fill">False</property>
@@ -1702,54 +1729,30 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="Gtk.Toolbar" id="toolbar2">
+                      <widget class="Gtk.ScrolledWindow" id="scrolledwindow1">
                         <property name="MemberName" />
-                        <property name="Orientation">Vertical</property>
-                        <property name="ShowArrow">False</property>
-                        <node name="toolbar2" type="Toolbar">
-                          <node type="Toolitem" action="closeAction" />
-                          <node type="Toolitem" action="circuitsAction" />
-                        </node>
+                        <property name="CanFocus">True</property>
+                        <property name="ShadowType">In</property>
+                        <child>
+                          <widget class="Gtk.TreeView" id="MatriceUI">
+                            <property name="MemberName" />
+                            <property name="CanFocus">True</property>
+                          </widget>
+                        </child>
                       </widget>
                       <packing>
-                        <property name="PackType">End</property>
                         <property name="Position">1</property>
                         <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
                       </packing>
                     </child>
                   </widget>
-                  <packing>
-                    <property name="Position">0</property>
-                    <property name="AutoSize">True</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.ScrolledWindow" id="scrolledwindow5">
-                    <property name="MemberName" />
-                    <property name="CanFocus">True</property>
-                    <property name="ShadowType">In</property>
-                    <child>
-                      <widget class="Gtk.TreeView" id="MatriceUI">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                      </widget>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="Position">1</property>
-                    <property name="AutoSize">True</property>
-                  </packing>
                 </child>
               </widget>
             </child>
           </widget>
         </child>
         <child>
-          <widget class="Gtk.Label" id="GtkLabel3">
+          <widget class="Gtk.Label" id="titreLabel">
             <property name="MemberName" />
             <property name="LabelProp" translatable="yes">Séquenceur Macro</property>
             <property name="UseMarkup">True</property>