Author: danw
Date: 2005-03-15 14:57:20 -0500 (Tue, 15 Mar 2005)
New Revision: 41850
Modified:
trunk/stetic/ChangeLog
trunk/stetic/libstetic/editor/StockItem.cs
trunk/stetic/libstetic/wrapper/CheckButton.cs
trunk/stetic/libstetic/wrapper/DrawingArea.cs
trunk/stetic/libstetic/wrapper/Entry.cs
trunk/stetic/libstetic/wrapper/ProgressBar.cs
trunk/stetic/libstetic/wrapper/RadioButton.cs
trunk/stetic/libstetic/wrapper/Statusbar.cs
trunk/stetic/libstetic/wrapper/TextView.cs
trunk/stetic/libstetic/wrapper/TreeView.cs
Log:
* libstetic/editor/StockItem.cs: fix sorting again. (ignore "_")
* libstetic/wrapper/CheckButton.cs:
* libstetic/wrapper/Entry.cs:
* libstetic/wrapper/ProgressBar.cs:
* libstetic/wrapper/RadioButton.cs:
* libstetic/wrapper/Statusbar.cs: mark HExpandable
* libstetic/wrapper/DrawingArea.cs:
* libstetic/wrapper/TextView.cs:
* libstetic/wrapper/TreeView.cs: mark HExpandable and VExpandable
Modified: trunk/stetic/ChangeLog
===================================================================
--- trunk/stetic/ChangeLog 2005-03-15 19:56:50 UTC (rev 41849)
+++ trunk/stetic/ChangeLog 2005-03-15 19:57:20 UTC (rev 41850)
@@ -1,5 +1,19 @@
2005-03-15 Dan Winship <[EMAIL PROTECTED]>
+ * libstetic/editor/StockItem.cs: fix sorting again. (ignore "_")
+
+ * libstetic/wrapper/CheckButton.cs:
+ * libstetic/wrapper/Entry.cs:
+ * libstetic/wrapper/ProgressBar.cs:
+ * libstetic/wrapper/RadioButton.cs:
+ * libstetic/wrapper/Statusbar.cs: mark HExpandable
+
+ * libstetic/wrapper/DrawingArea.cs:
+ * libstetic/wrapper/TextView.cs:
+ * libstetic/wrapper/TreeView.cs: mark HExpandable and VExpandable
+
+2005-03-15 Dan Winship <[EMAIL PROTECTED]>
+
* libstetic/WidgetSite.cs (AddFault, AddHFault, AddVFault): Make
AddHFault and AddVFault take WidgetSites rather than coordinates,
and provide AddFault for fully-generic fault adding. For AddHFault
Modified: trunk/stetic/libstetic/editor/StockItem.cs
===================================================================
--- trunk/stetic/libstetic/editor/StockItem.cs 2005-03-15 19:56:50 UTC (rev
41849)
+++ trunk/stetic/libstetic/editor/StockItem.cs 2005-03-15 19:57:20 UTC (rev
41850)
@@ -21,9 +21,15 @@
if (item.StockId == null)
continue;
stockItems.Add (item);
+ Console.WriteLine ("adding {0}", item.Label);
}
stockItems.Sort (this);
+ Console.WriteLine ("\nSORTING\n");
+
+ foreach (Gtk.StockItem item in stockItems)
+ Console.WriteLine ("{0}", item.Label);
+
stockIds = new ArrayList ();
foreach (Gtk.StockItem item in stockItems) {
string markup;
@@ -55,7 +61,8 @@
Gtk.StockItem x = (Gtk.StockItem)itemx;
Gtk.StockItem y = (Gtk.StockItem)itemy;
- return string.Compare (x.Label, y.Label);
+ return string.Compare (x.Label.Replace ("_", ""),
+ y.Label.Replace ("_", ""));
}
public string StockId {
Modified: trunk/stetic/libstetic/wrapper/CheckButton.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/CheckButton.cs 2005-03-15 19:56:50 UTC
(rev 41849)
+++ trunk/stetic/libstetic/wrapper/CheckButton.cs 2005-03-15 19:57:20 UTC
(rev 41850)
@@ -24,5 +24,7 @@
checkbutton.Label = checkbutton.Name;
}
}
+
+ public override bool HExpandable { get { return true; } }
}
}
Modified: trunk/stetic/libstetic/wrapper/DrawingArea.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/DrawingArea.cs 2005-03-15 19:56:50 UTC
(rev 41849)
+++ trunk/stetic/libstetic/wrapper/DrawingArea.cs 2005-03-15 19:57:20 UTC
(rev 41850)
@@ -6,5 +6,8 @@
public class DrawingArea : Widget {
public static new Type WrappedType = typeof (Gtk.DrawingArea);
+
+ public override bool HExpandable { get { return true; } }
+ public override bool VExpandable { get { return true; } }
}
}
Modified: trunk/stetic/libstetic/wrapper/Entry.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/Entry.cs 2005-03-15 19:56:50 UTC (rev
41849)
+++ trunk/stetic/libstetic/wrapper/Entry.cs 2005-03-15 19:57:20 UTC (rev
41850)
@@ -41,5 +41,7 @@
InvisibleChar = Char.Parse (value);
}
}
+
+ public override bool HExpandable { get { return true; } }
}
}
Modified: trunk/stetic/libstetic/wrapper/ProgressBar.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/ProgressBar.cs 2005-03-15 19:56:50 UTC
(rev 41849)
+++ trunk/stetic/libstetic/wrapper/ProgressBar.cs 2005-03-15 19:57:20 UTC
(rev 41850)
@@ -14,5 +14,7 @@
"Text",
"PulseStep");
}
+
+ public override bool HExpandable { get { return true; } }
}
}
Modified: trunk/stetic/libstetic/wrapper/RadioButton.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/RadioButton.cs 2005-03-15 19:56:50 UTC
(rev 41849)
+++ trunk/stetic/libstetic/wrapper/RadioButton.cs 2005-03-15 19:57:20 UTC
(rev 41850)
@@ -147,5 +147,7 @@
}
}
}
+
+ public override bool HExpandable { get { return true; } }
}
}
Modified: trunk/stetic/libstetic/wrapper/Statusbar.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/Statusbar.cs 2005-03-15 19:56:50 UTC (rev
41849)
+++ trunk/stetic/libstetic/wrapper/Statusbar.cs 2005-03-15 19:57:20 UTC (rev
41850)
@@ -12,5 +12,7 @@
AddItemGroup (type, "Status Bar Properties",
"HasResizeGrip");
}
+
+ public override bool HExpandable { get { return true; } }
}
}
Modified: trunk/stetic/libstetic/wrapper/TextView.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/TextView.cs 2005-03-15 19:56:50 UTC (rev
41849)
+++ trunk/stetic/libstetic/wrapper/TextView.cs 2005-03-15 19:57:20 UTC (rev
41850)
@@ -49,5 +49,8 @@
{
EmitNotify ("Text");
}
+
+ public override bool HExpandable { get { return true; } }
+ public override bool VExpandable { get { return true; } }
}
}
Modified: trunk/stetic/libstetic/wrapper/TreeView.cs
===================================================================
--- trunk/stetic/libstetic/wrapper/TreeView.cs 2005-03-15 19:56:50 UTC (rev
41849)
+++ trunk/stetic/libstetic/wrapper/TreeView.cs 2005-03-15 19:57:20 UTC (rev
41850)
@@ -18,5 +18,8 @@
"SearchColumn",
"Model");
}
+
+ public override bool HExpandable { get { return true; } }
+ public override bool VExpandable { get { return true; } }
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
