tzim/loupiottes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Coloration des tirettes modifiées, et en transition

Browse source
This commit is contained in:
tzim 2013-11-06 10:38:14 +00:00
parent c7c2c50490
commit a37fefb9d7
9 changed files with 163 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
DMX-2.0/MainWindow.cs
View file

@ -23,7 +23,6 @@ namespace DMX2
win=this;
Build ();
MajWidgets();
defStyle= this.Style;
}
@ -467,7 +466,7 @@ namespace DMX2
if(sequi != null) sequi.Update(fullUpdateFlag);
}
MajCircuits(fullUpdateFlag);
timeLabel.LabelProp = string.Format (@"<big>{0:0\.0}</big>", Conduite.Courante.SequenceurMaitre.TimeStamp.TotalMilliseconds / 100);
timeLabel.LabelProp = string.Format (@"{0:0\.0}", Conduite.Courante.SequenceurMaitre.TimeStamp.TotalMilliseconds / 100);
if(fullUpdateFlag) ConstruitMatriceSeqColumns();
if( Conduite.Courante.SequenceurMaitre.EffetChange() )MatriceUI.QueueDraw();
fullUpdateFlag=false;
@ -591,8 +590,6 @@ namespace DMX2
ChangeMatriceCouleur();
}
Style defStyle;
void ChangeMatriceCouleur ()
{
if (Conduite.Courante.BlackOut) {
@ -612,10 +609,20 @@ namespace DMX2
return;
}
evInfo.ModifyBg (Gtk.StateType.Normal, defStyle.Background(StateType.Normal) );
evInfo.ModifyBg (Gtk.StateType.Normal, this.Style.Background(StateType.Normal) );
}
protected void OnSelectColorActionActivated (object sender, EventArgs e)
{
if(System.IO.File.Exists("style.gtkrc")) Gtk.Rc.Parse("style.gtkrc");
else
using (System.IO.Stream stream = System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream("style.gtkrc"))
using (System.IO.TextReader reader = new System.IO.StreamReader(stream))
Gtk.Rc.ParseString (reader.ReadToEnd());
this.ResetRcStyles();
}
}
}

15
DMX-2.0/SeqLinUI.cs
View file

@ -180,7 +180,7 @@ namespace DMX2
if (fullUpdFlag || full)
FullUpdate ();
UpdateValues ();
timeLabel.LabelProp = string.Format (@"<big>{0:0\.0}</big>", sequenceur.TimeStamp.TotalMilliseconds / 100);
timeLabel.LabelProp = string.Format (@"{0:0\.0}", sequenceur.TimeStamp.TotalMilliseconds / 100);
if (sequenceur.EffetCourrant.Duree != TimeSpan.Zero)
pbDuree.Fraction = Math.Min (1.0d, sequenceur.TimeStamp.TotalMilliseconds / sequenceur.EffetCourrant.Duree.TotalMilliseconds);
@ -237,6 +237,7 @@ namespace DMX2
tirette.Adjustment.StepIncrement = 1;
tirette.DrawValue = true;
tirette.Digits = 0;
tirette.Name = "sclTirette";
return tirette;
}
@ -249,6 +250,7 @@ namespace DMX2
l.Yalign = 0F;
l.UseMarkup = true;
l.Angle = 65;
l.Name = "lblTirette";
return l;
}
@ -284,13 +286,15 @@ namespace DMX2
tirette.Show();
tirette.ValueChanged += TiretteActionee;
tirette.Data.Add(circuitKey,c);
tirette.TooltipText = c.Name;
label = NouveauLabel();
zoneWid.Add(label);
fx = ( zoneWid[label] as Fixed.FixedChild);
fx.X = xpos-30;
fx.Y = ypos+150;
label.LabelProp = "<small>"+c.ID + "-" + c.ShortName + "</small>";
label.LabelProp = string.Format( "{0}-{1}", c.ID, c.ShortName);
label.Show();
xpos+=30;
@ -322,6 +326,13 @@ namespace DMX2
updating = true;
foreach (Circuit c in tirettes.Keys) {
tirettes[c].Value = sequenceur.ValeurBruteCircuit(c);
if(sequenceur.EstChange(c))
tirettes[c].Name="sclTiretteC";
else if (sequenceur.EnTransition(c))
tirettes[c].Name="sclTiretteT";
else
tirettes[c].Name="sclTirette";
}
updating=false;
}

6
DMX-2.0/SeqMacroUI.cs
View file

@ -243,7 +243,7 @@ namespace DMX2
if (fullUpdFlag || full)
FullUpdate ();
// UpdateValues (); inutil dans le contexte
timeLabel.LabelProp = string.Format (@"<big>{0:0\.0}</big>", sequenceur.TimeStamp.TotalMilliseconds / 100);
timeLabel.LabelProp = string.Format (@"{0:0\.0}", sequenceur.TimeStamp.TotalMilliseconds / 100);
/*if (sequenceur.EffetCourrant.Duree != TimeSpan.Zero)
pbDuree.Fraction = Math.Min (1.0d, sequenceur.TimeStamp.TotalMilliseconds / sequenceur.EffetCourrant.Duree.TotalMilliseconds);
@ -292,10 +292,10 @@ namespace DMX2
fullUpdFlag = true;
foreach (Circuit c in sequenceur.Circuits) {
/*foreach (Circuit c in sequenceur.Circuits) {
}
}*/
seqMasterScale.Value = sequenceur.Master;

5
DMX-2.0/SequenceurLineaire.cs
View file

@ -213,6 +213,11 @@ namespace DMX2
return valeurschangees.ContainsKey (c);
}
public bool EnTransition (Circuit c)
{
if(!enTransition) return false ;
return valeurscourantes [c] != effetcourrant [c];
}
bool paused=false;
public bool Paused {

38
DMX-2.0/gtk-gui/DMX2.MainWindow.cs
View file

@ -22,6 +22,7 @@ namespace DMX2
private global::Gtk.Action universAction;
private global::Gtk.Action connectAction;
private global::Gtk.Action seqMacroAction;
private global::Gtk.Action selectColorAction;
private global::Gtk.VBox vbox1;
private global::Gtk.HBox hbox1;
private global::Gtk.VBox vbox2;
@ -55,24 +56,24 @@ namespace DMX2
// Widget DMX2.MainWindow
this.UIManager = new global::Gtk.UIManager ();
global::Gtk.ActionGroup w1 = new global::Gtk.ActionGroup ("Default");
this.openAction = new global::Gtk.Action ("openAction", global::Mono.Unix.Catalog.GetString ("_Ouvrir"), null, "gtk-open");
this.openAction = new global::Gtk.Action ("openAction", global::Mono.Unix.Catalog.GetString ("_Ouvrir"), global::Mono.Unix.Catalog.GetString ("Ouvrir"), "gtk-open");
this.openAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("_Ouvrir");
w1.Add (this.openAction, null);
this.saveAction = new global::Gtk.Action ("saveAction", null, null, "gtk-save");
this.saveAction = new global::Gtk.Action ("saveAction", null, global::Mono.Unix.Catalog.GetString ("Enregistrer"), "gtk-save");
this.saveAction.Sensitive = false;
w1.Add (this.saveAction, null);
this.saveAsAction = new global::Gtk.Action ("saveAsAction", null, null, "gtk-save-as");
this.saveAsAction = new global::Gtk.Action ("saveAsAction", null, global::Mono.Unix.Catalog.GetString ("Enregistrer sous ..."), "gtk-save-as");
this.saveAsAction.Sensitive = false;
w1.Add (this.saveAsAction, null);
this.quitAction = new global::Gtk.Action ("quitAction", null, null, "gtk-quit");
this.quitAction = new global::Gtk.Action ("quitAction", null, global::Mono.Unix.Catalog.GetString ("Quitter"), "gtk-quit");
w1.Add (this.quitAction, null);
this.closeAction = new global::Gtk.Action ("closeAction", null, null, "gtk-close");
this.closeAction = new global::Gtk.Action ("closeAction", null, global::Mono.Unix.Catalog.GetString ("Fermer"), "gtk-close");
this.closeAction.Sensitive = false;
w1.Add (this.closeAction, null);
this.TestAction = new global::Gtk.Action ("TestAction", global::Mono.Unix.Catalog.GetString ("Test"), null, null);
this.TestAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("Test");
w1.Add (this.TestAction, null);
this.circAction = new global::Gtk.Action ("circAction", global::Mono.Unix.Catalog.GetString ("Circuits"), null, "circuits");
this.circAction = new global::Gtk.Action ("circAction", global::Mono.Unix.Catalog.GetString ("Gestion des Circuits"), global::Mono.Unix.Catalog.GetString ("Gestion des Circuits"), "circuits");
this.circAction.Sensitive = false;
this.circAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("Circuits");
w1.Add (this.circAction, null);
@ -82,30 +83,33 @@ namespace DMX2
this.FichierAction = new global::Gtk.Action ("FichierAction", global::Mono.Unix.Catalog.GetString ("_Fichier"), null, null);
this.FichierAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("_Fichier");
w1.Add (this.FichierAction, null);
this.newAction = new global::Gtk.Action ("newAction", null, null, "gtk-new");
this.newAction = new global::Gtk.Action ("newAction", null, global::Mono.Unix.Catalog.GetString ("Nouvelle Conduite"), "gtk-new");
w1.Add (this.newAction, null);
this.seqLinAction = new global::Gtk.Action ("seqLinAction", null, null, "tirettes");
this.seqLinAction = new global::Gtk.Action ("seqLinAction", global::Mono.Unix.Catalog.GetString ("Ajout Sequenceur"), global::Mono.Unix.Catalog.GetString ("Ajouter un sequenceur lineraire"), "tirettes");
this.seqLinAction.Sensitive = false;
this.seqLinAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("Ajout Sequenceur");
w1.Add (this.seqLinAction, null);
this.fullscreenAction = new global::Gtk.Action ("fullscreenAction", global::Mono.Unix.Catalog.GetString ("_Plein écran"), null, "gtk-fullscreen");
this.fullscreenAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("_Plein écran");
w1.Add (this.fullscreenAction, null);
this.fullscreenAction1 = new global::Gtk.Action ("fullscreenAction1", global::Mono.Unix.Catalog.GetString ("_Plein écran"), null, "gtk-fullscreen");
this.fullscreenAction1 = new global::Gtk.Action ("fullscreenAction1", global::Mono.Unix.Catalog.GetString ("_Plein écran"), global::Mono.Unix.Catalog.GetString ("Plein Ecran"), "gtk-fullscreen");
this.fullscreenAction1.ShortLabel = global::Mono.Unix.Catalog.GetString ("_Plein écran");
w1.Add (this.fullscreenAction1, null);
this.showAllAction = new global::Gtk.Action ("showAllAction", global::Mono.Unix.Catalog.GetString ("ShowAll"), null, "gtk-refresh");
this.showAllAction = new global::Gtk.Action ("showAllAction", global::Mono.Unix.Catalog.GetString ("ShowAll"), global::Mono.Unix.Catalog.GetString ("Tout réafficher"), "gtk-refresh");
this.showAllAction.Sensitive = false;
this.showAllAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("ShowAll");
w1.Add (this.showAllAction, null);
this.universAction = new global::Gtk.Action ("universAction", global::Mono.Unix.Catalog.GetString ("Univers"), null, "gtk-execute");
this.universAction = new global::Gtk.Action ("universAction", global::Mono.Unix.Catalog.GetString ("Univers"), global::Mono.Unix.Catalog.GetString ("Gestion des Univers"), "gtk-execute");
this.universAction.Sensitive = false;
this.universAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("Univers");
w1.Add (this.universAction, null);
this.connectAction = new global::Gtk.Action ("connectAction", null, null, "gtk-connect");
this.connectAction = new global::Gtk.Action ("connectAction", null, global::Mono.Unix.Catalog.GetString ("Connecter d'un boitier"), "gtk-connect");
w1.Add (this.connectAction, null);
this.seqMacroAction = new global::Gtk.Action ("seqMacroAction", null, null, "gtk-index");
this.seqMacroAction = new global::Gtk.Action ("seqMacroAction", null, global::Mono.Unix.Catalog.GetString ("Ajouter un sequenceur macro"), "gtk-index");
this.seqMacroAction.Sensitive = false;
w1.Add (this.seqMacroAction, null);
this.selectColorAction = new global::Gtk.Action ("selectColorAction", null, global::Mono.Unix.Catalog.GetString ("Recharger le theme"), "gtk-select-color");
w1.Add (this.selectColorAction, null);
this.UIManager.InsertActionGroup (w1, 0);
this.AddAccelGroup (this.UIManager.AccelGroup);
this.Name = "DMX2.MainWindow";
@ -174,6 +178,7 @@ namespace DMX2
w19.Fill = false;
// Container child vbox2.Gtk.Box+BoxChild
this.btnAjoutLigne = new global::Gtk.Button ();
this.btnAjoutLigne.TooltipMarkup = "Ajoute ligne sous\ncelle selectionnée";
this.btnAjoutLigne.CanFocus = true;
this.btnAjoutLigne.Name = "btnAjoutLigne";
this.btnAjoutLigne.UseUnderline = true;
@ -198,6 +203,7 @@ namespace DMX2
w28.Fill = false;
// Container child vbox2.Gtk.Box+BoxChild
this.btnRetireLigne = new global::Gtk.Button ();
this.btnRetireLigne.TooltipMarkup = "Retire la ligne selectionnée";
this.btnRetireLigne.CanFocus = true;
this.btnRetireLigne.Name = "btnRetireLigne";
this.btnRetireLigne.UseUnderline = true;
@ -222,6 +228,7 @@ namespace DMX2
w37.Fill = false;
// Container child vbox2.Gtk.Box+BoxChild
this.btnBlackOut = new global::Gtk.ToggleButton ();
this.btnBlackOut.TooltipMarkup = "Blackout";
this.btnBlackOut.CanFocus = true;
this.btnBlackOut.Name = "btnBlackOut";
this.btnBlackOut.UseUnderline = true;
@ -246,6 +253,7 @@ namespace DMX2
w46.Fill = false;
// Container child vbox2.Gtk.Box+BoxChild
this.btnPause = new global::Gtk.ToggleButton ();
this.btnPause.TooltipMarkup = "Pause";
this.btnPause.CanFocus = true;
this.btnPause.Name = "btnPause";
this.btnPause.UseUnderline = true;
@ -287,6 +295,7 @@ namespace DMX2
w57.Fill = false;
// Container child vbox2.Gtk.Box+BoxChild
this.masterScale = new global::Gtk.VScale (null);
this.masterScale.TooltipMarkup = "Master";
this.masterScale.HeightRequest = 75;
this.masterScale.Name = "masterScale";
this.masterScale.Inverted = true;
@ -404,7 +413,7 @@ namespace DMX2
global::Gtk.Box.BoxChild w74 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.evInfo]));
w74.Position = 1;
// Container child hbox4.Gtk.Box+BoxChild
this.UIManager.AddUiFromString ("<ui><toolbar name='toolbar8'><toolitem name='newAction' action='newAction'/><toolitem name='openAction' action='openAction'/><toolitem name='saveAction' action='saveAction'/><toolitem name='saveAsAction' action='saveAsAction'/><toolitem name='closeAction' action='closeAction'/><toolitem name='quitAction' action='quitAction'/></toolbar></ui>");
this.UIManager.AddUiFromString ("<ui><toolbar name='toolbar8'><toolitem name='newAction' action='newAction'/><toolitem name='openAction' action='openAction'/><toolitem name='saveAction' action='saveAction'/><toolitem name='saveAsAction' action='saveAsAction'/><toolitem name='closeAction' action='closeAction'/><toolitem name='selectColorAction' action='selectColorAction'/><toolitem name='quitAction' action='quitAction'/></toolbar></ui>");
this.toolbar8 = ((global::Gtk.Toolbar)(this.UIManager.GetWidget ("/toolbar8")));
this.toolbar8.Name = "toolbar8";
this.toolbar8.ShowArrow = false;
@ -440,6 +449,7 @@ namespace DMX2
this.universAction.Activated += new global::System.EventHandler (this.OnUniversActionActivated);
this.connectAction.Activated += new global::System.EventHandler (this.OnConnectActionActivated);
this.seqMacroAction.Activated += new global::System.EventHandler (this.OnSeqMacroActionActivated);
this.selectColorAction.Activated += new global::System.EventHandler (this.OnSelectColorActionActivated);
this.btnGo.Clicked += new global::System.EventHandler (this.OnBtnGoClicked);
this.btnGoBack.Clicked += new global::System.EventHandler (this.OnBtnGoBackClicked);
this.btnAjoutLigne.Clicked += new global::System.EventHandler (this.OnBtnAjoutLigneClicked);

8
DMX-2.0/gtk-gui/DMX2.SeqLinUI.cs
View file

@ -51,9 +51,9 @@ namespace DMX2
w2.Add (this.goForwardAction, null);
this.applyAction = new global::Gtk.Action ("applyAction", null, global::Mono.Unix.Catalog.GetString ("Ecrase l'effet selectionné."), "gtk-apply");
w2.Add (this.applyAction, null);
this.mediaPauseAction = new global::Gtk.Action ("mediaPauseAction", null, null, "gtk-media-pause");
this.mediaPauseAction = new global::Gtk.Action ("mediaPauseAction", null, global::Mono.Unix.Catalog.GetString ("Pause"), "gtk-media-pause");
w2.Add (this.mediaPauseAction, null);
this.mediaNextAction = new global::Gtk.Action ("mediaNextAction", null, null, "gtk-media-next");
this.mediaNextAction = new global::Gtk.Action ("mediaNextAction", null, global::Mono.Unix.Catalog.GetString ("Fin de transition"), "gtk-media-next");
w2.Add (this.mediaNextAction, null);
this.saveAction = new global::Gtk.Action ("saveAction", null, global::Mono.Unix.Catalog.GetString ("Enregistre l'effet à la fin."), "gtk-save");
w2.Add (this.saveAction, null);
@ -61,11 +61,11 @@ namespace DMX2
w2.Add (this.saveAfterAction, null);
this.deleteAction = new global::Gtk.Action ("deleteAction", null, global::Mono.Unix.Catalog.GetString ("Supprime l'effet selectionné."), "gtk-delete");
w2.Add (this.deleteAction, null);
this.moveUpAction = new global::Gtk.Action ("moveUpAction", null, null, "gtk-go-up");
this.moveUpAction = new global::Gtk.Action ("moveUpAction", null, "", "gtk-go-up");
w2.Add (this.moveUpAction, null);
this.moveDownAction = new global::Gtk.Action ("moveDownAction", null, null, "gtk-go-down");
w2.Add (this.moveDownAction, null);
this.circuitsAction = new global::Gtk.Action ("circuitsAction", null, null, "circuits");
this.circuitsAction = new global::Gtk.Action ("circuitsAction", null, global::Mono.Unix.Catalog.GetString ("Association des circuits\nau sequenceur"), "circuits");
w2.Add (this.circuitsAction, null);
this.closeAction = new global::Gtk.Action ("closeAction", null, null, "gtk-close");
w2.Add (this.closeAction, null);

2
DMX-2.0/gtk-gui/DMX2.SeqMacroUI.cs
View file

@ -43,7 +43,7 @@ namespace DMX2
this.closeAction = new global::Gtk.ToggleAction ("closeAction", global::Mono.Unix.Catalog.GetString (" "), null, "gtk-close");
this.closeAction.ShortLabel = global::Mono.Unix.Catalog.GetString (" ");
w2.Add (this.closeAction, null);
this.circuitsAction = new global::Gtk.Action ("circuitsAction", null, null, "circuits");
this.circuitsAction = new global::Gtk.Action ("circuitsAction", null, global::Mono.Unix.Catalog.GetString ("Association des circuits\nau sequenceur"), "circuits");
w2.Add (this.circuitsAction, null);
this.goForwardAction = new global::Gtk.Action ("goForwardAction", null, null, "gtk-go-forward");
w2.Add (this.goForwardAction, null);

41
DMX-2.0/gtk-gui/gui.stetic
View file

@ -69,6 +69,7 @@
<property name="Label" translatable="yes">_Ouvrir</property>
<property name="ShortLabel" translatable="yes">_Ouvrir</property>
<property name="StockId">gtk-open</property>
<property name="Tooltip" translatable="yes">Ouvrir</property>
<signal name="Activated" handler="OnOpenActionActivated" />
</action>
<action id="saveAction">
@ -76,6 +77,7 @@
<property name="Label" translatable="yes" />
<property name="Sensitive">False</property>
<property name="StockId">gtk-save</property>
<property name="Tooltip" translatable="yes">Enregistrer</property>
<signal name="Activated" handler="OnSaveActionActivated" />
</action>
<action id="saveAsAction">
@ -83,12 +85,14 @@
<property name="Label" translatable="yes" />
<property name="Sensitive">False</property>
<property name="StockId">gtk-save-as</property>
<property name="Tooltip" translatable="yes">Enregistrer sous ...</property>
<signal name="Activated" handler="OnSaveAsActionActivated" />
</action>
<action id="quitAction">
<property name="Type">Action</property>
<property name="Label" translatable="yes" />
<property name="StockId">gtk-quit</property>
<property name="Tooltip" translatable="yes">Quitter</property>
<signal name="Activated" handler="OnQuitActionActivated" />
</action>
<action id="closeAction">
@ -96,6 +100,7 @@
<property name="Label" translatable="yes" />
<property name="Sensitive">False</property>
<property name="StockId">gtk-close</property>
<property name="Tooltip" translatable="yes">Fermer</property>
<signal name="Activated" handler="OnCloseActionActivated" />
</action>
<action id="TestAction">
@ -105,10 +110,11 @@
</action>
<action id="circAction">
<property name="Type">Action</property>
<property name="Label" translatable="yes">Circuits</property>
<property name="Label" translatable="yes">Gestion des Circuits</property>
<property name="Sensitive">False</property>
<property name="ShortLabel" translatable="yes">Circuits</property>
<property name="StockId">circuits</property>
<property name="Tooltip" translatable="yes">Gestion des Circuits</property>
<signal name="Activated" handler="OnCircuitsActionActivated" />
</action>
<action id="propertiesAction">
@ -126,13 +132,16 @@
<property name="Type">Action</property>
<property name="Label" translatable="yes" />
<property name="StockId">gtk-new</property>
<property name="Tooltip" translatable="yes">Nouvelle Conduite</property>
<signal name="Activated" handler="OnNewActionActivated" />
</action>
<action id="seqLinAction">
<property name="Type">Action</property>
<property name="Label" translatable="yes" />
<property name="Label" translatable="yes">Ajout Sequenceur</property>
<property name="Sensitive">False</property>
<property name="ShortLabel" translatable="yes">Ajout Sequenceur</property>
<property name="StockId">tirettes</property>
<property name="Tooltip" translatable="yes">Ajouter un sequenceur lineraire</property>
<signal name="Activated" handler="OnSeqLinActionActivated" />
</action>
<action id="fullscreenAction">
@ -146,6 +155,7 @@
<property name="Label" translatable="yes">_Plein écran</property>
<property name="ShortLabel" translatable="yes">_Plein écran</property>
<property name="StockId">gtk-fullscreen</property>
<property name="Tooltip" translatable="yes">Plein Ecran</property>
<signal name="Activated" handler="OnFullscreenAction1Activated" />
</action>
<action id="showAllAction">
@ -154,6 +164,7 @@
<property name="Sensitive">False</property>
<property name="ShortLabel" translatable="yes">ShowAll</property>
<property name="StockId">gtk-refresh</property>
<property name="Tooltip" translatable="yes">Tout réafficher</property>
<signal name="Activated" handler="OnShowAllActionActivated" />
</action>
<action id="universAction">
@ -162,12 +173,14 @@
<property name="Sensitive">False</property>
<property name="ShortLabel" translatable="yes">Univers</property>
<property name="StockId">gtk-execute</property>
<property name="Tooltip" translatable="yes">Gestion des Univers</property>
<signal name="Activated" handler="OnUniversActionActivated" />
</action>
<action id="connectAction">
<property name="Type">Action</property>
<property name="Label" translatable="yes" />
<property name="StockId">gtk-connect</property>
<property name="Tooltip" translatable="yes">Connecter d'un boitier</property>
<signal name="Activated" handler="OnConnectActionActivated" />
</action>
<action id="seqMacroAction">
@ -175,8 +188,16 @@
<property name="Label" translatable="yes" />
<property name="Sensitive">False</property>
<property name="StockId">gtk-index</property>
<property name="Tooltip" translatable="yes">Ajouter un sequenceur macro</property>
<signal name="Activated" handler="OnSeqMacroActionActivated" />
</action>
<action id="selectColorAction">
<property name="Type">Action</property>
<property name="Label" translatable="yes" />
<property name="StockId">gtk-select-color</property>
<property name="Tooltip" translatable="yes">Recharger le theme</property>
<signal name="Activated" handler="OnSelectColorActionActivated" />
</action>
</action-group>
<property name="MemberName" />
<property name="Title" translatable="yes">MainWindow</property>
@ -198,6 +219,7 @@
<child>
<widget class="Gtk.Button" id="btnGo">
<property name="MemberName" />
<property name="Tooltip" translatable="yes" />
<property name="CanFocus">True</property>
<property name="Type">TextAndIcon</property>
<property name="Icon">stock:gtk-goto-last Dnd</property>
@ -232,6 +254,8 @@
<child>
<widget class="Gtk.Button" id="btnAjoutLigne">
<property name="MemberName" />
<property name="Tooltip" translatable="yes">Ajoute ligne sous
celle selectionnée</property>
<property name="CanFocus">True</property>
<property name="Type">TextAndIcon</property>
<property name="Icon">stock:gtk-add Dnd</property>
@ -249,6 +273,7 @@
<child>
<widget class="Gtk.Button" id="btnRetireLigne">
<property name="MemberName" />
<property name="Tooltip" translatable="yes">Retire la ligne selectionnée</property>
<property name="CanFocus">True</property>
<property name="Type">TextAndIcon</property>
<property name="Icon">stock:gtk-remove Dnd</property>
@ -266,6 +291,7 @@
<child>
<widget class="Gtk.ToggleButton" id="btnBlackOut">
<property name="MemberName" />
<property name="Tooltip" translatable="yes">Blackout</property>
<property name="CanFocus">True</property>
<property name="Type">TextAndIcon</property>
<property name="Icon">stock:gtk-no Dnd</property>
@ -283,6 +309,7 @@
<child>
<widget class="Gtk.ToggleButton" id="btnPause">
<property name="MemberName" />
<property name="Tooltip" translatable="yes">Pause</property>
<property name="CanFocus">True</property>
<property name="Type">TextAndIcon</property>
<property name="Icon">stock:gtk-media-pause Dnd</property>
@ -322,6 +349,7 @@
<widget class="Gtk.VScale" id="masterScale">
<property name="MemberName" />
<property name="HeightRequest">75</property>
<property name="Tooltip" translatable="yes">Master</property>
<property name="Inverted">True</property>
<property name="Upper">100</property>
<property name="PageIncrement">10</property>
@ -504,6 +532,7 @@
<node type="Toolitem" action="saveAction" />
<node type="Toolitem" action="saveAsAction" />
<node type="Toolitem" action="closeAction" />
<node type="Toolitem" action="selectColorAction" />
<node type="Toolitem" action="quitAction" />
</node>
</widget>
@ -646,12 +675,14 @@
<property name="Type">Action</property>
<property name="Label" translatable="yes" />
<property name="StockId">gtk-media-pause</property>
<property name="Tooltip" translatable="yes">Pause</property>
<signal name="Activated" handler="OnMediaPauseActionActivated" />
</action>
<action id="mediaNextAction">
<property name="Type">Action</property>
<property name="Label" translatable="yes" />
<property name="StockId">gtk-media-next</property>
<property name="Tooltip" translatable="yes">Fin de transition</property>
<signal name="Activated" handler="OnMediaNextActionActivated" />
</action>
<action id="saveAction">
@ -679,6 +710,7 @@
<property name="Type">Action</property>
<property name="Label" translatable="yes" />
<property name="StockId">gtk-go-up</property>
<property name="Tooltip" translatable="yes" />
<signal name="Activated" handler="OnMoveUpActionActivated" />
</action>
<action id="moveDownAction">
@ -691,6 +723,8 @@
<property name="Type">Action</property>
<property name="Label" translatable="yes" />
<property name="StockId">circuits</property>
<property name="Tooltip" translatable="yes">Association des circuits
au sequenceur</property>
<signal name="Activated" handler="OnCircuitsActionActivated" />
</action>
<action id="closeAction">
@ -1549,6 +1583,8 @@
<property name="Type">Action</property>
<property name="Label" translatable="yes" />
<property name="StockId">circuits</property>
<property name="Tooltip" translatable="yes">Association des circuits
au sequenceur</property>
<signal name="Activated" handler="OnCircuitsActionActivated" />
</action>
<action id="goForwardAction">
@ -1641,7 +1677,6 @@
<property name="MemberName" />
<property name="HeightRequest">33</property>
<property name="Xpad">15</property>
<property name="Xalign">0,69</property>
<property name="LabelProp" translatable="yes">&lt;big&gt;00.0&lt;/big&gt;</property>
<property name="UseMarkup">True</property>
</widget>

88
DMX-2.0/style.gtkrc
View file

@ -3,60 +3,92 @@ style "sombre"
{
font_name = "Cantarell 9"
bg[NORMAL] = {0.4, 0.4, 0.4}
bg[SELECTED] = {0.44, 0.45, 0.5}
bg[ACTIVE] = {0.45, 0.45, 0.45}
bg[INSENSITIVE] = {0.2, 0.2, 0.2}
bg[PRELIGHT] = {0.5, 0.5, 0.58}
base[NORMAL] = {0.35, 0.35, 0.35}
base[SELECTED] = {0.75, 0.35, 0.35}
base[ACTIVE] = {0.75, 0.75, 0.35}
text[NORMAL] = {0.75, 0.75, 0.75}
fg[NORMAL] = {1.0, 1.0, 1.0}
fg[PRELIGHT] = {1.0, 1.0, 1.0}
bg[NORMAL] = "#666666"
bg[SELECTED] = "#707090"
bg[ACTIVE] = "#808080"
bg[INSENSITIVE] = "#808080"
bg[PRELIGHT] = "#8080A0"
base[NORMAL] = "#595959"
base[SELECTED] = "#bb5959"
base[ACTIVE] = "#DAC000"
text[NORMAL] = "#D0D0D0"
fg[NORMAL] = "#FFFFFF"
fg[PRELIGHT] = "#FFFFFF"
engine "clearlooks" {
#colorize_scrollbar = FALSE
toolbarstyle = 0
}
GtkTreeView::odd-row-color = {0.40, 0.40, 0.43}
#GtkTreeView::even-row-color = {0.35, 0.35, 0.35}
GtkTreeView::odd-row-color = "#66666F"
#GtkTreeView::even-row-color = "#595959"
}
style "scale" {
GtkScale::slider-width = 18
GtkScale::slider-length = 30
GtkScale::slider-width = 19
GtkScale::slider-length = 27
GtkRange::trough-side-details = 1
bg[NORMAL] = {0.64, 0.64, 0.70}
bg[NORMAL] = "#A0A0B0"
}
style "tirettes" {
GtkScale::slider-width = 19
GtkScale::slider-length = 28
bg[NORMAL] = "#A0A0B0"
bg[PRELIGHT] = "#8080A0"
bg[SELECTED] = "#DAC000"
fg[NORMAL] = "#FFFFFF"
}
style "tirettesc" {
GtkScale::slider-width = 19
GtkScale::slider-length = 28
bg[NORMAL] = "#B08080"
bg[PRELIGHT] = "#B06060"
bg[SELECTED] = "#DAC000"
fg[NORMAL] = "#FF5050"
}
style "tirettest" {
GtkScale::slider-width = 19
GtkScale::slider-length = 28
bg[NORMAL] = "#80B080"
bg[PRELIGHT] = "#B06060"
bg[SELECTED] = "#DAC000"
fg[NORMAL] = "#50FF50"
}
style "progressbar" {
bg[SELECTED] = {0.64, 0.64, 0.70}
bg[SELECTED] = "#A8A8B8"
}
style "circuitspb"
{
font_name = "DejaVu Sans 6"
}
style "test" {
bg[SELECTED] = {1.0, 0.4, 0.4}
font_name = "DejaVu Sans 7"
bg[SELECTED] = "#DAC000"
}
style "counter"
{
fg[NORMAL] = {1.0,1.0,0.0}
bg[NORMAL] = {0.0,0.0,0.0}
font_name = "DejaVu Sans Mono 12"
fg[NORMAL] = "#FFFF00"
bg[NORMAL] = "#000000"
font_name = "DejaVu Sans Mono Bold 12"
}
style "lbtirette"
{
fg[NORMAL] = "#D0D0D0"
font_name = "DejaVu Sans Mono 7"
}
class "GtkWidget" style "sombre"
class "GtkScale" style "scale"
class "GtkProgressBar" style "progressbar"
widget "*.pb" style "circuitspb"
#class "GtkScrollbar" style "test"
widget "*.posLabel" style "counter"
widget "*.timeLabel" style "counter"
widget "*.evBBox" style "counter"
widget "*.lblTirette" style "lbtirette"
widget "*.sclTirette" style "tirettes"
widget "*.sclTiretteC" style "tirettesc"
widget "*.sclTiretteT" style "tirettest"