Hello community, here is the log from the commit of package monodevelop-python for openSUSE:Factory checked in at Fri Nov 5 16:23:38 CET 2010. -------- --- GNOME/monodevelop-python/monodevelop-python.changes 2010-03-16 18:19:52.000000000 +0100 +++ monodevelop-python/monodevelop-python.changes 2010-10-29 19:13:36.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Oct 29 17:10:36 UTC 2010 - ajorgensen@novell.com + +- Update to 2.4 + * http://monodevelop.com/Download/MonoDevelop_2.4_Released + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- monodevelop-python-2.2.tar.bz2 New: ---- monodevelop-python-2.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ monodevelop-python.spec ++++++ --- /var/tmp/diff_new_pack.ziX8fB/_old 2010-11-05 16:23:20.000000000 +0100 +++ /var/tmp/diff_new_pack.ziX8fB/_new 2010-11-05 16:23:20.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package monodevelop-python (Version 2.2) +# spec file for package monodevelop-python (Version 2.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: monodevelop-python -Version: 2.2 -Release: 2 +Version: 2.4 +Release: 1 License: MIT/X11 AutoReqProv: on BuildArch: noarch @@ -56,12 +56,15 @@ %install %{?env_options} make install DESTDIR=${RPM_BUILD_ROOT} + mkdir -p $RPM_BUILD_ROOT%_prefix/share/pkgconfig mv $RPM_BUILD_ROOT%_prefix/lib/pkgconfig/*.pc $RPM_BUILD_ROOT%_prefix/share/pkgconfig + #%find_lang %{name} %clean rm -rf "$RPM_BUILD_ROOT" + %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 ++++++ monodevelop-python-2.2.tar.bz2 -> monodevelop-python-2.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/AssemblyInfo.cs new/monodevelop-python-2.4/PyBinding/AssemblyInfo.cs --- old/monodevelop-python-2.2/PyBinding/AssemblyInfo.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/AssemblyInfo.cs 2010-06-14 21:45:40.000000000 +0200 @@ -5,5 +5,5 @@ [assembly: AssemblyProduct ("MonoDevelop")] [assembly: AssemblyTitle ("Python Language Binding")] [assembly: AssemblyDescription ("Python Language binding")] -[assembly: AssemblyVersion ("2.2")] +[assembly: AssemblyVersion ("2.4")] [assembly: AssemblyCopyright ("MIT X11")] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/PyBinding/PythonProject.cs new/monodevelop-python-2.4/PyBinding/PyBinding/PythonProject.cs --- old/monodevelop-python-2.2/PyBinding/PyBinding/PythonProject.cs 2009-12-02 11:07:21.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/PyBinding/PythonProject.cs 2010-06-14 21:45:40.000000000 +0200 @@ -27,7 +27,7 @@ using MonoDevelop.Core; using MonoDevelop.Core.Execution; -using MonoDevelop.Core.Gui; +using MonoDevelop.Ide; using MonoDevelop.Core.ProgressMonitoring; using MonoDevelop.Gettext; using MonoDevelop.Ide.Gui; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/PyBinding/PythonSite.cs new/monodevelop-python-2.4/PyBinding/PyBinding/PythonSite.cs --- old/monodevelop-python-2.2/PyBinding/PyBinding/PythonSite.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/PyBinding/PythonSite.cs 2010-06-14 21:45:40.000000000 +0200 @@ -29,7 +29,7 @@ using System.IO; using System.Threading; -using MonoDevelop.Ide.Gui; +using MonoDevelop.Ide; using PyBinding.Parser; using PyBinding.Runtime; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/PyBinding.Gui/PythonEditorCompletion.cs new/monodevelop-python-2.4/PyBinding/PyBinding.Gui/PythonEditorCompletion.cs --- old/monodevelop-python-2.2/PyBinding/PyBinding.Gui/PythonEditorCompletion.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/PyBinding.Gui/PythonEditorCompletion.cs 2010-06-14 21:45:40.000000000 +0200 @@ -30,8 +30,7 @@ using MonoDevelop.Ide.Gui.Content; using MonoDevelop.Projects.Dom; using MonoDevelop.Projects.Dom.Parser; -using MonoDevelop.Projects.Gui; -using MonoDevelop.Projects.Gui.Completion; +using MonoDevelop.Ide.CodeCompletion; using PyBinding; using PyBinding.Parser; @@ -62,13 +61,6 @@ m_site = new PythonSite (PythonHelper.FindPreferedRuntime ()); } - public override bool ExtendsEditor (Document doc, IEditableTextBuffer editor) - { - if (doc == null || String.IsNullOrEmpty (doc.Name)) - return false; - return Path.GetExtension (doc.Name) == ".py"; - } - public override ICompletionDataList HandleCodeCompletion (CodeCompletionContext completionContext, char completionChar) { switch (completionChar) { @@ -87,7 +79,7 @@ } } - public IEnumerable<ICompletionData> SelfDotCompletionData (PythonClass klass) + public IEnumerable<CompletionData> SelfDotCompletionData (PythonClass klass) { foreach (var attr in klass.Attributes) yield return new CompletionData (attr.Name, s_ImgAttr, attr.Documentation); @@ -135,7 +127,7 @@ // "from blah " if (inFrom && parts.Length == 2 && parts [parts.Length-1].Trim ().Length > 0 && completionChar == ' ') { - return new CompletionDataList (new ICompletionData[] { new CompletionData ("import") }); + return new CompletionDataList (new CompletionData[] { new CompletionData ("import") }); } // "from blah import " else if (inFrom && parts.Length > 2) { @@ -191,12 +183,12 @@ ; } - static ICompletionData CreateCompletionData (ParserItem item, string triggerWord) + static CompletionData CreateCompletionData (ParserItem item, string triggerWord) { return CreateCompletionData (item, triggerWord, ""); } - static ICompletionData CreateCompletionData (ParserItem item, string triggerWord, string suffix) + static CompletionData CreateCompletionData (ParserItem item, string triggerWord, string suffix) { var name = item.FullName.Substring (triggerWord.Length); return new CompletionData (name, IconForType (item), item.Documentation, name + suffix); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/PyBinding.Gui/PythonEditorIndentation.cs new/monodevelop-python-2.4/PyBinding/PyBinding.Gui/PythonEditorIndentation.cs --- old/monodevelop-python-2.2/PyBinding/PyBinding.Gui/PythonEditorIndentation.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/PyBinding.Gui/PythonEditorIndentation.cs 2010-06-14 21:45:40.000000000 +0200 @@ -36,11 +36,6 @@ { public class PythonEditorIndentation : TextEditorExtension { - public override bool ExtendsEditor (Document doc, IEditableTextBuffer editor) - { - return !String.IsNullOrEmpty (doc.Name) && Path.GetExtension (doc.Name) == ".py"; - } - public override bool KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modifier) { if (key == Gdk.Key.Return) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/PyBinding.Gui/PythonEditorOutline.cs new/monodevelop-python-2.4/PyBinding/PyBinding.Gui/PythonEditorOutline.cs --- old/monodevelop-python-2.2/PyBinding/PyBinding.Gui/PythonEditorOutline.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/PyBinding.Gui/PythonEditorOutline.cs 2010-06-14 21:45:40.000000000 +0200 @@ -32,11 +32,5 @@ { public class PythonEditorOutline : ClassOutlineTextEditorExtension { - public override bool ExtendsEditor (Document doc, IEditableTextBuffer editor) - { - PythonLanguageBinding binding = MonoDevelop.Projects.LanguageBindingService.GetBindingPerFileName (doc.Name) - as PythonLanguageBinding; - return binding != null; - } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/PyBinding.Gui/PythonOptionsPanel.cs new/monodevelop-python-2.4/PyBinding/PyBinding.Gui/PythonOptionsPanel.cs --- old/monodevelop-python-2.2/PyBinding/PyBinding.Gui/PythonOptionsPanel.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/PyBinding.Gui/PythonOptionsPanel.cs 2010-06-14 21:45:40.000000000 +0200 @@ -22,16 +22,8 @@ using System; using System.Collections.Generic; - using Gtk; - -using MonoDevelop.Ide.Gui; -using MonoDevelop.Core; -using MonoDevelop.Core.Gui; -using MonoDevelop.Projects; -using MonoDevelop.Projects.Gui.Dialogs; -using MonoDevelop.Projects.Text; -using MonoDevelop.Core.Gui.Dialogs; +using MonoDevelop.Ide.Gui.Dialogs; namespace PyBinding.Gui { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/PyBinding.Gui/PythonOptionsWidget.cs new/monodevelop-python-2.4/PyBinding/PyBinding.Gui/PythonOptionsWidget.cs --- old/monodevelop-python-2.2/PyBinding/PyBinding.Gui/PythonOptionsWidget.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/PyBinding.Gui/PythonOptionsWidget.cs 2010-06-14 21:45:40.000000000 +0200 @@ -26,7 +26,7 @@ using Gtk; using MonoDevelop.Gettext; -using MonoDevelop.Ide.Gui; +using MonoDevelop.Ide; using PyBinding.Runtime; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/PyBinding.Gui.Navigation/AttributeNodeBuilder.cs new/monodevelop-python-2.4/PyBinding/PyBinding.Gui.Navigation/AttributeNodeBuilder.cs --- old/monodevelop-python-2.2/PyBinding/PyBinding.Gui.Navigation/AttributeNodeBuilder.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/PyBinding.Gui.Navigation/AttributeNodeBuilder.cs 2010-06-14 21:45:40.000000000 +0200 @@ -24,7 +24,7 @@ using System.Collections.Generic; using MonoDevelop.Core; -using MonoDevelop.Core.Gui; + using MonoDevelop.Ide.Gui.Components; using MonoDevelop.Projects; using MonoDevelop.Projects.Dom; @@ -63,7 +63,7 @@ { PythonNode pyNode = dataObject as PythonNode; label = pyNode.Name; - icon = Context.GetIcon (Stock.Property); + icon = Context.GetIcon (MonoDevelop.Ide.Gui.Stock.Property); } public override int CompareObjects (ITreeNavigator thisNode, ITreeNavigator otherNode) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/PyBinding.Gui.Navigation/ClassNodeBuilder.cs new/monodevelop-python-2.4/PyBinding/PyBinding.Gui.Navigation/ClassNodeBuilder.cs --- old/monodevelop-python-2.2/PyBinding/PyBinding.Gui.Navigation/ClassNodeBuilder.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/PyBinding.Gui.Navigation/ClassNodeBuilder.cs 2010-06-14 21:45:40.000000000 +0200 @@ -25,7 +25,7 @@ using System.IO; using MonoDevelop.Core; -using MonoDevelop.Core.Gui; + using MonoDevelop.Ide.Gui.Components; using MonoDevelop.Projects; using MonoDevelop.Projects.Dom; @@ -65,7 +65,7 @@ PythonClass pyClass = dataObject as PythonClass; label = pyClass.Name; - icon = Context.GetIcon (Stock.Class); + icon = Context.GetIcon (MonoDevelop.Ide.Gui.Stock.Class); } public override void BuildChildNodes (ITreeBuilder treeBuilder, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/PyBinding.Gui.Navigation/FunctionNodeBuilder.cs new/monodevelop-python-2.4/PyBinding/PyBinding.Gui.Navigation/FunctionNodeBuilder.cs --- old/monodevelop-python-2.2/PyBinding/PyBinding.Gui.Navigation/FunctionNodeBuilder.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/PyBinding.Gui.Navigation/FunctionNodeBuilder.cs 2010-06-14 21:45:40.000000000 +0200 @@ -24,7 +24,7 @@ using System.Collections.Generic; using MonoDevelop.Core; -using MonoDevelop.Core.Gui; + using MonoDevelop.Ide.Gui.Components; using MonoDevelop.Projects; using MonoDevelop.Projects.Dom; @@ -66,7 +66,7 @@ ref Gdk.Pixbuf closedIcon) { label = GetNodeName (null, dataObject); - icon = Context.GetIcon (Stock.Method); + icon = Context.GetIcon (MonoDevelop.Ide.Gui.Stock.Method); } public override int CompareObjects (ITreeNavigator thisNode, ITreeNavigator otherNode) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/PyBinding.Gui.Navigation/PackageNodeBuilder.cs new/monodevelop-python-2.4/PyBinding/PyBinding.Gui.Navigation/PackageNodeBuilder.cs --- old/monodevelop-python-2.2/PyBinding/PyBinding.Gui.Navigation/PackageNodeBuilder.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/PyBinding.Gui.Navigation/PackageNodeBuilder.cs 2010-06-14 21:45:40.000000000 +0200 @@ -25,7 +25,7 @@ using System.IO; using MonoDevelop.Core; -using MonoDevelop.Core.Gui; + using MonoDevelop.Ide.Gui.Components; using MonoDevelop.Projects; using MonoDevelop.Projects.Dom; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/PyBinding.Gui.Navigation/PackagesNodeBuilder.cs new/monodevelop-python-2.4/PyBinding/PyBinding.Gui.Navigation/PackagesNodeBuilder.cs --- old/monodevelop-python-2.2/PyBinding/PyBinding.Gui.Navigation/PackagesNodeBuilder.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/PyBinding.Gui.Navigation/PackagesNodeBuilder.cs 2010-06-14 21:45:40.000000000 +0200 @@ -25,7 +25,7 @@ using System.IO; using MonoDevelop.Core; -using MonoDevelop.Core.Gui; + using MonoDevelop.Ide.Gui.Components; using MonoDevelop.Projects; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/PyBinding.Parser/ParserDatabase.cs new/monodevelop-python-2.4/PyBinding/PyBinding.Parser/ParserDatabase.cs --- old/monodevelop-python-2.2/PyBinding/PyBinding.Parser/ParserDatabase.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/PyBinding.Parser/ParserDatabase.cs 2010-06-14 21:45:40.000000000 +0200 @@ -30,6 +30,7 @@ using System.IO; using System.Reflection; using System.Threading; +using MonoDevelop.Ide; using Mono.Data.Sqlite; @@ -286,7 +287,7 @@ var rowsCommand = new SqliteCommand ("SELECT count(*) FROM Items;", src); var count = (long)rowsCommand.ExecuteScalar (); - var progress = MonoDevelop.Ide.Gui.IdeApp.Workbench.ProgressMonitors.GetBackgroundProgressMonitor ("Python Completion Database", Gtk.Stock.Execute); + var progress = IdeApp.Workbench.ProgressMonitors.GetBackgroundProgressMonitor ("Python Completion Database", Gtk.Stock.Execute); progress.BeginTask ("Migrating completion database", (int)count); while (reader.Read ()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/PyBinding.Parser.Dom/PythonCompilationUnit.cs new/monodevelop-python-2.4/PyBinding/PyBinding.Parser.Dom/PythonCompilationUnit.cs --- old/monodevelop-python-2.2/PyBinding/PyBinding.Parser.Dom/PythonCompilationUnit.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/PyBinding.Parser.Dom/PythonCompilationUnit.cs 2010-06-14 21:45:40.000000000 +0200 @@ -23,6 +23,7 @@ using System; using System.Collections.Generic; +using MonoDevelop.Core; using MonoDevelop.Projects.Dom; using MonoDevelop.Projects.Dom.Parser; @@ -156,7 +157,7 @@ class PackageDomType: DomType { - public override string StockIcon { + public override IconId StockIcon { get { return "md-package"; } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/PyBinding.addin.xml new/monodevelop-python-2.4/PyBinding/PyBinding.addin.xml --- old/monodevelop-python-2.2/PyBinding/PyBinding.addin.xml 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/PyBinding.addin.xml 2010-06-14 21:45:40.000000000 +0200 @@ -6,20 +6,16 @@ url = "http://www.monodevelop.com" description = "Python Language binding" category = "Language bindings" - version = "2.2"> + version = "2.4"> <Runtime> <Import assembly = "PyBinding.dll"/> </Runtime> <Dependencies> - <Addin id = "Core" version = "2.2"/> - <Addin id = "Core.Gui" version = "2.2"/> - <Addin id = "Projects" version = "2.2"/> - <Addin id = "Projects.Gui" version = "2.2"/> - <Addin id = "Ide" version = "2.2"/> - <Addin id = "Components" version = "2.2"/> - <Addin id = "SourceEditor2" version = "2.2"/> + <Addin id = "Core" version = "2.4"/> + <Addin id = "Ide" version = "2.4"/> + <Addin id = "SourceEditor2" version = "2.4"/> </Dependencies> <Extension path = "/MonoDevelop/Core/StockIcons"> @@ -88,9 +84,9 @@ </Extension> <Extension path = "/MonoDevelop/Ide/TextEditorExtensions"> - <Class id = "PyBinding.Gui.PythonEditorCompletion" class = "PyBinding.Gui.PythonEditorCompletion" /> - <Class id = "PyBinding.Gui.PythonEditorIndentation" class = "PyBinding.Gui.PythonEditorIndentation" /> - <Class id = "PyBinding.Gui.PythonEditorOutline" class = "PyBinding.Gui.PythonEditorOutline" /> + <Class fileExtensions = ".py" id = "PyBinding.Gui.PythonEditorCompletion" class = "PyBinding.Gui.PythonEditorCompletion" /> + <Class fileExtensions = ".py" id = "PyBinding.Gui.PythonEditorIndentation" class = "PyBinding.Gui.PythonEditorIndentation" /> + <Class fileExtensions = ".py" id = "PyBinding.Gui.PythonEditorOutline" class = "PyBinding.Gui.PythonEditorOutline" /> </Extension> <Extension path = "/MonoDevelop/ProjectModel/DomParser"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/gtk-gui/PyBinding.Gui.PythonOptionsWidget.cs new/monodevelop-python-2.4/PyBinding/gtk-gui/PyBinding.Gui.PythonOptionsWidget.cs --- old/monodevelop-python-2.2/PyBinding/gtk-gui/PyBinding.Gui.PythonOptionsWidget.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/gtk-gui/PyBinding.Gui.PythonOptionsWidget.cs 2010-06-14 21:45:40.000000000 +0200 @@ -1,241 +1,233 @@ -// ------------------------------------------------------------------------------ -// <autogenerated> -// This code was generated by a tool. -// -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// </autogenerated> -// ------------------------------------------------------------------------------ - -namespace PyBinding.Gui { - - - public partial class PythonOptionsWidget { - - private Gtk.VBox vbox1; - - private Gtk.Label label1; - - private Gtk.Alignment alignment1; - - private Gtk.Table table1; - - private Gtk.Label label4; - - private Gtk.Label label5; - - private Gtk.Entry m_ModuleEntry; - - private Gtk.CheckButton m_OptimizeCheckBox; - - private Gtk.Entry m_PythonOptions; - - private Gtk.ComboBox m_RuntimeCombo; - - private Gtk.Label label3; - - private Gtk.Alignment alignment2; - - private Gtk.HBox hbox1; - - private Gtk.ScrolledWindow scrolledwindow1; - - private Gtk.TreeView m_PathsTreeView; - - private Gtk.VBox vbox2; - - private Gtk.Button m_AddPathButton; - - private Gtk.Button m_RemovePathButton; - - protected virtual void Build() { - Stetic.Gui.Initialize(this); - // Widget PyBinding.Gui.PythonOptionsWidget - Stetic.BinContainer.Attach(this); - this.Name = "PyBinding.Gui.PythonOptionsWidget"; - // Container child PyBinding.Gui.PythonOptionsWidget.Gtk.Container+ContainerChild - this.vbox1 = new Gtk.VBox(); - this.vbox1.Name = "vbox1"; - this.vbox1.Spacing = 6; - // Container child vbox1.Gtk.Box+BoxChild - this.label1 = new Gtk.Label(); - this.label1.Name = "label1"; - this.label1.Xalign = 0F; - this.label1.LabelProp = Mono.Unix.Catalog.GetString("Runtime</span>"); - this.label1.UseMarkup = true; - this.vbox1.Add(this.label1); - Gtk.Box.BoxChild w1 = ((Gtk.Box.BoxChild)(this.vbox1[this.label1])); - w1.Position = 0; - w1.Expand = false; - w1.Fill = false; - // Container child vbox1.Gtk.Box+BoxChild - this.alignment1 = new Gtk.Alignment(0.5F, 0.5F, 1F, 1F); - this.alignment1.Name = "alignment1"; - this.alignment1.LeftPadding = ((uint)(12)); - // Container child alignment1.Gtk.Container+ContainerChild - this.table1 = new Gtk.Table(((uint)(5)), ((uint)(2)), false); - this.table1.Name = "table1"; - this.table1.RowSpacing = ((uint)(6)); - this.table1.ColumnSpacing = ((uint)(6)); - // Container child table1.Gtk.Table+TableChild - this.label4 = new Gtk.Label(); - this.label4.Name = "label4"; - this.label4.LabelProp = Mono.Unix.Catalog.GetString("Python _Options:"); - this.label4.UseUnderline = true; - this.table1.Add(this.label4); - Gtk.Table.TableChild w2 = ((Gtk.Table.TableChild)(this.table1[this.label4])); - w2.TopAttach = ((uint)(1)); - w2.BottomAttach = ((uint)(2)); - w2.XOptions = ((Gtk.AttachOptions)(4)); - w2.YOptions = ((Gtk.AttachOptions)(4)); - // Container child table1.Gtk.Table+TableChild - this.label5 = new Gtk.Label(); - this.label5.Name = "label5"; - this.label5.LabelProp = Mono.Unix.Catalog.GetString("Default _Module:"); - this.label5.UseUnderline = true; - this.table1.Add(this.label5); - Gtk.Table.TableChild w3 = ((Gtk.Table.TableChild)(this.table1[this.label5])); - w3.TopAttach = ((uint)(2)); - w3.BottomAttach = ((uint)(3)); - w3.XOptions = ((Gtk.AttachOptions)(4)); - w3.YOptions = ((Gtk.AttachOptions)(4)); - // Container child table1.Gtk.Table+TableChild - this.m_ModuleEntry = new Gtk.Entry(); - this.m_ModuleEntry.CanFocus = true; - this.m_ModuleEntry.Name = "m_ModuleEntry"; - this.m_ModuleEntry.IsEditable = true; - this.m_ModuleEntry.InvisibleChar = '●'; - this.table1.Add(this.m_ModuleEntry); - Gtk.Table.TableChild w4 = ((Gtk.Table.TableChild)(this.table1[this.m_ModuleEntry])); - w4.TopAttach = ((uint)(2)); - w4.BottomAttach = ((uint)(3)); - w4.LeftAttach = ((uint)(1)); - w4.RightAttach = ((uint)(2)); - w4.YOptions = ((Gtk.AttachOptions)(4)); - // Container child table1.Gtk.Table+TableChild - this.m_OptimizeCheckBox = new Gtk.CheckButton(); - this.m_OptimizeCheckBox.CanFocus = true; - this.m_OptimizeCheckBox.Name = "m_OptimizeCheckBox"; - this.m_OptimizeCheckBox.Label = Mono.Unix.Catalog.GetString("Optimize byte-code output"); - this.m_OptimizeCheckBox.DrawIndicator = true; - this.m_OptimizeCheckBox.UseUnderline = true; - this.table1.Add(this.m_OptimizeCheckBox); - Gtk.Table.TableChild w5 = ((Gtk.Table.TableChild)(this.table1[this.m_OptimizeCheckBox])); - w5.TopAttach = ((uint)(3)); - w5.BottomAttach = ((uint)(4)); - w5.RightAttach = ((uint)(2)); - w5.YOptions = ((Gtk.AttachOptions)(4)); - // Container child table1.Gtk.Table+TableChild - this.m_PythonOptions = new Gtk.Entry(); - this.m_PythonOptions.CanFocus = true; - this.m_PythonOptions.Name = "m_PythonOptions"; - this.m_PythonOptions.IsEditable = true; - this.m_PythonOptions.InvisibleChar = '●'; - this.table1.Add(this.m_PythonOptions); - Gtk.Table.TableChild w6 = ((Gtk.Table.TableChild)(this.table1[this.m_PythonOptions])); - w6.TopAttach = ((uint)(1)); - w6.BottomAttach = ((uint)(2)); - w6.LeftAttach = ((uint)(1)); - w6.RightAttach = ((uint)(2)); - w6.XOptions = ((Gtk.AttachOptions)(4)); - w6.YOptions = ((Gtk.AttachOptions)(4)); - // Container child table1.Gtk.Table+TableChild - this.m_RuntimeCombo = Gtk.ComboBox.NewText(); - this.m_RuntimeCombo.Name = "m_RuntimeCombo"; - this.table1.Add(this.m_RuntimeCombo); - Gtk.Table.TableChild w7 = ((Gtk.Table.TableChild)(this.table1[this.m_RuntimeCombo])); - w7.RightAttach = ((uint)(2)); - w7.XOptions = ((Gtk.AttachOptions)(4)); - w7.YOptions = ((Gtk.AttachOptions)(4)); - this.alignment1.Add(this.table1); - this.vbox1.Add(this.alignment1); - Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(this.vbox1[this.alignment1])); - w9.Position = 1; - w9.Expand = false; - // Container child vbox1.Gtk.Box+BoxChild - this.label3 = new Gtk.Label(); - this.label3.Name = "label3"; - this.label3.Xalign = 0F; - this.label3.LabelProp = Mono.Unix.Catalog.GetString("Module Paths</span>"); - this.label3.UseMarkup = true; - this.vbox1.Add(this.label3); - Gtk.Box.BoxChild w10 = ((Gtk.Box.BoxChild)(this.vbox1[this.label3])); - w10.Position = 2; - w10.Expand = false; - w10.Fill = false; - // Container child vbox1.Gtk.Box+BoxChild - this.alignment2 = new Gtk.Alignment(0.5F, 0.5F, 1F, 1F); - this.alignment2.Name = "alignment2"; - this.alignment2.LeftPadding = ((uint)(12)); - // Container child alignment2.Gtk.Container+ContainerChild - this.hbox1 = new Gtk.HBox(); - this.hbox1.Name = "hbox1"; - this.hbox1.Spacing = 6; - // Container child hbox1.Gtk.Box+BoxChild - this.scrolledwindow1 = new Gtk.ScrolledWindow(); - this.scrolledwindow1.CanFocus = true; - this.scrolledwindow1.Name = "scrolledwindow1"; - this.scrolledwindow1.ShadowType = ((Gtk.ShadowType)(1)); - // Container child scrolledwindow1.Gtk.Container+ContainerChild - Gtk.Viewport w11 = new Gtk.Viewport(); - w11.ShadowType = ((Gtk.ShadowType)(0)); - // Container child GtkViewport.Gtk.Container+ContainerChild - this.m_PathsTreeView = new Gtk.TreeView(); - this.m_PathsTreeView.CanFocus = true; - this.m_PathsTreeView.Name = "m_PathsTreeView"; - w11.Add(this.m_PathsTreeView); - this.scrolledwindow1.Add(w11); - this.hbox1.Add(this.scrolledwindow1); - Gtk.Box.BoxChild w14 = ((Gtk.Box.BoxChild)(this.hbox1[this.scrolledwindow1])); - w14.Position = 0; - // Container child hbox1.Gtk.Box+BoxChild - this.vbox2 = new Gtk.VBox(); - this.vbox2.Name = "vbox2"; - this.vbox2.Spacing = 6; - // Container child vbox2.Gtk.Box+BoxChild - this.m_AddPathButton = new Gtk.Button(); - this.m_AddPathButton.CanFocus = true; - this.m_AddPathButton.Name = "m_AddPathButton"; - this.m_AddPathButton.UseStock = true; - this.m_AddPathButton.UseUnderline = true; - this.m_AddPathButton.Label = "gtk-add"; - this.vbox2.Add(this.m_AddPathButton); - Gtk.Box.BoxChild w15 = ((Gtk.Box.BoxChild)(this.vbox2[this.m_AddPathButton])); - w15.Position = 0; - w15.Expand = false; - w15.Fill = false; - // Container child vbox2.Gtk.Box+BoxChild - this.m_RemovePathButton = new Gtk.Button(); - this.m_RemovePathButton.Sensitive = false; - this.m_RemovePathButton.CanFocus = true; - this.m_RemovePathButton.Name = "m_RemovePathButton"; - this.m_RemovePathButton.UseStock = true; - this.m_RemovePathButton.UseUnderline = true; - this.m_RemovePathButton.Label = "gtk-remove"; - this.vbox2.Add(this.m_RemovePathButton); - Gtk.Box.BoxChild w16 = ((Gtk.Box.BoxChild)(this.vbox2[this.m_RemovePathButton])); - w16.Position = 1; - w16.Expand = false; - w16.Fill = false; - this.hbox1.Add(this.vbox2); - Gtk.Box.BoxChild w17 = ((Gtk.Box.BoxChild)(this.hbox1[this.vbox2])); - w17.Position = 1; - w17.Expand = false; - w17.Fill = false; - this.alignment2.Add(this.hbox1); - this.vbox1.Add(this.alignment2); - Gtk.Box.BoxChild w19 = ((Gtk.Box.BoxChild)(this.vbox1[this.alignment2])); - w19.Position = 3; - this.Add(this.vbox1); - if ((this.Child != null)) { - this.Child.ShowAll(); - } - this.label4.MnemonicWidget = this.m_PythonOptions; - this.label5.MnemonicWidget = this.m_ModuleEntry; - this.Show(); - this.m_AddPathButton.Clicked += new System.EventHandler(this.AddPath_Clicked); - this.m_RemovePathButton.Clicked += new System.EventHandler(this.RemovePath_Clicked); - } - } + +// This file has been generated by the GUI designer. Do not modify. +namespace PyBinding.Gui +{ + public partial class PythonOptionsWidget + { + private global::Gtk.VBox vbox1; + + private global::Gtk.Label label1; + + private global::Gtk.Alignment alignment1; + + private global::Gtk.Table table1; + + private global::Gtk.Label label4; + + private global::Gtk.Label label5; + + private global::Gtk.Entry m_ModuleEntry; + + private global::Gtk.CheckButton m_OptimizeCheckBox; + + private global::Gtk.Entry m_PythonOptions; + + private global::Gtk.ComboBox m_RuntimeCombo; + + private global::Gtk.Label label3; + + private global::Gtk.Alignment alignment2; + + private global::Gtk.HBox hbox1; + + private global::Gtk.ScrolledWindow scrolledwindow1; + + private global::Gtk.TreeView m_PathsTreeView; + + private global::Gtk.VBox vbox2; + + private global::Gtk.Button m_AddPathButton; + + private global::Gtk.Button m_RemovePathButton; + + protected virtual void Build () + { + global::Stetic.Gui.Initialize (this); + // Widget PyBinding.Gui.PythonOptionsWidget + global::Stetic.BinContainer.Attach (this); + this.Name = "PyBinding.Gui.PythonOptionsWidget"; + // Container child PyBinding.Gui.PythonOptionsWidget.Gtk.Container+ContainerChild + this.vbox1 = new global::Gtk.VBox (); + this.vbox1.Name = "vbox1"; + this.vbox1.Spacing = 6; + // Container child vbox1.Gtk.Box+BoxChild + this.label1 = new global::Gtk.Label (); + this.label1.Name = "label1"; + this.label1.Xalign = 0f; + this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("Runtime</span>"); + this.label1.UseMarkup = true; + this.vbox1.Add (this.label1); + global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.label1])); + w1.Position = 0; + w1.Expand = false; + w1.Fill = false; + // Container child vbox1.Gtk.Box+BoxChild + this.alignment1 = new global::Gtk.Alignment (0.5f, 0.5f, 1f, 1f); + this.alignment1.Name = "alignment1"; + this.alignment1.LeftPadding = ((uint)(12)); + // Container child alignment1.Gtk.Container+ContainerChild + this.table1 = new global::Gtk.Table (((uint)(5)), ((uint)(2)), false); + this.table1.Name = "table1"; + this.table1.RowSpacing = ((uint)(6)); + this.table1.ColumnSpacing = ((uint)(6)); + // Container child table1.Gtk.Table+TableChild + this.label4 = new global::Gtk.Label (); + this.label4.Name = "label4"; + this.label4.LabelProp = global::Mono.Unix.Catalog.GetString ("Python _Options:"); + this.label4.UseUnderline = true; + this.table1.Add (this.label4); + global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1[this.label4])); + w2.TopAttach = ((uint)(1)); + w2.BottomAttach = ((uint)(2)); + w2.XOptions = ((global::Gtk.AttachOptions)(4)); + w2.YOptions = ((global::Gtk.AttachOptions)(4)); + // Container child table1.Gtk.Table+TableChild + this.label5 = new global::Gtk.Label (); + this.label5.Name = "label5"; + this.label5.LabelProp = global::Mono.Unix.Catalog.GetString ("Default _Module:"); + this.label5.UseUnderline = true; + this.table1.Add (this.label5); + global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1[this.label5])); + w3.TopAttach = ((uint)(2)); + w3.BottomAttach = ((uint)(3)); + w3.XOptions = ((global::Gtk.AttachOptions)(4)); + w3.YOptions = ((global::Gtk.AttachOptions)(4)); + // Container child table1.Gtk.Table+TableChild + this.m_ModuleEntry = new global::Gtk.Entry (); + this.m_ModuleEntry.CanFocus = true; + this.m_ModuleEntry.Name = "m_ModuleEntry"; + this.m_ModuleEntry.IsEditable = true; + this.m_ModuleEntry.InvisibleChar = '●'; + this.table1.Add (this.m_ModuleEntry); + global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1[this.m_ModuleEntry])); + w4.TopAttach = ((uint)(2)); + w4.BottomAttach = ((uint)(3)); + w4.LeftAttach = ((uint)(1)); + w4.RightAttach = ((uint)(2)); + w4.YOptions = ((global::Gtk.AttachOptions)(4)); + // Container child table1.Gtk.Table+TableChild + this.m_OptimizeCheckBox = new global::Gtk.CheckButton (); + this.m_OptimizeCheckBox.CanFocus = true; + this.m_OptimizeCheckBox.Name = "m_OptimizeCheckBox"; + this.m_OptimizeCheckBox.Label = global::Mono.Unix.Catalog.GetString ("Optimize byte-code output"); + this.m_OptimizeCheckBox.DrawIndicator = true; + this.m_OptimizeCheckBox.UseUnderline = true; + this.table1.Add (this.m_OptimizeCheckBox); + global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1[this.m_OptimizeCheckBox])); + w5.TopAttach = ((uint)(3)); + w5.BottomAttach = ((uint)(4)); + w5.RightAttach = ((uint)(2)); + w5.YOptions = ((global::Gtk.AttachOptions)(4)); + // Container child table1.Gtk.Table+TableChild + this.m_PythonOptions = new global::Gtk.Entry (); + this.m_PythonOptions.CanFocus = true; + this.m_PythonOptions.Name = "m_PythonOptions"; + this.m_PythonOptions.IsEditable = true; + this.m_PythonOptions.InvisibleChar = '●'; + this.table1.Add (this.m_PythonOptions); + global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1[this.m_PythonOptions])); + w6.TopAttach = ((uint)(1)); + w6.BottomAttach = ((uint)(2)); + w6.LeftAttach = ((uint)(1)); + w6.RightAttach = ((uint)(2)); + w6.XOptions = ((global::Gtk.AttachOptions)(4)); + w6.YOptions = ((global::Gtk.AttachOptions)(4)); + // Container child table1.Gtk.Table+TableChild + this.m_RuntimeCombo = global::Gtk.ComboBox.NewText (); + this.m_RuntimeCombo.Name = "m_RuntimeCombo"; + this.table1.Add (this.m_RuntimeCombo); + global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1[this.m_RuntimeCombo])); + w7.RightAttach = ((uint)(2)); + w7.XOptions = ((global::Gtk.AttachOptions)(4)); + w7.YOptions = ((global::Gtk.AttachOptions)(4)); + this.alignment1.Add (this.table1); + this.vbox1.Add (this.alignment1); + global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment1])); + w9.Position = 1; + w9.Expand = false; + // Container child vbox1.Gtk.Box+BoxChild + this.label3 = new global::Gtk.Label (); + this.label3.Name = "label3"; + this.label3.Xalign = 0f; + this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("Module Paths</span>"); + this.label3.UseMarkup = true; + this.vbox1.Add (this.label3); + global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.label3])); + w10.Position = 2; + w10.Expand = false; + w10.Fill = false; + // Container child vbox1.Gtk.Box+BoxChild + this.alignment2 = new global::Gtk.Alignment (0.5f, 0.5f, 1f, 1f); + this.alignment2.Name = "alignment2"; + this.alignment2.LeftPadding = ((uint)(12)); + // Container child alignment2.Gtk.Container+ContainerChild + this.hbox1 = new global::Gtk.HBox (); + this.hbox1.Name = "hbox1"; + this.hbox1.Spacing = 6; + // Container child hbox1.Gtk.Box+BoxChild + this.scrolledwindow1 = new global::Gtk.ScrolledWindow (); + this.scrolledwindow1.CanFocus = true; + this.scrolledwindow1.Name = "scrolledwindow1"; + this.scrolledwindow1.ShadowType = ((global::Gtk.ShadowType)(1)); + // Container child scrolledwindow1.Gtk.Container+ContainerChild + global::Gtk.Viewport w11 = new global::Gtk.Viewport (); + w11.ShadowType = ((global::Gtk.ShadowType)(0)); + // Container child GtkViewport.Gtk.Container+ContainerChild + this.m_PathsTreeView = new global::Gtk.TreeView (); + this.m_PathsTreeView.CanFocus = true; + this.m_PathsTreeView.Name = "m_PathsTreeView"; + w11.Add (this.m_PathsTreeView); + this.scrolledwindow1.Add (w11); + this.hbox1.Add (this.scrolledwindow1); + global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.scrolledwindow1])); + w14.Position = 0; + // Container child hbox1.Gtk.Box+BoxChild + this.vbox2 = new global::Gtk.VBox (); + this.vbox2.Name = "vbox2"; + this.vbox2.Spacing = 6; + // Container child vbox2.Gtk.Box+BoxChild + this.m_AddPathButton = new global::Gtk.Button (); + this.m_AddPathButton.CanFocus = true; + this.m_AddPathButton.Name = "m_AddPathButton"; + this.m_AddPathButton.UseStock = true; + this.m_AddPathButton.UseUnderline = true; + this.m_AddPathButton.Label = "gtk-add"; + this.vbox2.Add (this.m_AddPathButton); + global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.m_AddPathButton])); + w15.Position = 0; + w15.Expand = false; + w15.Fill = false; + // Container child vbox2.Gtk.Box+BoxChild + this.m_RemovePathButton = new global::Gtk.Button (); + this.m_RemovePathButton.Sensitive = false; + this.m_RemovePathButton.CanFocus = true; + this.m_RemovePathButton.Name = "m_RemovePathButton"; + this.m_RemovePathButton.UseStock = true; + this.m_RemovePathButton.UseUnderline = true; + this.m_RemovePathButton.Label = "gtk-remove"; + this.vbox2.Add (this.m_RemovePathButton); + global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.m_RemovePathButton])); + w16.Position = 1; + w16.Expand = false; + w16.Fill = false; + this.hbox1.Add (this.vbox2); + global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.vbox2])); + w17.Position = 1; + w17.Expand = false; + w17.Fill = false; + this.alignment2.Add (this.hbox1); + this.vbox1.Add (this.alignment2); + global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment2])); + w19.Position = 3; + this.Add (this.vbox1); + if ((this.Child != null)) { + this.Child.ShowAll (); + } + this.label4.MnemonicWidget = this.m_PythonOptions; + this.label5.MnemonicWidget = this.m_ModuleEntry; + this.Show (); + this.m_AddPathButton.Clicked += new global::System.EventHandler (this.AddPath_Clicked); + this.m_RemovePathButton.Clicked += new global::System.EventHandler (this.RemovePath_Clicked); + } + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/gtk-gui/generated.cs new/monodevelop-python-2.4/PyBinding/gtk-gui/generated.cs --- old/monodevelop-python-2.2/PyBinding/gtk-gui/generated.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/gtk-gui/generated.cs 2010-06-14 21:45:40.000000000 +0200 @@ -1,82 +1,82 @@ -// ------------------------------------------------------------------------------ -// <autogenerated> -// This code was generated by a tool. -// -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// </autogenerated> -// ------------------------------------------------------------------------------ - -namespace Stetic { - - - internal class Gui { - - private static bool initialized; - - internal static void Initialize(Gtk.Widget iconRenderer) { - if ((Stetic.Gui.initialized == false)) { - Stetic.Gui.initialized = true; - } - } - } - - internal class BinContainer { - - private Gtk.Widget child; - - private Gtk.UIManager uimanager; - - public static BinContainer Attach(Gtk.Bin bin) { - BinContainer bc = new BinContainer(); - bin.SizeRequested += new Gtk.SizeRequestedHandler(bc.OnSizeRequested); - bin.SizeAllocated += new Gtk.SizeAllocatedHandler(bc.OnSizeAllocated); - bin.Added += new Gtk.AddedHandler(bc.OnAdded); - return bc; - } - - private void OnSizeRequested(object sender, Gtk.SizeRequestedArgs args) { - if ((this.child != null)) { - args.Requisition = this.child.SizeRequest(); - } - } - - private void OnSizeAllocated(object sender, Gtk.SizeAllocatedArgs args) { - if ((this.child != null)) { - this.child.Allocation = args.Allocation; - } - } - - private void OnAdded(object sender, Gtk.AddedArgs args) { - this.child = args.Widget; - } - - public void SetUiManager(Gtk.UIManager uim) { - this.uimanager = uim; - this.child.Realized += new System.EventHandler(this.OnRealized); - } - - private void OnRealized(object sender, System.EventArgs args) { - if ((this.uimanager != null)) { - Gtk.Widget w; - w = this.child.Toplevel; - if (((w != null) && typeof(Gtk.Window).IsInstanceOfType(w))) { - ((Gtk.Window)(w)).AddAccelGroup(this.uimanager.AccelGroup); - this.uimanager = null; - } - } - } - } - - internal class ActionGroups { - - public static Gtk.ActionGroup GetActionGroup(System.Type type) { - return Stetic.ActionGroups.GetActionGroup(type.FullName); - } - - public static Gtk.ActionGroup GetActionGroup(string name) { - return null; - } - } + +// This file has been generated by the GUI designer. Do not modify. +namespace Stetic +{ + internal class Gui + { + private static bool initialized; + + static internal void Initialize (Gtk.Widget iconRenderer) + { + if ((Stetic.Gui.initialized == false)) { + Stetic.Gui.initialized = true; + } + } + } + + internal class BinContainer + { + private Gtk.Widget child; + + private Gtk.UIManager uimanager; + + public static BinContainer Attach (Gtk.Bin bin) + { + BinContainer bc = new BinContainer (); + bin.SizeRequested += new Gtk.SizeRequestedHandler (bc.OnSizeRequested); + bin.SizeAllocated += new Gtk.SizeAllocatedHandler (bc.OnSizeAllocated); + bin.Added += new Gtk.AddedHandler (bc.OnAdded); + return bc; + } + + private void OnSizeRequested (object sender, Gtk.SizeRequestedArgs args) + { + if ((this.child != null)) { + args.Requisition = this.child.SizeRequest (); + } + } + + private void OnSizeAllocated (object sender, Gtk.SizeAllocatedArgs args) + { + if ((this.child != null)) { + this.child.Allocation = args.Allocation; + } + } + + private void OnAdded (object sender, Gtk.AddedArgs args) + { + this.child = args.Widget; + } + + public void SetUiManager (Gtk.UIManager uim) + { + this.uimanager = uim; + this.child.Realized += new System.EventHandler (this.OnRealized); + } + + private void OnRealized (object sender, System.EventArgs args) + { + if ((this.uimanager != null)) { + Gtk.Widget w; + w = this.child.Toplevel; + if (((w != null) && typeof(Gtk.Window).IsInstanceOfType (w))) { + ((Gtk.Window)(w)).AddAccelGroup (this.uimanager.AccelGroup); + this.uimanager = null; + } + } + } + } + + internal class ActionGroups + { + public static Gtk.ActionGroup GetActionGroup (System.Type type) + { + return Stetic.ActionGroups.GetActionGroup (type.FullName); + } + + public static Gtk.ActionGroup GetActionGroup (string name) + { + return null; + } + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/gtk-gui/gui.stetic new/monodevelop-python-2.4/PyBinding/gtk-gui/gui.stetic --- old/monodevelop-python-2.2/PyBinding/gtk-gui/gui.stetic 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/gtk-gui/gui.stetic 2010-06-14 21:45:40.000000000 +0200 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <stetic-interface> <configuration> <images-root-path>..</images-root-path> @@ -6,26 +6,28 @@ </configuration> <import> <widget-library name="Mono.TextEditor, Version=1.0.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.Gettext, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.Ide, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.Projects.Gui, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.Components, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.GtkCore, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.DesignerSupport, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.Core.Gui, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.VersionControl, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.NUnit, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.XmlEditor, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.AspNet, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.Deployment, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.Deployment.Linux, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.VBNetBinding, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.CBinding, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.CSharpBinding, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.Autotools, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.SourceEditor2, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.Debugger, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.Refactoring, Version=2.1.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Gettext, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Ide, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Projects.Gui, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Components, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.GtkCore, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Core.Gui, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Autotools, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.SourceEditor2, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Debugger, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Refactoring, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.VersionControl, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.NUnit, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.XmlEditor, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.AspNet, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Deployment, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Deployment.Linux, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.DesignerSupport, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.VBNetBinding, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.CBinding, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.CSharpBinding, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Moonlight, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Debugger.Soft, Version=2.2.0.0, Culture=neutral" /> <widget-library name="../../build/PyBinding.dll" internal="true" /> </import> <widget class="Gtk.Bin" id="PyBinding.Gui.PythonOptionsWidget" design-size="491 382"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/configure new/monodevelop-python-2.4/configure --- old/monodevelop-python-2.2/configure 2009-12-11 21:51:50.000000000 +0100 +++ new/monodevelop-python-2.4/configure 2010-06-14 21:45:40.000000000 +0200 @@ -1,10 +1,10 @@ #!/bin/bash -VERSION=2.2 +VERSION=2.4 PACKAGE=monodevelop-python prefix=/usr/local config=DEBUG configurations=" RELEASE DEBUG" -common_packages=" gtk-sharp-2.0;2.12.8 mono-addins;0.3 monodevelop;2.2 monodevelop-core-addins;2.2" +common_packages=" gtk-sharp-2.0;2.12.8 mono-addins;0.3 monodevelop;2.4 monodevelop-core-addins;2.4" usage () ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org