[Monodevelop-patches-list] r1687 - in trunk/MonoDevelop: build/AddIns data/resources/glade src/Libraries/MonoDevelop.Gui.Utils src/Main/Base src/Main/Base/Gui/Dialogs/CombineConfiguration src/Main/Base/Internal/Project/Combine
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Wed Jun 2 16:20:18 EDT 2004
Author: tberman
Date: 2004-06-02 16:20:18 -0400 (Wed, 02 Jun 2004)
New Revision: 1687
Added:
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CombineConfiguration/CombineBuildOptions.cs
Modified:
trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin.xml
trunk/MonoDevelop/data/resources/glade/Base.glade
trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Utils/MonoDevelop.Gui.Utils.prjx
trunk/MonoDevelop/src/Main/Base/ChangeLog
trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/Combine.cs
trunk/MonoDevelop/src/Main/Base/Makefile.MonoDevelop.Base
trunk/MonoDevelop/src/Main/Base/Makefile.am
trunk/MonoDevelop/src/Main/Base/MonoDevelop.Base.prjx
Log:
gui love for the new solution bould build option. and as non-relative as it may look to you, it really does store it relatively, so it is safe to checkin and distribute.
Modified: trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin.xml
===================================================================
--- trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin.xml 2004-06-02 17:58:34 UTC (rev 1686)
+++ trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin.xml 2004-06-02 20:20:18 UTC (rev 1687)
@@ -325,6 +325,9 @@
<DialogPanel id = "Startup"
_label = "Startup Properties"
class = "MonoDevelop.Gui.Dialogs.OptionPanels.CombineStartupPanel"/>
+ <DialogPanel id = "Build"
+ _label = "Build Properties"
+ class = "MonoDevelop.Gui.Dialogs.OptionPanels.CombineBuildOptions"/>
<!-- <DialogPanel id = "Dependency"
_label = "${res:Dialog.Options.CombineOptions.Dependencies.PanelName}"
Modified: trunk/MonoDevelop/data/resources/glade/Base.glade
===================================================================
--- trunk/MonoDevelop/data/resources/glade/Base.glade 2004-06-02 17:58:34 UTC (rev 1686)
+++ trunk/MonoDevelop/data/resources/glade/Base.glade 2004-06-02 20:20:18 UTC (rev 1687)
@@ -4492,4 +4492,111 @@
</child>
</widget>
+<widget class="GtkWindow" id="CombineBuildOptions">
+ <property name="title" translatable="yes">cmbBuildOptions</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+
+ <child>
+ <widget class="GtkVBox" id="vbox68">
+ <property name="border_width">12</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="label73">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Output Directory</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox46">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
+
+ <child>
+ <widget class="GtkLabel" id="label74">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"> </property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkEntry" id="buildOutputLoc">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char" translatable="yes">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="OutputDirBrowse">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">_Browse...</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">6</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+</widget>
+
</glade-interface>
Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Utils/MonoDevelop.Gui.Utils.prjx
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Utils/MonoDevelop.Gui.Utils.prjx 2004-06-02 17:58:34 UTC (rev 1686)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Utils/MonoDevelop.Gui.Utils.prjx 2004-06-02 20:20:18 UTC (rev 1687)
@@ -38,4 +38,4 @@
<Output directory="./bin/Release" assembly="MonoDevelop.Gui.Utils" executeScript="" executeBeforeBuild="" executeAfterBuild="" />
</Configuration>
</Configurations>
-</Project>
+</Project>
\ No newline at end of file
Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog 2004-06-02 17:58:34 UTC (rev 1686)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog 2004-06-02 20:20:18 UTC (rev 1687)
@@ -1,3 +1,14 @@
+2004-06-02 Todd Berman <tberman at sevenl.net>
+
+ * MonoDevelop.Base.prjx: fixed ICSharpCode.SharpZipLib reference and
+ added new file.
+ * Gui/Dialogs/CombineConfiguration/CombineBuildOptions.cs: new dialog
+ for the .mdsx relative output build path.
+ * Makefile.am: add new file.
+ * Internal/Project/Combine/Combine.cs: Add BaseDirectory property.
+ * Makefile.MonoDevelop.Base: automagic updates to reflect new file
+ (This is good to see).
+
2004-05-30 Todd Berman <tberman at sevenl.net>
* Commands/AutostartCommands: Remove some dead code.
Added: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CombineConfiguration/CombineBuildOptions.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CombineConfiguration/CombineBuildOptions.cs 2004-06-02 17:58:34 UTC (rev 1686)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CombineConfiguration/CombineBuildOptions.cs 2004-06-02 20:20:18 UTC (rev 1687)
@@ -0,0 +1,79 @@
+// <file>
+// <copyright see="prj:///doc/copyright.txt"/>
+// <license see="prj:///doc/license.txt"/>
+// <owner name="Mike Krüger" email="mike at icsharpcode.net"/>
+// <version value="$version"/>
+// </file>
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using MonoDevelop.Core.AddIns.Codons;
+
+using MonoDevelop.Core.Properties;
+using MonoDevelop.Core.Services;
+using MonoDevelop.Internal.Project;
+
+using Gtk;
+using MonoDevelop.Gui.Widgets;
+
+namespace MonoDevelop.Gui.Dialogs.OptionPanels
+{
+ public class CombineBuildOptions : AbstractOptionPanel
+ {
+ CombineBuildOptionsWidget widget;
+
+ class CombineBuildOptionsWidget : GladeWidgetExtract
+ {
+ // Gtk Controls
+ [Glade.WidgetAttribute] Entry buildOutputLoc;
+ [Glade.WidgetAttribute] Button OutputDirBrowse;
+
+ // Services
+ StringParserService StringParserService = (StringParserService)ServiceManager.Services.GetService (
+ typeof (StringParserService));
+ static ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(
+ typeof(IResourceService));
+ static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(
+ typeof(PropertyService));
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService (typeof (FileUtilityService));
+
+ Combine combine;
+
+ public CombineBuildOptionsWidget(IProperties CustomizationObject) :
+ base ("Base.glade", "CombineBuildOptions")
+ {
+ this.combine = (Combine)((IProperties)CustomizationObject).GetProperty("Combine");
+ buildOutputLoc.Text = combine.OutputDirectory + System.IO.Path.DirectorySeparatorChar;
+ OutputDirBrowse.Clicked += new EventHandler (onClicked);
+ }
+
+ void onClicked (object o, EventArgs e)
+ {
+ FolderDialog fd = new FolderDialog ("Output Directory");
+ fd.Filename = buildOutputLoc.Text;
+ int response = fd.Run ();
+ fd.Hide ();
+ if (response == (int) ResponseType.Ok)
+ buildOutputLoc.Text = fd.Filename + System.IO.Path.DirectorySeparatorChar;
+ }
+
+ public bool Store()
+ {
+ combine.OutputDirectory = buildOutputLoc.Text;
+ return true;
+ }
+ }
+
+ public override void LoadPanelContents()
+ {
+ Add (widget = new CombineBuildOptionsWidget ((IProperties) CustomizationObject));
+ }
+
+ public override bool StorePanelContents()
+ {
+ bool success = widget.Store ();
+ return success;
+ }
+ }
+}
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/Combine.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/Combine.cs 2004-06-02 17:58:34 UTC (rev 1686)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/Combine.cs 2004-06-02 20:20:18 UTC (rev 1687)
@@ -119,6 +119,12 @@
}
}
+ public string BaseDirectory {
+ get {
+ return path;
+ }
+ }
+
[LocalizedProperty("${res:MonoDevelop.Internal.Project.Combine.Name}",
Description ="${res:MonoDevelop.Internal.Project.Combine.Name.Description}")]
public string Name {
Modified: trunk/MonoDevelop/src/Main/Base/Makefile.MonoDevelop.Base
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Makefile.MonoDevelop.Base 2004-06-02 17:58:34 UTC (rev 1686)
+++ trunk/MonoDevelop/src/Main/Base/Makefile.MonoDevelop.Base 2004-06-02 20:20:18 UTC (rev 1687)
@@ -372,8 +372,14 @@
./Services/StatusBar/IStatusBarService.cs \
./Services/Tasks/Task.cs \
./Services/Tasks/TaskService.cs \
-./Services/Toolbar/ToolbarService.cs
+./Services/Toolbar/ToolbarService.cs \
+./Gui/Dialogs/CombineConfiguration/CombineBuildOptions.cs
+RESOURCES = \
+../../../data/resources/glade/Base.glade
+
+RESOURCES_BUILD = $(foreach res,$(RESOURCES), $(addprefix -resource:,$(res)),$(notdir $(res)))
+
PKG_REFERENCES = \
gtk-sharp \
gecko-sharp \
@@ -401,8 +407,8 @@
all: MonoDevelop.Base.dll
-MonoDevelop.Base.dll: $(SOURCES)
- mcs $(MCS_OPTIONS) -target:library -out:"MonoDevelop.Base.dll" $(PKG_REFERENCES_BUILD) $(SYSTEM_REFERENCES_BUILD) $(SOURCES) \
+MonoDevelop.Base.dll: $(SOURCES) $(RESOURCES)
+ mcs $(MCS_OPTIONS) -target:library -out:"MonoDevelop.Base.dll" $(RESOURCES_BUILD) $(PKG_REFERENCES_BUILD) $(SYSTEM_REFERENCES_BUILD) $(SOURCES) \
&& cp "MonoDevelop.Base.dll" ../../build/bin
clean:
Modified: trunk/MonoDevelop/src/Main/Base/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Makefile.am 2004-06-02 17:58:34 UTC (rev 1686)
+++ trunk/MonoDevelop/src/Main/Base/Makefile.am 2004-06-02 20:20:18 UTC (rev 1687)
@@ -89,6 +89,7 @@
./Gui/Dialogs/CombineConfiguration/CombineConfigurationPanel.cs \
./Gui/Dialogs/CombineConfiguration/CombineDependencyPanel.cs \
./Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs \
+./Gui/Dialogs/CombineConfiguration/CombineBuildOptions.cs \
./Gui/Dialogs/CombineConfiguration/ConfigurationManager.cs \
./Gui/Dialogs/FusionNative.cs \
./Gui/Dialogs/NewProjectDialog.cs \
Modified: trunk/MonoDevelop/src/Main/Base/MonoDevelop.Base.prjx
===================================================================
--- trunk/MonoDevelop/src/Main/Base/MonoDevelop.Base.prjx 2004-06-02 17:58:34 UTC (rev 1686)
+++ trunk/MonoDevelop/src/Main/Base/MonoDevelop.Base.prjx 2004-06-02 20:20:18 UTC (rev 1687)
@@ -381,13 +381,14 @@
<File name="./Services/Tasks/Task.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
<File name="./Services/Tasks/TaskService.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
<File name="./Services/Toolbar/ToolbarService.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
+ <File name="../../../data/resources/glade/Base.glade" subtype="Code" buildaction="EmbedAsResource" dependson="" data="" />
+ <File name="./Gui/Dialogs/CombineConfiguration/CombineBuildOptions.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
</Contents>
<References>
<Reference type="Gac" refto="System.Web.Services, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" localcopy="True" />
<Reference type="Gac" refto="System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" localcopy="True" />
<Reference type="Gac" refto="System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" localcopy="True" />
<Reference type="Gac" refto="Mono.Posix, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" localcopy="True" />
- <Reference type="Gac" refto="ICSharpCode.SharpZipLib, Version=0.31.0.0, Culture=neutral, PublicKeyToken=1b03e6acf1164f73" localcopy="True" />
<Reference type="Gac" refto="gdk-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" localcopy="True" />
<Reference type="Gac" refto="gecko-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=de14aa3cf4f97add" localcopy="True" />
<Reference type="Gac" refto="glib-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" localcopy="True" />
@@ -397,6 +398,7 @@
<Reference type="Gac" refto="gtk-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" localcopy="True" />
<Reference type="Gac" refto="monodoc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" localcopy="True" />
<Reference type="Gac" refto="pango-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" localcopy="True" />
+ <Reference type="Gac" refto="ICSharpCode.SharpZipLib, Version=0.6.0.0, Culture=neutral, PublicKeyToken=1b03e6acf1164f73" localcopy="True" />
</References>
<DeploymentInformation target="" script="" strategy="File" />
<Configuration runwithwarnings="False" name="Debug">
More information about the Monodevelop-patches-list
mailing list