diff --git a/DMX-2.0/DMX-2.0.csproj b/DMX-2.0/DMX-2.0.csproj index dc230b9..625fbd3 100644 --- a/DMX-2.0/DMX-2.0.csproj +++ b/DMX-2.0/DMX-2.0.csproj @@ -44,19 +44,6 @@ False glib-sharp-2.0 - - False - glade-sharp-2.0 - - - False - gtk-sharp-2.0 - - - False - gtk-sharp-2.0 - - @@ -124,6 +111,8 @@ + + diff --git a/DMX-2.0/DriverBoitierV1.cs b/DMX-2.0/DriverBoitierV1.cs index c558b06..43f1738 100644 --- a/DMX-2.0/DriverBoitierV1.cs +++ b/DMX-2.0/DriverBoitierV1.cs @@ -26,6 +26,7 @@ namespace DMX2 outputbuffer[0]=27; outputbuffer[1]=68; outputbuffer[4]=255; + } void Start () diff --git a/DMX-2.0/MainWindow.cs b/DMX-2.0/MainWindow.cs index b8171f7..2ee6d95 100644 --- a/DMX-2.0/MainWindow.cs +++ b/DMX-2.0/MainWindow.cs @@ -253,7 +253,6 @@ namespace DMX2 dlg.AddButton (Stock.Ok, ResponseType.Ok).GrabDefault(); dlg.AddButton (Stock.Cancel, ResponseType.Cancel); dlg.VBox.Add (new Label("Nom de la nouvelle Conduite :")); dlg.VBox.Add (entry); dlg.VBox.ShowAll (); entry.ActivatesDefault=true; - if ((ResponseType)dlg.Run () == ResponseType.Ok) { Conduite.Courante = new Conduite (); Conduite.Courante.Name = entry.Text; diff --git a/DMX-2.0/gtk-gui/DMX2.EditionUnivers.cs b/DMX-2.0/gtk-gui/DMX2.EditionUnivers.cs index 87030c1..e9d4d7b 100644 --- a/DMX-2.0/gtk-gui/DMX2.EditionUnivers.cs +++ b/DMX-2.0/gtk-gui/DMX2.EditionUnivers.cs @@ -55,7 +55,7 @@ namespace DMX2 // Container child hbox2.Gtk.Box+BoxChild this.label1 = new global::Gtk.Label (); this.label1.Name = "label1"; - this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("Univers :"); + this.label1.LabelProp = "Univers :"; this.hbox2.Add (this.label1); global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.label1])); w3.Position = 0; @@ -89,7 +89,7 @@ namespace DMX2 w6.Add (w7); // Container child GtkHBox.Gtk.Container+ContainerChild global::Gtk.Label w9 = new global::Gtk.Label (); - w9.LabelProp = global::Mono.Unix.Catalog.GetString ("Nouvel Univers"); + w9.LabelProp = "Nouvel Univers"; w9.UseUnderline = true; w6.Add (w9); w5.Add (w6); @@ -116,7 +116,7 @@ namespace DMX2 w15.Add (w16); // Container child GtkHBox.Gtk.Container+ContainerChild global::Gtk.Label w18 = new global::Gtk.Label (); - w18.LabelProp = global::Mono.Unix.Catalog.GetString ("Supprimer"); + w18.LabelProp = "Supprimer"; w18.UseUnderline = true; w15.Add (w18); w14.Add (w15); @@ -142,7 +142,7 @@ namespace DMX2 w24.Add (w25); // Container child GtkHBox.Gtk.Container+ContainerChild global::Gtk.Label w27 = new global::Gtk.Label (); - w27.LabelProp = global::Mono.Unix.Catalog.GetString ("Réinitialiser"); + w27.LabelProp = "Réinitialiser"; w27.UseUnderline = true; w24.Add (w27); w23.Add (w24); @@ -169,7 +169,7 @@ namespace DMX2 w33.Add (w34); // Container child GtkHBox.Gtk.Container+ContainerChild global::Gtk.Label w36 = new global::Gtk.Label (); - w36.LabelProp = global::Mono.Unix.Catalog.GetString ("Patch Droit"); + w36.LabelProp = "Patch Droit"; w36.UseUnderline = true; w33.Add (w36); w32.Add (w33); @@ -217,7 +217,7 @@ namespace DMX2 w45.Add (w46); // Container child GtkHBox.Gtk.Container+ContainerChild global::Gtk.Label w48 = new global::Gtk.Label (); - w48.LabelProp = global::Mono.Unix.Catalog.GetString ("Allumer !"); + w48.LabelProp = "Allumer !"; w48.UseUnderline = true; w45.Add (w48); w44.Add (w45); @@ -243,7 +243,7 @@ namespace DMX2 // Container child hbox1.Gtk.Box+BoxChild this.label6 = new global::Gtk.Label (); this.label6.Name = "label6"; - this.label6.LabelProp = global::Mono.Unix.Catalog.GetString ("Circuit :"); + this.label6.LabelProp = "Circuit :"; this.hbox1.Add (this.label6); global::Gtk.Box.BoxChild w54 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.label6])); w54.Position = 2; @@ -268,7 +268,7 @@ namespace DMX2 // Container child hbox1.Gtk.Box+BoxChild this.lbParam1 = new global::Gtk.Label (); this.lbParam1.Name = "lbParam1"; - this.lbParam1.LabelProp = global::Mono.Unix.Catalog.GetString ("param 1"); + this.lbParam1.LabelProp = "param 1"; this.hbox1.Add (this.lbParam1); global::Gtk.Box.BoxChild w57 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.lbParam1])); w57.Position = 5; @@ -286,7 +286,7 @@ namespace DMX2 // Container child hbox1.Gtk.Box+BoxChild this.lbParam2 = new global::Gtk.Label (); this.lbParam2.Name = "lbParam2"; - this.lbParam2.LabelProp = global::Mono.Unix.Catalog.GetString ("param2"); + this.lbParam2.LabelProp = "param2"; this.hbox1.Add (this.lbParam2); global::Gtk.Box.BoxChild w59 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.lbParam2])); w59.Position = 7; @@ -324,7 +324,7 @@ namespace DMX2 // Notebook tab this.label2 = new global::Gtk.Label (); this.label2.Name = "label2"; - this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Patch"); + this.label2.LabelProp = "Patch"; this.notebook1.SetTabLabel (this.GtkScrolledWindow, this.label2); this.label2.ShowAll (); // Container child notebook1.Gtk.Notebook+NotebookChild @@ -342,7 +342,7 @@ namespace DMX2 // Notebook tab this.label5 = new global::Gtk.Label (); this.label5.Name = "label5"; - this.label5.LabelProp = global::Mono.Unix.Catalog.GetString ("Patch Rapide"); + this.label5.LabelProp = "Patch Rapide"; this.notebook1.SetTabLabel (this.GtkScrolledWindow1, this.label5); this.label5.ShowAll (); w2.Add (this.notebook1); diff --git a/DMX-2.0/gtk-gui/DMX2.GestionCircuits.cs b/DMX-2.0/gtk-gui/DMX2.GestionCircuits.cs index 7240f49..eefc7ae 100644 --- a/DMX-2.0/gtk-gui/DMX2.GestionCircuits.cs +++ b/DMX-2.0/gtk-gui/DMX2.GestionCircuits.cs @@ -23,7 +23,7 @@ namespace DMX2 this.UIManager.InsertActionGroup (w1, 0); this.AddAccelGroup (this.UIManager.AccelGroup); this.Name = "DMX2.GestionCircuits"; - this.Title = global::Mono.Unix.Catalog.GetString ("Circuits"); + this.Title = "Circuits"; this.TypeHint = ((global::Gdk.WindowTypeHint)(1)); this.WindowPosition = ((global::Gtk.WindowPosition)(4)); this.DestroyWithParent = true; diff --git a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs index 095e0c8..10af0be 100644 --- a/DMX-2.0/gtk-gui/DMX2.MainWindow.cs +++ b/DMX-2.0/gtk-gui/DMX2.MainWindow.cs @@ -56,64 +56,64 @@ 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"), global::Mono.Unix.Catalog.GetString ("Ouvrir"), "gtk-open"); - this.openAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("_Ouvrir"); + this.openAction = new global::Gtk.Action ("openAction", "_Ouvrir", "Ouvrir", "gtk-open"); + this.openAction.ShortLabel = "_Ouvrir"; w1.Add (this.openAction, null); - this.saveAction = new global::Gtk.Action ("saveAction", null, global::Mono.Unix.Catalog.GetString ("Enregistrer"), "gtk-save"); + this.saveAction = new global::Gtk.Action ("saveAction", null, "Enregistrer", "gtk-save"); this.saveAction.Sensitive = false; w1.Add (this.saveAction, null); - this.saveAsAction = new global::Gtk.Action ("saveAsAction", null, global::Mono.Unix.Catalog.GetString ("Enregistrer sous ..."), "gtk-save-as"); + this.saveAsAction = new global::Gtk.Action ("saveAsAction", null, "Enregistrer sous ...", "gtk-save-as"); this.saveAsAction.Sensitive = false; w1.Add (this.saveAsAction, null); - this.quitAction = new global::Gtk.Action ("quitAction", null, global::Mono.Unix.Catalog.GetString ("Quitter"), "gtk-quit"); + this.quitAction = new global::Gtk.Action ("quitAction", null, "Quitter", "gtk-quit"); w1.Add (this.quitAction, null); - this.closeAction = new global::Gtk.Action ("closeAction", null, global::Mono.Unix.Catalog.GetString ("Fermer"), "gtk-close"); + this.closeAction = new global::Gtk.Action ("closeAction", null, "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"); + this.TestAction = new global::Gtk.Action ("TestAction", "Test", null, null); + this.TestAction.ShortLabel = "Test"; w1.Add (this.TestAction, null); - 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 = new global::Gtk.Action ("circAction", "Gestion des Circuits", "Gestion des Circuits", "circuits"); this.circAction.Sensitive = false; - this.circAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("Circuits"); + this.circAction.ShortLabel = "Circuits"; w1.Add (this.circAction, null); - this.propertiesAction = new global::Gtk.Action ("propertiesAction", global::Mono.Unix.Catalog.GetString ("Circuits"), null, "gtk-properties"); - this.propertiesAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("Circuits"); + this.propertiesAction = new global::Gtk.Action ("propertiesAction", "Circuits", null, "gtk-properties"); + this.propertiesAction.ShortLabel = "Circuits"; w1.Add (this.propertiesAction, null); - this.FichierAction = new global::Gtk.Action ("FichierAction", global::Mono.Unix.Catalog.GetString ("_Fichier"), null, null); - this.FichierAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("_Fichier"); + this.FichierAction = new global::Gtk.Action ("FichierAction", "_Fichier", null, null); + this.FichierAction.ShortLabel = "_Fichier"; w1.Add (this.FichierAction, null); - this.newAction = new global::Gtk.Action ("newAction", null, global::Mono.Unix.Catalog.GetString ("Nouvelle Conduite"), "gtk-new"); + this.newAction = new global::Gtk.Action ("newAction", null, "Nouvelle Conduite", "gtk-new"); w1.Add (this.newAction, null); - 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 = new global::Gtk.Action ("seqLinAction", "Ajout Sequenceur", "Ajouter un sequenceur lineraire", "tirettes"); this.seqLinAction.Sensitive = false; - this.seqLinAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("Ajout Sequenceur"); + this.seqLinAction.ShortLabel = "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"); + this.fullscreenAction = new global::Gtk.Action ("fullscreenAction", "_Plein écran", null, "gtk-fullscreen"); + this.fullscreenAction.ShortLabel = "_Plein écran"; w1.Add (this.fullscreenAction, null); - 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"); + this.fullscreenAction1 = new global::Gtk.Action ("fullscreenAction1", "_Plein écran", "Plein Ecran", "gtk-fullscreen"); + this.fullscreenAction1.ShortLabel = "_Plein écran"; w1.Add (this.fullscreenAction1, null); - 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 = new global::Gtk.Action ("showAllAction", "ShowAll", "Tout réafficher", "gtk-refresh"); this.showAllAction.Sensitive = false; - this.showAllAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("ShowAll"); + this.showAllAction.ShortLabel = "ShowAll"; w1.Add (this.showAllAction, null); - 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 = new global::Gtk.Action ("universAction", "Univers", "Gestion des Univers", "gtk-execute"); this.universAction.Sensitive = false; - this.universAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("Univers"); + this.universAction.ShortLabel = "Univers"; w1.Add (this.universAction, null); - this.connectAction = new global::Gtk.Action ("connectAction", null, global::Mono.Unix.Catalog.GetString ("Connecter d'un boitier"), "gtk-connect"); + this.connectAction = new global::Gtk.Action ("connectAction", null, "Connecter d'un boitier", "gtk-connect"); w1.Add (this.connectAction, null); - this.seqMacroAction = new global::Gtk.Action ("seqMacroAction", null, global::Mono.Unix.Catalog.GetString ("Ajouter un sequenceur macro"), "gtk-index"); + this.seqMacroAction = new global::Gtk.Action ("seqMacroAction", null, "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"); + this.selectColorAction = new global::Gtk.Action ("selectColorAction", null, "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"; - this.Title = global::Mono.Unix.Catalog.GetString ("MainWindow"); + this.Title = "MainWindow"; this.WindowPosition = ((global::Gtk.WindowPosition)(4)); this.BorderWidth = ((uint)(3)); // Container child DMX2.MainWindow.Gtk.Container+ContainerChild @@ -283,7 +283,7 @@ namespace DMX2 this.timeLabel = new global::Gtk.Label (); this.timeLabel.Name = "timeLabel"; this.timeLabel.Ypad = 8; - this.timeLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("0.00"); + this.timeLabel.LabelProp = "0.00"; this.timeLabel.UseMarkup = true; this.timeLabel.Justify = ((global::Gtk.Justification)(2)); this.timeLabel.Angle = 90; @@ -407,7 +407,7 @@ namespace DMX2 // Container child evInfo.Gtk.Container+ContainerChild this.lblInfo = new global::Gtk.Label (); this.lblInfo.Name = "lblInfo"; - this.lblInfo.LabelProp = global::Mono.Unix.Catalog.GetString ("info"); + this.lblInfo.LabelProp = "info"; this.evInfo.Add (this.lblInfo); this.hbox4.Add (this.evInfo); global::Gtk.Box.BoxChild w74 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.evInfo])); diff --git a/DMX-2.0/gtk-gui/DMX2.SelSeqCircuits.cs b/DMX-2.0/gtk-gui/DMX2.SelSeqCircuits.cs index b937102..3c5262e 100644 --- a/DMX-2.0/gtk-gui/DMX2.SelSeqCircuits.cs +++ b/DMX-2.0/gtk-gui/DMX2.SelSeqCircuits.cs @@ -24,7 +24,7 @@ namespace DMX2 global::Stetic.Gui.Initialize (this); // Widget DMX2.SelSeqCircuits this.Name = "DMX2.SelSeqCircuits"; - this.Title = global::Mono.Unix.Catalog.GetString ("Selection des Circuits"); + this.Title = "Selection des Circuits"; this.TypeHint = ((global::Gdk.WindowTypeHint)(1)); this.WindowPosition = ((global::Gtk.WindowPosition)(4)); this.Modal = true; @@ -70,7 +70,7 @@ namespace DMX2 w5.Add (w6); // Container child GtkHBox.Gtk.Container+ContainerChild global::Gtk.Label w8 = new global::Gtk.Label (); - w8.LabelProp = global::Mono.Unix.Catalog.GetString ("Ajouter"); + w8.LabelProp = "Ajouter"; w8.UseUnderline = true; w5.Add (w8); w4.Add (w5); @@ -95,7 +95,7 @@ namespace DMX2 w14.Add (w15); // Container child GtkHBox.Gtk.Container+ContainerChild global::Gtk.Label w17 = new global::Gtk.Label (); - w17.LabelProp = global::Mono.Unix.Catalog.GetString ("Enlever"); + w17.LabelProp = "Enlever"; w17.UseUnderline = true; w14.Add (w17); w13.Add (w14); @@ -121,7 +121,7 @@ namespace DMX2 w23.Add (w24); // Container child GtkHBox.Gtk.Container+ContainerChild global::Gtk.Label w26 = new global::Gtk.Label (); - w26.LabelProp = global::Mono.Unix.Catalog.GetString ("Tout Enlever"); + w26.LabelProp = "Tout Enlever"; w26.UseUnderline = true; w23.Add (w26); w22.Add (w23); @@ -160,7 +160,7 @@ namespace DMX2 w33.Add (w34); // Container child GtkHBox.Gtk.Container+ContainerChild global::Gtk.Label w36 = new global::Gtk.Label (); - w36.LabelProp = global::Mono.Unix.Catalog.GetString ("Monter"); + w36.LabelProp = "Monter"; w36.UseUnderline = true; w33.Add (w36); w32.Add (w33); @@ -186,7 +186,7 @@ namespace DMX2 w42.Add (w43); // Container child GtkHBox.Gtk.Container+ContainerChild global::Gtk.Label w45 = new global::Gtk.Label (); - w45.LabelProp = global::Mono.Unix.Catalog.GetString ("Descendre"); + w45.LabelProp = "Descendre"; w45.UseUnderline = true; w42.Add (w45); w41.Add (w42); diff --git a/DMX-2.0/gtk-gui/DMX2.SeqLinUI.cs b/DMX-2.0/gtk-gui/DMX2.SeqLinUI.cs index 83b9eaa..2591721 100644 --- a/DMX-2.0/gtk-gui/DMX2.SeqLinUI.cs +++ b/DMX-2.0/gtk-gui/DMX2.SeqLinUI.cs @@ -49,23 +49,23 @@ namespace DMX2 w2.Add (this.goBackAction, null); this.goForwardAction = new global::Gtk.Action ("goForwardAction", null, null, "gtk-go-forward"); w2.Add (this.goForwardAction, null); - this.applyAction = new global::Gtk.Action ("applyAction", null, global::Mono.Unix.Catalog.GetString ("Ecrase l'effet selectionné."), "gtk-apply"); + this.applyAction = new global::Gtk.Action ("applyAction", null, "Ecrase l'effet selectionné.", "gtk-apply"); w2.Add (this.applyAction, null); - this.mediaPauseAction = new global::Gtk.Action ("mediaPauseAction", null, global::Mono.Unix.Catalog.GetString ("Pause"), "gtk-media-pause"); + this.mediaPauseAction = new global::Gtk.Action ("mediaPauseAction", null, "Pause", "gtk-media-pause"); w2.Add (this.mediaPauseAction, null); - this.mediaNextAction = new global::Gtk.Action ("mediaNextAction", null, global::Mono.Unix.Catalog.GetString ("Fin de transition"), "gtk-media-next"); + this.mediaNextAction = new global::Gtk.Action ("mediaNextAction", null, "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"); + this.saveAction = new global::Gtk.Action ("saveAction", null, "Enregistre l'effet à la fin.", "gtk-save"); w2.Add (this.saveAction, null); - this.saveAfterAction = new global::Gtk.Action ("saveAfterAction", null, global::Mono.Unix.Catalog.GetString ("Insère un effet sous celui selectionné."), "gtk-save-as"); + this.saveAfterAction = new global::Gtk.Action ("saveAfterAction", null, "Insère un effet sous celui selectionné.", "gtk-save-as"); w2.Add (this.saveAfterAction, null); - this.deleteAction = new global::Gtk.Action ("deleteAction", null, global::Mono.Unix.Catalog.GetString ("Supprime l'effet selectionné."), "gtk-delete"); + this.deleteAction = new global::Gtk.Action ("deleteAction", null, "Supprime l'effet selectionné.", "gtk-delete"); w2.Add (this.deleteAction, null); 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, global::Mono.Unix.Catalog.GetString ("Association des circuits\nau sequenceur"), "circuits"); + this.circuitsAction = new global::Gtk.Action ("circuitsAction", null, "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); @@ -103,7 +103,7 @@ namespace DMX2 this.posLabel.Name = "posLabel"; this.posLabel.Xpad = 15; this.posLabel.Xalign = 0F; - this.posLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("n°0"); + this.posLabel.LabelProp = "n°0"; this.posLabel.UseMarkup = true; this.hbox2.Add (this.posLabel); global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.posLabel])); @@ -116,7 +116,7 @@ namespace DMX2 this.timeLabel.Name = "timeLabel"; this.timeLabel.Xpad = 15; this.timeLabel.Xalign = 1F; - this.timeLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("0.00"); + this.timeLabel.LabelProp = "0.00"; this.timeLabel.UseMarkup = true; this.timeLabel.Justify = ((global::Gtk.Justification)(1)); this.hbox2.Add (this.timeLabel); @@ -245,7 +245,7 @@ namespace DMX2 this.frame1.Add (this.GtkAlignment); this.titreLabel = new global::Gtk.Label (); this.titreLabel.Name = "titreLabel"; - this.titreLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("Sequenceur Lineaire"); + this.titreLabel.LabelProp = "Sequenceur Lineaire"; this.titreLabel.UseMarkup = true; this.frame1.LabelWidget = this.titreLabel; this.Add (this.frame1); diff --git a/DMX-2.0/gtk-gui/DMX2.SeqMacroUI.cs b/DMX-2.0/gtk-gui/DMX2.SeqMacroUI.cs index ad308fb..12bac90 100644 --- a/DMX-2.0/gtk-gui/DMX2.SeqMacroUI.cs +++ b/DMX-2.0/gtk-gui/DMX2.SeqMacroUI.cs @@ -40,10 +40,10 @@ namespace DMX2 Stetic.BinContainer w1 = global::Stetic.BinContainer.Attach (this); this.UIManager = new global::Gtk.UIManager (); global::Gtk.ActionGroup w2 = new global::Gtk.ActionGroup ("Default"); - this.closeAction = new global::Gtk.ToggleAction ("closeAction", global::Mono.Unix.Catalog.GetString (" "), null, "gtk-close"); - this.closeAction.ShortLabel = global::Mono.Unix.Catalog.GetString (" "); + this.closeAction = new global::Gtk.ToggleAction ("closeAction", " ", null, "gtk-close"); + this.closeAction.ShortLabel = " "; w2.Add (this.closeAction, null); - this.circuitsAction = new global::Gtk.Action ("circuitsAction", null, global::Mono.Unix.Catalog.GetString ("Association des circuits\nau sequenceur"), "circuits"); + this.circuitsAction = new global::Gtk.Action ("circuitsAction", null, "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); @@ -94,7 +94,7 @@ namespace DMX2 this.posLabel.Name = "posLabel"; this.posLabel.Xpad = 15; this.posLabel.Xalign = 0F; - this.posLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("n° 0"); + this.posLabel.LabelProp = "n° 0"; this.posLabel.UseMarkup = true; this.hbox2.Add (this.posLabel); global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.posLabel])); @@ -106,7 +106,7 @@ namespace DMX2 this.timeLabel.HeightRequest = 33; this.timeLabel.Name = "timeLabel"; this.timeLabel.Xpad = 15; - this.timeLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("00.0"); + this.timeLabel.LabelProp = "00.0"; this.timeLabel.UseMarkup = true; this.hbox2.Add (this.timeLabel); global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.timeLabel])); @@ -165,7 +165,7 @@ namespace DMX2 w10.Add (w11); // Container child GtkHBox.Gtk.Container+ContainerChild global::Gtk.Label w13 = new global::Gtk.Label (); - w13.LabelProp = global::Mono.Unix.Catalog.GetString ("Ok"); + w13.LabelProp = "Ok"; w13.UseUnderline = true; w10.Add (w13); w9.Add (w10); @@ -231,7 +231,7 @@ namespace DMX2 this.frame1.Add (this.GtkAlignment); this.titreLabel = new global::Gtk.Label (); this.titreLabel.Name = "titreLabel"; - this.titreLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("Séquenceur Macro"); + this.titreLabel.LabelProp = "Séquenceur Macro"; this.titreLabel.UseMarkup = true; this.frame1.LabelWidget = this.titreLabel; this.Add (this.frame1); diff --git a/DMX-2.0/gtk-gui/gui.stetic b/DMX-2.0/gtk-gui/gui.stetic index 4f3e271..1a655ec 100644 --- a/DMX-2.0/gtk-gui/gui.stetic +++ b/DMX-2.0/gtk-gui/gui.stetic @@ -5,7 +5,6 @@ 2.12 -