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

Ajout ID sur labels circuits

Browse source
This commit is contained in:
tzim 2013-05-08 18:44:44 +00:00
parent 91ef14865c
commit 284076263f
3 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
DMX-2.0/EditionUnivers.cs
View file

@ -64,7 +64,7 @@ namespace DMX2
{ {
Circuit c = tree_model.GetValue (iter, 0) as Circuit; Circuit c = tree_model.GetValue (iter, 0) as Circuit;
if(c != null) if(c != null)
(cell as Gtk.CellRendererText).Text = c.Name; (cell as Gtk.CellRendererText).Text = c.ID + "-" + c.Name;
else else
(cell as Gtk.CellRendererText).Text = "--Aucun--"; (cell as Gtk.CellRendererText).Text = "--Aucun--";
@ -77,12 +77,12 @@ namespace DMX2
{ {
var values = Enum.GetValues(typeof(UniversDMX.FTransfer)); var values = Enum.GetValues(typeof(UniversDMX.FTransfer));
cbFT.Model = lsCbFT; cbFT.Model = lsCbFT;
var cellCbFt = new CellRendererText(); //var cellCbFt = new CellRendererText();
cbFT.PackStart(cellCbFt,true); //cbFT.PackStart(cellCbFt,true);
cbFT.SetCellDataFunc(cellCbFt,new CellLayoutDataFunc(RenderFTName)); //cbFT.SetCellDataFunc(cellCbFt,new CellLayoutDataFunc(RenderFTName));
foreach(var v in values) foreach(var v in values)
lsCbFT.AppendValues( (UniversDMX.FTransfer)v ); lsCbFT.AppendValues(v.ToString(), (UniversDMX.FTransfer)v );
} }
protected void OnCbUniversChanged (object sender, EventArgs e) protected void OnCbUniversChanged (object sender, EventArgs e)

15
DMX-2.0/GestionCircuits.cs
View file

@ -12,6 +12,16 @@ namespace DMX2
this.Build (); this.Build ();
var idCol = new Gtk.TreeViewColumn();
var idCell = new Gtk.CellRendererText();
idCol.Title = "ID";
idCol.PackStart(idCell,true);
idCol.SetCellDataFunc(idCell, new Gtk.TreeCellDataFunc( RenderCircuitID) );
idCell.Editable =true;
idCell.Edited += OnNameCellEdited;
this.listeCircuits.AppendColumn(idCol);
var nameCol = new Gtk.TreeViewColumn(); var nameCol = new Gtk.TreeViewColumn();
var nameCell = new Gtk.CellRendererText(); var nameCell = new Gtk.CellRendererText();
nameCol.Title = "Circuit"; nameCol.Title = "Circuit";
@ -55,6 +65,11 @@ namespace DMX2
c.ShortName = args.NewText; c.ShortName = args.NewText;
} }
void RenderCircuitID (TreeViewColumn tree_column, CellRenderer cell, TreeModel tree_model, TreeIter iter)
{
Circuit c = tree_model.GetValue (iter, 0) as Circuit;
(cell as Gtk.CellRendererText).Text = c.ID.ToString();
}
void RenderCircuitShortName (TreeViewColumn tree_column, CellRenderer cell, TreeModel tree_model, TreeIter iter) void RenderCircuitShortName (TreeViewColumn tree_column, CellRenderer cell, TreeModel tree_model, TreeIter iter)
{ {
Circuit c = tree_model.GetValue (iter, 0) as Circuit; Circuit c = tree_model.GetValue (iter, 0) as Circuit;

2
DMX-2.0/SeqLinUI.cs
View file

@ -246,7 +246,7 @@ namespace DMX2
fx = ( zoneWid[label] as Fixed.FixedChild); fx = ( zoneWid[label] as Fixed.FixedChild);
fx.X = xpos-30; fx.X = xpos-30;
fx.Y = ypos+150; fx.Y = ypos+150;
label.LabelProp = "<small>" + c.ShortName + "</small>"; label.LabelProp = "<small>"+c.ID + "-" + c.ShortName + "</small>";
label.Show(); label.Show();
xpos+=30; xpos+=30;