Hello community, here is the log from the commit of package mono-addins checked in at Thu Mar 27 21:29:42 CET 2008. -------- --- mono-addins/mono-addins.changes 2008-01-15 00:57:58.000000000 +0100 +++ /mounts/work_src_done/NOARCH/mono-addins/mono-addins.changes 2008-03-26 20:57:24.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Mar 26 16:56:07 MST 2008 - wberrier@suse.de + +- Update to 0.3.1 + -Fix compatibility with new Mono + -Delete subdirectory when uninstalling + -Improve error reporting + +------------------------------------------------------------------- Old: ---- mono-addins-0.3.tar.bz2 New: ---- mono-addins-0.3.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mono-addins.spec ++++++ --- /var/tmp/diff_new_pack.sc8216/_old 2008-03-27 21:28:38.000000000 +0100 +++ /var/tmp/diff_new_pack.sc8216/_new 2008-03-27 21:28:38.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package mono-addins (Version 0.3) +# spec file for package mono-addins (Version 0.3.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -10,10 +10,11 @@ # norootforbuild + Name: mono-addins -Version: 0.3 +Version: 0.3.1 Release: 1 -License: LGPL +License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on BuildArch: noarch @@ -25,6 +26,9 @@ %if 0%{?fedora_version} %define env_options export MONO_SHARED_DIR=/tmp %endif +%if 0%{?rhel_version} +%define env_options export MONO_SHARED_DIR=/tmp +%endif %description Mono.Addins is a generic framework for creating extensible @@ -69,7 +73,7 @@ %clean rm -rf "$RPM_BUILD_ROOT" -%if 0%{?fedora_version} +%if 0%{?fedora_version} || 0%{?rhel_version} # Allows overrides of __find_provides in fedora distros... (already set to zero on newer suse distros) %define _use_internal_dependency_generator 0 %endif @@ -77,5 +81,10 @@ %define __find_requires env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-requires && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-requires ; } | sort | uniq' %changelog -* Mon Jan 14 2008 - wberrier@suse.de +* Wed Mar 26 2008 wberrier@suse.de +- Update to 0.3.1 + -Fix compatibility with new Mono + -Delete subdirectory when uninstalling + -Improve error reporting +* Mon Jan 14 2008 wberrier@suse.de - Initial package (needed by MD and other mono apps) ++++++ mono-addins-0.3.tar.bz2 -> mono-addins-0.3.1.tar.bz2 ++++++ ++++ 1704 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mono-addins-0.3/ChangeLog new/mono-addins-0.3.1/ChangeLog --- old/mono-addins-0.3/ChangeLog 2007-12-18 20:16:27.000000000 +0100 +++ new/mono-addins-0.3.1/ChangeLog 2008-01-31 01:00:42.000000000 +0100 @@ -1,3 +1,15 @@ +2008-01-30 Michael Hutchinson <mhutchinson@novell.com> + + * configure.in: Bump release number to 0.3.1. + +2008-01-17 Lluis Sanchez Gual <lluis@novell.com> + + * COPYING, Makefile.am: Add COPYING file. + +2008-01-07 Lluis Sanchez Gual <lluis@novell.com> + + * Mono.Addins.sln: Updated VS solution files. Patch by Andrés G. Aragoneses. + 2007-12-15 Lluis Sanchez Gual <lluis@novell.com> * Makefile.include, configure.ac: Don't install assemblies in diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mono-addins-0.3/configure.ac new/mono-addins-0.3.1/configure.ac --- old/mono-addins-0.3/configure.ac 2007-12-18 20:16:27.000000000 +0100 +++ new/mono-addins-0.3.1/configure.ac 2008-01-31 01:00:42.000000000 +0100 @@ -1,7 +1,7 @@ dnl Warning: This is an automatically generated file, do not edit! dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.54]) -AC_INIT([mono-addins], [0.3]) +AC_INIT([mono-addins], [0.3.1]) AM_INIT_AUTOMAKE([foreign]) dnl pkg-config diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mono-addins-0.3/COPYING new/mono-addins-0.3.1/COPYING --- old/mono-addins-0.3/COPYING 1970-01-01 01:00:00.000000000 +0100 +++ new/mono-addins-0.3.1/COPYING 2008-01-30 23:37:53.000000000 +0100 @@ -0,0 +1,21 @@ +The MIT License + +Copyright (C) 2007 Novell, Inc (http://www.novell.com) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mono-addins-0.3/Makefile.am new/mono-addins-0.3.1/Makefile.am --- old/mono-addins-0.3/Makefile.am 2007-12-18 20:16:27.000000000 +0100 +++ new/mono-addins-0.3.1/Makefile.am 2008-01-30 23:37:53.000000000 +0100 @@ -10,4 +10,4 @@ mkdir -p docs monodocer --delete --pretty $(DOCFILES:%=--assembly:%) --path docs -EXTRA_DIST = mono-addins.snk +EXTRA_DIST = COPYING mono-addins.snk diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mono-addins-0.3/mautil/ChangeLog new/mono-addins-0.3.1/mautil/ChangeLog --- old/mono-addins-0.3/mautil/ChangeLog 2007-12-18 20:16:23.000000000 +0100 +++ new/mono-addins-0.3.1/mautil/ChangeLog 2008-01-30 23:37:49.000000000 +0100 @@ -1,3 +1,7 @@ +2008-01-17 Lluis Sanchez Gual <lluis@novell.com> + + * mautil.csproj: Add missing project file. + 2007-12-15 Wade Berrier <wberrier@novell.com> * Makefile.am: install path for mautil.exe doesn't need DESTDIR (somehow...?) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mono-addins-0.3/Mono.Addins/ChangeLog new/mono-addins-0.3.1/Mono.Addins/ChangeLog --- old/mono-addins-0.3/Mono.Addins/ChangeLog 2007-12-18 20:16:27.000000000 +0100 +++ new/mono-addins-0.3.1/Mono.Addins/ChangeLog 2008-01-30 23:37:53.000000000 +0100 @@ -1,3 +1,14 @@ +2008-01-21 Lluis Sanchez Gual <lluis@novell.com> + + * Mono.Addins/ExtensionTree.cs: Since Mono r93079, GetFields don't return + private fields from base classes. Fixed the code to work with the new + behavior. + +2008-01-07 Lluis Sanchez Gual <lluis@novell.com> + + * Mono.Addins.csproj: Updated VS solution files. Patch by Andrés G. + Aragoneses. + 2007-12-15 Lluis Sanchez Gual <lluis@novell.com> * mono-addins.pc.in: Update assembly paths. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mono-addins-0.3/Mono.Addins/Mono.Addins/ExtensionTree.cs new/mono-addins-0.3.1/Mono.Addins/Mono.Addins/ExtensionTree.cs --- old/mono-addins-0.3/Mono.Addins/Mono.Addins/ExtensionTree.cs 2007-12-18 20:16:26.000000000 +0100 +++ new/mono-addins-0.3.1/Mono.Addins/Mono.Addins/ExtensionTree.cs 2008-01-30 23:37:52.000000000 +0100 @@ -210,22 +210,26 @@ Hashtable fields = new Hashtable (); // Check if the type has NodeAttribute attributes applied to fields. - foreach (FieldInfo field in ntype.Type.GetFields (BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)) { - NodeAttributeAttribute at = (NodeAttributeAttribute) Attribute.GetCustomAttribute (field, typeof(NodeAttributeAttribute), true); - if (at != null) { - ExtensionNodeType.FieldData fdata = new ExtensionNodeType.FieldData (); - fdata.Field = field; - fdata.Required = at.Required; - fdata.Localizable = at.Localizable; - - string name; - if (at.Name != null && at.Name.Length > 0) - name = at.Name; - else - name = field.Name; - - fields [name] = fdata; + Type type = ntype.Type; + while (type != typeof(object) && type != null) { + foreach (FieldInfo field in type.GetFields (BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly)) { + NodeAttributeAttribute at = (NodeAttributeAttribute) Attribute.GetCustomAttribute (field, typeof(NodeAttributeAttribute), true); + if (at != null) { + ExtensionNodeType.FieldData fdata = new ExtensionNodeType.FieldData (); + fdata.Field = field; + fdata.Required = at.Required; + fdata.Localizable = at.Localizable; + + string name; + if (at.Name != null && at.Name.Length > 0) + name = at.Name; + else + name = field.Name; + + fields [name] = fdata; + } } + type = type.BaseType; } if (fields.Count > 0) ntype.Fields = fields; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mono-addins-0.3/Mono.Addins.Gui/ChangeLog new/mono-addins-0.3.1/Mono.Addins.Gui/ChangeLog --- old/mono-addins-0.3/Mono.Addins.Gui/ChangeLog 2007-12-18 20:16:23.000000000 +0100 +++ new/mono-addins-0.3.1/Mono.Addins.Gui/ChangeLog 2008-01-30 23:37:49.000000000 +0100 @@ -1,3 +1,23 @@ +2008-01-17 Lluis Sanchez Gual <lluis@novell.com> + + * gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs, + gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs, + gtk-gui/Mono.Addins.Gui.ErrorDialog.cs, + gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs, + gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs, + gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs: Regenerated. + * gtk-gui/Mono.Addins.Gui.ProgressDialog.cs, gtk-gui/gui.stetic, + Makefile.am, Mono.Addins.Gui.mdp, Mono.Addins.Gui/ProgressDialog.cs: + Added new progress dialog to be used when updating registries. + * Mono.Addins.Gui/ManageSitesDialog.cs: When adding a repository, update it + to get the add-in list. + * Mono.Addins.Gui/AddinInstallDialog.cs: Improve progress reporting. + +2008-01-07 Lluis Sanchez Gual <lluis@novell.com> + + * Mono.Addins.Gui.csproj: Updated VS solution files. Patch by Andrés G. + Aragoneses. + 2007-12-15 Lluis Sanchez Gual <lluis@novell.com> * mono-addins-gui.pc.in: Update assembly paths. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mono-addins-0.3/Mono.Addins.Gui/gtk-gui/gui.stetic new/mono-addins-0.3.1/Mono.Addins.Gui/gtk-gui/gui.stetic --- old/mono-addins-0.3/Mono.Addins.Gui/gtk-gui/gui.stetic 2007-12-18 20:16:23.000000000 +0100 +++ new/mono-addins-0.3.1/Mono.Addins.Gui/gtk-gui/gui.stetic 2008-01-30 23:37:49.000000000 +0100 @@ -73,8 +73,6 @@ <widget class="Gtk.ScrolledWindow" id="scrolledwindow10"> <property name="MemberName" /> <property name="CanFocus">True</property> - <property name="VscrollbarPolicy">Automatic</property> - <property name="HscrollbarPolicy">Automatic</property> <property name="ShadowType">In</property> <child> <widget class="Gtk.TextView" id="detailsTextView"> @@ -236,8 +234,6 @@ <widget class="Gtk.ScrolledWindow" id="scrolledwindow13"> <property name="MemberName" /> <property name="CanFocus">True</property> - <property name="VscrollbarPolicy">Automatic</property> - <property name="HscrollbarPolicy">Automatic</property> <property name="ShadowType">In</property> <child> <widget class="Gtk.TreeView" id="addinTree"> @@ -439,7 +435,7 @@ <widget class="Gtk.Notebook" id="wizardNotebook"> <property name="MemberName" /> <property name="CanFocus">True</property> - <property name="CurrentPage">3</property> + <property name="CurrentPage">0</property> <property name="ShowBorder">False</property> <property name="BorderWidth">6</property> <child> @@ -541,8 +537,6 @@ <widget class="Gtk.ScrolledWindow" id="scrolledwindow18"> <property name="MemberName" /> <property name="CanFocus">True</property> - <property name="VscrollbarPolicy">Automatic</property> - <property name="HscrollbarPolicy">Automatic</property> <property name="ShadowType">In</property> <child> <widget class="Gtk.TreeView" id="addinTree"> @@ -651,9 +645,6 @@ </packing> </child> </widget> - <packing> - <property name="TabExpand">False</property> - </packing> </child> <child> <widget class="Gtk.Label" id="label108"> @@ -668,8 +659,6 @@ <widget class="Gtk.ScrolledWindow" id="scrolledwindow19"> <property name="MemberName" /> <property name="CanFocus">True</property> - <property name="VscrollbarPolicy">Automatic</property> - <property name="HscrollbarPolicy">Automatic</property> <child> <widget class="Gtk.Viewport" id="viewport1"> <property name="MemberName" /> @@ -740,7 +729,6 @@ </widget> <packing> <property name="Position">1</property> - <property name="TabExpand">False</property> </packing> </child> <child> @@ -756,24 +744,23 @@ <widget class="Gtk.VBox" id="vbox86"> <property name="MemberName" /> <property name="Spacing">6</property> - <property name="BorderWidth">116</property> + <property name="BorderWidth">61</property> <child> - <widget class="Gtk.Label" id="label126"> + <widget class="Gtk.Label" id="label1"> <property name="MemberName" /> - <property name="Xalign">0</property> - <property name="LabelProp" translatable="yes">Overall Progress:</property> + <property name="LabelProp" translatable="yes" /> </widget> <packing> <property name="Position">0</property> <property name="AutoSize">False</property> - <property name="Expand">False</property> - <property name="Fill">False</property> </packing> </child> <child> - <widget class="Gtk.ProgressBar" id="mainProgressBar"> + <widget class="Gtk.Label" id="globalProgressLabel"> <property name="MemberName" /> - <property name="PulseStep">10000000149</property> + <property name="Xalign">0</property> + <property name="LabelProp" translatable="yes">Overall Progress:</property> + <property name="Ellipsize">End</property> </widget> <packing> <property name="Position">1</property> @@ -783,9 +770,9 @@ </packing> </child> <child> - <widget class="Gtk.Label" id="label129"> + <widget class="Gtk.ProgressBar" id="mainProgressBar"> <property name="MemberName" /> - <property name="LabelProp" translatable="yes" /> + <property name="PulseStep">10000000149</property> </widget> <packing> <property name="Position">2</property> @@ -795,34 +782,18 @@ </packing> </child> <child> - <widget class="Gtk.Label" id="progressLabel"> + <widget class="Gtk.Label" id="label2"> <property name="MemberName" /> - <property name="Xalign">0</property> - <property name="LabelProp" translatable="yes">Downloading add-ins...</property> + <property name="LabelProp" translatable="yes" /> </widget> <packing> <property name="Position">3</property> <property name="AutoSize">False</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - <child> - <widget class="Gtk.ProgressBar" id="progressBar"> - <property name="MemberName" /> - <property name="PulseStep">10000000149</property> - </widget> - <packing> - <property name="Position">4</property> - <property name="AutoSize">False</property> - <property name="Expand">False</property> - <property name="Fill">False</property> </packing> </child> </widget> <packing> <property name="Position">2</property> - <property name="TabExpand">False</property> </packing> </child> <child> @@ -838,8 +809,6 @@ <widget class="Gtk.ScrolledWindow" id="scrolledwindow20"> <property name="MemberName" /> <property name="CanFocus">True</property> - <property name="VscrollbarPolicy">Automatic</property> - <property name="HscrollbarPolicy">Automatic</property> <child> <widget class="Gtk.Viewport" id="viewport3"> <property name="MemberName" /> @@ -941,7 +910,6 @@ </widget> <packing> <property name="Position">3</property> - <property name="TabExpand">False</property> </packing> </child> <child> @@ -1039,7 +1007,7 @@ <widget class="Gtk.HButtonBox" id="hbuttonbox1"> <property name="MemberName" /> <property name="Visible">False</property> - <property name="Spacing">10</property> + <property name="Spacing">6</property> <property name="BorderWidth">5</property> <property name="Size">0</property> <property name="LayoutStyle">End</property> @@ -1069,8 +1037,6 @@ <widget class="Gtk.ScrolledWindow" id="scrolledwindow17"> <property name="MemberName" /> <property name="CanFocus">True</property> - <property name="VscrollbarPolicy">Automatic</property> - <property name="HscrollbarPolicy">Automatic</property> <property name="ShadowType">In</property> <child> <widget class="Gtk.TreeView" id="repoTree"> @@ -1450,8 +1416,6 @@ <widget class="Gtk.ScrolledWindow" id="scrolledwindow22"> <property name="MemberName" /> <property name="CanFocus">True</property> - <property name="VscrollbarPolicy">Automatic</property> - <property name="HscrollbarPolicy">Automatic</property> <child> <widget class="Gtk.Viewport" id="viewport4"> <property name="MemberName" /> @@ -1555,8 +1519,6 @@ <widget class="Gtk.ScrolledWindow" id="scrolledwindow1"> <property name="MemberName" /> <property name="CanFocus">True</property> - <property name="VscrollbarPolicy">Automatic</property> - <property name="HscrollbarPolicy">Automatic</property> <property name="ShadowType">In</property> <child> <widget class="Gtk.Viewport" id="GtkViewport"> @@ -1645,4 +1607,115 @@ </widget> </child> </widget> + <widget class="Gtk.Dialog" id="Mono.Addins.Gui.ProgressDialog" design-size="513 165"> + <property name="MemberName" /> + <property name="GeneratePublic">False</property> + <property name="Title" translatable="yes">Progress</property> + <property name="WindowPosition">CenterOnParent</property> + <property name="Modal">True</property> + <property name="Buttons">1</property> + <property name="HelpButton">False</property> + <property name="HasSeparator">False</property> + <child internal-child="VBox"> + <widget class="Gtk.VBox" id="dialog1_VBox"> + <property name="MemberName" /> + <property name="BorderWidth">2</property> + <child> + <widget class="Gtk.VBox" id="vbox2"> + <property name="MemberName" /> + <property name="Spacing">6</property> + <property name="BorderWidth">9</property> + <child> + <widget class="Gtk.Label" id="labelMessage"> + <property name="MemberName" /> + <property name="Xalign">0</property> + <property name="LabelProp" translatable="yes" /> + </widget> + <packing> + <property name="Position">0</property> + <property name="AutoSize">True</property> + <property name="Expand">False</property> + <property name="Fill">False</property> + </packing> + </child> + <child> + <widget class="Gtk.ProgressBar" id="progressbar"> + <property name="MemberName" /> + </widget> + <packing> + <property name="Position">1</property> + <property name="AutoSize">True</property> + <property name="Expand">False</property> + <property name="Fill">False</property> + </packing> + </child> + <child> + <widget class="Gtk.Expander" id="expander1"> + <property name="MemberName" /> + <property name="CanFocus">True</property> + <child> + <widget class="Gtk.ScrolledWindow" id="GtkScrolledWindow"> + <property name="MemberName" /> + <property name="ShadowType">In</property> + <child> + <widget class="Gtk.TextView" id="textview"> + <property name="MemberName" /> + <property name="CanFocus">True</property> + <property name="ShowScrollbars">True</property> + <property name="Text" translatable="yes" /> + </widget> + </child> + </widget> + </child> + <child> + <widget class="Gtk.Label" id="GtkLabel1"> + <property name="MemberName" /> + <property name="LabelProp" translatable="yes">Details</property> + <property name="UseUnderline">True</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="Position">2</property> + <property name="AutoSize">True</property> + </packing> + </child> + </widget> + <packing> + <property name="Position">0</property> + <property name="AutoSize">True</property> + </packing> + </child> + </widget> + </child> + <child internal-child="ActionArea"> + <widget class="Gtk.HButtonBox" id="dialog1_ActionArea"> + <property name="MemberName" /> + <property name="Spacing">6</property> + <property name="BorderWidth">5</property> + <property name="Size">1</property> + <property name="LayoutStyle">End</property> + <child> + <widget class="Gtk.Button" id="buttonCancel"> + <property name="MemberName" /> + <property name="CanDefault">True</property> + <property name="CanFocus">True</property> + <property name="UseStock">True</property> + <property name="Type">StockItem</property> + <property name="StockId">gtk-cancel</property> + <property name="ResponseId">-6</property> + <signal name="Clicked" handler="OnButtonCancelClicked" /> + <property name="label">gtk-cancel</property> + </widget> + <packing> + <property name="Expand">False</property> + <property name="Fill">False</property> + </packing> + </child> + </widget> + </child> + </widget> </stetic-interface> \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mono-addins-0.3/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs new/mono-addins-0.3.1/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs --- old/mono-addins-0.3/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs 2007-12-18 20:16:23.000000000 +0100 +++ new/mono-addins-0.3.1/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs 2008-01-30 23:37:49.000000000 +0100 @@ -63,8 +63,6 @@ this.scrolledwindow22 = new Gtk.ScrolledWindow(); this.scrolledwindow22.CanFocus = true; this.scrolledwindow22.Name = "scrolledwindow22"; - this.scrolledwindow22.VscrollbarPolicy = ((Gtk.PolicyType)(1)); - this.scrolledwindow22.HscrollbarPolicy = ((Gtk.PolicyType)(1)); // Container child scrolledwindow22.Gtk.Container+ContainerChild Gtk.Viewport w4 = new Gtk.Viewport(); w4.ShadowType = ((Gtk.ShadowType)(0)); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mono-addins-0.3/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs new/mono-addins-0.3.1/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs --- old/mono-addins-0.3/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs 2007-12-18 20:16:23.000000000 +0100 +++ new/mono-addins-0.3.1/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs 2008-01-30 23:37:49.000000000 +0100 @@ -61,15 +61,13 @@ private Gtk.VBox vbox86; - private Gtk.Label label126; + private Gtk.Label label1; - private Gtk.ProgressBar mainProgressBar; - - private Gtk.Label label129; + private Gtk.Label globalProgressLabel; - private Gtk.Label progressLabel; + private Gtk.ProgressBar mainProgressBar; - private Gtk.ProgressBar progressBar; + private Gtk.Label label2; private Gtk.Label label110; @@ -122,7 +120,7 @@ this.wizardNotebook = new Gtk.Notebook(); this.wizardNotebook.CanFocus = true; this.wizardNotebook.Name = "wizardNotebook"; - this.wizardNotebook.CurrentPage = 3; + this.wizardNotebook.CurrentPage = 0; this.wizardNotebook.ShowBorder = false; this.wizardNotebook.BorderWidth = ((uint)(6)); // Container child wizardNotebook.Gtk.Notebook+NotebookChild @@ -199,8 +197,6 @@ this.scrolledwindow18 = new Gtk.ScrolledWindow(); this.scrolledwindow18.CanFocus = true; this.scrolledwindow18.Name = "scrolledwindow18"; - this.scrolledwindow18.VscrollbarPolicy = ((Gtk.PolicyType)(1)); - this.scrolledwindow18.HscrollbarPolicy = ((Gtk.PolicyType)(1)); this.scrolledwindow18.ShadowType = ((Gtk.ShadowType)(1)); // Container child scrolledwindow18.Gtk.Container+ContainerChild this.addinTree = new Gtk.TreeView(); @@ -275,8 +271,6 @@ Gtk.Box.BoxChild w16 = ((Gtk.Box.BoxChild)(this.vbox82[this.hbox70])); w16.Position = 2; this.wizardNotebook.Add(this.vbox82); - Gtk.Notebook.NotebookChild w17 = ((Gtk.Notebook.NotebookChild)(this.wizardNotebook[this.vbox82])); - w17.TabExpand = false; // Notebook tab this.label108 = new Gtk.Label(); this.label108.Name = "label108"; @@ -287,8 +281,6 @@ this.scrolledwindow19 = new Gtk.ScrolledWindow(); this.scrolledwindow19.CanFocus = true; this.scrolledwindow19.Name = "scrolledwindow19"; - this.scrolledwindow19.VscrollbarPolicy = ((Gtk.PolicyType)(1)); - this.scrolledwindow19.HscrollbarPolicy = ((Gtk.PolicyType)(1)); // Container child scrolledwindow19.Gtk.Container+ContainerChild Gtk.Viewport w18 = new Gtk.Viewport(); // Container child viewport1.Gtk.Container+ContainerChild @@ -327,7 +319,6 @@ this.wizardNotebook.Add(this.scrolledwindow19); Gtk.Notebook.NotebookChild w23 = ((Gtk.Notebook.NotebookChild)(this.wizardNotebook[this.scrolledwindow19])); w23.Position = 1; - w23.TabExpand = false; // Notebook tab this.label124 = new Gtk.Label(); this.label124.Name = "label124"; @@ -338,58 +329,44 @@ this.vbox86 = new Gtk.VBox(); this.vbox86.Name = "vbox86"; this.vbox86.Spacing = 6; - this.vbox86.BorderWidth = ((uint)(116)); + this.vbox86.BorderWidth = ((uint)(61)); // Container child vbox86.Gtk.Box+BoxChild - this.label126 = new Gtk.Label(); - this.label126.Name = "label126"; - this.label126.Xalign = 0F; - this.label126.LabelProp = Mono.Unix.Catalog.GetString("Overall Progress:"); - this.vbox86.Add(this.label126); - Gtk.Box.BoxChild w24 = ((Gtk.Box.BoxChild)(this.vbox86[this.label126])); + this.label1 = new Gtk.Label(); + this.label1.Name = "label1"; + this.label1.LabelProp = ""; + this.vbox86.Add(this.label1); + Gtk.Box.BoxChild w24 = ((Gtk.Box.BoxChild)(this.vbox86[this.label1])); w24.Position = 0; - w24.Expand = false; - w24.Fill = false; // Container child vbox86.Gtk.Box+BoxChild - this.mainProgressBar = new Gtk.ProgressBar(); - this.mainProgressBar.Name = "mainProgressBar"; - this.mainProgressBar.PulseStep = 10000000149; - this.vbox86.Add(this.mainProgressBar); - Gtk.Box.BoxChild w25 = ((Gtk.Box.BoxChild)(this.vbox86[this.mainProgressBar])); + this.globalProgressLabel = new Gtk.Label(); + this.globalProgressLabel.Name = "globalProgressLabel"; + this.globalProgressLabel.Xalign = 0F; + this.globalProgressLabel.LabelProp = Mono.Unix.Catalog.GetString("Overall Progress:"); + this.globalProgressLabel.Ellipsize = ((Pango.EllipsizeMode)(3)); + this.vbox86.Add(this.globalProgressLabel); + Gtk.Box.BoxChild w25 = ((Gtk.Box.BoxChild)(this.vbox86[this.globalProgressLabel])); w25.Position = 1; w25.Expand = false; w25.Fill = false; // Container child vbox86.Gtk.Box+BoxChild - this.label129 = new Gtk.Label(); - this.label129.Name = "label129"; - this.label129.LabelProp = ""; - this.vbox86.Add(this.label129); - Gtk.Box.BoxChild w26 = ((Gtk.Box.BoxChild)(this.vbox86[this.label129])); + this.mainProgressBar = new Gtk.ProgressBar(); + this.mainProgressBar.Name = "mainProgressBar"; + this.mainProgressBar.PulseStep = 10000000149; + this.vbox86.Add(this.mainProgressBar); + Gtk.Box.BoxChild w26 = ((Gtk.Box.BoxChild)(this.vbox86[this.mainProgressBar])); w26.Position = 2; w26.Expand = false; w26.Fill = false; // Container child vbox86.Gtk.Box+BoxChild - this.progressLabel = new Gtk.Label(); - this.progressLabel.Name = "progressLabel"; - this.progressLabel.Xalign = 0F; - this.progressLabel.LabelProp = Mono.Unix.Catalog.GetString("Downloading add-ins..."); - this.vbox86.Add(this.progressLabel); - Gtk.Box.BoxChild w27 = ((Gtk.Box.BoxChild)(this.vbox86[this.progressLabel])); + this.label2 = new Gtk.Label(); + this.label2.Name = "label2"; + this.label2.LabelProp = ""; + this.vbox86.Add(this.label2); + Gtk.Box.BoxChild w27 = ((Gtk.Box.BoxChild)(this.vbox86[this.label2])); w27.Position = 3; - w27.Expand = false; - w27.Fill = false; - // Container child vbox86.Gtk.Box+BoxChild - this.progressBar = new Gtk.ProgressBar(); - this.progressBar.Name = "progressBar"; - this.progressBar.PulseStep = 10000000149; - this.vbox86.Add(this.progressBar); - Gtk.Box.BoxChild w28 = ((Gtk.Box.BoxChild)(this.vbox86[this.progressBar])); - w28.Position = 4; - w28.Expand = false; - w28.Fill = false; this.wizardNotebook.Add(this.vbox86); - Gtk.Notebook.NotebookChild w29 = ((Gtk.Notebook.NotebookChild)(this.wizardNotebook[this.vbox86])); - w29.Position = 2; - w29.TabExpand = false; + Gtk.Notebook.NotebookChild w28 = ((Gtk.Notebook.NotebookChild)(this.wizardNotebook[this.vbox86])); + w28.Position = 2; // Notebook tab this.label110 = new Gtk.Label(); this.label110.Name = "label110"; @@ -400,10 +377,8 @@ this.scrolledwindow20 = new Gtk.ScrolledWindow(); this.scrolledwindow20.CanFocus = true; this.scrolledwindow20.Name = "scrolledwindow20"; - this.scrolledwindow20.VscrollbarPolicy = ((Gtk.PolicyType)(1)); - this.scrolledwindow20.HscrollbarPolicy = ((Gtk.PolicyType)(1)); // Container child scrolledwindow20.Gtk.Container+ContainerChild - Gtk.Viewport w30 = new Gtk.Viewport(); + Gtk.Viewport w29 = new Gtk.Viewport(); // Container child viewport3.Gtk.Container+ContainerChild this.vbox91 = new Gtk.VBox(); this.vbox91.Name = "vbox91"; @@ -412,39 +387,39 @@ this.label130.Name = "label130"; this.label130.LabelProp = ""; this.vbox91.Add(this.label130); - Gtk.Box.BoxChild w31 = ((Gtk.Box.BoxChild)(this.vbox91[this.label130])); - w31.Position = 0; + Gtk.Box.BoxChild w30 = ((Gtk.Box.BoxChild)(this.vbox91[this.label130])); + w30.Position = 0; // Container child vbox91.Gtk.Box+BoxChild this.imageError = new Gtk.Image(); this.imageError.Name = "imageError"; this.imageError.Yalign = 1F; this.imageError.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-dialog-error", Gtk.IconSize.Dialog, 48); this.vbox91.Add(this.imageError); - Gtk.Box.BoxChild w32 = ((Gtk.Box.BoxChild)(this.vbox91[this.imageError])); - w32.Position = 1; - w32.Expand = false; - w32.Fill = false; - w32.Padding = ((uint)(5)); + Gtk.Box.BoxChild w31 = ((Gtk.Box.BoxChild)(this.vbox91[this.imageError])); + w31.Position = 1; + w31.Expand = false; + w31.Fill = false; + w31.Padding = ((uint)(5)); // Container child vbox91.Gtk.Box+BoxChild this.imageWarn = new Gtk.Image(); this.imageWarn.Name = "imageWarn"; this.imageWarn.Yalign = 1F; this.imageWarn.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-dialog-warning", Gtk.IconSize.Dialog, 48); this.vbox91.Add(this.imageWarn); - Gtk.Box.BoxChild w33 = ((Gtk.Box.BoxChild)(this.vbox91[this.imageWarn])); - w33.Position = 2; - w33.Expand = false; - w33.Fill = false; + Gtk.Box.BoxChild w32 = ((Gtk.Box.BoxChild)(this.vbox91[this.imageWarn])); + w32.Position = 2; + w32.Expand = false; + w32.Fill = false; // Container child vbox91.Gtk.Box+BoxChild this.imageInfo = new Gtk.Image(); this.imageInfo.Name = "imageInfo"; this.imageInfo.Yalign = 1F; this.imageInfo.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-dialog-info", Gtk.IconSize.Dialog, 48); this.vbox91.Add(this.imageInfo); - Gtk.Box.BoxChild w34 = ((Gtk.Box.BoxChild)(this.vbox91[this.imageInfo])); - w34.Position = 3; - w34.Expand = false; - w34.Fill = false; + Gtk.Box.BoxChild w33 = ((Gtk.Box.BoxChild)(this.vbox91[this.imageInfo])); + w33.Position = 3; + w33.Expand = false; + w33.Fill = false; // Container child vbox91.Gtk.Box+BoxChild this.hbox71 = new Gtk.HBox(); this.hbox71.Name = "hbox71"; @@ -459,27 +434,26 @@ this.labelResult.Wrap = true; this.labelResult.Justify = ((Gtk.Justification)(2)); this.hbox71.Add(this.labelResult); - Gtk.Box.BoxChild w35 = ((Gtk.Box.BoxChild)(this.hbox71[this.labelResult])); - w35.PackType = ((Gtk.PackType)(1)); - w35.Position = 0; + Gtk.Box.BoxChild w34 = ((Gtk.Box.BoxChild)(this.hbox71[this.labelResult])); + w34.PackType = ((Gtk.PackType)(1)); + w34.Position = 0; this.vbox91.Add(this.hbox71); - Gtk.Box.BoxChild w36 = ((Gtk.Box.BoxChild)(this.vbox91[this.hbox71])); - w36.Position = 4; - w36.Expand = false; - w36.Fill = false; + Gtk.Box.BoxChild w35 = ((Gtk.Box.BoxChild)(this.vbox91[this.hbox71])); + w35.Position = 4; + w35.Expand = false; + w35.Fill = false; // Container child vbox91.Gtk.Box+BoxChild this.label131 = new Gtk.Label(); this.label131.Name = "label131"; this.label131.LabelProp = ""; this.vbox91.Add(this.label131); - Gtk.Box.BoxChild w37 = ((Gtk.Box.BoxChild)(this.vbox91[this.label131])); - w37.Position = 5; - w30.Add(this.vbox91); - this.scrolledwindow20.Add(w30); + Gtk.Box.BoxChild w36 = ((Gtk.Box.BoxChild)(this.vbox91[this.label131])); + w36.Position = 5; + w29.Add(this.vbox91); + this.scrolledwindow20.Add(w29); this.wizardNotebook.Add(this.scrolledwindow20); - Gtk.Notebook.NotebookChild w40 = ((Gtk.Notebook.NotebookChild)(this.wizardNotebook[this.scrolledwindow20])); - w40.Position = 3; - w40.TabExpand = false; + Gtk.Notebook.NotebookChild w39 = ((Gtk.Notebook.NotebookChild)(this.wizardNotebook[this.scrolledwindow20])); + w39.Position = 3; // Notebook tab this.label111 = new Gtk.Label(); this.label111.Name = "label111"; @@ -487,8 +461,8 @@ this.wizardNotebook.SetTabLabel(this.scrolledwindow20, this.label111); this.label111.ShowAll(); w1.Add(this.wizardNotebook); - Gtk.Box.BoxChild w41 = ((Gtk.Box.BoxChild)(w1[this.wizardNotebook])); - w41.Position = 0; + Gtk.Box.BoxChild w40 = ((Gtk.Box.BoxChild)(w1[this.wizardNotebook])); + w40.Position = 0; // Container child dialog-vbox9.Gtk.Box+BoxChild this.dialog_action_area9 = new Gtk.HButtonBox(); this.dialog_action_area9.Name = "dialog_action_area9"; @@ -513,8 +487,8 @@ this.btnPrev.UseUnderline = true; this.btnPrev.Label = "gtk-go-back"; this.dialog_action_area9.Add(this.btnPrev); - Gtk.ButtonBox.ButtonBoxChild w43 = ((Gtk.ButtonBox.ButtonBoxChild)(this.dialog_action_area9[this.btnPrev])); - w43.Position = 1; + Gtk.ButtonBox.ButtonBoxChild w42 = ((Gtk.ButtonBox.ButtonBoxChild)(this.dialog_action_area9[this.btnPrev])); + w42.Position = 1; // Container child dialog_action_area9.Gtk.ButtonBox+ButtonBoxChild this.btnNext = new Gtk.Button(); this.btnNext.CanDefault = true; @@ -524,8 +498,8 @@ this.btnNext.UseUnderline = true; this.btnNext.Label = "gtk-go-forward"; this.dialog_action_area9.Add(this.btnNext); - Gtk.ButtonBox.ButtonBoxChild w44 = ((Gtk.ButtonBox.ButtonBoxChild)(this.dialog_action_area9[this.btnNext])); - w44.Position = 2; + Gtk.ButtonBox.ButtonBoxChild w43 = ((Gtk.ButtonBox.ButtonBoxChild)(this.dialog_action_area9[this.btnNext])); + w43.Position = 2; // Container child dialog_action_area9.Gtk.ButtonBox+ButtonBoxChild this.btnOk = new Gtk.Button(); this.btnOk.CanDefault = true; @@ -535,25 +509,25 @@ this.btnOk.UseUnderline = true; this.btnOk.Label = "gtk-ok"; this.dialog_action_area9.Add(this.btnOk); - Gtk.ButtonBox.ButtonBoxChild w45 = ((Gtk.ButtonBox.ButtonBoxChild)(this.dialog_action_area9[this.btnOk])); - w45.Position = 3; + Gtk.ButtonBox.ButtonBoxChild w44 = ((Gtk.ButtonBox.ButtonBoxChild)(this.dialog_action_area9[this.btnOk])); + w44.Position = 3; w1.Add(this.dialog_action_area9); - Gtk.Box.BoxChild w46 = ((Gtk.Box.BoxChild)(w1[this.dialog_action_area9])); - w46.PackType = ((Gtk.PackType)(1)); - w46.Position = 2; - w46.Expand = false; - w46.Fill = false; + Gtk.Box.BoxChild w45 = ((Gtk.Box.BoxChild)(w1[this.dialog_action_area9])); + w45.PackType = ((Gtk.PackType)(1)); + w45.Position = 2; + w45.Expand = false; + w45.Fill = false; // Internal child Mono.Addins.Gui.AddinInstallDialog.ActionArea - Gtk.HButtonBox w47 = this.ActionArea; - w47.Name = "hbuttonbox1"; - w47.Spacing = 10; - w47.BorderWidth = ((uint)(5)); - w47.LayoutStyle = ((Gtk.ButtonBoxStyle)(4)); + Gtk.HButtonBox w46 = this.ActionArea; + w46.Name = "hbuttonbox1"; + w46.Spacing = 6; + w46.BorderWidth = ((uint)(5)); + w46.LayoutStyle = ((Gtk.ButtonBoxStyle)(4)); if ((this.Child != null)) { this.Child.ShowAll(); } this.btnOk.Hide(); - w47.Hide(); + w46.Hide(); this.Show(); this.repoCombo.Changed += new System.EventHandler(this.OnRepoChanged); this.button1.Clicked += new System.EventHandler(this.OnUpdateRepo); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mono-addins-0.3/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs new/mono-addins-0.3.1/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs --- old/mono-addins-0.3/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs 2007-12-18 20:16:23.000000000 +0100 +++ new/mono-addins-0.3.1/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs 2008-01-30 23:37:49.000000000 +0100 @@ -71,8 +71,6 @@ this.scrolledwindow1 = new Gtk.ScrolledWindow(); this.scrolledwindow1.CanFocus = true; this.scrolledwindow1.Name = "scrolledwindow1"; - this.scrolledwindow1.VscrollbarPolicy = ((Gtk.PolicyType)(1)); - this.scrolledwindow1.HscrollbarPolicy = ((Gtk.PolicyType)(1)); this.scrolledwindow1.ShadowType = ((Gtk.ShadowType)(1)); // Container child scrolledwindow1.Gtk.Container+ContainerChild Gtk.Viewport w4 = new Gtk.Viewport(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mono-addins-0.3/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs new/mono-addins-0.3.1/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs --- old/mono-addins-0.3/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs 2007-12-18 20:16:23.000000000 +0100 +++ new/mono-addins-0.3.1/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs 2008-01-30 23:37:49.000000000 +0100 @@ -130,8 +130,6 @@ this.scrolledwindow13 = new Gtk.ScrolledWindow(); this.scrolledwindow13.CanFocus = true; this.scrolledwindow13.Name = "scrolledwindow13"; - this.scrolledwindow13.VscrollbarPolicy = ((Gtk.PolicyType)(1)); - this.scrolledwindow13.HscrollbarPolicy = ((Gtk.PolicyType)(1)); this.scrolledwindow13.ShadowType = ((Gtk.ShadowType)(1)); // Container child scrolledwindow13.Gtk.Container+ContainerChild this.addinTree = new Gtk.TreeView(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mono-addins-0.3/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs new/mono-addins-0.3.1/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs --- old/mono-addins-0.3/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs 2007-12-18 20:16:23.000000000 +0100 +++ new/mono-addins-0.3.1/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs 2008-01-30 23:37:49.000000000 +0100 @@ -92,8 +92,6 @@ this.scrolledwindow10 = new Gtk.ScrolledWindow(); this.scrolledwindow10.CanFocus = true; this.scrolledwindow10.Name = "scrolledwindow10"; - this.scrolledwindow10.VscrollbarPolicy = ((Gtk.PolicyType)(1)); - this.scrolledwindow10.HscrollbarPolicy = ((Gtk.PolicyType)(1)); this.scrolledwindow10.ShadowType = ((Gtk.ShadowType)(1)); // Container child scrolledwindow10.Gtk.Container+ContainerChild this.detailsTextView = new Gtk.TextView(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mono-addins-0.3/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs new/mono-addins-0.3.1/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs --- old/mono-addins-0.3/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs 2007-12-18 20:16:23.000000000 +0100 +++ new/mono-addins-0.3.1/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs 2008-01-30 23:37:49.000000000 +0100 @@ -49,8 +49,6 @@ this.scrolledwindow17 = new Gtk.ScrolledWindow(); this.scrolledwindow17.CanFocus = true; this.scrolledwindow17.Name = "scrolledwindow17"; - this.scrolledwindow17.VscrollbarPolicy = ((Gtk.PolicyType)(1)); - this.scrolledwindow17.HscrollbarPolicy = ((Gtk.PolicyType)(1)); this.scrolledwindow17.ShadowType = ((Gtk.ShadowType)(1)); // Container child scrolledwindow17.Gtk.Container+ContainerChild this.repoTree = new Gtk.TreeView(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mono-addins-0.3/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ProgressDialog.cs new/mono-addins-0.3.1/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ProgressDialog.cs --- old/mono-addins-0.3/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ProgressDialog.cs 1970-01-01 01:00:00.000000000 +0100 +++ new/mono-addins-0.3.1/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ProgressDialog.cs 2008-01-30 23:37:49.000000000 +0100 @@ -0,0 +1,119 @@ +// ------------------------------------------------------------------------------ +// <autogenerated> +// This code was generated by a tool. +// Mono Runtime Version: 2.0.50727.42 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// </autogenerated> +// ------------------------------------------------------------------------------ + +namespace Mono.Addins.Gui { + + + internal partial class ProgressDialog { + + private Gtk.VBox vbox2; + + private Gtk.Label labelMessage; + + private Gtk.ProgressBar progressbar; + + private Gtk.Expander expander1; + + private Gtk.ScrolledWindow GtkScrolledWindow; + + private Gtk.TextView textview; + + private Gtk.Label GtkLabel1; + + private Gtk.Button buttonCancel; + + protected virtual void Build() { + Stetic.Gui.Initialize(this); + // Widget Mono.Addins.Gui.ProgressDialog + this.Name = "Mono.Addins.Gui.ProgressDialog"; + this.Title = Mono.Unix.Catalog.GetString("Progress"); + this.WindowPosition = ((Gtk.WindowPosition)(4)); + this.Modal = true; + this.HasSeparator = false; + // Internal child Mono.Addins.Gui.ProgressDialog.VBox + Gtk.VBox w1 = this.VBox; + w1.Name = "dialog1_VBox"; + w1.BorderWidth = ((uint)(2)); + // Container child dialog1_VBox.Gtk.Box+BoxChild + this.vbox2 = new Gtk.VBox(); + this.vbox2.Name = "vbox2"; + this.vbox2.Spacing = 6; + this.vbox2.BorderWidth = ((uint)(9)); + // Container child vbox2.Gtk.Box+BoxChild + this.labelMessage = new Gtk.Label(); + this.labelMessage.Name = "labelMessage"; + this.labelMessage.Xalign = 0F; + this.labelMessage.LabelProp = ""; + this.vbox2.Add(this.labelMessage); + Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.vbox2[this.labelMessage])); + w2.Position = 0; + w2.Expand = false; + w2.Fill = false; + // Container child vbox2.Gtk.Box+BoxChild + this.progressbar = new Gtk.ProgressBar(); + this.progressbar.Name = "progressbar"; + this.vbox2.Add(this.progressbar); + Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.vbox2[this.progressbar])); + w3.Position = 1; + w3.Expand = false; + w3.Fill = false; + // Container child vbox2.Gtk.Box+BoxChild + this.expander1 = new Gtk.Expander(null); + this.expander1.CanFocus = true; + this.expander1.Name = "expander1"; + // Container child expander1.Gtk.Container+ContainerChild + this.GtkScrolledWindow = new Gtk.ScrolledWindow(); + this.GtkScrolledWindow.Name = "GtkScrolledWindow"; + this.GtkScrolledWindow.ShadowType = ((Gtk.ShadowType)(1)); + // Container child GtkScrolledWindow.Gtk.Container+ContainerChild + this.textview = new Gtk.TextView(); + this.textview.CanFocus = true; + this.textview.Name = "textview"; + this.GtkScrolledWindow.Add(this.textview); + this.expander1.Add(this.GtkScrolledWindow); + this.GtkLabel1 = new Gtk.Label(); + this.GtkLabel1.Name = "GtkLabel1"; + this.GtkLabel1.LabelProp = Mono.Unix.Catalog.GetString("Details"); + this.GtkLabel1.UseUnderline = true; + this.expander1.LabelWidget = this.GtkLabel1; + this.vbox2.Add(this.expander1); + Gtk.Box.BoxChild w6 = ((Gtk.Box.BoxChild)(this.vbox2[this.expander1])); + w6.Position = 2; + w1.Add(this.vbox2); + Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(w1[this.vbox2])); + w7.Position = 0; + // Internal child Mono.Addins.Gui.ProgressDialog.ActionArea + Gtk.HButtonBox w8 = this.ActionArea; + w8.Name = "dialog1_ActionArea"; + w8.Spacing = 6; + w8.BorderWidth = ((uint)(5)); + w8.LayoutStyle = ((Gtk.ButtonBoxStyle)(4)); + // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild + this.buttonCancel = new Gtk.Button(); + this.buttonCancel.CanDefault = true; + this.buttonCancel.CanFocus = true; + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.UseStock = true; + this.buttonCancel.UseUnderline = true; + this.buttonCancel.Label = "gtk-cancel"; + this.AddActionWidget(this.buttonCancel, -6); + Gtk.ButtonBox.ButtonBoxChild w9 = ((Gtk.ButtonBox.ButtonBoxChild)(w8[this.buttonCancel])); + w9.Expand = false; + w9.Fill = false; + if ((this.Child != null)) { + this.Child.ShowAll(); + } + this.DefaultWidth = 513; + this.DefaultHeight = 165; + this.Show(); + this.buttonCancel.Clicked += new System.EventHandler(this.OnButtonCancelClicked); + } + } +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mono-addins-0.3/Mono.Addins.Gui/Makefile.am new/mono-addins-0.3.1/Mono.Addins.Gui/Makefile.am --- old/mono-addins-0.3/Mono.Addins.Gui/Makefile.am 2007-12-18 20:16:23.000000000 +0100 +++ new/mono-addins-0.3.1/Mono.Addins.Gui/Makefile.am 2008-01-30 23:37:49.000000000 +0100 @@ -28,6 +28,7 @@ gtk-gui/Mono.Addins.Gui.ErrorDialog.cs \ gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs \ gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs \ + gtk-gui/Mono.Addins.Gui.ProgressDialog.cs \ Mono.Addins.Gui/AddinInfoDialog.cs \ Mono.Addins.Gui/AddinInstallDialog.cs \ Mono.Addins.Gui/AddinInstaller.cs \ @@ -38,6 +39,7 @@ Mono.Addins.Gui/ErrorDialog.cs \ Mono.Addins.Gui/ManageSitesDialog.cs \ Mono.Addins.Gui/NewSiteDialog.cs \ + Mono.Addins.Gui/ProgressDialog.cs \ Mono.Addins.Gui/Services.cs DATA_FILES = diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mono-addins-0.3/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs new/mono-addins-0.3.1/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs --- old/mono-addins-0.3/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs 2007-12-18 20:16:23.000000000 +0100 +++ new/mono-addins-0.3.1/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs 2008-01-30 23:37:49.000000000 +0100 @@ -206,9 +206,15 @@ bool updateDone; + IProgressStatus updateMonitor; protected void OnUpdateRepo (object sender, EventArgs e) { + ProgressDialog pdlg = new ProgressDialog (); + pdlg.Show (); + pdlg.SetMessage (AddinManager.CurrentLocalizer.GetString ("Updating repository")); + updateMonitor = pdlg; + Thread t = new Thread (new ThreadStart (RunUpdate)); t.Start (); updateDone = false; @@ -217,13 +223,14 @@ Gtk.Application.RunIteration (); Thread.Sleep (50); } + pdlg.Destroy (); LoadAddins (); } void RunUpdate () { try { - service.Repositories.UpdateAllRepositories (null); + service.Repositories.UpdateAllRepositories (updateMonitor); } finally { updateDone = true; } @@ -433,15 +440,16 @@ string errmessage; string warnmessage; - installMonitor = new InstallMonitor (progressLabel, progressBar, mainProgressBar); ThreadStart oper; if (uninstallId == null) { + installMonitor = new InstallMonitor (globalProgressLabel, mainProgressBar, Catalog.GetString ("Installing Add-ins")); oper = new ThreadStart (RunInstall); okmessage = Catalog.GetString ("The installation has been successfully completed."); errmessage = Catalog.GetString ("The installation failed!"); warnmessage = Catalog.GetString ("The installation has completed with warnings."); } else { + installMonitor = new InstallMonitor (globalProgressLabel, mainProgressBar, Catalog.GetString ("Uninstalling Add-ins")); oper = new ThreadStart (RunUninstall); okmessage = Catalog.GetString ("The uninstallation has been successfully completed."); errmessage = Catalog.GetString ("The uninstallation failed!"); @@ -509,17 +517,17 @@ { Label progressLabel; ProgressBar progressBar; - ProgressBar mainProgressBar; StringCollection errors = new StringCollection (); StringCollection warnings = new StringCollection (); bool canceled; bool done; + string mainOperation; - public InstallMonitor (Label progressLabel, ProgressBar progressBar, ProgressBar mainProgressBar) + public InstallMonitor (Label progressLabel, ProgressBar progressBar, string mainOperation) { this.progressLabel = progressLabel; this.progressBar = progressBar; - this.mainProgressBar = mainProgressBar; + this.mainOperation = mainOperation; } public InstallMonitor () @@ -529,13 +537,11 @@ public void SetMessage (string msg) { if (progressLabel != null) - progressLabel.Text = msg; + progressLabel.Markup = "<b>" + GLib.Markup.EscapeText (mainOperation) + "</b>\n" + GLib.Markup.EscapeText (msg); } public void SetProgress (double progress) { - if (mainProgressBar != null) - mainProgressBar.Fraction = progress; if (progressBar != null) progressBar.Fraction = progress; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mono-addins-0.3/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs new/mono-addins-0.3.1/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs --- old/mono-addins-0.3/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs 2007-12-18 20:16:23.000000000 +0100 +++ new/mono-addins-0.3.1/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs 2008-01-30 23:37:49.000000000 +0100 @@ -30,6 +30,7 @@ using System; using Gtk; using Mono.Unix; +using System.Threading; using Mono.Addins.Setup; @@ -83,12 +84,44 @@ } if (!service.Repositories.ContainsRepository (url)) { - IProgressStatus m = new ConsoleProgressStatus (false); - AddinRepository rr = service.Repositories.RegisterRepository (m, url); - if (rr == null) { - Services.ShowError (null, "The repository could not be registered", null, true); + ProgressDialog pdlg = new ProgressDialog (); + pdlg.Show (); + pdlg.SetMessage (AddinManager.CurrentLocalizer.GetString ("Registering repository")); + + bool done = false; + AddinRepository rr = null; + Exception error = null; + + ThreadPool.QueueUserWorkItem (delegate { + try { + rr = service.Repositories.RegisterRepository (pdlg, url, true); + } catch (Exception ex) { + error = ex; + } finally { + done = true; + } + }); + + while (!done) { + if (Gtk.Application.EventsPending ()) + Gtk.Application.RunIteration (); + else + Thread.Sleep (100); + } + + pdlg.Destroy (); + + if (pdlg.HadError) { + if (rr != null) + service.Repositories.RemoveRepository (rr.Url); + return; + } + + if (error != null) { + Services.ShowError (error, "The repository could not be registered", null, true); return; } + treeStore.AppendValues (rr.Url, rr.Title); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mono-addins-0.3/Mono.Addins.Gui/Mono.Addins.Gui/ProgressDialog.cs new/mono-addins-0.3.1/Mono.Addins.Gui/Mono.Addins.Gui/ProgressDialog.cs --- old/mono-addins-0.3/Mono.Addins.Gui/Mono.Addins.Gui/ProgressDialog.cs 1970-01-01 01:00:00.000000000 +0100 +++ new/mono-addins-0.3.1/Mono.Addins.Gui/Mono.Addins.Gui/ProgressDialog.cs 2008-01-30 23:37:49.000000000 +0100 @@ -0,0 +1,109 @@ +// ProgressDialog.cs +// +// Author: +// Lluis Sanchez Gual <lluis@novell.com> +// +// Copyright (c) 2007 Novell, Inc (http://www.novell.com) +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +// + +using System; + +namespace Mono.Addins.Gui +{ + internal partial class ProgressDialog : Gtk.Dialog, IProgressStatus + { + bool cancelled; + bool hadError; + + public ProgressDialog() + { + this.Build(); + } + + public bool IsCanceled { + get { + return cancelled; + } + } + + public int LogLevel { + get { + return 1; + } + } + + public bool HadError { + get { + return hadError; + } + } + + public void SetMessage (string msg) + { + Gtk.Application.Invoke (delegate { + labelMessage.Text = msg; + }); + } + + public void SetProgress (double progress) + { + Gtk.Application.Invoke (delegate { + progressbar.Fraction = progress; + }); + } + + public void Log (string msg) + { + Gtk.Application.Invoke (delegate { + Gtk.TextIter it = textview.Buffer.EndIter; + textview.Buffer.Insert (ref it, msg + "\n"); + }); + } + + public void ReportWarning (string message) + { + Log ("WARNING: " + message); + } + + public void ReportError (string message, Exception exception) + { + Log ("Error: " + message); + if (exception != null) + Log (exception.ToString ()); + Services.ShowError (exception, message, null, true); + hadError = true; + } + + public void Cancel () + { + Gtk.Application.Invoke (delegate { + cancelled = true; + buttonCancel.Sensitive = false; + }); + } + + protected virtual void OnButtonCancelClicked (object sender, System.EventArgs e) + { + Cancel (); + } + } +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mono-addins-0.3/Mono.Addins.Setup/ChangeLog new/mono-addins-0.3.1/Mono.Addins.Setup/ChangeLog --- old/mono-addins-0.3/Mono.Addins.Setup/ChangeLog 2007-12-18 20:16:25.000000000 +0100 +++ new/mono-addins-0.3.1/Mono.Addins.Setup/ChangeLog 2008-01-30 23:37:51.000000000 +0100 @@ -1,3 +1,15 @@ +2008-01-18 Lluis Sanchez Gual <lluis@novell.com> + + * Mono.Addins.Setup/RepositoryRegistry.cs: Don't break the api. + +2008-01-17 Lluis Sanchez Gual <lluis@novell.com> + + * Mono.Addins.Setup/AddinPackage.cs: Delete subdirectories when + uninstalling. + * Mono.Addins.Setup/AddinStore.cs: Use a more informative uninstall message. + * Mono.Addins.Setup/RepositoryRegistry.cs: Fix a nullref. Improved error + reporting. + 2007-12-15 Lluis Sanchez Gual <lluis@novell.com> * mono-addins-setup.pc.in: Update assembly paths. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mono-addins-0.3/Mono.Addins.Setup/Mono.Addins.Setup/AddinPackage.cs new/mono-addins-0.3.1/Mono.Addins.Setup/Mono.Addins.Setup/AddinPackage.cs --- old/mono-addins-0.3/Mono.Addins.Setup/Mono.Addins.Setup/AddinPackage.cs 2007-12-18 20:16:25.000000000 +0100 +++ new/mono-addins-0.3.1/Mono.Addins.Setup/Mono.Addins.Setup/AddinPackage.cs 2008-01-30 23:37:51.000000000 +0100 @@ -260,17 +260,26 @@ File.Delete (iaddin.AddinFile); - if (Directory.GetFiles (basePath).Length == 0) { - try { - Directory.Delete (basePath); - } catch { - monitor.ReportWarning ("Directory " + basePath + " could not be deleted."); - } - } + RecDeleteDir (monitor, basePath); monitor.Log.WriteLine ("Done"); } + void RecDeleteDir (IProgressMonitor monitor, string path) + { + if (Directory.GetFiles (path).Length != 0) + return; + + foreach (string dir in Directory.GetDirectories (path)) + RecDeleteDir (monitor, dir); + + try { + Directory.Delete (path); + } catch { + monitor.ReportWarning ("Directory " + path + " could not be deleted."); + } + } + internal override void RollbackUninstall (IProgressMonitor monitor, AddinStore service) { if (tempFolder != null) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mono-addins-0.3/Mono.Addins.Setup/Mono.Addins.Setup/AddinStore.cs new/mono-addins-0.3.1/Mono.Addins.Setup/Mono.Addins.Setup/AddinStore.cs --- old/mono-addins-0.3/Mono.Addins.Setup/Mono.Addins.Setup/AddinStore.cs 2007-12-18 20:16:25.000000000 +0100 +++ new/mono-addins-0.3.1/Mono.Addins.Setup/Mono.Addins.Setup/AddinStore.cs 2008-01-30 23:37:51.000000000 +0100 @@ -263,7 +263,7 @@ foreach (Addin dep in deps) toUninstall.Add (AddinPackage.FromInstalledAddin (dep)); - monitor.BeginTask ("Uninstalling addins", toUninstall.Count*2 + uninstallPrepared.Count + 1); + monitor.BeginTask ("Deleting files", toUninstall.Count*2 + uninstallPrepared.Count + 1); // Prepare install diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mono-addins-0.3/Mono.Addins.Setup/Mono.Addins.Setup/RepositoryRegistry.cs new/mono-addins-0.3.1/Mono.Addins.Setup/Mono.Addins.Setup/RepositoryRegistry.cs --- old/mono-addins-0.3/Mono.Addins.Setup/Mono.Addins.Setup/RepositoryRegistry.cs 2007-12-18 20:16:25.000000000 +0100 +++ new/mono-addins-0.3.1/Mono.Addins.Setup/Mono.Addins.Setup/RepositoryRegistry.cs 2008-01-30 23:37:51.000000000 +0100 @@ -65,7 +65,8 @@ UpdateRepository (monitor, url); rr = FindRepositoryRecord (url); Repository rep = rr.GetCachedRepository (); - rr.Name = rep.Name; + if (rep != null) + rr.Name = rep.Name; } service.SaveConfiguration (); return rr; @@ -195,6 +196,9 @@ UpdateRepository (monitor, new Uri (rr.Url), rr); monitor.Step (1); } + } catch (Exception ex) { + statusMonitor.ReportError ("Could not get information from repository", ex); + return; } finally { monitor.EndTask (); } @@ -205,11 +209,17 @@ { Uri absUri = new Uri (baseUri, rr.Url); monitor.BeginTask ("Updating from " + absUri.ToString (), 2); - Repository newRep; + Repository newRep = null; + Exception error = null; + try { newRep = (Repository) service.Store.DownloadObject (monitor, absUri.ToString (), typeof(Repository)); } catch (Exception ex) { - monitor.ReportError ("Could not get information from repository" + ": " + absUri.ToString (), ex); + error = ex; + } + + if (newRep == null) { + monitor.ReportError ("Could not get information from repository" + ": " + absUri.ToString (), error); return; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mono-addins-0.3/Samples/ChangeLog new/mono-addins-0.3.1/Samples/ChangeLog --- old/mono-addins-0.3/Samples/ChangeLog 2007-12-18 20:16:24.000000000 +0100 +++ new/mono-addins-0.3.1/Samples/ChangeLog 2008-01-30 23:37:50.000000000 +0100 @@ -1,3 +1,26 @@ +2008-01-07 Lluis Sanchez Gual <lluis@novell.com> + + * TextEditor.CompilerService/MyClass.cs, + TextEditor.CompilerService/TextEditor.CompilerService.mdp, + TextEditor.CompilerService/Makefile.am, TextEditor.Xml/MyClass.cs: + Removed unused MyClass file. + * TextEditor.CompilerService/TextEditor.CompilerService.csproj, + TextEditor.CompilerService.CSharp/TextEditor.CompilerService.CSharp.csproj, + TextEditor.Xml/TextEditor.Xml.csproj, TextEditor/TextEditor.csproj, + TextEditorLib/TextEditorLib.csproj, + WriterService.SampleExtender/WriterService.SampleExtender.csproj, + WriterService/WriterService.csproj, + WriterServiceHost/WriterServiceHost.csproj: Updated VS solution files. + Patch by Andrés G. Aragoneses. + +2008-01-07 Lluis Sanchez Gual <lluis@novell.com> + + * TextEditorLib/TextEditorLib.mdp: Update. + * TextEditorLib/gtk-gui/MainWindow.cs, TextEditorLib/gtk-gui/generated.cs: + Regenerated. + * TextEditorLib/Makefile.am: Remove undeeded reference. Patch by Ben + Motmans. + 2007-12-05 Lluis Sanchez Gual <lluis@novell.com> * TextEditorLib/gtk-gui/gui.stetic, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mono-addins-0.3/Samples/TextEditor.CompilerService/Makefile.am new/mono-addins-0.3.1/Samples/TextEditor.CompilerService/Makefile.am --- old/mono-addins-0.3/Samples/TextEditor.CompilerService/Makefile.am 2007-12-18 20:16:24.000000000 +0100 +++ new/mono-addins-0.3.1/Samples/TextEditor.CompilerService/Makefile.am 2008-01-30 23:37:49.000000000 +0100 @@ -17,7 +17,6 @@ AssemblyInfo.cs \ CompilerManager.cs \ ICompiler.cs \ - MyClass.cs \ RunCommand.cs DATA_FILES = diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mono-addins-0.3/Samples/TextEditor.CompilerService/MyClass.cs new/mono-addins-0.3.1/Samples/TextEditor.CompilerService/MyClass.cs --- old/mono-addins-0.3/Samples/TextEditor.CompilerService/MyClass.cs 2007-12-18 20:16:24.000000000 +0100 +++ new/mono-addins-0.3.1/Samples/TextEditor.CompilerService/MyClass.cs 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -// project created on 23/03/2007 at 14:10 -using System; - -public class MyClass -{ - -} \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mono-addins-0.3/Samples/TextEditorLib/gtk-gui/generated.cs new/mono-addins-0.3.1/Samples/TextEditorLib/gtk-gui/generated.cs --- old/mono-addins-0.3/Samples/TextEditorLib/gtk-gui/generated.cs 2007-12-18 20:16:24.000000000 +0100 +++ new/mono-addins-0.3.1/Samples/TextEditorLib/gtk-gui/generated.cs 2008-01-30 23:37:49.000000000 +0100 @@ -15,13 +15,46 @@ private static bool initialized; - internal static void Initialize() { + internal static void Initialize(Gtk.Widget iconRenderer) { if ((Stetic.Gui.initialized == false)) { Stetic.Gui.initialized = true; } } } + internal class IconLoader { + + 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; + } + else { + try { + return Gtk.IconTheme.Default.LoadIcon(name, sz, 0); + } + 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); + } + } + } + } + } + internal class ActionGroups { public static Gtk.ActionGroup GetActionGroup(System.Type type) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mono-addins-0.3/Samples/TextEditorLib/gtk-gui/MainWindow.cs new/mono-addins-0.3.1/Samples/TextEditorLib/gtk-gui/MainWindow.cs --- old/mono-addins-0.3/Samples/TextEditorLib/gtk-gui/MainWindow.cs 2007-12-18 20:16:24.000000000 +0100 +++ new/mono-addins-0.3.1/Samples/TextEditorLib/gtk-gui/MainWindow.cs 2008-01-30 23:37:49.000000000 +0100 @@ -37,7 +37,7 @@ private Gtk.Statusbar statusbar1; protected virtual void Build() { - Stetic.Gui.Initialize(); + Stetic.Gui.Initialize(this); // Widget MainWindow Gtk.UIManager w1 = new Gtk.UIManager(); Gtk.ActionGroup w2 = new Gtk.ActionGroup("Default"); @@ -73,8 +73,6 @@ this.scrolledwindow1 = new Gtk.ScrolledWindow(); this.scrolledwindow1.CanFocus = true; this.scrolledwindow1.Name = "scrolledwindow1"; - this.scrolledwindow1.VscrollbarPolicy = ((Gtk.PolicyType)(1)); - this.scrolledwindow1.HscrollbarPolicy = ((Gtk.PolicyType)(1)); this.scrolledwindow1.ShadowType = ((Gtk.ShadowType)(1)); // Container child scrolledwindow1.Gtk.Container+ContainerChild this.textview = new Gtk.TextView(); @@ -111,19 +109,15 @@ this.button1.Relief = ((Gtk.ReliefStyle)(2)); // Container child button1.Gtk.Container+ContainerChild Gtk.Alignment w8 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F); - w8.Name = "GtkAlignment"; // Container child GtkAlignment.Gtk.Container+ContainerChild Gtk.HBox w9 = new Gtk.HBox(); - w9.Name = "GtkHBox"; w9.Spacing = 2; // Container child GtkHBox.Gtk.Container+ContainerChild Gtk.Image w10 = new Gtk.Image(); - w10.Name = "image1"; - w10.Pixbuf = Gtk.IconTheme.Default.LoadIcon("gtk-close", 16, 0); + w10.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-close", Gtk.IconSize.Menu, 16); w9.Add(w10); // Container child GtkHBox.Gtk.Container+ContainerChild Gtk.Label w12 = new Gtk.Label(); - w12.Name = "GtkLabel"; w12.LabelProp = ""; w9.Add(w12); w8.Add(w9); @@ -143,8 +137,6 @@ this.scrolledwindow2 = new Gtk.ScrolledWindow(); this.scrolledwindow2.CanFocus = true; this.scrolledwindow2.Name = "scrolledwindow2"; - this.scrolledwindow2.VscrollbarPolicy = ((Gtk.PolicyType)(1)); - this.scrolledwindow2.HscrollbarPolicy = ((Gtk.PolicyType)(1)); this.scrolledwindow2.ShadowType = ((Gtk.ShadowType)(1)); // Container child scrolledwindow2.Gtk.Container+ContainerChild this.consoleView = new Gtk.TextView(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mono-addins-0.3/Samples/TextEditorLib/Makefile.am new/mono-addins-0.3.1/Samples/TextEditorLib/Makefile.am --- old/mono-addins-0.3/Samples/TextEditorLib/Makefile.am 2007-12-18 20:16:24.000000000 +0100 +++ new/mono-addins-0.3.1/Samples/TextEditorLib/Makefile.am 2008-01-30 23:37:49.000000000 +0100 @@ -50,7 +50,6 @@ EXTRAS = REFERENCES = \ - $(GTK_SHARP_20_LIBS) \ -pkg:gtk-sharp-2.0 \ -r:Mono.Posix \ -r:System ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org