Author: lluis
Date: 2007-05-25 13:08:04 -0400 (Fri, 25 May 2007)
New Revision: 77953
Modified:
trunk/mono-addins/Mono.Addins.Gui/ChangeLog
trunk/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinManagerDialog.cs
trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs
trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs
trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs
trunk/mono-addins/Mono.Addins.Gui/gtk-gui/generated.cs
trunk/mono-addins/Mono.Addins.Gui/gtk-gui/gui.stetic
Log:
* gtk-gui/generated.cs, gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs,
gtk-gui/Mono.Addins.Gui.ErrorDialog.cs,
gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs, gtk-gui/gui.stetic:
Updated.
* Mono.Addins.Gui/AddinManagerDialog.cs: Handle exceptions thrown when
enabling/disabling add-ins.
Modified: trunk/mono-addins/Mono.Addins.Gui/ChangeLog
===================================================================
--- trunk/mono-addins/Mono.Addins.Gui/ChangeLog 2007-05-25 17:06:44 UTC (rev
77952)
+++ trunk/mono-addins/Mono.Addins.Gui/ChangeLog 2007-05-25 17:08:04 UTC (rev
77953)
@@ -1,3 +1,12 @@
+2007-05-25 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * gtk-gui/generated.cs, gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs,
+ gtk-gui/Mono.Addins.Gui.ErrorDialog.cs,
+ gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs, gtk-gui/gui.stetic:
+ Updated.
+ * Mono.Addins.Gui/AddinManagerDialog.cs: Handle exceptions thrown when
+ enabling/disabling add-ins.
+
2007-05-10 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs, gtk-gui/gui.stetic:
Modified:
trunk/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinManagerDialog.cs
===================================================================
--- trunk/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinManagerDialog.cs
2007-05-25 17:06:44 UTC (rev 77952)
+++ trunk/mono-addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinManagerDialog.cs
2007-05-25 17:08:04 UTC (rev 77953)
@@ -91,20 +91,30 @@
internal void OnEnable (object sender, EventArgs e)
{
- Addin sinfo = (Addin) tree.ActiveAddinData;
- if (sinfo == null)
- return;
- sinfo.Enabled = true;
- LoadAddins ();
+ try {
+ Addin sinfo = (Addin) tree.ActiveAddinData;
+ if (sinfo == null)
+ return;
+ sinfo.Enabled = true;
+ LoadAddins ();
+ }
+ catch (Exception ex) {
+ Services.ShowError (ex, null, this, true);
+ }
}
internal void OnDisable (object sender, EventArgs e)
{
- Addin sinfo = (Addin) tree.ActiveAddinData;
- if (sinfo == null)
- return;
- sinfo.Enabled = false;
- LoadAddins ();
+ try {
+ Addin sinfo = (Addin) tree.ActiveAddinData;
+ if (sinfo == null)
+ return;
+ sinfo.Enabled = false;
+ LoadAddins ();
+ }
+ catch (Exception ex) {
+ Services.ShowError (ex, null, this, true);
+ }
}
internal void OnShowInfo (object sender, EventArgs e)
Modified:
trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs
===================================================================
---
trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs
2007-05-25 17:06:44 UTC (rev 77952)
+++
trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs
2007-05-25 17:08:04 UTC (rev 77953)
@@ -120,6 +120,7 @@
this.wizardNotebook = new Gtk.Notebook();
this.wizardNotebook.CanFocus = true;
this.wizardNotebook.Name = "wizardNotebook";
+ this.wizardNotebook.CurrentPage = 0;
this.wizardNotebook.ShowBorder = false;
this.wizardNotebook.BorderWidth = ((uint)(12));
// Container child wizardNotebook.Gtk.Notebook+NotebookChild
@@ -297,7 +298,7 @@
this.imageInstall.Name = "imageInstall";
this.imageInstall.Xalign = 0F;
this.imageInstall.Yalign = 0F;
- this.imageInstall.Pixbuf =
Gtk.IconTheme.Default.LoadIcon("gtk-dialog-warning", 48, 0);
+ this.imageInstall.Pixbuf =
Stetic.IconLoader.LoadIcon("gtk-dialog-warning", 48);
this.hbox82.Add(this.imageInstall);
Gtk.Box.BoxChild w19 =
((Gtk.Box.BoxChild)(this.hbox82[this.imageInstall]));
w19.Position = 0;
@@ -413,7 +414,7 @@
this.imageError = new Gtk.Image();
this.imageError.Name = "imageError";
this.imageError.Yalign = 1F;
- this.imageError.Pixbuf =
Gtk.IconTheme.Default.LoadIcon("gtk-dialog-error", 48, 0);
+ this.imageError.Pixbuf =
Stetic.IconLoader.LoadIcon("gtk-dialog-error", 48);
this.vbox91.Add(this.imageError);
Gtk.Box.BoxChild w32 =
((Gtk.Box.BoxChild)(this.vbox91[this.imageError]));
w32.Position = 1;
@@ -424,7 +425,7 @@
this.imageInfo = new Gtk.Image();
this.imageInfo.Name = "imageInfo";
this.imageInfo.Yalign = 1F;
- this.imageInfo.Pixbuf =
Gtk.IconTheme.Default.LoadIcon("gtk-dialog-info", 48, 0);
+ this.imageInfo.Pixbuf =
Stetic.IconLoader.LoadIcon("gtk-dialog-info", 48);
this.vbox91.Add(this.imageInfo);
Gtk.Box.BoxChild w33 =
((Gtk.Box.BoxChild)(this.vbox91[this.imageInfo]));
w33.Position = 2;
Modified:
trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs
===================================================================
---
trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs
2007-05-25 17:06:44 UTC (rev 77952)
+++
trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs
2007-05-25 17:08:04 UTC (rev 77953)
@@ -76,7 +76,7 @@
this.imageInstall = new Gtk.Image();
this.imageInstall.Name = "imageInstall";
this.imageInstall.Yalign = 0F;
- this.imageInstall.Pixbuf =
Gtk.IconTheme.Default.LoadIcon("gtk-dialog-warning", 48, 0);
+ this.imageInstall.Pixbuf =
Stetic.IconLoader.LoadIcon("gtk-dialog-warning", 48);
this.hbox85.Add(this.imageInstall);
Gtk.Box.BoxChild w2 =
((Gtk.Box.BoxChild)(this.hbox85[this.imageInstall]));
w2.Position = 0;
@@ -157,8 +157,8 @@
w10.Spacing = 2;
// Container child GtkHBox.Gtk.Container+ContainerChild
Gtk.Image w11 = new Gtk.Image();
- w11.Name = "image25";
- w11.Pixbuf = Gtk.IconTheme.Default.LoadIcon("gtk-add", 20, 0);
+ w11.Name = "image17";
+ w11.Pixbuf = Stetic.IconLoader.LoadIcon("gtk-add", 20);
w10.Add(w11);
// Container child GtkHBox.Gtk.Container+ContainerChild
Gtk.Label w13 = new Gtk.Label();
@@ -206,8 +206,8 @@
w21.Spacing = 2;
// Container child GtkHBox1.Gtk.Container+ContainerChild
Gtk.Image w22 = new Gtk.Image();
- w22.Name = "image26";
- w22.Pixbuf = Gtk.IconTheme.Default.LoadIcon("gtk-remove", 20, 0);
+ w22.Name = "image18";
+ w22.Pixbuf = Stetic.IconLoader.LoadIcon("gtk-remove", 20);
w21.Add(w22);
// Container child GtkHBox1.Gtk.Container+ContainerChild
Gtk.Label w24 = new Gtk.Label();
@@ -236,8 +236,8 @@
w30.Spacing = 2;
// Container child GtkHBox2.Gtk.Container+ContainerChild
Gtk.Image w31 = new Gtk.Image();
- w31.Name = "image27";
- w31.Pixbuf = Gtk.IconTheme.Default.LoadIcon("gtk-yes", 20, 0);
+ w31.Name = "image19";
+ w31.Pixbuf = Stetic.IconLoader.LoadIcon("gtk-yes", 20);
w30.Add(w31);
// Container child GtkHBox2.Gtk.Container+ContainerChild
Gtk.Label w33 = new Gtk.Label();
@@ -266,8 +266,8 @@
w39.Spacing = 2;
// Container child GtkHBox3.Gtk.Container+ContainerChild
Gtk.Image w40 = new Gtk.Image();
- w40.Name = "image28";
- w40.Pixbuf = Gtk.IconTheme.Default.LoadIcon("gtk-no", 20, 0);
+ w40.Name = "image20";
+ w40.Pixbuf = Stetic.IconLoader.LoadIcon("gtk-no", 20);
w39.Add(w40);
// Container child GtkHBox3.Gtk.Container+ContainerChild
Gtk.Label w42 = new Gtk.Label();
Modified:
trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs
===================================================================
--- trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs
2007-05-25 17:06:44 UTC (rev 77952)
+++ trunk/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs
2007-05-25 17:08:04 UTC (rev 77953)
@@ -55,7 +55,7 @@
// Container child vbox72.Gtk.Box+BoxChild
this.icon = new Gtk.Image();
this.icon.Name = "icon";
- this.icon.Pixbuf =
Gtk.IconTheme.Default.LoadIcon("gtk-dialog-error", 48, 0);
+ this.icon.Pixbuf = Stetic.IconLoader.LoadIcon("gtk-dialog-error",
48);
this.vbox72.Add(this.icon);
Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.vbox72[this.icon]));
w2.Position = 0;
Modified: trunk/mono-addins/Mono.Addins.Gui/gtk-gui/generated.cs
===================================================================
--- trunk/mono-addins/Mono.Addins.Gui/gtk-gui/generated.cs 2007-05-25
17:06:44 UTC (rev 77952)
+++ trunk/mono-addins/Mono.Addins.Gui/gtk-gui/generated.cs 2007-05-25
17:08:04 UTC (rev 77953)
@@ -22,6 +22,33 @@
}
}
+ public class IconLoader {
+
+ public static Gdk.Pixbuf LoadIcon(string name, int sz) {
+ try {
+ return Gtk.IconTheme.Default.LoadIcon(name, sz, 0);
+ }
+ catch (System.Exception ) {
+ if ((name != "gtk-missing-image")) {
+ return Stetic.IconLoader.LoadIcon("gtk-missing-image", 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);
+ }
+ }
+ }
+ }
+
internal class ActionGroups {
public static Gtk.ActionGroup GetActionGroup(System.Type type) {
Modified: trunk/mono-addins/Mono.Addins.Gui/gtk-gui/gui.stetic
===================================================================
--- trunk/mono-addins/Mono.Addins.Gui/gtk-gui/gui.stetic 2007-05-25
17:06:44 UTC (rev 77952)
+++ trunk/mono-addins/Mono.Addins.Gui/gtk-gui/gui.stetic 2007-05-25
17:08:04 UTC (rev 77953)
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<stetic-interface>
+ <configuration>
+ <images-root-path>../</images-root-path>
+ </configuration>
<widget class="Gtk.Dialog" id="Mono.Addins.Gui.ErrorDialog" design-size="628
145">
<property name="MemberName" />
<property name="GeneratePublic">False</property>
@@ -436,6 +439,7 @@
<widget class="Gtk.Notebook" id="wizardNotebook">
<property name="MemberName" />
<property name="CanFocus">True</property>
+ <property name="CurrentPage">0</property>
<property name="ShowBorder">False</property>
<property name="BorderWidth">12</property>
<child>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
