[Monodevelop-patches-list] r2114 - in trunk/MonoDevelop: . Core/src/MonoDevelop.Base Core/src/MonoDevelop.Base/Commands Core/src/MonoDevelop.Base/Gui/Dialogs Core/src/MonoDevelop.Base/options build/data

[commit-watcher at mono-cvs.ximian.com]

Author: tberman
Date: 2005-01-03 15:18:16 -0500 (Mon, 03 Jan 2005)
New Revision: 2114

Added:
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/options/
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/options/DefaultEditingLayout.xml
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/options/MonoDevelop-templates.xml
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/options/MonoDevelop-tools.xml
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/options/MonoDevelopProperties.xml
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/options/TipsOfTheDay.xml
Removed:
   trunk/MonoDevelop/build/data/options/
Modified:
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Commands/HelpCommands.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CommonAboutDialog.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am
   trunk/MonoDevelop/build/data/Makefile.am
   trunk/MonoDevelop/configure.in
Log:
remove build/data/options, populate it from default files.


Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Commands/HelpCommands.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Commands/HelpCommands.cs	2005-01-03 20:04:41 UTC (rev 2113)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Commands/HelpCommands.cs	2005-01-03 20:18:16 UTC (rev 2114)
@@ -34,14 +34,6 @@
 		}
 	}
 	
-	public class ViewGPL : AbstractMenuCommand
-	{
-		public override void Run()
-		{
-			using (ViewGPLDialog vgd = new ViewGPLDialog ());
-		}
-	}
-	
 	public class GotoWebSite : AbstractMenuCommand
 	{
 		string site;

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CommonAboutDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CommonAboutDialog.cs	2005-01-03 20:04:41 UTC (rev 2113)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CommonAboutDialog.cs	2005-01-03 20:18:16 UTC (rev 2114)
@@ -140,12 +140,8 @@
 	public class CommonAboutDialog : Dialog
 	{
 		
-		AuthorAboutTabPage aatp;
-		//ChangeLogTabPage changelog;
 		ScrollBox aboutPictureScrollBox;
 		
-		//static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
-		
 		public CommonAboutDialog ()
 		{
 			this.Title = GettextCatalog.GetString ("About MonoDevelop");

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am	2005-01-03 20:04:41 UTC (rev 2113)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am	2005-01-03 20:18:16 UTC (rev 2114)
@@ -385,6 +385,15 @@
 Internal/ExternalTool/ExternalTool.cs \
 AssemblyInfo.cs
 
+OPTIONS = \
+options/DefaultEditingLayout.xml \
+options/MonoDevelopProperties.xml \
+options/MonoDevelop-templates.xml \
+options/MonoDevelop-tools.xml \
+options/TipsOfTheDay.xml
+
+build_OPTIONS = $(addprefix $(top_builddir)/build/data/options/, $(notdir $(OPTIONS)))
+
 build_sources = $(addprefix $(srcdir)/, $(FILES))
 
 ASSEMBLY = MonoDevelop.Base.dll
@@ -393,8 +402,12 @@
 
 ADDIN_BUILD = $(top_builddir)/build/AddIns
 
-all: $(ASSEMBLY) $(ADDIN_BUILD)/$(ADDIN)
+all: $(ASSEMBLY) $(ADDIN_BUILD)/$(ADDIN) $(build_OPTIONS)
 
+$(build_OPTIONS): $(top_builddir)/build/data/options/%.xml: $(srcdir)/options/%.xml
+	mkdir -p $(top_builddir)/build/data/options
+	cp $(srcdir)/options/$(notdir $@) $@
+
 $(ADDIN_BUILD)/$(ADDIN): $(srcdir)/$(ADDIN)
 	mkdir -p $(ADDIN_BUILD)
 	cp $(srcdir)/$(ADDIN) $(ADDIN_BUILD)/.
@@ -416,8 +429,11 @@
 addindir = $(libdir)/monodevelop/AddIns
 addin_DATA = $(ADDIN)
 
+optionsdir = $(libdir)/monodevelop/data/options
+options_DATA = $(OPTIONS)
+
 CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
 DISTCLEANFILES = $(ASSEMBLY).config
 
-EXTRA_DIST = $(FILES) ./Services/process-icons.pl $(ASSEMBLY).config.in Base.glade $(ADDIN)
+EXTRA_DIST = $(FILES) ./Services/process-icons.pl $(ASSEMBLY).config.in Base.glade $(ADDIN) $(OPTIONS)
 

Copied: trunk/MonoDevelop/Core/src/MonoDevelop.Base/options/DefaultEditingLayout.xml (from rev 2112, trunk/MonoDevelop/build/data/options/DefaultEditingLayout.xml)

Copied: trunk/MonoDevelop/Core/src/MonoDevelop.Base/options/MonoDevelop-templates.xml (from rev 2112, trunk/MonoDevelop/build/data/options/MonoDevelop-templates.xml)

Copied: trunk/MonoDevelop/Core/src/MonoDevelop.Base/options/MonoDevelop-tools.xml (from rev 2112, trunk/MonoDevelop/build/data/options/MonoDevelop-tools.xml)

Copied: trunk/MonoDevelop/Core/src/MonoDevelop.Base/options/MonoDevelopProperties.xml (from rev 2112, trunk/MonoDevelop/build/data/options/MonoDevelopProperties.xml)

Copied: trunk/MonoDevelop/Core/src/MonoDevelop.Base/options/TipsOfTheDay.xml (from rev 2112, trunk/MonoDevelop/build/data/options/TipsOfTheDay.xml)

Modified: trunk/MonoDevelop/build/data/Makefile.am
===================================================================
--- trunk/MonoDevelop/build/data/Makefile.am	2005-01-03 20:04:41 UTC (rev 2113)
+++ trunk/MonoDevelop/build/data/Makefile.am	2005-01-03 20:18:16 UTC (rev 2114)
@@ -1 +1 @@
-SUBDIRS = resources options
+SUBDIRS = resources

Modified: trunk/MonoDevelop/configure.in
===================================================================
--- trunk/MonoDevelop/configure.in	2005-01-03 20:04:41 UTC (rev 2113)
+++ trunk/MonoDevelop/configure.in	2005-01-03 20:18:16 UTC (rev 2114)
@@ -192,7 +192,6 @@
 build/Makefile
 build/data/Makefile
 build/data/resources/Makefile
-build/data/options/Makefile
 build/data/resources/css/Makefile
 build/data/resources/icons/Makefile
 Core/src/AddIns/DebuggerAddIn/AssemblyInfo.cs