Author: lluis
Date: 2007-09-20 13:03:15 -0400 (Thu, 20 Sep 2007)
New Revision: 86079
Modified:
trunk/monodevelop/Extras/VersionControl/ChangeLog
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificateDialog.cs
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificatePasswordDialog.cs
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.UserPasswordDialog.cs
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/generated.cs
Log:
*
MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificateDialog.cs,
MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.UserPasswordDialog.cs,
MonoDevelop.VersionControl.Subversion/gtk-gui/generated.cs,
MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificatePasswordDialog.cs,
MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs:
Regenerated GUI files.
Modified: trunk/monodevelop/Extras/VersionControl/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/VersionControl/ChangeLog 2007-09-20 17:02:04 UTC
(rev 86078)
+++ trunk/monodevelop/Extras/VersionControl/ChangeLog 2007-09-20 17:03:15 UTC
(rev 86079)
@@ -1,3 +1,12 @@
+2007-09-20 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ *
MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificateDialog.cs,
+
MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.UserPasswordDialog.cs,
+ MonoDevelop.VersionControl.Subversion/gtk-gui/generated.cs,
+
MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificatePasswordDialog.cs,
+
MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs:
+ Regenerated GUI files.
+
2007-09-15 Andrés G. Aragoneses <[EMAIL PROTECTED]>
*
MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificatePasswordDialog.cs:
Modified:
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificateDialog.cs
===================================================================
---
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificateDialog.cs
2007-09-20 17:02:04 UTC (rev 86078)
+++
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificateDialog.cs
2007-09-20 17:03:15 UTC (rev 86079)
@@ -34,7 +34,7 @@
private Gtk.Button button24;
protected virtual void Build() {
- Stetic.Gui.Initialize();
+ Stetic.Gui.Initialize(this);
// Widget
MonoDevelop.VersionControl.Subversion.Gui.ClientCertificateDialog
this.Events = ((Gdk.EventMask)(256));
this.Name =
"MonoDevelop.VersionControl.Subversion.Gui.ClientCertificateDialog";
Modified:
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificatePasswordDialog.cs
===================================================================
---
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificatePasswordDialog.cs
2007-09-20 17:02:04 UTC (rev 86078)
+++
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificatePasswordDialog.cs
2007-09-20 17:03:15 UTC (rev 86079)
@@ -34,7 +34,7 @@
private Gtk.Button button28;
protected virtual void Build() {
- Stetic.Gui.Initialize();
+ Stetic.Gui.Initialize(this);
// Widget
MonoDevelop.VersionControl.Subversion.Gui.ClientCertificatePasswordDialog
this.Events = ((Gdk.EventMask)(256));
this.Name =
"MonoDevelop.VersionControl.Subversion.Gui.ClientCertificatePasswordDialog";
Modified:
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs
===================================================================
---
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs
2007-09-20 17:02:04 UTC (rev 86078)
+++
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs
2007-09-20 17:03:15 UTC (rev 86079)
@@ -68,7 +68,7 @@
private Gtk.Button button104;
protected virtual void Build() {
- Stetic.Gui.Initialize();
+ Stetic.Gui.Initialize(this);
// Widget
MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog
this.Events = ((Gdk.EventMask)(256));
this.Name =
"MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog";
@@ -90,7 +90,7 @@
// Container child vbox2.Gtk.Box+BoxChild
this.image1 = new Gtk.Image();
this.image1.Name = "image1";
- this.image1.Pixbuf =
Stetic.IconLoader.LoadIcon("gtk-dialog-warning", 48);
+ this.image1.Pixbuf = Stetic.IconLoader.LoadIcon(this,
"gtk-dialog-warning", Gtk.IconSize.Dialog, 48);
this.vbox2.Add(this.image1);
Gtk.Box.BoxChild w2 =
((Gtk.Box.BoxChild)(this.vbox2[this.image1]));
w2.Position = 0;
@@ -313,7 +313,6 @@
this.radioAccept = new
Gtk.RadioButton(Mono.Unix.Catalog.GetString("Accept this certificate
permanently"));
this.radioAccept.CanFocus = true;
this.radioAccept.Name = "radioAccept";
- this.radioAccept.Active = true;
this.radioAccept.DrawIndicator = true;
this.radioAccept.UseUnderline = true;
this.radioAccept.Group = new GLib.SList(System.IntPtr.Zero);
Modified:
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.UserPasswordDialog.cs
===================================================================
---
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.UserPasswordDialog.cs
2007-09-20 17:02:04 UTC (rev 86078)
+++
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.UserPasswordDialog.cs
2007-09-20 17:03:15 UTC (rev 86079)
@@ -36,7 +36,7 @@
private Gtk.Button button7;
protected virtual void Build() {
- Stetic.Gui.Initialize();
+ Stetic.Gui.Initialize(this);
// Widget
MonoDevelop.VersionControl.Subversion.Gui.UserPasswordDialog
this.Events = ((Gdk.EventMask)(256));
this.Name =
"MonoDevelop.VersionControl.Subversion.Gui.UserPasswordDialog";
Modified:
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/generated.cs
===================================================================
---
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/generated.cs
2007-09-20 17:02:04 UTC (rev 86078)
+++
trunk/monodevelop/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/generated.cs
2007-09-20 17:03:15 UTC (rev 86079)
@@ -15,7 +15,7 @@
private static bool initialized;
- internal static void Initialize() {
+ internal static void Initialize(Gtk.Widget iconRenderer) {
if ((Stetic.Gui.initialized == false)) {
Stetic.Gui.initialized = true;
}
@@ -24,26 +24,32 @@
internal class IconLoader {
- public static Gdk.Pixbuf LoadIcon(string name, int sz) {
- try {
- return Gtk.IconTheme.Default.LoadIcon(name, sz, 0);
+ public static Gdk.Pixbuf LoadIcon(Gtk.Widget widget, string name,
Gtk.IconSize size, int sz) {
+ Gdk.Pixbuf res = widget.RenderIcon(name, size, null);
+ if ((res != null)) {
+ return res;
}
- catch (System.Exception ) {
- if ((name != "gtk-missing-image")) {
- return Stetic.IconLoader.LoadIcon("gtk-missing-image", sz);
+ else {
+ try {
+ return Gtk.IconTheme.Default.LoadIcon(name, sz, 0);
}
- else {
- Gdk.Pixmap pmap = new
Gdk.Pixmap(Gdk.Screen.Default.RootWindow, sz, sz);
- Gdk.GC gc = new Gdk.GC(pmap);
- gc.RgbFgColor = new Gdk.Color(255, 255, 255);
- pmap.DrawRectangle(gc, true, 0, 0, sz, sz);
- gc.RgbFgColor = new Gdk.Color(0, 0, 0);
- pmap.DrawRectangle(gc, false, 0, 0, (sz - 1), (sz - 1));
- gc.SetLineAttributes(3, Gdk.LineStyle.Solid,
Gdk.CapStyle.Round, Gdk.JoinStyle.Round);
- gc.RgbFgColor = new Gdk.Color(255, 0, 0);
- pmap.DrawLine(gc, (sz / 4), (sz / 4), ((sz - 1) - (sz /
4)), ((sz - 1) - (sz / 4)));
- pmap.DrawLine(gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz /
4), ((sz - 1) - (sz / 4)));
- return Gdk.Pixbuf.FromDrawable(pmap, pmap.Colormap, 0, 0,
0, 0, sz, sz);
+ catch (System.Exception ) {
+ if ((name != "gtk-missing-image")) {
+ return Stetic.IconLoader.LoadIcon(widget,
"gtk-missing-image", size, sz);
+ }
+ else {
+ Gdk.Pixmap pmap = new
Gdk.Pixmap(Gdk.Screen.Default.RootWindow, sz, sz);
+ Gdk.GC gc = new Gdk.GC(pmap);
+ gc.RgbFgColor = new Gdk.Color(255, 255, 255);
+ pmap.DrawRectangle(gc, true, 0, 0, sz, sz);
+ gc.RgbFgColor = new Gdk.Color(0, 0, 0);
+ pmap.DrawRectangle(gc, false, 0, 0, (sz - 1), (sz -
1));
+ gc.SetLineAttributes(3, Gdk.LineStyle.Solid,
Gdk.CapStyle.Round, Gdk.JoinStyle.Round);
+ gc.RgbFgColor = new Gdk.Color(255, 0, 0);
+ pmap.DrawLine(gc, (sz / 4), (sz / 4), ((sz - 1) - (sz
/ 4)), ((sz - 1) - (sz / 4)));
+ pmap.DrawLine(gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz
/ 4), ((sz - 1) - (sz / 4)));
+ return Gdk.Pixbuf.FromDrawable(pmap, pmap.Colormap, 0,
0, 0, 0, sz, sz);
+ }
}
}
}
_______________________________________________
Mono-patches maillist - Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches
