From tberman at mono-cvs.ximian.com Wed Jun 1 03:16:22 2005 From: tberman at mono-cvs.ximian.com (Todd Berman ) Date: Wed, 1 Jun 2005 03:16:22 -0400 (EDT) Subject: [Monodevelop-patches-list] r2570 - in trunk/MonoDevelop: . Core/src/AddIns/BackendBindings/CSharpBinding Core/src/AddIns/BackendBindings/ILAsmBinding Core/src/AddIns/BackendBindings/NemerleBinding Core/src/AddIns/BackendBindings/VBNetBinding Core/src/AddIns/BackendBindings/VBNetBinding/SharpRefactoryVB Core/src/AddIns/DebuggerAddIn Core/src/AddIns/DebuggerAddIn/Visualizers Core/src/AddIns/DisplayBindings/SourceEditor Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels Core/src/AddIns/prj2make-sharp-lib Core/src/ICSharpCode.SharpAssembly Core/src/ICSharpCode.SharpRefactory Core/src/MonoDevelop.Base Core/src/MonoDevelop.Base/Gui/BrowserDisplayBinding Core/src/MonoDevelop.Base/Gui/Pads Core/src/MonoDevelop.Base/Gui/Pads/FileScout Core/src/MonoDevelop.Base/Gui/Pads/SolutionPad Core/src/MonoDevelop.Base/Services/StatusBar Core/src/MonoDevelop.Core Core/src/MonoDevelop.Dock Core/src/MonoDevelop.Gui.Utils Core/src/MonoDevelop.Gui.W idgets Core/src/MonoDevelop.Gui.Widgets/FileSelector Core/src/MonoDevelop.Gui.Widgets/Navbar Core/src/MonoDevelop.Startup Core/src/Tools/SharpCoco Core/src/Tools/dbgen Core/src/Tools/mdhost Extras/JavaBinding Extras/MonoDeveloperExtensions Extras/MonoQuery Unused/AddInManager Unused/ICSharpCode.TextEditor Unused/TextEditor Message-ID: <20050601071622.E604394765@mono-cvs.ximian.com> Author: tberman Date: 2005-06-01 03:16:22 -0400 (Wed, 01 Jun 2005) New Revision: 2570 Modified: trunk/MonoDevelop/ChangeLog trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Makefile.am trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/Makefile.am trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Makefile.am trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Makefile.am trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/SharpRefactoryVB/Makefile.am trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/Makefile.am trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/Visualizers/Makefile.am trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionWindow.cs trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/SyntaxHighlightingPanel.cs trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/Makefile.am trunk/MonoDevelop/Core/src/ICSharpCode.SharpAssembly/Makefile.am trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/Makefile.am trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/FileScout/FileList.cs trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/OpenTaskView.cs trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/SolutionPad/TreeViewPad.cs trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/StatusBar/DefaultStatusBarService.cs trunk/MonoDevelop/Core/src/MonoDevelop.Core/Makefile.am trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockBar.cs trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockItem.cs trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockItemGrip.cs trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockLayout.cs trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockMaster.cs trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockPaned.cs trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockPlaceholder.cs trunk/MonoDevelop/Core/src/MonoDevelop.Dock/Makefile.am trunk/MonoDevelop/Core/src/MonoDevelop.Dock/Stock.cs trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/Makefile.am trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/FileSelector/FileSelector.cs trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Makefile.am trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Navbar/Navbar.cs trunk/MonoDevelop/Core/src/MonoDevelop.Startup/Makefile.am trunk/MonoDevelop/Core/src/Tools/SharpCoco/Makefile.am trunk/MonoDevelop/Core/src/Tools/dbgen/Makefile.am trunk/MonoDevelop/Core/src/Tools/mdhost/Makefile.am trunk/MonoDevelop/Extras/JavaBinding/Makefile.am trunk/MonoDevelop/Extras/MonoDeveloperExtensions/Makefile.am trunk/MonoDevelop/Extras/MonoQuery/Makefile.am trunk/MonoDevelop/Unused/AddInManager/Makefile.am trunk/MonoDevelop/Unused/ICSharpCode.TextEditor/Makefile.am trunk/MonoDevelop/Unused/TextEditor/Makefile.am trunk/MonoDevelop/configure.in Log: 2005-06-01 Todd Berman * */*: Make MD -langversion:ISO-1 compliant, and add checking to the makefiles Modified: trunk/MonoDevelop/ChangeLog =================================================================== --- trunk/MonoDevelop/ChangeLog 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/ChangeLog 2005-06-01 07:16:22 UTC (rev 2570) @@ -1,3 +1,8 @@ +2005-06-01 Todd Berman + + * */*: Make MD -langversion:ISO-1 compliant, and add checking to the + makefiles + 2005-05-31 Peter Johanson * configure.in: Bump boo version requirement. Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Makefile.am 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Makefile.am 2005-06-01 07:16:22 UTC (rev 2570) @@ -82,7 +82,7 @@ $(ASSEMBLY): $(build_sources) $(srcdir)/CSharp.glade mkdir -p $(ADDIN_BUILD) - $(CSC) -out:$@ -target:library $(DLLS) \ + $(CSC) $(CSC_FLAGS) -out:$@ -target:library $(DLLS) \ -resource:$(srcdir)/CSharp.glade,CSharp.glade \ $(build_sources) Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/Makefile.am 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/ILAsmBinding/Makefile.am 2005-06-01 07:16:22 UTC (rev 2570) @@ -43,7 +43,7 @@ $(ASSEMBLY): $(build_sources) mkdir -p $(ADDIN_BUILD) - $(CSC) $(build_sources) $(DLLS) -out:$@ -target:library + $(CSC) $(CSC_FLAGS) $(build_sources) $(DLLS) -out:$@ -target:library CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb EXTRA_DIST = $(FILES) $(ADDIN) $(TEMPLATES) Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Makefile.am 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Makefile.am 2005-06-01 07:16:22 UTC (rev 2570) @@ -46,7 +46,7 @@ $(ASSEMBLY): $(FILES) $(srcdir)/Nemerle.glade mkdir -p $(ADDIN_BUILD) - $(CSC) $(DLLS) $(build_sources) -out:$@ -target:library \ + $(CSC) $(CSC_FLAGS) $(DLLS) $(build_sources) -out:$@ -target:library \ -resource:$(srcdir)/Nemerle.glade,Nemerle.glade assemblydir = $(MD_ADDIN_DIR)/BackendBindings/ Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Makefile.am 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/Makefile.am 2005-06-01 07:16:22 UTC (rev 2570) @@ -69,7 +69,7 @@ $(ASSEMBLY): $(build_sources) $(srcdir)/VB.glade mkdir -p $(ADDIN_BUILD) cd SharpRefactoryVB && $(MAKE) - $(CSC) -out:$@ -target:library $(DLLS) \ + $(CSC) $(CSC_FLAGS) -out:$@ -target:library $(DLLS) \ -resource:$(srcdir)/VB.glade,VB.glade \ $(build_sources) Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/SharpRefactoryVB/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/SharpRefactoryVB/Makefile.am 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/SharpRefactoryVB/Makefile.am 2005-06-01 07:16:22 UTC (rev 2570) @@ -112,7 +112,7 @@ all: $(DLL) $(DLL): $(FILES) - @ $(CSC) /out:$(DLL) /target:library $(REFS) $(build_sources) \ + @ $(CSC) $(CSC_FLAGS) /out:$(DLL) /target:library $(REFS) $(build_sources) \ && cp $(DLL) $(top_builddir)/build/bin/. test-parser.exe : $(DLL) src/Main.cs Modified: trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/Makefile.am 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/Makefile.am 2005-06-01 07:16:22 UTC (rev 2570) @@ -40,7 +40,7 @@ $(ASSEMBLY): $(build_sources) mkdir -p $(ADDIN_BUILD) - $(CSC) -debug -out:$@ -target:library \ + $(CSC) $(CSC_FLAGS) -debug -out:$@ -target:library \ $(build_sources) $(DLLS) assemblydir = $(MD_ADDIN_DIR)/DebuggerAddIn Modified: trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/Visualizers/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/Visualizers/Makefile.am 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/Visualizers/Makefile.am 2005-06-01 07:16:22 UTC (rev 2570) @@ -28,7 +28,7 @@ $(ASSEMBLY): $(build_sources) mkdir -p $(ADDIN_BUILD) - $(CSC) -g $(DEFINES) -keyfile:$(srcdir)/visualizer.snk -out:$@ -target:library \ + $(CSC) $(CSC_FLAGS) -g $(DEFINES) -keyfile:$(srcdir)/visualizer.snk -out:$@ -target:library \ $(build_sources) $(DLLS) CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionWindow.cs =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionWindow.cs 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionWindow.cs 2005-06-01 07:16:22 UTC (rev 2570) @@ -273,7 +273,7 @@ TreeIter iter; if (store.GetIterFirst (out iter) == false) { - listView.FocusOutEvent -= LostFocusListView; + listView.FocusOutEvent -= new FocusOutEventHandler (LostFocusListView); control.buf.EndAtomicUndo (); control.GrabFocus (); return; @@ -326,7 +326,7 @@ { control.buf.DropCompleteAhead (); control.buf.EndAtomicUndo (); - listView.FocusOutEvent -= LostFocusListView; + listView.FocusOutEvent -= new FocusOutEventHandler (LostFocusListView); control.HasFocus = true; declarationviewwindow.HideAll (); this.Hide (); Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/SyntaxHighlightingPanel.cs =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/SyntaxHighlightingPanel.cs 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/OptionPanels/SyntaxHighlightingPanel.cs 2005-06-01 07:16:22 UTC (rev 2570) @@ -68,7 +68,7 @@ sourceLanguages.Active = 0; stylesTreeView.AppendColumn ("styles", new CellRendererText (), "text", 0); - stylesTreeView.Selection.Changed += OnStyleChanged; + stylesTreeView.Selection.Changed += new EventHandler (OnStyleChanged); } public void Store (IProperties CustomizationObject) Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am 2005-06-01 07:16:22 UTC (rev 2570) @@ -94,7 +94,7 @@ $(DLL) : $(build_sources) $(srcdir)/EditorBindings.glade $(srcdir)/texteditoraddin.glade mkdir -p $(top_builddir)/build/bin - $(CSC) $(build_sources) -out:$@ -t:library $(REFS) \ + $(CSC) $(CSC_FLAGS) $(build_sources) -out:$@ -t:library $(REFS) \ -resource:$(srcdir)/EditorBindings.glade,EditorBindings.glade \ -resource:$(srcdir)/texteditoraddin.glade,texteditoraddin.glade \ && cp $(CONFIG) $(top_builddir)/build/bin/. Modified: trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/Makefile.am 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/AddIns/prj2make-sharp-lib/Makefile.am 2005-06-01 07:16:22 UTC (rev 2570) @@ -32,7 +32,7 @@ $(ASSEMBLY): $(build_sources) mkdir -p $(ADDIN_BUILD) - $(CSC) -out:$@ -target:library $(build_sources) $(DLLS) + $(CSC) $(CSC_FLAGS) -out:$@ -target:library $(build_sources) $(DLLS) assemblydir = $(MD_ADDIN_DIR) assembly_DATA = $(ASSEMBLY) $(ADDIN) Modified: trunk/MonoDevelop/Core/src/ICSharpCode.SharpAssembly/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/ICSharpCode.SharpAssembly/Makefile.am 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/ICSharpCode.SharpAssembly/Makefile.am 2005-06-01 07:16:22 UTC (rev 2570) @@ -71,7 +71,7 @@ all: $(DLL) $(DLL): $(build_sources) - $(CSC) -out:$@ -target:library $(build_sources) + $(CSC) $(CSC_FLAGS) -out:$@ -target:library $(build_sources) assemblydir = $(MD_ASSEMBLY_DIR) assembly_DATA = $(DLL) Modified: trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/Makefile.am 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/Makefile.am 2005-06-01 07:16:22 UTC (rev 2570) @@ -119,7 +119,7 @@ all: $(DLL) $(TEST) $(DLL): $(FILES) - $(CSC) -out:$@ /target:library $(REFS) $(build_sources) + $(CSC) $(CSC_FLAGS) -out:$@ /target:library $(REFS) $(build_sources) test: $(TEST) Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs 2005-06-01 07:16:22 UTC (rev 2570) @@ -156,20 +156,20 @@ if (showNavigation) { - nav.Back += OnBackClicked; - nav.Forward += OnForwardClicked; - nav.Stop += OnStopClicked; - nav.Reload += OnRefreshClicked; - nav.Go += OnEntryActivated; + nav.Back += new EventHandler (OnBackClicked); + nav.Forward += new EventHandler (OnForwardClicked); + nav.Stop += new EventHandler (OnStopClicked); + nav.Reload += new EventHandler (OnRefreshClicked); + nav.Go += new EventHandler (OnEntryActivated); topPanel.PackStart (nav); mainbox.PackStart (topPanel, false, false, 2); } htmlControl = new MozillaControl (); - htmlControl.NetStart += OnNetStart; - htmlControl.NetStop += OnNetStop; - htmlControl.LocChange += OnLocationChanged; + htmlControl.NetStart += new EventHandler (OnNetStart); + htmlControl.NetStop += new EventHandler (OnNetStop); + htmlControl.LocChange += new EventHandler (OnLocationChanged); htmlControl.ShowAll (); mainbox.PackStart (htmlControl); Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/FileScout/FileList.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/FileScout/FileList.cs 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/FileScout/FileList.cs 2005-06-01 07:16:22 UTC (rev 2570) @@ -67,7 +67,7 @@ this.PopupMenu += new Gtk.PopupMenuHandler (OnPopupMenu); this.ButtonReleaseEvent += new Gtk.ButtonReleaseEventHandler (OnButtonReleased); - this.Selection.Changed += OnSelectionChanged; + this.Selection.Changed += new EventHandler (OnSelectionChanged); watcher = new FileSystemWatcher (); Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/OpenTaskView.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/OpenTaskView.cs 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/OpenTaskView.cs 2005-06-01 07:16:22 UTC (rev 2570) @@ -77,8 +77,8 @@ view = new Gtk.TreeView (store); view.RulesHint = true; - view.PopupMenu += OnPopupMenu; - view.ButtonPressEvent += OnButtonPressed; + view.PopupMenu += new PopupMenuHandler (OnPopupMenu); + view.ButtonPressEvent += new ButtonPressEventHandler (OnButtonPressed); AddColumns (); sw = new Gtk.ScrolledWindow (); @@ -110,7 +110,7 @@ Menu menu = new Menu (); menu.AccelGroup = new AccelGroup (); ImageMenuItem copy = new ImageMenuItem (Gtk.Stock.Copy, menu.AccelGroup); - copy.Activated += OnTaskCopied; + copy.Activated += new EventHandler (OnTaskCopied); menu.Append (copy); menu.Popup (null, null, null, IntPtr.Zero, 3, Global.CurrentEventTime); menu.ShowAll (); Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/SolutionPad/TreeViewPad.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/SolutionPad/TreeViewPad.cs 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/SolutionPad/TreeViewPad.cs 2005-06-01 07:16:22 UTC (rev 2570) @@ -219,7 +219,7 @@ tree.RowActivated += new Gtk.RowActivatedHandler(OnNodeActivated); contentPanel.ButtonReleaseEvent += new Gtk.ButtonReleaseEventHandler(OnButtonRelease); - contentPanel.PopupMenu += OnPopupMenu; + contentPanel.PopupMenu += new Gtk.PopupMenuHandler (OnPopupMenu); foreach (NodeBuilder nb in builders) nb.SetContext (builderContext); Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am 2005-06-01 07:16:22 UTC (rev 2570) @@ -494,7 +494,7 @@ $(PERL) -x$(srcdir)/../../../build/data/resources/icons -w $(srcdir)/Services/process-icons.pl > Services/StockIcons.cs $(ASSEMBLY): $(build_sources) $(srcdir)/Base.glade Services/StockIcons.cs - $(CSC) $(MONO_POSIX_OEE) -codepage:utf8 -out:$@ -target:library $(DLLS) \ + $(CSC) $(CSC_FLAGS) $(MONO_POSIX_OEE) -codepage:utf8 -out:$@ -target:library $(DLLS) \ -resource:$(srcdir)/Base.glade,Base.glade \ $(monodoc_libflags) $(build_sources) Services/StockIcons.cs \ && cp $(CONFIG) $(top_builddir)/build/bin/. Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/StatusBar/DefaultStatusBarService.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/StatusBar/DefaultStatusBarService.cs 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/StatusBar/DefaultStatusBarService.cs 2005-06-01 07:16:22 UTC (rev 2570) @@ -28,7 +28,7 @@ protected override void OnInitialize (EventArgs e) { base.OnInitialize (e); - Runtime.ProjectService.CombineClosed += OnCombineClosed; + Runtime.ProjectService.CombineClosed += new CombineEventHandler (OnCombineClosed); } public void Dispose() Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Core/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Core/Makefile.am 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Core/Makefile.am 2005-06-01 07:16:22 UTC (rev 2570) @@ -68,7 +68,7 @@ mv $@.tmp $@ $(DLL): $(build_sources) $(build_resources) - $(CSC) -out:$@ -target:library $(REFS) $(build_sources) + $(CSC) $(CSC_FLAGS) -out:$@ -target:library $(REFS) $(build_sources) assemblydir = $(MD_ASSEMBLY_DIR) assembly_DATA = $(DLL) Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockBar.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockBar.cs 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockBar.cs 2005-06-01 07:16:22 UTC (rev 2570) @@ -60,7 +60,7 @@ tooltips.SetTip (button, item.Name, item.Name); item.DockBar = this; item.DockBarButton = button; - button.Clicked += OnDockButtonClicked; + button.Clicked += new EventHandler (OnDockButtonClicked); this.ShowAll (); } @@ -69,16 +69,16 @@ if (master == null) return; - master.LayoutChanged -= OnLayoutChanged; + master.LayoutChanged -= new EventHandler (OnLayoutChanged); this.master = master; - master.LayoutChanged += OnLayoutChanged; + master.LayoutChanged += new EventHandler (OnLayoutChanged); } public override void Destroy () { if (master != null) { - master.LayoutChanged -= OnLayoutChanged; + master.LayoutChanged -= new EventHandler (OnLayoutChanged); master = null; } Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockItem.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockItem.cs 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockItem.cs 2005-06-01 07:16:22 UTC (rev 2570) @@ -764,7 +764,7 @@ // Lock menuitem CheckMenuItem citem = new CheckMenuItem ("Lock"); citem.Active = this.Locked; - citem.Toggled += ItemLockCb; + citem.Toggled += new EventHandler (ItemLockCb); menu.Append (citem); } Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockItemGrip.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockItemGrip.cs 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockItemGrip.cs 2005-06-01 07:16:22 UTC (rev 2570) @@ -104,10 +104,10 @@ } set { if (item != null) - item.PropertyChanged -= OnPropertyChanged; + item.PropertyChanged -= new PropertyChangedHandler (OnPropertyChanged); item = value; - item.PropertyChanged += OnPropertyChanged; + item.PropertyChanged += new PropertyChangedHandler (OnPropertyChanged); if (!item.CantClose) closeButton.Show (); Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockLayout.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockLayout.cs 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockLayout.cs 2005-06-01 07:16:22 UTC (rev 2570) @@ -115,13 +115,13 @@ if (master == null) return; - master.LayoutChanged -= OnLayoutChanged; + master.LayoutChanged -= new EventHandler (OnLayoutChanged); if (itemsModel != null) itemsModel.Clear (); this.master = master; - master.LayoutChanged += OnLayoutChanged; + master.LayoutChanged += new EventHandler (OnLayoutChanged); UpdateItemsModel (); } @@ -396,9 +396,9 @@ locked_check = gui.GetWidget ("locked_check") as CheckButton; Gtk.TreeView items_list = gui.GetWidget ("items_list") as TreeView; - locked_check.Toggled += AllLockedToggledCb; + locked_check.Toggled += new EventHandler (AllLockedToggledCb); if (master != null) { - master.NotifyLocked += MasterLockedNotifyCb; + master.NotifyLocked += new EventHandler (MasterLockedNotifyCb); // force update now MasterLockedNotifyCb (master, EventArgs.Empty); } @@ -408,7 +408,7 @@ // construct list views CellRendererToggle renderer = new CellRendererToggle (); - renderer.Toggled += ShowToggledCb; + renderer.Toggled += new ToggledHandler (ShowToggledCb); TreeViewColumn column = new TreeViewColumn ("Visible", renderer, "active", 1); items_list.AppendColumn (column); @@ -428,7 +428,7 @@ Gtk.TreeView layouts_list = gui.GetWidget ("layouts_list") as TreeView; layouts_list.Model = layoutsModel; CellRendererText renderer = new CellRendererText (); - renderer.Edited += CellEditedCb; + renderer.Edited += new EditedHandler (CellEditedCb); TreeViewColumn column = new TreeViewColumn ("Name", renderer, "text", 0, "editable", 1); layouts_list.AppendColumn (column); Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockMaster.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockMaster.cs 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockMaster.cs 2005-06-01 07:16:22 UTC (rev 2570) @@ -160,20 +160,20 @@ /* we are interested in the dock request this toplevel * receives to update the layout */ - obj.Docked += OnItemDocked; + obj.Docked += new DockedHandler (OnItemDocked); } else if (obj is DockItem) { DockItem item = obj as DockItem; /* we need to connect the item's events */ - item.Detached += OnItemDetached; - item.Docked += OnItemDocked; - item.DockItemDragBegin += OnDragBegin; - item.DockItemMotion += OnDragMotion; - item.DockItemDragEnd += OnDragEnd; + item.Detached += new DetachedHandler (OnItemDetached); + item.Docked += new DockedHandler (OnItemDocked); + item.DockItemDragBegin += new DockItemDragBeginHandler (OnDragBegin); + item.DockItemMotion += new DockItemMotionHandler (OnDragMotion); + item.DockItemDragEnd += new DockItemDragEndHandler (OnDragEnd); /* register to "locked" notification if the item has a grip, * and add the item to the corresponding hash */ - item.PropertyChanged += OnItemPropertyChanged; + item.PropertyChanged += new PropertyChangedHandler (OnItemPropertyChanged); /* post a layout_changed emission if the item is not automatic * (since it should be added to the items model) */ @@ -205,7 +205,7 @@ if (obj is Dock) { toplevelDocks.Remove (obj); - obj.Docked -= OnItemDocked; + obj.Docked -= new DockedHandler (OnItemDocked); if (obj == controller) { DockObject newController = null; @@ -235,12 +235,12 @@ // disconnect the signals if (obj is DockItem) { DockItem item = obj as DockItem; - item.Detached -= OnItemDetached; - item.Docked -= OnItemDocked; - item.DockItemDragBegin -= OnDragBegin; - item.DockItemMotion -= OnDragMotion; - item.DockItemDragEnd -= OnDragEnd; - item.PropertyChanged -= OnItemPropertyChanged; + item.Detached -= new DetachedHandler (OnItemDetached); + item.Docked -= new DockedHandler (OnItemDocked); + item.DockItemDragBegin -= new DockItemDragBeginHandler (OnDragBegin); + item.DockItemMotion -= new DockItemMotionHandler (OnDragMotion); + item.DockItemDragEnd -= new DockItemDragEndHandler (OnDragEnd); + item.PropertyChanged -= new PropertyChangedHandler (OnItemPropertyChanged); } // remove the object from the hash if it is there Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockPaned.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockPaned.cs 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockPaned.cs 2005-06-01 07:16:22 UTC (rev 2570) @@ -84,7 +84,7 @@ Child = new VPaned (); Child.AddNotification ("position", new GLib.NotifyHandler (OnNotifyPosition)); - Child.ButtonReleaseEvent += OnButtonReleased; + Child.ButtonReleaseEvent += new ButtonReleaseEventHandler (OnButtonReleased); Child.Parent = this; Child.Show (); @@ -138,7 +138,7 @@ // after that we can remove the Paned child if (Child != null) { - Child.ButtonReleaseEvent -= OnButtonReleased; + Child.ButtonReleaseEvent -= new ButtonReleaseEventHandler (OnButtonReleased); Child.Unparent (); Child = null; } @@ -320,7 +320,7 @@ { if (name == "orientation") { CreateChild (); - this.PropertyChanged -= OnPropertyChanged; + this.PropertyChanged -= new PropertyChangedHandler (OnPropertyChanged); } } } Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockPlaceholder.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockPlaceholder.cs 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockPlaceholder.cs 2005-06-01 07:16:22 UTC (rev 2570) @@ -193,8 +193,8 @@ if (host == null) return; - host.Detached -= OnHostDetached; - host.Docked -= OnHostDocked; + host.Detached -= new DetachedHandler (OnHostDetached); + host.Docked -= new DockedHandler (OnHostDocked); host = null; } @@ -206,8 +206,8 @@ host = newHost; - host.Detached += OnHostDetached; - host.Docked += OnHostDocked; + host.Detached += new DetachedHandler (OnHostDetached); + host.Docked += new DockedHandler (OnHostDocked); } public void Attach (DockObject objekt) Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Dock/Makefile.am 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Dock/Makefile.am 2005-06-01 07:16:22 UTC (rev 2570) @@ -48,10 +48,10 @@ $(DOCK): $(build_sources) $(GLADE) $(IMAGES) mkdir -p $(top_builddir)/build/bin/ - $(CSC) -out:$@ -target:library $(build_sources) $(RESOURCES) $(REFS) + $(CSC) $(CSC_FLAGS) -out:$@ -target:library $(build_sources) $(RESOURCES) $(REFS) $(TEST) : $(TEST_FILES) $(DOCK) - $(CSC) -out:$@ -r:$(DOCK) -pkg:gtk-sharp-2.0 $(TEST_FILES) -codepage:utf8 + $(CSC) $(CSC_FLAGS) -out:$@ -r:$(DOCK) -pkg:gtk-sharp-2.0 $(TEST_FILES) -codepage:utf8 run-test: $(TEST) $(RUNTIME) $(TEST) Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/Stock.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Dock/Stock.cs 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Dock/Stock.cs 2005-06-01 07:16:22 UTC (rev 2570) @@ -27,7 +27,7 @@ namespace Gdl { - public static class Stock + public class Stock { static Gtk.IconFactory stock = new Gtk.IconFactory (); Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/Makefile.am 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/Makefile.am 2005-06-01 07:16:22 UTC (rev 2570) @@ -19,7 +19,7 @@ all: $(DLL) $(DLL): $(build_sources) - $(CSC) -out:$@ /target:library $(REFERENCES) $(build_sources) + $(CSC) $(CSC_FLAGS) -out:$@ /target:library $(REFERENCES) $(build_sources) assemblydir = $(MD_ASSEMBLY_DIR) assembly_DATA = $(DLL) Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/FileSelector/FileSelector.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/FileSelector/FileSelector.cs 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/FileSelector/FileSelector.cs 2005-06-01 07:16:22 UTC (rev 2570) @@ -61,7 +61,7 @@ // FIXME: only set this once per-dialog // perhaps in Dispose ()? or only when a file or dir is selected - this.CurrentFolderChanged += OnCurrentFolderChanged; + this.CurrentFolderChanged += new EventHandler (OnCurrentFolderChanged); } void OnCurrentFolderChanged (object o, EventArgs args) Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Makefile.am 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Makefile.am 2005-06-01 07:16:22 UTC (rev 2570) @@ -57,7 +57,7 @@ all: $(DLL) $(DLL): $(build_sources) - $(CSC) -out:$@ -target:library $(REFERENCES) $(build_sources) + $(CSC) $(CSC_FLAGS) -out:$@ -target:library $(REFERENCES) $(build_sources) assemblydir = $(MD_ASSEMBLY_DIR) assembly_DATA = $(DLL) Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Navbar/Navbar.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Navbar/Navbar.cs 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Navbar/Navbar.cs 2005-06-01 07:16:22 UTC (rev 2570) @@ -27,7 +27,7 @@ // FIXME: this doesnt't seem to work yet // address.Completion = new EntryCompletion (); address.WidthChars = 50; - address.Activated += OnGoUrl; + address.Activated += new EventHandler (OnGoUrl); ActionEntry[] actions = new ActionEntry[] { @@ -43,7 +43,7 @@ UIManager uim = new UIManager (); uim.InsertActionGroup (ag, 0); - uim.AddWidget += OnAddWidget; + uim.AddWidget += new AddWidgetHandler (OnAddWidget); uim.AddUiFromString (uiInfo); ToolItem item = new ToolItem (); Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Startup/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Startup/Makefile.am 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Startup/Makefile.am 2005-06-01 07:16:22 UTC (rev 2570) @@ -20,7 +20,7 @@ $(GNOME_SHARP_LIBS) $(ASSEMBLY): $(build_sources) - $(CSC) -out:$@ $(REFS) $(build_sources) $(SPLASH) + $(CSC) $(CSC_FLAGS) -out:$@ $(REFS) $(build_sources) $(SPLASH) $(ASSEMBLY).config: $(ASSEMBLY) $(srcdir)/app.config cp $(srcdir)/app.config $(ASSEMBLY).config Modified: trunk/MonoDevelop/Core/src/Tools/SharpCoco/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/Tools/SharpCoco/Makefile.am 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/Tools/SharpCoco/Makefile.am 2005-06-01 07:16:22 UTC (rev 2570) @@ -14,7 +14,7 @@ all: $(ASSEMBLY) $(ASSEMBLY): $(build_sources) - $(CSC) $(build_sources) /out:$(ASSEMBLY) + $(CSC) $(CSC_FLAGS) $(build_sources) /out:$(ASSEMBLY) CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb EXTRA_DIST = $(FILES) Modified: trunk/MonoDevelop/Core/src/Tools/dbgen/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/Tools/dbgen/Makefile.am 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/Tools/dbgen/Makefile.am 2005-06-01 07:16:22 UTC (rev 2570) @@ -9,7 +9,7 @@ REFS = /r:$(top_builddir)/build/bin/MonoDevelop.Base.dll /r:$(top_builddir)/build/bin/MonoDevelop.Core.dll $(ASSEMBLY): $(build_sources) - $(CSC) $(build_sources) $(REFS) -out:$@ + $(CSC) $(CSC_FLAGS) $(build_sources) $(REFS) -out:$@ assemblydir = $(MD_ASSEMBLY_DIR) assembly_DATA = $(ASSEMBLY) Modified: trunk/MonoDevelop/Core/src/Tools/mdhost/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/Tools/mdhost/Makefile.am 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Core/src/Tools/mdhost/Makefile.am 2005-06-01 07:16:22 UTC (rev 2570) @@ -11,7 +11,7 @@ REFS = /r:$(top_builddir)/build/bin/MonoDevelop.Base.dll /r:System.Runtime.Remoting $(ASSEMBLY): $(build_sources) - $(CSC) $(build_sources) $(REFS) /out:$(ASSEMBLY) \ + $(CSC) $(CSC_FLAGS) $(build_sources) $(REFS) /out:$(ASSEMBLY) \ && cp $(ASSEMBLY) $(top_builddir)/build/bin/. assemblydir = $(MD_ASSEMBLY_DIR) Modified: trunk/MonoDevelop/Extras/JavaBinding/Makefile.am =================================================================== --- trunk/MonoDevelop/Extras/JavaBinding/Makefile.am 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Extras/JavaBinding/Makefile.am 2005-06-01 07:16:22 UTC (rev 2570) @@ -72,7 +72,7 @@ $(ASSEMBLY): $(FILES) $(srcdir)/Java.glade mkdir -p $(ADDIN_BUILD) - $(CSC) $(DLLS) -resource:$(srcdir)/Java.glade,Java.glade $(build_sources) -out:$@ -target:library + $(CSC) $(CSC_FLAGS) $(DLLS) -resource:$(srcdir)/Java.glade,Java.glade $(build_sources) -out:$@ -target:library if ENABLE_JAVA assemblydir = $(MD_ADDIN_DIR)/BackendBindings Modified: trunk/MonoDevelop/Extras/MonoDeveloperExtensions/Makefile.am =================================================================== --- trunk/MonoDevelop/Extras/MonoDeveloperExtensions/Makefile.am 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Extras/MonoDeveloperExtensions/Makefile.am 2005-06-01 07:16:22 UTC (rev 2570) @@ -29,7 +29,7 @@ $(DLL): $(build_sources) $(srcdir)/$(GLADEFILE) mkdir -p $(ADDIN_BUILD) - $(CSC) -target:library -out:$@ $(build_sources) $(REFS) + $(CSC) $(CSC_FLAGS) -target:library -out:$@ $(build_sources) $(REFS) CLEANFILES = $(DLL) $(DLL).mdb $(ADDIN_BUILD)/$(ADDIN) Modified: trunk/MonoDevelop/Extras/MonoQuery/Makefile.am =================================================================== --- trunk/MonoDevelop/Extras/MonoQuery/Makefile.am 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Extras/MonoQuery/Makefile.am 2005-06-01 07:16:22 UTC (rev 2570) @@ -69,7 +69,7 @@ $(DLL): $(build_sources) $(srcdir)/$(GLADEFILE) mkdir -p $(ADDIN_BUILD) - $(CSC) -target:library -out:$@ $(build_sources) $(REFS) + $(CSC) $(CSC_FLAGS) -target:library -out:$@ $(build_sources) $(REFS) CLEANFILES = $(DLL) $(DLL).mdb $(ADDIN_BUILD)/$(ADDIN) Modified: trunk/MonoDevelop/Unused/AddInManager/Makefile.am =================================================================== --- trunk/MonoDevelop/Unused/AddInManager/Makefile.am 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Unused/AddInManager/Makefile.am 2005-06-01 07:16:22 UTC (rev 2570) @@ -18,7 +18,7 @@ all: $(ASSEMBLY) $(ASSEMBLY): $(FILES) - $(CSC) /out:$(ASSEMBLY) /target:library $(FILES) $(REFS) \ + $(CSC) $(CSC_FLAGS) /out:$(ASSEMBLY) /target:library $(FILES) $(REFS) \ && cp $(ASSEMBLY) ../../build/AddIns/. \ && cp $(ADDIN) ../../build/AddIns/. Modified: trunk/MonoDevelop/Unused/ICSharpCode.TextEditor/Makefile.am =================================================================== --- trunk/MonoDevelop/Unused/ICSharpCode.TextEditor/Makefile.am 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Unused/ICSharpCode.TextEditor/Makefile.am 2005-06-01 07:16:22 UTC (rev 2570) @@ -108,6 +108,6 @@ all: $(DLL) $(DLL): $(FILES) - $(CSC) /out:$@ /target:library $(REFS) /define:GTK /resource:data/syntaxmodes/SyntaxModes.xml,SyntaxModes.xml /resource:data/syntaxmodes/CSharp-Mode.xshd,CSharp-Mode.xshd /resource:data/Mode.xsd,Mode.xsd /resource:data/syntaxmodes/ASPX.xshd,ASPX.xshd /resource:data/syntaxmodes/BAT-Mode.xshd,BAT-Mode.xshd /resource:data/syntaxmodes/CPP-Mode.xshd,CPP-Modes.xshd /resource:data/syntaxmodes/Coco-Mode.xshd,Coco-Mode.xshd /resource:data/syntaxmodes/HTML-Mode.xshd,HTML-Mode.xshd /resource:data/syntaxmodes/Java-Mode.xshd,Java-Mode.xshd /resource:data/syntaxmodes/JavaScript-Mode.xshd,JavaScript-Mode.xshd /resource:data/syntaxmodes/PHP-Mode.xshd,PHP-Mode.xshd /resource:data/syntaxmodes/Tex-Mode.xshd,Tex-Mode.xshd /resource:data/syntaxmodes/VBNET-Mode.xshd,VBNET-Mode.xshd /resource:data/syntaxmodes/XML-Mode.xshd,XML-Mode.xshd /resource:data/RightArrow.cur,RightArrow.cur $(FILES) + $(CSC) $(CSC_FLAGS) /out:$@ /target:library $(REFS) /define:GTK /resource:data/syntaxmodes/SyntaxModes.xml,SyntaxModes.xml /resource:data/syntaxmodes/CSharp-Mode.xshd,CSharp-Mode.xshd /resource:data/Mode.xsd,Mode.xsd /resource:data/syntaxmodes/ASPX.xshd,ASPX.xshd /resource:data/syntaxmodes/BAT-Mode.xshd,BAT-Mode.xshd /resource:data/syntaxmodes/CPP-Mode.xshd,CPP-Modes.xshd /resource:data/syntaxmodes/Coco-Mode.xshd,Coco-Mode.xshd /resource:data/syntaxmodes/HTML-Mode.xshd,HTML-Mode.xshd /resource:data/syntaxmodes/Java-Mode.xshd,Java-Mode.xshd /resource:data/syntaxmodes/JavaScript-Mode.xshd,JavaScript-Mode.xshd /resource:data/syntaxmodes/PHP-Mode.xshd,PHP-Mode.xshd /resource:data/syntaxmodes/Tex-Mode.xshd,Tex-Mode.xshd /resource:data/syntaxmodes/VBNET-Mode.xshd,VBNET-Mode.xshd /resource:data/syntaxmodes/XML-Mode.xshd,XML-Mode.xshd /resource:data/RightArrow.cur,RightArrow.cur $(FILES) CLEANFILES=$(DLL) $(DLL).mdb Modified: trunk/MonoDevelop/Unused/TextEditor/Makefile.am =================================================================== --- trunk/MonoDevelop/Unused/TextEditor/Makefile.am 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/Unused/TextEditor/Makefile.am 2005-06-01 07:16:22 UTC (rev 2570) @@ -43,7 +43,7 @@ all: $(DLL) $(DLL): $(FILES) ../../../../data/resources/glade/texteditoraddin.glade - $(CSC) /out:$(DLL) /target:library /r:System.Drawing \ + $(CSC) $(CSC_FLAGS) /out:$(DLL) /target:library /r:System.Drawing \ /r:../../../../build/bin/MonoDevelop.Core.dll \ /r:../../../../build/bin/MonoDevelop.Base.dll \ /r:../../../../build/bin/MonoDevelop.SourceEditor.dll \ Modified: trunk/MonoDevelop/configure.in =================================================================== --- trunk/MonoDevelop/configure.in 2005-05-31 10:57:16 UTC (rev 2569) +++ trunk/MonoDevelop/configure.in 2005-06-01 07:16:22 UTC (rev 2570) @@ -159,11 +159,14 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) AM_GLIB_GNU_GETTEXT +CSC_FLAGS='-langversion:ISO-1' + AC_SUBST(LIB_SUFFIX) AC_SUBST(LIB_PREFIX) AC_SUBST(ASSEMBLY_VERSION) AC_SUBST(MONO_POSIX_OEE) AC_SUBST(SQLITE_XML) +AC_SUBST(CSC_FLAGS) MD_DIR='$(prefix)/lib/monodevelop' From jacobilsoe at mono-cvs.ximian.com Wed Jun 1 09:35:49 2005 From: jacobilsoe at mono-cvs.ximian.com (Jacob Ilsų Christensen ) Date: Wed, 1 Jun 2005 09:35:49 -0400 (EDT) Subject: [Monodevelop-patches-list] r2571 - in trunk/MonoDevelop/Core/src/MonoDevelop.Base: . Gui/Dialogs/ReferenceDialog Message-ID: <20050601133549.76F5594765@mono-cvs.ximian.com> Author: jacobilsoe Date: 2005-06-01 09:35:49 -0400 (Wed, 01 Jun 2005) New Revision: 2571 Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReferenceDialog/ProjectReferencePanel.cs trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs Log: Prevent a project from referencing itself Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-06-01 07:16:22 UTC (rev 2570) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-06-01 13:35:49 UTC (rev 2571) @@ -1,3 +1,10 @@ +2005-06-01 Jacob Ils? Christensen + + * Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs: + * Gui/Dialogs/ReferenceDialog/ProjectReferencePanel.cs: + * Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs: + Prevent a project from referencing itself. + 2005-05-30 Lluis Sanchez Gual * Services/StatusBar/DefaultStatusBarService.cs: Added null checks. Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs 2005-06-01 07:16:22 UTC (rev 2570) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs 2005-06-01 13:35:49 UTC (rev 2571) @@ -82,7 +82,11 @@ public void SignalRefChange (string refLoc, bool newstate) { Gtk.TreeIter looping_iter; - store.GetIterFirst (out looping_iter); + + if (!store.GetIterFirst (out looping_iter)) { + return; + } + do { if ((string)store.GetValue (looping_iter, 4) == refLoc) { store.SetValue (looping_iter, 3, newstate); Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReferenceDialog/ProjectReferencePanel.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReferenceDialog/ProjectReferencePanel.cs 2005-06-01 07:16:22 UTC (rev 2570) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReferenceDialog/ProjectReferencePanel.cs 2005-06-01 13:35:49 UTC (rev 2571) @@ -23,7 +23,7 @@ TreeStore store; TreeView treeView; - public ProjectReferencePanel (SelectReferenceDialog selectDialog) : base (false, 6) + public ProjectReferencePanel (SelectReferenceDialog selectDialog, Project configureProject) : base (false, 6) { this.selectDialog = selectDialog; @@ -50,7 +50,7 @@ treeView.AppendColumn (firstColumn); treeView.AppendColumn (GettextCatalog.GetString ("Directory"), new CellRendererText (), "text", 1); - PopulateListView (); + PopulateListView (configureProject); ScrolledWindow sc = new ScrolledWindow (); sc.ShadowType = Gtk.ShadowType.In; sc.Add (treeView); @@ -82,7 +82,10 @@ public void SignalRefChange (string refLoc, bool newstate) { Gtk.TreeIter looping_iter; - store.GetIterFirst (out looping_iter); + if (!store.GetIterFirst (out looping_iter)) { + return; + } + do { Project project = (Project) store.GetValue (looping_iter, 2); if (project.Name == refLoc) { @@ -92,7 +95,7 @@ } while (store.IterNext (ref looping_iter)); } - void PopulateListView () + void PopulateListView (Project configureProject) { Combine openCombine = Runtime.ProjectService.CurrentOpenCombine; @@ -101,6 +104,11 @@ } foreach (Project projectEntry in openCombine.GetAllProjects()) { + + if (projectEntry == configureProject) { + continue; + } + string iconName = Runtime.Gui.Icons.GetImageForProjectType (projectEntry.ProjectType); Gdk.Pixbuf icon = treeView.RenderIcon (iconName, Gtk.IconSize.Menu, ""); store.AppendValues (projectEntry.Name, projectEntry.BaseDirectory, projectEntry, false, icon); Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs 2005-06-01 07:16:22 UTC (rev 2570) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs 2005-06-01 13:35:49 UTC (rev 2571) @@ -78,7 +78,7 @@ ReferencesTreeView.AppendColumn (GettextCatalog.GetString ("Location"), new CellRendererText (), "text", 2); gacRefPanel = new GacReferencePanel (this); - projectRefPanel = new ProjectReferencePanel (this); + projectRefPanel = new ProjectReferencePanel (this, configureProject); foreach (ProjectReference refInfo in configureProject.ProjectReferences) { switch (refInfo.ReferenceType) { From jacobilsoe at mono-cvs.ximian.com Wed Jun 1 09:41:24 2005 From: jacobilsoe at mono-cvs.ximian.com (Jacob Ilsų Christensen ) Date: Wed, 1 Jun 2005 09:41:24 -0400 (EDT) Subject: [Monodevelop-patches-list] r2572 - in trunk/MonoDevelop/Core/src: MonoDevelop.Base MonoDevelop.Base/Gui/Workbench/Layouts MonoDevelop.Base/Services MonoDevelop.Core MonoDevelop.Core/Services Message-ID: <20050601134124.442B394765@mono-cvs.ximian.com> Author: jacobilsoe Date: 2005-06-01 09:41:24 -0400 (Wed, 01 Jun 2005) New Revision: 2572 Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/MessageService.cs trunk/MonoDevelop/Core/src/MonoDevelop.Core/ChangeLog trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/IMessageService.cs Log: Added a cancel option when trying to close a modified file Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-06-01 13:35:49 UTC (rev 2571) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-06-01 13:41:24 UTC (rev 2572) @@ -1,5 +1,12 @@ 2005-06-01 Jacob Ils? Christensen + * Services/MessageService.cs: Added methods to ask a question + with a cancel option. + * Gui/Workbench/Layouts/SdiWorkspaceWindow.cs: Added a cancel + option when trying to close a modified file. + +2005-06-01 Jacob Ils? Christensen + * Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs: * Gui/Dialogs/ReferenceDialog/ProjectReferencePanel.cs: * Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs: Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs 2005-06-01 13:35:49 UTC (rev 2571) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs 2005-06-01 13:41:24 UTC (rev 2572) @@ -209,9 +209,13 @@ { if (!force && ViewContent != null && ViewContent.IsDirty) { - bool save = Runtime.MessageService.AskQuestion (GettextCatalog.GetString ("Do you want to save the current changes")); + QuestionResponse response = Runtime.MessageService.AskQuestionWithCancel (GettextCatalog.GetString ("Do you want to save the current changes")); - if (save) { + if (response == QuestionResponse.Cancel) { + return; + } + + if (response == QuestionResponse.Yes) { if (content.ContentName == null) { while (true) { Runtime.FileService.SaveFileAs (this); Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/MessageService.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/MessageService.cs 2005-06-01 13:35:49 UTC (rev 2571) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/MessageService.cs 2005-06-01 13:41:24 UTC (rev 2572) @@ -116,7 +116,50 @@ { return AskQuestion(stringParserService.Parse(question), GettextCatalog.GetString ("Question")); } + + public QuestionResponse AskQuestionWithCancel(string question, string caption) + { + using (Gtk.MessageDialog md = new Gtk.MessageDialog ((Gtk.Window) WorkbenchSingleton.Workbench, Gtk.DialogFlags.Modal | Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Question, Gtk.ButtonsType.None, question)) { + + md.AddActionWidget (new Button (Gtk.Stock.No), ResponseType.No); + md.AddActionWidget (new Button (Gtk.Stock.Cancel), ResponseType.Cancel); + md.AddActionWidget (new Button (Gtk.Stock.Yes), ResponseType.Yes); + md.ActionArea.ShowAll (); + + Gtk.ResponseType response = (Gtk.ResponseType)md.Run (); + md.Hide (); + + if (response == Gtk.ResponseType.Yes) { + return QuestionResponse.Yes; + } + + if (response == Gtk.ResponseType.No) { + return QuestionResponse.No; + } + + if (response == Gtk.ResponseType.Cancel) { + return QuestionResponse.Cancel; + } + + return QuestionResponse.Cancel; + } + } + public QuestionResponse AskQuestionFormattedWithCancel(string caption, string formatstring, params string[] formatitems) + { + return AskQuestionWithCancel(String.Format(stringParserService.Parse(formatstring), formatitems), caption); + } + + public QuestionResponse AskQuestionFormattedWithCancel(string formatstring, params string[] formatitems) + { + return AskQuestionWithCancel(String.Format(stringParserService.Parse(formatstring), formatitems)); + } + + public QuestionResponse AskQuestionWithCancel(string question) + { + return AskQuestionWithCancel(stringParserService.Parse(question), GettextCatalog.GetString ("Question")); + } + public int ShowCustomDialog(string caption, string dialogText, params string[] buttontexts) { // TODO Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Core/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Core/ChangeLog 2005-06-01 13:35:49 UTC (rev 2571) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Core/ChangeLog 2005-06-01 13:41:24 UTC (rev 2572) @@ -1,3 +1,8 @@ +2005-06-01 Jacob Ils? Christensen + + * Services/IMessageService.cs: Added methods to ask a question + with a cancel option. + 2005-04-25 Lluis Sanchez Gual * AddIns/AddIn.cs: Added GetType method. Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/IMessageService.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/IMessageService.cs 2005-06-01 13:35:49 UTC (rev 2571) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/IMessageService.cs 2005-06-01 13:41:24 UTC (rev 2572) @@ -12,6 +12,13 @@ namespace MonoDevelop.Core.Services { + public enum QuestionResponse + { + Yes, + No, + Cancel + } + /// /// This interface must be implemented by all services. /// @@ -41,6 +48,11 @@ bool AskQuestionFormatted(string formatstring, params string[] formatitems); bool AskQuestion(string question, string caption); bool AskQuestionFormatted(string caption, string formatstring, params string[] formatitems); + + QuestionResponse AskQuestionWithCancel(string question); + QuestionResponse AskQuestionFormattedWithCancel(string formatstring, params string[] formatitems); + QuestionResponse AskQuestionWithCancel(string question, string caption); + QuestionResponse AskQuestionFormattedWithCancel(string caption, string formatstring, params string[] formatitems); // used to return text input from a user in response to a question string GetTextResponse(string question, string caption, string initialValue); From jluke at mono-cvs.ximian.com Wed Jun 1 11:21:47 2005 From: jluke at mono-cvs.ximian.com (John Luke ) Date: Wed, 1 Jun 2005 11:21:47 -0400 (EDT) Subject: [Monodevelop-patches-list] r2573 - in trunk/MonoDevelop/Core/src: MonoDevelop.Base MonoDevelop.Base/Gui/Pads/FileScout MonoDevelop.Base/Gui/Workbench/Layouts MonoDevelop.Gui.Utils MonoDevelop.Gui.Utils/FileIcons MonoDevelop.Gui.Widgets MonoDevelop.Gui.Widgets/FileBrowser Message-ID: <20050601152147.7236094765@mono-cvs.ximian.com> Author: jluke Date: 2005-06-01 11:21:47 -0400 (Wed, 01 Jun 2005) New Revision: 2573 Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/FileScout/FileListItem.cs trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/FileBrowser/FileBrowser.cs Log: change FileIconLoader to just use size instead of height, width Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-06-01 13:41:24 UTC (rev 2572) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-06-01 15:21:47 UTC (rev 2573) @@ -1,3 +1,10 @@ +2005-06-01 John Luke + + * Gui/Workbench/Layouts/SdiWorkspaceLayout.cs: + * Gui/Workbench/Layouts/SdiWorkspaceWindow.cs: + * Gui/Pads/FileScout/FileListItem.cs: adjust to + FileIconLoader.GetPixbufForFile change + 2005-06-01 Jacob Ils? Christensen * Services/MessageService.cs: Added methods to ask a question Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/FileScout/FileListItem.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/FileScout/FileListItem.cs 2005-06-01 13:41:24 UTC (rev 2572) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/FileScout/FileListItem.cs 2005-06-01 15:21:47 UTC (rev 2573) @@ -65,7 +65,7 @@ this.lastModified = lastModified; //FIXME: This is because //home/blah is not the same as /home/blah according to Icon.LookupSync, if we get weird behaviours, lets look at this again, see if we still need it. FullName = fullname.Substring (1); - icon = FileIconLoader.GetPixbufForFile (FullName, 24, 24); + icon = FileIconLoader.GetPixbufForFile (FullName, 24); } public FileListItem (string name) @@ -74,7 +74,7 @@ this.size = Math.Round ((double) fi.Length / 1024).ToString () + " KB"; this.lastModified = fi.LastWriteTime.ToString (); FullName = System.IO.Path.GetFullPath (name); - icon = FileIconLoader.GetPixbufForFile (FullName, 24, 24); + icon = FileIconLoader.GetPixbufForFile (FullName, 24); } } } Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs 2005-06-01 13:41:24 UTC (rev 2572) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs 2005-06-01 15:21:47 UTC (rev 2573) @@ -464,7 +464,7 @@ if (content.IsUntitled) { mimeimage = new Gtk.Image (FileIconLoader.GetPixbufForType ("gnome-fs-regular").ScaleSimple (16, 16, Gdk.InterpType.Bilinear)); } else { - mimeimage = new Gtk.Image (FileIconLoader.GetPixbufForFile (content.ContentName, 16, 16)); + mimeimage = new Gtk.Image (FileIconLoader.GetPixbufForFile (content.ContentName, 16)); } TabLabel tabLabel = new TabLabel (new Label (), mimeimage != null ? mimeimage : new Gtk.Image ("")); Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs 2005-06-01 13:41:24 UTC (rev 2572) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs 2005-06-01 15:21:47 UTC (rev 2573) @@ -313,7 +313,7 @@ try { if (content.ContentName.IndexOfAny (new char[] { '*', '+'}) == -1) { - tabLabel.Icon.Pixbuf = FileIconLoader.GetPixbufForFile (content.ContentName, 16, 16); + tabLabel.Icon.Pixbuf = FileIconLoader.GetPixbufForFile (content.ContentName, 16); } } catch { tabLabel.Icon.Pixbuf = FileIconLoader.GetPixbufForType ("gnome-fs-regular").ScaleSimple (16, 16, Gdk.InterpType.Bilinear); Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog 2005-06-01 13:41:24 UTC (rev 2572) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog 2005-06-01 15:21:47 UTC (rev 2573) @@ -1,3 +1,8 @@ +2005-06-01 John Luke + + * FileIcons/FileIconLoader.cs (GetPixbufForFile): + just use size instead of height, width + 2005-04-17 John Luke * Makefile.am: fix distcheck Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs 2005-06-01 13:41:24 UTC (rev 2572) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs 2005-06-01 15:21:47 UTC (rev 2573) @@ -24,7 +24,7 @@ { } - public static Gdk.Pixbuf GetPixbufForFile (string filename, int width, int height) + public static Gdk.Pixbuf GetPixbufForFile (string filename, int size) { Gnome.IconLookupResultFlags result; string icon; @@ -37,7 +37,7 @@ icon = "gnome-fs-regular"; } Gdk.Pixbuf pix = GetPixbufForType (icon); - return pix.ScaleSimple (height, width, Gdk.InterpType.Bilinear); + return pix.ScaleSimple (size, size, Gdk.InterpType.Bilinear); } public static Gdk.Pixbuf GetPixbufForType (string type) Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog 2005-06-01 13:41:24 UTC (rev 2572) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog 2005-06-01 15:21:47 UTC (rev 2573) @@ -1,3 +1,8 @@ +2005-06-01 John Luke + + * FileBrowser/FileBrowser.cs: adjust to FileIconLoader + change + 2005-05-30 Lluis Sanchez Gual * Commands/CommandToolButton.cs: Only update button properties if Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/FileBrowser/FileBrowser.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/FileBrowser/FileBrowser.cs 2005-06-01 13:41:24 UTC (rev 2572) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/FileBrowser/FileBrowser.cs 2005-06-01 15:21:47 UTC (rev 2573) @@ -176,11 +176,11 @@ if (ignoreHidden) { if (!d.Name.StartsWith (".") && NotHidden (d.Name)) - store.AppendValues (FileIconLoader.GetPixbufForFile (System.IO.Path.Combine (CurrentDir, d.Name), 24, 24), d.Name); + store.AppendValues (FileIconLoader.GetPixbufForFile (System.IO.Path.Combine (CurrentDir, d.Name), 24), d.Name); } else { - store.AppendValues (FileIconLoader.GetPixbufForFile (System.IO.Path.Combine (CurrentDir, d.Name), 24, 24), d.Name); + store.AppendValues (FileIconLoader.GetPixbufForFile (System.IO.Path.Combine (CurrentDir, d.Name), 24), d.Name); } } @@ -415,7 +415,7 @@ text_render.Editable = true; tv.Reorderable = false; - iter = store.AppendValues (FileIconLoader.GetPixbufForFile (CurrentDir, 24, 24), "folder name"); + iter = store.AppendValues (FileIconLoader.GetPixbufForFile (CurrentDir, 24), "folder name"); treepath = tv.Model.GetPath(iter); column = tv.GetColumn (0); From jluke at mono-cvs.ximian.com Wed Jun 1 12:47:51 2005 From: jluke at mono-cvs.ximian.com (John Luke ) Date: Wed, 1 Jun 2005 12:47:51 -0400 (EDT) Subject: [Monodevelop-patches-list] r2574 - in trunk/MonoDevelop/Core/src: MonoDevelop.Base MonoDevelop.Base/Gui/Workbench/Layouts MonoDevelop.Gui.Utils MonoDevelop.Gui.Utils/FileIcons Message-ID: <20050601164751.F310B94765@mono-cvs.ximian.com> Author: jluke Date: 2005-06-01 12:47:51 -0400 (Wed, 01 Jun 2005) New Revision: 2574 Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs Log: use Gtk.IconTheme to load the icons Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-06-01 15:21:47 UTC (rev 2573) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-06-01 16:47:51 UTC (rev 2574) @@ -3,7 +3,7 @@ * Gui/Workbench/Layouts/SdiWorkspaceLayout.cs: * Gui/Workbench/Layouts/SdiWorkspaceWindow.cs: * Gui/Pads/FileScout/FileListItem.cs: adjust to - FileIconLoader.GetPixbufForFile change + FileIconLoader changes 2005-06-01 Jacob Ils? Christensen Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs 2005-06-01 15:21:47 UTC (rev 2573) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs 2005-06-01 16:47:51 UTC (rev 2574) @@ -462,7 +462,7 @@ { Gtk.Image mimeimage = null; if (content.IsUntitled) { - mimeimage = new Gtk.Image (FileIconLoader.GetPixbufForType ("gnome-fs-regular").ScaleSimple (16, 16, Gdk.InterpType.Bilinear)); + mimeimage = new Gtk.Image (FileIconLoader.GetPixbufForType ("gnome-fs-regular", 16)); } else { mimeimage = new Gtk.Image (FileIconLoader.GetPixbufForFile (content.ContentName, 16)); } Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs 2005-06-01 15:21:47 UTC (rev 2573) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs 2005-06-01 16:47:51 UTC (rev 2574) @@ -316,7 +316,7 @@ tabLabel.Icon.Pixbuf = FileIconLoader.GetPixbufForFile (content.ContentName, 16); } } catch { - tabLabel.Icon.Pixbuf = FileIconLoader.GetPixbufForType ("gnome-fs-regular").ScaleSimple (16, 16, Gdk.InterpType.Bilinear); + tabLabel.Icon.Pixbuf = FileIconLoader.GetPixbufForType ("gnome-fs-regular", 16); } if (TitleChanged != null) { TitleChanged(this, e); Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog 2005-06-01 15:21:47 UTC (rev 2573) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog 2005-06-01 16:47:51 UTC (rev 2574) @@ -2,6 +2,9 @@ * FileIcons/FileIconLoader.cs (GetPixbufForFile): just use size instead of height, width + + * FileIcons/FileIconLoader.cs: use Gtk.IconTheme to load + icons, simplify and size appropriately 2005-04-17 John Luke Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs 2005-06-01 15:21:47 UTC (rev 2573) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs 2005-06-01 16:47:51 UTC (rev 2574) @@ -1,22 +1,19 @@ using System; using System.Collections; -using Gnome; +using Gtk; namespace MonoDevelop.Gui.Utils { - - public class FileIconLoader + public sealed class FileIconLoader { - - static Gnome.IconTheme iconTheme; + static Gdk.Pixbuf defaultIcon; static Gnome.ThumbnailFactory thumbnailFactory; static Hashtable iconHash; static FileIconLoader () { - iconTheme = new Gnome.IconTheme (); - thumbnailFactory = new Gnome.ThumbnailFactory (ThumbnailSize.Normal); + thumbnailFactory = new Gnome.ThumbnailFactory (Gnome.ThumbnailSize.Normal); iconHash = new Hashtable (); } @@ -24,6 +21,15 @@ { } + public static Gdk.Pixbuf DefaultIcon { + get { + if (defaultIcon == null) + defaultIcon = new Gdk.Pixbuf ("../data/resources/icons/gnome-fs-regular.png"); + return defaultIcon; + } + } + + // FIXME: is there a GTK replacement for Gnome.Icon.LookupSync? public static Gdk.Pixbuf GetPixbufForFile (string filename, int size) { Gnome.IconLookupResultFlags result; @@ -32,35 +38,26 @@ if (filename == "Documentation") icon = "gnome-fs-regular"; else - icon = Gnome.Icon.LookupSync (iconTheme, thumbnailFactory, filename, "", Gnome.IconLookupFlags.None, out result); + icon = Gnome.Icon.LookupSync (IconTheme.Default, thumbnailFactory, filename, "", Gnome.IconLookupFlags.None, out result); } catch { icon = "gnome-fs-regular"; } - Gdk.Pixbuf pix = GetPixbufForType (icon); - return pix.ScaleSimple (size, size, Gdk.InterpType.Bilinear); + return GetPixbufForType (icon, size); } - public static Gdk.Pixbuf GetPixbufForType (string type) + public static Gdk.Pixbuf GetPixbufForType (string type, int size) { - Gdk.Pixbuf bf = (Gdk.Pixbuf) iconHash [type]; + // FIXME: is caching these really worth it? + // we have to cache them in both type and size + Gdk.Pixbuf bf = (Gdk.Pixbuf) iconHash [type+size]; if (bf == null) { - const string default_icon_location = "../data/resources/icons/gnome-fs-regular.png"; - string p_filename = ""; - try { - int i; - p_filename = iconTheme.LookupIcon (type, 24, new Gnome.IconData (), out i); - if (p_filename.Equals ("")) { - p_filename = default_icon_location; - } - } catch { - p_filename = default_icon_location; + bf = IconTheme.Default.LoadIcon (type, size, (IconLookupFlags) 0); + if (bf == null) { + bf = DefaultIcon; + if (bf.Height > size) + bf = bf.ScaleSimple (size, size, Gdk.InterpType.Bilinear); } - try { - bf = new Gdk.Pixbuf (p_filename); - } catch { - bf = new Gdk.Pixbuf (default_icon_location); - } - iconHash [type] = bf; + iconHash [type+size] = bf; } return bf; } From jluke at mono-cvs.ximian.com Wed Jun 1 20:14:59 2005 From: jluke at mono-cvs.ximian.com (John Luke ) Date: Wed, 1 Jun 2005 20:14:59 -0400 (EDT) Subject: [Monodevelop-patches-list] r2575 - in trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets: . FileBrowser Message-ID: <20050602001459.158C394765@mono-cvs.ximian.com> Author: jluke Date: 2005-06-01 20:14:58 -0400 (Wed, 01 Jun 2005) New Revision: 2575 Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/FileBrowser/FileBrowser.cs trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Makefile.am Log: remove unneeded gnome-vfs ref Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog 2005-06-01 16:47:51 UTC (rev 2574) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog 2005-06-02 00:14:58 UTC (rev 2575) @@ -1,5 +1,10 @@ 2005-06-01 John Luke + * Makefile.am: no longer using gnome-vfs in here + * FileBrowser/FileBrowser.cs: remove vfs remnents + +2005-06-01 John Luke + * FileBrowser/FileBrowser.cs: adjust to FileIconLoader change Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/FileBrowser/FileBrowser.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/FileBrowser/FileBrowser.cs 2005-06-01 16:47:51 UTC (rev 2574) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/FileBrowser/FileBrowser.cs 2005-06-02 00:14:58 UTC (rev 2575) @@ -11,7 +11,6 @@ using System.Diagnostics; using System.IO; using Gtk; -using Vfs = Gnome.Vfs.Vfs; using MonoDevelop.Core.Properties; using MonoDevelop.Core.Services; @@ -53,10 +52,6 @@ public FileBrowser () { - if (!Vfs.Initialized) { - Vfs.Initialize (); - } - messageService = (IMessageService) ServiceManager.GetService (typeof (IMessageService)); scrolledwindow = new ScrolledWindow (); Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Makefile.am 2005-06-01 16:47:51 UTC (rev 2574) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Makefile.am 2005-06-02 00:14:58 UTC (rev 2575) @@ -1,13 +1,12 @@ DLL = $(top_builddir)/build/bin/MonoDevelop.Gui.Widgets.dll -REFERENCES = /r:System.Drawing \ - /r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \ - /r:$(top_builddir)/build/bin/MonoDevelop.Gui.Utils.dll \ +REFERENCES = -r:System.Drawing.dll \ + -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \ + -r:$(top_builddir)/build/bin/MonoDevelop.Gui.Utils.dll \ $(GTK_SHARP_LIBS) \ $(GLADE_SHARP_LIBS) \ - $(GNOME_SHARP_LIBS) \ - $(GNOME_VFS_SHARP_LIBS) + $(GNOME_SHARP_LIBS) FILES = \ Tree/TreeView.cs \ From jluke at mono-cvs.ximian.com Wed Jun 1 21:14:59 2005 From: jluke at mono-cvs.ximian.com (John Luke ) Date: Wed, 1 Jun 2005 21:14:59 -0400 (EDT) Subject: [Monodevelop-patches-list] r2576 - in trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets: . DataGrid DragNotebook GladeWidgetExtract IconView Message-ID: <20050602011459.99D9394765@mono-cvs.ximian.com> Author: jluke Date: 2005-06-01 21:14:59 -0400 (Wed, 01 Jun 2005) New Revision: 2576 Removed: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Dock/ Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/DataGrid/DataGrid.cs trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/DragNotebook/DragNotebook.cs trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/GladeWidgetExtract/GladeWidgetExtract.cs trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/IconView/IconView.cs trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Makefile.am Log: remove cruft Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog 2005-06-02 00:14:58 UTC (rev 2575) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/ChangeLog 2005-06-02 01:14:59 UTC (rev 2576) @@ -1,5 +1,11 @@ 2005-06-01 John Luke + * Makefile.am: remove Dock/* + * Dock: removed + * */*.cs: remove GtkSharp and similar references + +2005-06-01 John Luke + * Makefile.am: no longer using gnome-vfs in here * FileBrowser/FileBrowser.cs: remove vfs remnents Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/DataGrid/DataGrid.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/DataGrid/DataGrid.cs 2005-06-02 00:14:58 UTC (rev 2575) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/DataGrid/DataGrid.cs 2005-06-02 01:14:59 UTC (rev 2576) @@ -22,7 +22,6 @@ using System.Text; using GLib; using Gtk; -using GtkSharp; using System.Runtime.InteropServices; namespace MonoDevelop.Gui.Widgets Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/DragNotebook/DragNotebook.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/DragNotebook/DragNotebook.cs 2005-06-02 00:14:58 UTC (rev 2575) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/DragNotebook/DragNotebook.cs 2005-06-02 01:14:59 UTC (rev 2576) @@ -1,6 +1,5 @@ using Gdk; using Gtk; -using GtkSharp; using System; namespace MonoDevelop.Gui.Widgets Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/GladeWidgetExtract/GladeWidgetExtract.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/GladeWidgetExtract/GladeWidgetExtract.cs 2005-06-02 00:14:58 UTC (rev 2575) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/GladeWidgetExtract/GladeWidgetExtract.cs 2005-06-02 01:14:59 UTC (rev 2576) @@ -7,9 +7,7 @@ using System; using Gtk; -using GtkSharp; using Glade; -using GladeSharp; using Assembly = System.Reflection.Assembly; Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/IconView/IconView.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/IconView/IconView.cs 2005-06-02 00:14:58 UTC (rev 2575) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/IconView/IconView.cs 2005-06-02 01:14:59 UTC (rev 2576) @@ -2,9 +2,7 @@ using System.Collections; using Gtk; -using GtkSharp; using Gnome; -using GnomeSharp; namespace MonoDevelop.Gui.Widgets { public class IconView : ScrolledWindow { Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Makefile.am 2005-06-02 00:14:58 UTC (rev 2575) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Widgets/Makefile.am 2005-06-02 01:14:59 UTC (rev 2576) @@ -12,8 +12,6 @@ Tree/TreeView.cs \ Tree/TreeNodeCollection.cs \ Tree/TreeNode.cs \ -Dock/Docker.cs \ -Dock/DockingManager.cs \ IconView/IconView.cs \ AssemblyInfo.cs \ FileBrowser/FileBrowser.cs \ From jluke at mono-cvs.ximian.com Wed Jun 1 21:58:46 2005 From: jluke at mono-cvs.ximian.com (John Luke ) Date: Wed, 1 Jun 2005 21:58:46 -0400 (EDT) Subject: [Monodevelop-patches-list] r2577 - in trunk/MonoDevelop: . Core/src/MonoDevelop.Base Core/src/MonoDevelop.Base/Services Message-ID: <20050602015846.2A94594765@mono-cvs.ximian.com> Author: jluke Date: 2005-06-01 21:58:45 -0400 (Wed, 01 Jun 2005) New Revision: 2577 Removed: trunk/MonoDevelop/Core/src/MonoDevelop.Base/MonoDevelop.Base.dll.config.in Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ResourceService.cs trunk/MonoDevelop/configure.in Log: remove pinvoke workaround and use RenderIcon directly now Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-06-02 01:14:59 UTC (rev 2576) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-06-02 01:58:45 UTC (rev 2577) @@ -1,5 +1,13 @@ 2005-06-01 John Luke + * Core/src/MonoDevelop.Base/Services/ResourceService.cs: remove + DllImport workaround for rendering an icon + * Core/src/MonoDevelop.Base/MonoDevelop.Base.dll.config.in: remove + as we no longer p/invoke + * Core/src/MonoDevelop.Base/Makefile.am: updated for above + +2005-06-01 John Luke + * Gui/Workbench/Layouts/SdiWorkspaceLayout.cs: * Gui/Workbench/Layouts/SdiWorkspaceWindow.cs: * Gui/Pads/FileScout/FileListItem.cs: adjust to Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am 2005-06-02 01:14:59 UTC (rev 2576) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am 2005-06-02 01:58:45 UTC (rev 2577) @@ -472,7 +472,6 @@ build_OPTIONS = $(addprefix $(top_builddir)/build/data/options/, $(notdir $(OPTIONS))) DLLNAME = MonoDevelop.Base.dll -CONFIG = $(DLLNAME).config ASSEMBLY = $(top_builddir)/build/bin/$(DLLNAME) ADDIN = MonoDevelopCore.addin.xml @@ -496,11 +495,10 @@ $(ASSEMBLY): $(build_sources) $(srcdir)/Base.glade Services/StockIcons.cs $(CSC) $(CSC_FLAGS) $(MONO_POSIX_OEE) -codepage:utf8 -out:$@ -target:library $(DLLS) \ -resource:$(srcdir)/Base.glade,Base.glade \ - $(monodoc_libflags) $(build_sources) Services/StockIcons.cs \ - && cp $(CONFIG) $(top_builddir)/build/bin/. + $(monodoc_libflags) $(build_sources) Services/StockIcons.cs assemblydir = $(MD_ASSEMBLY_DIR) -assembly_DATA = $(ASSEMBLY) $(CONFIG) +assembly_DATA = $(ASSEMBLY) addindir = $(MD_ADDIN_DIR) addin_DATA = $(ADDIN) @@ -509,8 +507,8 @@ options_DATA = $(OPTIONS) CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(build_OPTIONS) -DISTCLEANFILES = $(CONFIG) Services/StockIcons.cs +DISTCLEANFILES = Services/StockIcons.cs -EXTRA_DIST = $(FILES) ./Services/process-icons.pl $(CONFIG).in Base.glade $(ADDIN) $(OPTIONS) +EXTRA_DIST = $(FILES) ./Services/process-icons.pl Base.glade $(ADDIN) $(OPTIONS) include $(top_srcdir)/Makefile.include Deleted: trunk/MonoDevelop/Core/src/MonoDevelop.Base/MonoDevelop.Base.dll.config.in =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/MonoDevelop.Base.dll.config.in 2005-06-02 01:14:59 UTC (rev 2576) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/MonoDevelop.Base.dll.config.in 2005-06-02 01:58:45 UTC (rev 2577) @@ -1,3 +0,0 @@ - - - Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ResourceService.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ResourceService.cs 2005-06-02 01:14:59 UTC (rev 2576) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/ResourceService.cs 2005-06-02 01:58:45 UTC (rev 2577) @@ -121,13 +121,6 @@ //} } - // use P/Invoke to be able to pass some NULL parameters - [DllImport("libgtk-win32-2.0-0.dll")] - static extern IntPtr - gtk_icon_set_render_icon (IntPtr raw, IntPtr style, int direction, - int state, int size, IntPtr widget, - string detail); - /// /// Returns a icon from the resource database, it handles localization /// transparent for the user. In the resource database can be a bitmap @@ -154,19 +147,10 @@ if (stockid != null) { Gtk.IconSet iconset = Gtk.IconFactory.LookupDefault (stockid); if (iconset != null) { - // use P/Invoke to be able to pass some NULL parameters - IntPtr raw_ret = gtk_icon_set_render_icon - (iconset.Handle, - Gtk.Widget.DefaultStyle.Handle, - (int) Gtk.TextDirection.None, - (int) Gtk.StateType.Normal, - (int) size, - IntPtr.Zero, null); - return (Gdk.Pixbuf) GLib.Object.GetObject(raw_ret); + return iconset.RenderIcon (Gtk.Widget.DefaultStyle, Gtk.TextDirection.None, Gtk.StateType.Normal, size, null, null); } } - // throw GLib.GException as the old code? return null; } Modified: trunk/MonoDevelop/configure.in =================================================================== --- trunk/MonoDevelop/configure.in 2005-06-02 01:14:59 UTC (rev 2576) +++ trunk/MonoDevelop/configure.in 2005-06-02 01:58:45 UTC (rev 2577) @@ -193,7 +193,6 @@ Core/src/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor.dll.config Core/src/AddIns/DebuggerAddIn/Makefile Core/src/MonoDevelop.Base/Makefile -Core/src/MonoDevelop.Base/MonoDevelop.Base.dll.config Core/src/MonoDevelop.Startup/Makefile Core/src/MonoDevelop.Core/Makefile Core/src/MonoDevelop.Dock/Makefile From jluke at mono-cvs.ximian.com Thu Jun 2 10:05:17 2005 From: jluke at mono-cvs.ximian.com (John Luke ) Date: Thu, 2 Jun 2005 10:05:17 -0400 (EDT) Subject: [Monodevelop-patches-list] r2578 - in trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils: . FileIcons Message-ID: <20050602140517.AFB5394765@mono-cvs.ximian.com> Author: jluke Date: 2005-06-02 10:05:17 -0400 (Thu, 02 Jun 2005) New Revision: 2578 Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs Log: add back a try/catch Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog 2005-06-02 01:58:45 UTC (rev 2577) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog 2005-06-02 14:05:17 UTC (rev 2578) @@ -1,5 +1,10 @@ 2005-06-01 John Luke + * FileIcons/FileIconLoader.cs: add back one try/catch + from adrian at dreamsoftware.ro (Adrian Dinu), bug 75118 + +2005-06-01 John Luke + * FileIcons/FileIconLoader.cs (GetPixbufForFile): just use size instead of height, width Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs 2005-06-02 01:58:45 UTC (rev 2577) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs 2005-06-02 14:05:17 UTC (rev 2578) @@ -51,8 +51,10 @@ // we have to cache them in both type and size Gdk.Pixbuf bf = (Gdk.Pixbuf) iconHash [type+size]; if (bf == null) { - bf = IconTheme.Default.LoadIcon (type, size, (IconLookupFlags) 0); - if (bf == null) { + try { + bf = IconTheme.Default.LoadIcon (type, size, (IconLookupFlags) 0); + } + catch { bf = DefaultIcon; if (bf.Height > size) bf = bf.ScaleSimple (size, size, Gdk.InterpType.Bilinear); From lluis at mono-cvs.ximian.com Thu Jun 2 13:30:49 2005 From: lluis at mono-cvs.ximian.com (Lluis Sanchez ) Date: Thu, 2 Jun 2005 13:30:49 -0400 (EDT) Subject: [Monodevelop-patches-list] r2579 - in trunk/MonoDevelop/Core/src/MonoDevelop.Base: . Gui/Pads/SolutionPad Internal/Project/Combine Message-ID: <20050602173049.7EBF894765@mono-cvs.ximian.com> Author: lluis Date: 2005-06-02 13:30:49 -0400 (Thu, 02 Jun 2005) New Revision: 2579 Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/SolutionPad/TreeViewPad.cs trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineEntry.cs Log: 2005-06-02 Lluis Sanchez Gual * Gui/Pads/SolutionPad/TreeViewPad.cs: Fix warning. * Internal/Project/Combine/CombineEntry.cs: Added ParentCombine property. Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-06-02 14:05:17 UTC (rev 2578) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-06-02 17:30:49 UTC (rev 2579) @@ -1,3 +1,8 @@ +2005-06-02 Lluis Sanchez Gual + + * Gui/Pads/SolutionPad/TreeViewPad.cs: Fix warning. + * Internal/Project/Combine/CombineEntry.cs: Added ParentCombine property. + 2005-06-01 John Luke * Core/src/MonoDevelop.Base/Services/ResourceService.cs: remove Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/SolutionPad/TreeViewPad.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/SolutionPad/TreeViewPad.cs 2005-06-02 14:05:17 UTC (rev 2578) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Pads/SolutionPad/TreeViewPad.cs 2005-06-02 17:30:49 UTC (rev 2579) @@ -1341,7 +1341,7 @@ object data = DataItem; NodeBuilder[] chain = BuilderChain; if (chain != null && chain.Length > 0) return ((TypeNodeBuilder)chain[0]).GetNodeName (this, data); - else return store.GetValue (currentIter, TreeViewPad.TextColumn) as string;; + else return store.GetValue (currentIter, TreeViewPad.TextColumn) as string; } } Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineEntry.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineEntry.cs 2005-06-02 14:05:17 UTC (rev 2578) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineEntry.cs 2005-06-02 17:30:49 UTC (rev 2579) @@ -96,6 +96,10 @@ set {} } + public Combine ParentCombine { + get { return parentCombine; } + } + public virtual void Save (string fileName, IProgressMonitor monitor) { FileName = fileName; From jluke at mono-cvs.ximian.com Thu Jun 2 18:52:45 2005 From: jluke at mono-cvs.ximian.com (John Luke ) Date: Thu, 2 Jun 2005 18:52:45 -0400 (EDT) Subject: [Monodevelop-patches-list] r2580 - in trunk/MonoDevelop/Core/src/MonoDevelop.Base: . Gui/Dialogs/ReferenceDialog Message-ID: <20050602225245.3141494765@mono-cvs.ximian.com> Author: jluke Date: 2005-06-02 18:52:44 -0400 (Thu, 02 Jun 2005) New Revision: 2580 Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs Log: 2005-06-01 John Luke * Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs: check GetIterFirst return value to avoid gtk+ assertions might fix bug 74445 Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-06-02 17:30:49 UTC (rev 2579) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-06-02 22:52:44 UTC (rev 2580) @@ -1,3 +1,9 @@ +2005-06-01 John Luke + + * Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs: + check GetIterFirst return value to avoid gtk+ assertions + might fix bug 74445 + 2005-06-02 Lluis Sanchez Gual * Gui/Pads/SolutionPad/TreeViewPad.cs: Fix warning. Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs 2005-06-02 17:30:49 UTC (rev 2579) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs 2005-06-02 22:52:44 UTC (rev 2580) @@ -42,7 +42,7 @@ get { ProjectReferenceCollection referenceInformations = new ProjectReferenceCollection(); Gtk.TreeIter looping_iter; - if (refTreeStore.GetIterFirst (out looping_iter) == false) { + if (!refTreeStore.GetIterFirst (out looping_iter)) { return referenceInformations; } do { @@ -124,7 +124,8 @@ public void RemoveReference (ReferenceType referenceType, string referenceName, string referenceLocation) { Gtk.TreeIter looping_iter; - refTreeStore.GetIterFirst (out looping_iter); + if (!refTreeStore.GetIterFirst (out looping_iter)) + return; do { if (referenceLocation == (string)refTreeStore.GetValue (looping_iter, 2)) { refTreeStore.Remove (ref looping_iter); @@ -136,7 +137,8 @@ public void AddReference(ReferenceType referenceType, string referenceName, string referenceLocation) { Gtk.TreeIter looping_iter; - refTreeStore.GetIterFirst (out looping_iter); + if (!refTreeStore.GetIterFirst (out looping_iter)) + return; do { try { if (referenceLocation == (string)refTreeStore.GetValue (looping_iter, 2) && referenceName == (string)refTreeStore.GetValue (looping_iter, 0)) { From jluke at mono-cvs.ximian.com Thu Jun 2 19:09:15 2005 From: jluke at mono-cvs.ximian.com (John Luke ) Date: Thu, 2 Jun 2005 19:09:15 -0400 (EDT) Subject: [Monodevelop-patches-list] r2581 - trunk/MonoDevelop/Core/src/MonoDevelop.Base Message-ID: <20050602230915.4338894765@mono-cvs.ximian.com> Author: jluke Date: 2005-06-02 19:09:15 -0400 (Thu, 02 Jun 2005) New Revision: 2581 Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog trunk/MonoDevelop/Core/src/MonoDevelop.Base/MonoDevelopCore.addin.xml Log: avoid crashing on Shift|F8 Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-06-02 22:52:44 UTC (rev 2580) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-06-02 23:09:15 UTC (rev 2581) @@ -1,5 +1,11 @@ -2005-06-01 John Luke +2005-06-02 John Luke + * MonoDevelopCore.addin.xml: add Shift|F8 shortcut + for tip of the day from ?yvind Neuman (spam at agurk.com) + workaround for bug 61113 + +2005-06-02 John Luke + * Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs: check GetIterFirst return value to avoid gtk+ assertions might fix bug 74445 Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/MonoDevelopCore.addin.xml =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/MonoDevelopCore.addin.xml 2005-06-02 22:52:44 UTC (rev 2580) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/MonoDevelopCore.addin.xml 2005-06-02 23:09:15 UTC (rev 2581) @@ -405,7 +405,8 @@ defaultHandler = "MonoDevelop.Commands.TipOfTheDayHandler" _label = "_Tip of the Day..." icon = "Icons.16x16.TipOfTheDay" - description = "Show tip of the day" /> + description = "Show tip of the day" + shortcut = "Shift|F8" /> ) Date: Thu, 2 Jun 2005 19:10:38 -0400 (EDT) Subject: [Monodevelop-patches-list] r2582 - trunk/MonoDevelop/Core/src/MonoDevelop.Dock Message-ID: <20050602231038.3A1FC94765@mono-cvs.ximian.com> Author: jluke Date: 2005-06-02 19:10:38 -0400 (Thu, 02 Jun 2005) New Revision: 2582 Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/TODO Log: add note Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/TODO =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Dock/TODO 2005-06-02 23:09:15 UTC (rev 2581) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Dock/TODO 2005-06-02 23:10:38 UTC (rev 2582) @@ -5,6 +5,7 @@ - when we can use pango 1.6, use the built-in ellipsizing - audit event emitting frequency - use less ArrayLists + - Shift|F8 gtk_paned_find neighbors, see ximian bug 61113 potential new features - restore size/position on de-iconify? From jluke at mono-cvs.ximian.com Thu Jun 2 19:27:38 2005 From: jluke at mono-cvs.ximian.com (John Luke ) Date: Thu, 2 Jun 2005 19:27:38 -0400 (EDT) Subject: [Monodevelop-patches-list] r2583 - trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReferenceDialog Message-ID: <20050602232738.67B8694765@mono-cvs.ximian.com> Author: jluke Date: 2005-06-02 19:27:38 -0400 (Thu, 02 Jun 2005) New Revision: 2583 Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs Log: fix last commit Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs 2005-06-02 23:10:38 UTC (rev 2582) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs 2005-06-02 23:27:38 UTC (rev 2583) @@ -137,16 +137,16 @@ public void AddReference(ReferenceType referenceType, string referenceName, string referenceLocation) { Gtk.TreeIter looping_iter; - if (!refTreeStore.GetIterFirst (out looping_iter)) - return; - do { - try { - if (referenceLocation == (string)refTreeStore.GetValue (looping_iter, 2) && referenceName == (string)refTreeStore.GetValue (looping_iter, 0)) { - return; + if (refTreeStore.GetIterFirst (out looping_iter)) { + do { + try { + if (referenceLocation == (string)refTreeStore.GetValue (looping_iter, 2) && referenceName == (string)refTreeStore.GetValue (looping_iter, 0)) { + return; + } + } catch { } - } catch { - } - } while (refTreeStore.IterNext (ref looping_iter)); + } while (refTreeStore.IterNext (ref looping_iter)); + } ProjectReference tag; switch (referenceType) { From pjohanson at mono-cvs.ximian.com Thu Jun 2 20:54:59 2005 From: pjohanson at mono-cvs.ximian.com (Peter Johanson ) Date: Thu, 2 Jun 2005 20:54:59 -0400 (EDT) Subject: [Monodevelop-patches-list] r2584 - in trunk/MonoDevelop/Extras/BooBinding: . Parser Message-ID: <20050603005459.CB75794765@mono-cvs.ximian.com> Author: pjohanson Date: 2005-06-02 20:54:59 -0400 (Thu, 02 Jun 2005) New Revision: 2584 Modified: trunk/MonoDevelop/Extras/BooBinding/ChangeLog trunk/MonoDevelop/Extras/BooBinding/Parser/BooParser.boo trunk/MonoDevelop/Extras/BooBinding/Parser/Visitor.boo Log: Few more small parser fixes. Modified: trunk/MonoDevelop/Extras/BooBinding/ChangeLog =================================================================== --- trunk/MonoDevelop/Extras/BooBinding/ChangeLog 2005-06-02 23:27:38 UTC (rev 2583) +++ trunk/MonoDevelop/Extras/BooBinding/ChangeLog 2005-06-03 00:54:59 UTC (rev 2584) @@ -1,3 +1,12 @@ +2005-06-02 Peter Johanson + + * Parser/BooParser.boo: Re-apply change to include + ProcessMethodBodies step in the visitor. Problems this change caused + have been resolved elsewhere. + * Parser/Visitor.boo: Use the region of the property if the region for + the getter/setter is null (happens with [Getter()], etc AST + attributes). + 2005-05-31 Peter Johanson * BooBindingCompilerServices.boo: Make sure we Modified: trunk/MonoDevelop/Extras/BooBinding/Parser/BooParser.boo =================================================================== --- trunk/MonoDevelop/Extras/BooBinding/Parser/BooParser.boo 2005-06-02 23:27:38 UTC (rev 2583) +++ trunk/MonoDevelop/Extras/BooBinding/Parser/BooParser.boo 2005-06-03 00:54:59 UTC (rev 2584) @@ -100,10 +100,10 @@ compilePipe = Compile() parsingStep as Boo.Lang.Parser.BooParsingStep = compilePipe[0] parsingStep.TabSize = 1 - num = compilePipe.Find(typeof(ProcessMethodBodiesWithDuckTyping)) - // The following resolved issues with '[Property(foo] foo', but breaks other things - // reverting for now, as [Property] bug is less common than others cause by this. - //num = compilePipe.Find(typeof(StricterErrorChecking)) + //num = compilePipe.Find(typeof(ProcessMethodBodiesWithDuckTyping)) + // Include ProcessMethodBodies step now, as it solves issue + // with [Propert(foo)] with an untyped 'foo' + num = compilePipe.Find(typeof(StricterErrorChecking)) visitor = Visitor(LineLength:lineLength) compilePipe[num] = visitor // Remove unneccessary compiler steps Modified: trunk/MonoDevelop/Extras/BooBinding/Parser/Visitor.boo =================================================================== --- trunk/MonoDevelop/Extras/BooBinding/Parser/Visitor.boo 2005-06-02 23:27:38 UTC (rev 2583) +++ trunk/MonoDevelop/Extras/BooBinding/Parser/Visitor.boo 2005-06-03 00:54:59 UTC (rev 2584) @@ -261,9 +261,11 @@ if node.Getter is not null: getter = GetMethod(node.Getter) getRegion = GetRegion(node.Getter) + getRegion = GetRegion(node) if getRegion is null if node.Setter is not null: setter = GetMethod(node.Setter) setRegion = GetRegion(node.Setter) + setRegion = GetRegion(node) if setRegion is null property = Property(node.FullName, ReturnType.CreateReturnType(node), getter, setter, getRegion, setRegion, GetModifier(node), GetRegion(node), GetClientRegion(node)) property.Documentation = node.Documentation From jacobilsoe at mono-cvs.ximian.com Fri Jun 3 10:48:42 2005 From: jacobilsoe at mono-cvs.ximian.com (Jacob Ilsų Christensen ) Date: Fri, 3 Jun 2005 10:48:42 -0400 (EDT) Subject: [Monodevelop-patches-list] r2585 - in trunk/MonoDevelop/Core/src/MonoDevelop.Base: . Internal/Project/Combine Message-ID: <20050603144842.E952D94765@mono-cvs.ximian.com> Author: jacobilsoe Date: 2005-06-03 10:48:42 -0400 (Fri, 03 Jun 2005) New Revision: 2585 Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/Combine.cs Log: Removed references to a project when it is removed Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-06-03 00:54:59 UTC (rev 2584) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-06-03 14:48:42 UTC (rev 2585) @@ -1,3 +1,8 @@ +2005-06-03 Jacob Ils? Christensen + + * Internal/Project/Combine/Combine.cs: Remove references + to a project when it is removed from a combine (57782) + 2005-06-02 John Luke * MonoDevelopCore.addin.xml: add Shift|F8 shortcut Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/Combine.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/Combine.cs 2005-06-03 00:54:59 UTC (rev 2584) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/Combine.cs 2005-06-03 14:48:42 UTC (rev 2585) @@ -280,8 +280,48 @@ OnEntryRemoved (new CombineEntryEventArgs (entry)); } + private void RemoveReferencesToProject(Project projectToRemove) + { + if (projectToRemove == null) { + return; + } + + if (this.ParentCombine != null) + { + this.ParentCombine.RemoveReferencesToProject(projectToRemove); + return; + } + + foreach (Project project in this.GetAllProjects()) { + + if (project == projectToRemove) { + continue; + } + + ArrayList toBeDeleted = new ArrayList(); + + foreach (ProjectReference refInfo in project.ProjectReferences) { + switch (refInfo.ReferenceType) { + case ReferenceType.Project: + if (refInfo.Reference == projectToRemove.Name) { + toBeDeleted.Add(refInfo); + } + break; + case ReferenceType.Assembly: + case ReferenceType.Gac: + break; + } + } + + foreach (ProjectReference refInfo in toBeDeleted) { + project.ProjectReferences.Remove(refInfo); + } + } + } + public void RemoveEntry (CombineEntry entry) { + RemoveReferencesToProject (entry as Project); Entries.Remove (entry); } From jluke at mono-cvs.ximian.com Sat Jun 4 16:31:33 2005 From: jluke at mono-cvs.ximian.com (John Luke ) Date: Sat, 4 Jun 2005 16:31:33 -0400 (EDT) Subject: [Monodevelop-patches-list] r2586 - in trunk/MonoDevelop/Core/src: MonoDevelop.Base MonoDevelop.Dock Message-ID: <20050604203133.956A994765@mono-cvs.ximian.com> Author: jluke Date: 2005-06-04 16:31:33 -0400 (Sat, 04 Jun 2005) New Revision: 2586 Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog trunk/MonoDevelop/Core/src/MonoDevelop.Base/MonoDevelopCore.addin.xml trunk/MonoDevelop/Core/src/MonoDevelop.Dock/ChangeLog trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockPaned.cs trunk/MonoDevelop/Core/src/MonoDevelop.Dock/GdlDockTest.cs Log: improve fix for bug 61113 by handling shift|f8 in DockPaned Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-06-03 14:48:42 UTC (rev 2585) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog 2005-06-04 20:31:33 UTC (rev 2586) @@ -1,3 +1,8 @@ +2005-06-04 John Luke + + * MonoDevelopCore.addin.xml: remove workaround + for Shift|F8 as the dock handles it now + 2005-06-03 Jacob Ils? Christensen * Internal/Project/Combine/Combine.cs: Remove references Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/MonoDevelopCore.addin.xml =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Base/MonoDevelopCore.addin.xml 2005-06-03 14:48:42 UTC (rev 2585) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/MonoDevelopCore.addin.xml 2005-06-04 20:31:33 UTC (rev 2586) @@ -405,8 +405,7 @@ defaultHandler = "MonoDevelop.Commands.TipOfTheDayHandler" _label = "_Tip of the Day..." icon = "Icons.16x16.TipOfTheDay" - description = "Show tip of the day" - shortcut = "Shift|F8" /> + description = "Show tip of the day" /> + + * DockPaned.cs: handle Shift|F8 to avoid crash for now + * GdlDockTest.cs: remove C# 2 features + 2005-04-28 John Luke * DockBar.cs: remove redundent RemoveItem call Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockPaned.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockPaned.cs 2005-06-03 14:48:42 UTC (rev 2585) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockPaned.cs 2005-06-04 20:31:33 UTC (rev 2586) @@ -85,6 +85,7 @@ Child.AddNotification ("position", new GLib.NotifyHandler (OnNotifyPosition)); Child.ButtonReleaseEvent += new ButtonReleaseEventHandler (OnButtonReleased); + Child.KeyPressEvent += new KeyPressEventHandler (OnKeyPressed); Child.Parent = this; Child.Show (); @@ -139,6 +140,7 @@ // after that we can remove the Paned child if (Child != null) { Child.ButtonReleaseEvent -= new ButtonReleaseEventHandler (OnButtonReleased); + Child.KeyPressEvent -= new KeyPressEventHandler (OnKeyPressed); Child.Unparent (); Child = null; } @@ -308,6 +310,14 @@ } [GLib.ConnectBefore] + void OnKeyPressed (object sender, KeyPressEventArgs a) + { + // eat Shift|F8, see http://bugzilla.ximian.com/show_bug.cgi?id=61113 + if (a.Event.Key == Gdk.Key.F8 && a.Event.State == Gdk.ModifierType.ShiftMask) + a.RetVal = true; + } + + [GLib.ConnectBefore] void OnButtonReleased (object sender, ButtonReleaseEventArgs a) { if (a.Event.Button == 1 && positionChanged) { Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/GdlDockTest.cs =================================================================== --- trunk/MonoDevelop/Core/src/MonoDevelop.Dock/GdlDockTest.cs 2005-06-03 14:48:42 UTC (rev 2585) +++ trunk/MonoDevelop/Core/src/MonoDevelop.Dock/GdlDockTest.cs 2005-06-04 20:31:33 UTC (rev 2586) @@ -72,15 +72,15 @@ table.PackEnd (box, false, false, 0); Button button = new Button (Gtk.Stock.Save); - button.Clicked += OnSaveLayout; + button.Clicked += new EventHandler (OnSaveLayout); box.PackEnd (button, false, true, 0); button = new Button ("Layout Manager"); - button.Clicked += OnRunLayoutManager; + button.Clicked += new EventHandler (OnRunLayoutManager); box.PackEnd (button, false, true, 0); button = new Button ("Dump XML"); - button.Clicked += OnDumpXML; + button.Clicked += new EventHandler (OnDumpXML); box.PackEnd (button, false, true, 0); app.ShowAll (); From pjohanson at mono-cvs.ximian.com Sat Jun 4 17:12:12 2005 From: pjohanson at mono-cvs.ximian.com (Peter Johanson ) Date: Sat, 4 Jun 2005 17:12:12 -0400 (EDT) Subject: [Monodevelop-patches-list] r2587 - in trunk/MonoDevelop/Extras/BooBinding: . Gui/OptionPanels Project Message-ID: <20050604211212.A537194765@mono-cvs.ximian.com> Author: pjohanson Date: 2005-06-04 17:12:12 -0400 (Sat, 04 Jun 2005) New Revision: 2587 Modified: trunk/MonoDevelop/Extras/BooBinding/ChangeLog trunk/MonoDevelop/Extras/BooBinding/Gui/OptionPanels/CodeCompilationPanel.boo trunk/MonoDevelop/Extras/BooBinding/Project/BooCompilerParameters.boo Log: Remove items related to compiler selection. This is unnecessary now that we use the Boo API to compile things, instead of calling out to boo/booc. Modified: trunk/MonoDevelop/Extras/BooBinding/ChangeLog =================================================================== --- trunk/MonoDevelop/Extras/BooBinding/ChangeLog 2005-06-04 20:31:33 UTC (rev 2586) +++ trunk/MonoDevelop/Extras/BooBinding/ChangeLog 2005-06-04 21:12:12 UTC (rev 2587) @@ -1,3 +1,9 @@ +2005-06-04 Peter Johanson + + * Gui/OptionPanels/CodeCompilationPanel.boo: + * Project/BooCompilerParameters.boo: Remove compiler selection items, + as they are unneeded now that we use Boo's API for compilation + 2005-06-02 Peter Johanson * Parser/BooParser.boo: Re-apply change to include Modified: trunk/MonoDevelop/Extras/BooBinding/Gui/OptionPanels/CodeCompilationPanel.boo =================================================================== --- trunk/MonoDevelop/Extras/BooBinding/Gui/OptionPanels/CodeCompilationPanel.boo 2005-06-04 20:31:33 UTC (rev 2586) +++ trunk/MonoDevelop/Extras/BooBinding/Gui/OptionPanels/CodeCompilationPanel.boo 2005-06-04 21:12:12 UTC (rev 2587) @@ -47,10 +47,6 @@ private checkDebug = CheckButton (GettextCatalog.GetString ("Enable debug")) private checkDucky = CheckButton (GettextCatalog.GetString ("Enable ducky mode")) - // compiler chooser - private booc = RadioButton ("booc") - private boo as RadioButton - private outputAssembly = Entry () private outputDirectory = Entry() // Waiting on easy method for setting entry text before using @@ -93,17 +89,7 @@ vbox.PackStart (hboxTmp, false, false, 0) Add (vbox) - def OnCompilerToggled (o as object, args as EventArgs) as void: - if booc.Active: - compilerPath.Text = "booc" - else: - compilerPath.Text = "boo" - private def InitializeComponent() as void: - boo = RadioButton (booc, "boo") - boo.Toggled += OnCompilerToggled - booc.Toggled += OnCompilerToggled - codeGenerationLabel.Markup = String.Format ("{0}", GettextCatalog.GetString ("Code Generation")) labelOutputDir.Markup = String.Format ("{0} :", GettextCatalog.GetString ("Output Path")) labelOutputDir.Layout.Alignment = Pango.Alignment.Right @@ -147,18 +133,12 @@ configuration = cast(DotNetProjectConfiguration,(cast(IProperties,CustomizationObject)).GetProperty("Config")) compilerParameters = cast (BooCompilerParameters, configuration.CompilationParameters) - if (compilerParameters.Compiler == BooCompiler.Booc): - booc.Active = true - else: - boo.Active = true - checkDebug.Active = configuration.DebugMode checkDucky.Active = compilerParameters.Ducky outputAssembly.Text = configuration.OutputAssembly //outputDirectory.DefaultPath = configuration.OutputDirectory outputDirectory.Text = configuration.OutputDirectory - compilerPath.Text = compilerParameters.CompilerPath culture.Text = compilerParameters.Culture compileTargetCombo.Active = cast (int, configuration.CompileTarget) @@ -174,7 +154,6 @@ //configuration.OutputDirectory = outputDirectory.Path compilerParameters.Ducky = checkDucky.Active - compilerParameters.CompilerPath = compilerPath.Text compilerParameters.Culture = culture.Text return true Modified: trunk/MonoDevelop/Extras/BooBinding/Project/BooCompilerParameters.boo =================================================================== --- trunk/MonoDevelop/Extras/BooBinding/Project/BooCompilerParameters.boo 2005-06-04 20:31:33 UTC (rev 2586) +++ trunk/MonoDevelop/Extras/BooBinding/Project/BooCompilerParameters.boo 2005-06-04 21:12:12 UTC (rev 2587) @@ -27,12 +27,6 @@ import MonoDevelop.Internal.Serialization public class BooCompilerParameters: - [ItemProperty ("compiler")] - compiler = BooCompiler.Booc - - [ItemProperty("compilerpath")] - compilerpath = "booc" - [ItemProperty("genwarnings")] genwarnings = false @@ -48,18 +42,6 @@ set: genwarnings = value - public Compiler as BooCompiler: - get: - return compiler - set: - compiler = value - - public CompilerPath as string: - get: - return compilerpath - set: - compilerpath = value - public Ducky as bool: get: return ducky From jzwart at mono-cvs.ximian.com Sun Jun 5 07:26:18 2005 From: jzwart at mono-cvs.ximian.com (Jeroen Zwartepoorte) Date: Sun, 5 Jun 2005 07:26:18 -0400 (EDT) Subject: [Monodevelop-patches-list] r2588 - in branches/MonoDevelop-plan-43: . lib src src/Core src/Plugins src/Plugins/CSharp src/Plugins/Content src/Plugins/Editor src/Plugins/Node src/Plugins/Workbench Message-ID: <20050605112618.4C66894765@mono-cvs.ximian.com> Author: jzwart Date: 2005-06-05 07:26:17 -0400 (Sun, 05 Jun 2005) New Revision: 2588 Added: branches/MonoDevelop-plan-43/AUTHORS branches/MonoDevelop-plan-43/COPYING branches/MonoDevelop-plan-43/INSTALL branches/MonoDevelop-plan-43/MAINTAINERS branches/MonoDevelop-plan-43/Makefile.am branches/MonoDevelop-plan-43/NEWS branches/MonoDevelop-plan-43/README branches/MonoDevelop-plan-43/autogen.sh branches/MonoDevelop-plan-43/configure.in branches/MonoDevelop-plan-43/lib/Makefile.am branches/MonoDevelop-plan-43/lib/MonoDevelop.Dock.dll branches/MonoDevelop-plan-43/m4/ branches/MonoDevelop-plan-43/src/Core/Makefile.am branches/MonoDevelop-plan-43/src/Makefile.am branches/MonoDevelop-plan-43/src/Plugins/CSharp/Makefile.am branches/MonoDevelop-plan-43/src/Plugins/Content/Makefile.am branches/MonoDevelop-plan-43/src/Plugins/Editor/Makefile.am branches/MonoDevelop-plan-43/src/Plugins/Makefile.am branches/MonoDevelop-plan-43/src/Plugins/Node/Makefile.am branches/MonoDevelop-plan-43/src/Plugins/Workbench/Makefile.am Removed: branches/MonoDevelop-plan-43/default.build branches/MonoDevelop-plan-43/src/Core/core.build branches/MonoDevelop-plan-43/src/Plugins/CSharp/csharp.build branches/MonoDevelop-plan-43/src/Plugins/Content/content.build branches/MonoDevelop-plan-43/src/Plugins/Editor/editor.build branches/MonoDevelop-plan-43/src/Plugins/Node/node.build branches/MonoDevelop-plan-43/src/Plugins/Workbench/workbench.build branches/MonoDevelop-plan-43/src/Plugins/plugins.build Modified: branches/MonoDevelop-plan-43/ branches/MonoDevelop-plan-43/ChangeLog branches/MonoDevelop-plan-43/lib/ branches/MonoDevelop-plan-43/src/ branches/MonoDevelop-plan-43/src/Core/ branches/MonoDevelop-plan-43/src/Core/monodevelop.exe.config.in branches/MonoDevelop-plan-43/src/Core/monodevelop.in branches/MonoDevelop-plan-43/src/Plugins/ branches/MonoDevelop-plan-43/src/Plugins/CSharp/ branches/MonoDevelop-plan-43/src/Plugins/CSharp/CSharpFileNode.cs branches/MonoDevelop-plan-43/src/Plugins/CSharp/CSharpNodeViewerFactory.cs branches/MonoDevelop-plan-43/src/Plugins/Content/ branches/MonoDevelop-plan-43/src/Plugins/Content/ContentManager.cs branches/MonoDevelop-plan-43/src/Plugins/Content/ContentManagerWidgetFactory.cs branches/MonoDevelop-plan-43/src/Plugins/Content/Context.cs branches/MonoDevelop-plan-43/src/Plugins/Content/INodeViewerFactory.cs branches/MonoDevelop-plan-43/src/Plugins/Editor/ branches/MonoDevelop-plan-43/src/Plugins/Editor/TextNodeViewerFactory.cs branches/MonoDevelop-plan-43/src/Plugins/Node/ branches/MonoDevelop-plan-43/src/Plugins/Workbench/ branches/MonoDevelop-plan-43/src/Plugins/Workbench/Workbench.cs Log: 2005-06-05 Jeroen Zwartepoorte * autotoolify project. Property changes on: branches/MonoDevelop-plan-43 ___________________________________________________________________ Name: svn:ignore - build + Makefile Makefile.in aclocal.m4 autom4te.cache config.* configure install-sh intltool* libtool ltmain.sh missing mkinstalldirs stamp-h1 Added: branches/MonoDevelop-plan-43/AUTHORS =================================================================== --- branches/MonoDevelop-plan-43/AUTHORS 2005-06-04 21:12:12 UTC (rev 2587) +++ branches/MonoDevelop-plan-43/AUTHORS 2005-06-05 11:26:17 UTC (rev 2588) @@ -0,0 +1 @@ +Jeroen Zwartepoorte Added: branches/MonoDevelop-plan-43/COPYING =================================================================== --- branches/MonoDevelop-plan-43/COPYING 2005-06-04 21:12:12 UTC (rev 2587) +++ branches/MonoDevelop-plan-43/COPYING 2005-06-05 11:26:17 UTC (rev 2588) @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the