Author: lluis
Date: 2007-07-05 14:02:20 -0400 (Thu, 05 Jul 2007)
New Revision: 81414
Modified:
trunk/mono-addins/Samples/ChangeLog
trunk/mono-addins/Samples/TextEditor.CompilerService/Makefile.am
trunk/mono-addins/Samples/TextEditor.CompilerService/TextEditor.CompilerService.mdp
trunk/mono-addins/Samples/TextEditor.Xml/Makefile.am
trunk/mono-addins/Samples/TextEditor.Xml/TextEditor.Xml.mdp
trunk/mono-addins/Samples/TextEditor/Makefile.am
trunk/mono-addins/Samples/TextEditor/TextEditor.mdp
trunk/mono-addins/Samples/TextEditorLib/TextEditorLib.mdp
trunk/mono-addins/Samples/TextEditorLib/gtk-gui/MainWindow.cs
trunk/mono-addins/Samples/WriterService.SampleExtender/WriterService.SampleExtender.mdp
trunk/mono-addins/Samples/WriterService/WriterService.mdp
trunk/mono-addins/Samples/WriterServiceHost/Makefile.am
trunk/mono-addins/Samples/WriterServiceHost/WriterServiceHost.mdp
Log:
* TextEditorLib/TextEditorLib.mdp,
TextEditor.CompilerService/TextEditor.CompilerService.mdp,
TextEditor.CompilerService/Makefile.am,
TextEditor.Xml/TextEditor.Xml.mdp, TextEditor.Xml/Makefile.am,
TextEditor/Makefile.am, TextEditor/TextEditor.mdp,
WriterServiceHost/Makefile.am,
WriterServiceHost/WriterServiceHost.mdp,
WriterService.SampleExtender/WriterService.SampleExtender.mdp,
WriterService/WriterService.mdp: Makefile and project file fixes.
* TextEditorLib/gtk-gui/MainWindow.cs: Updated.
Modified: trunk/mono-addins/Samples/ChangeLog
===================================================================
--- trunk/mono-addins/Samples/ChangeLog 2007-07-05 18:01:50 UTC (rev 81413)
+++ trunk/mono-addins/Samples/ChangeLog 2007-07-05 18:02:20 UTC (rev 81414)
@@ -1,3 +1,16 @@
+2007-07-05 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * TextEditorLib/TextEditorLib.mdp,
+ TextEditor.CompilerService/TextEditor.CompilerService.mdp,
+ TextEditor.CompilerService/Makefile.am,
+ TextEditor.Xml/TextEditor.Xml.mdp, TextEditor.Xml/Makefile.am,
+ TextEditor/Makefile.am, TextEditor/TextEditor.mdp,
+ WriterServiceHost/Makefile.am,
+ WriterServiceHost/WriterServiceHost.mdp,
+ WriterService.SampleExtender/WriterService.SampleExtender.mdp,
+ WriterService/WriterService.mdp: Makefile and project file fixes.
+ * TextEditorLib/gtk-gui/MainWindow.cs: Updated.
+
2007-04-23 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* TextEditorLib/MainWindow.cs, TextEditorLib/gtk-gui/MainWindow.cs,
Modified: trunk/mono-addins/Samples/TextEditor/Makefile.am
===================================================================
--- trunk/mono-addins/Samples/TextEditor/Makefile.am 2007-07-05 18:01:50 UTC
(rev 81413)
+++ trunk/mono-addins/Samples/TextEditor/Makefile.am 2007-07-05 18:02:20 UTC
(rev 81414)
@@ -15,19 +15,16 @@
FILES = \
AssemblyInfo.cs \
- gtk-gui/generated.cs \
Main.cs
DATA_FILES =
-RESOURCES = gtk-gui/gui.stetic
+RESOURCES =
EXTRAS =
REFERENCES = \
- $(GLADE_SHARP_20_LIBS) \
- $(GLIB_SHARP_20_LIBS) \
- $(GTK_SHARP_20_LIBS) \
+ -pkg:gtk-sharp-2.0 \
-r:Mono.Posix \
-r:System
Modified: trunk/mono-addins/Samples/TextEditor/TextEditor.mdp
===================================================================
--- trunk/mono-addins/Samples/TextEditor/TextEditor.mdp 2007-07-05 18:01:50 UTC
(rev 81413)
+++ trunk/mono-addins/Samples/TextEditor/TextEditor.mdp 2007-07-05 18:02:20 UTC
(rev 81414)
@@ -14,10 +14,8 @@
</Configuration>
</Configurations>
<Contents>
- <File name="./gtk-gui/generated.cs" subtype="Code" buildaction="Compile" />
<File name="./Main.cs" subtype="Code" buildaction="Compile" />
<File name="./AssemblyInfo.cs" subtype="Code" buildaction="Compile" />
- <File name="./gtk-gui/gui.stetic" subtype="Code"
buildaction="EmbedAsResource" />
<File name="./Makefile.am" subtype="Code" buildaction="Nothing" />
</Contents>
<References>
@@ -25,8 +23,12 @@
<ProjectReference type="Gac" localcopy="True" refto="Mono.Posix,
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
<ProjectReference type="Project" localcopy="True" refto="TextEditorLib" />
<ProjectReference type="Project" localcopy="True" refto="Mono.Addins" />
+ <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Gac" localcopy="True" refto="pango-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Gac" localcopy="True" refto="atk-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
</References>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True"
RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName=""
SyncReferences="True">
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True"
RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName=""
SyncReferences="True" RelativeConfigureInPath="../../">
<BuildFilesVar Sync="True" Name="FILES" />
<DeployFilesVar Sync="True" Name="DATA_FILES" />
<ResourcesVar Sync="True" Name="RESOURCES" />
@@ -35,5 +37,4 @@
<AsmRefVar Sync="True" Name="DLL_REFERENCES" />
<ProjectRefVar Sync="True" Name="PROJECT_REFERENCES" />
</MonoDevelop.Autotools.MakefileInfo>
- <GtkDesignInfo partialTypes="True" />
</Project>
\ No newline at end of file
Modified: trunk/mono-addins/Samples/TextEditor.CompilerService/Makefile.am
===================================================================
--- trunk/mono-addins/Samples/TextEditor.CompilerService/Makefile.am
2007-07-05 18:01:50 UTC (rev 81413)
+++ trunk/mono-addins/Samples/TextEditor.CompilerService/Makefile.am
2007-07-05 18:02:20 UTC (rev 81414)
@@ -27,7 +27,7 @@
EXTRAS =
REFERENCES = \
- $(GTK_SHARP_20_LIBS) \
+ -pkg:gtk-sharp-2.0 \
-r:System
DLL_REFERENCES =
Modified:
trunk/mono-addins/Samples/TextEditor.CompilerService/TextEditor.CompilerService.mdp
===================================================================
---
trunk/mono-addins/Samples/TextEditor.CompilerService/TextEditor.CompilerService.mdp
2007-07-05 18:01:50 UTC (rev 81413)
+++
trunk/mono-addins/Samples/TextEditor.CompilerService/TextEditor.CompilerService.mdp
2007-07-05 18:02:20 UTC (rev 81414)
@@ -26,6 +26,7 @@
<ProjectReference type="Gac" localcopy="True" refto="System,
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<ProjectReference type="Project" localcopy="True" refto="TextEditorLib" />
<ProjectReference type="Project" localcopy="True" refto="Mono.Addins" />
+ <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
</References>
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True"
RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName=""
SyncReferences="True">
<BuildFilesVar Sync="True" Name="FILES" />
@@ -36,4 +37,5 @@
<AsmRefVar Sync="True" Name="DLL_REFERENCES" />
<ProjectRefVar Sync="True" Name="PROJECT_REFERENCES" />
</MonoDevelop.Autotools.MakefileInfo>
+ <Deployment.LinuxDeployData scriptName="texteditor.compilerservice"
generatePcFile="False" />
</Project>
\ No newline at end of file
Modified: trunk/mono-addins/Samples/TextEditor.Xml/Makefile.am
===================================================================
--- trunk/mono-addins/Samples/TextEditor.Xml/Makefile.am 2007-07-05
18:01:50 UTC (rev 81413)
+++ trunk/mono-addins/Samples/TextEditor.Xml/Makefile.am 2007-07-05
18:02:20 UTC (rev 81414)
@@ -24,7 +24,7 @@
EXTRAS =
REFERENCES = \
- $(GTK_SHARP_20_LIBS) \
+ -pkg:gtk-sharp-2.0 \
-r:System \
-r:System.Xml
Modified: trunk/mono-addins/Samples/TextEditor.Xml/TextEditor.Xml.mdp
===================================================================
--- trunk/mono-addins/Samples/TextEditor.Xml/TextEditor.Xml.mdp 2007-07-05
18:01:50 UTC (rev 81413)
+++ trunk/mono-addins/Samples/TextEditor.Xml/TextEditor.Xml.mdp 2007-07-05
18:02:20 UTC (rev 81414)
@@ -25,6 +25,7 @@
<ProjectReference type="Gac" localcopy="True" refto="System.Xml,
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<ProjectReference type="Project" localcopy="True" refto="TextEditorLib" />
<ProjectReference type="Project" localcopy="True" refto="Mono.Addins" />
+ <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
</References>
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True"
RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName=""
SyncReferences="True">
<BuildFilesVar Sync="True" Name="FILES" />
@@ -35,4 +36,5 @@
<AsmRefVar Sync="True" Name="DLL_REFERENCES" />
<ProjectRefVar Sync="True" Name="PROJECT_REFERENCES" />
</MonoDevelop.Autotools.MakefileInfo>
+ <Deployment.LinuxDeployData scriptName="texteditor.xml"
generatePcFile="False" />
</Project>
\ No newline at end of file
Modified: trunk/mono-addins/Samples/TextEditorLib/TextEditorLib.mdp
===================================================================
--- trunk/mono-addins/Samples/TextEditorLib/TextEditorLib.mdp 2007-07-05
18:01:50 UTC (rev 81413)
+++ trunk/mono-addins/Samples/TextEditorLib/TextEditorLib.mdp 2007-07-05
18:02:20 UTC (rev 81414)
@@ -52,6 +52,8 @@
<ProjectReference type="Project" localcopy="True" refto="Mono.Addins" />
<ProjectReference type="Gac" localcopy="True" refto="gtk-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Gac" localcopy="True" refto="gdk-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Gac" localcopy="True" refto="pango-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Gac" localcopy="True" refto="atk-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
</References>
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True"
RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName=""
SyncReferences="True">
<BuildFilesVar Sync="True" Name="FILES" />
@@ -63,4 +65,5 @@
<ProjectRefVar Sync="True" Name="PROJECT_REFERENCES" />
</MonoDevelop.Autotools.MakefileInfo>
<GtkDesignInfo partialTypes="True" />
+ <Deployment.LinuxDeployData scriptName="texteditorlib"
generatePcFile="False" />
</Project>
\ No newline at end of file
Modified: trunk/mono-addins/Samples/TextEditorLib/gtk-gui/MainWindow.cs
===================================================================
--- trunk/mono-addins/Samples/TextEditorLib/gtk-gui/MainWindow.cs
2007-07-05 18:01:50 UTC (rev 81413)
+++ trunk/mono-addins/Samples/TextEditorLib/gtk-gui/MainWindow.cs
2007-07-05 18:02:20 UTC (rev 81414)
@@ -45,7 +45,6 @@
this.AddAccelGroup(w1.AccelGroup);
this.Name = "MainWindow";
this.Title = Mono.Unix.Catalog.GetString("Text Editor");
- this.WindowPosition = ((Gtk.WindowPosition)(0));
// Container child MainWindow.Gtk.Container+ContainerChild
this.vbox2 = new Gtk.VBox();
this.vbox2.Name = "vbox2";
@@ -63,7 +62,6 @@
this.toolbar = ((Gtk.Toolbar)(w1.GetWidget("/toolbar")));
this.toolbar.Name = "toolbar";
this.toolbar.ShowArrow = false;
- this.toolbar.Tooltips = true;
this.toolbar.ToolbarStyle = ((Gtk.ToolbarStyle)(0));
this.toolbar.IconSize = ((Gtk.IconSize)(3));
this.vbox2.Add(this.toolbar);
@@ -120,12 +118,12 @@
w9.Spacing = 2;
// Container child GtkHBox.Gtk.Container+ContainerChild
Gtk.Image w10 = new Gtk.Image();
- w10.Name = "image24";
+ w10.Name = "image1";
w10.Pixbuf = Gtk.IconTheme.Default.LoadIcon("gtk-close", 16, 0);
w9.Add(w10);
// Container child GtkHBox.Gtk.Container+ContainerChild
Gtk.Label w12 = new Gtk.Label();
- w12.Name = "GtkLabel1";
+ w12.Name = "GtkLabel";
w12.LabelProp = "";
w9.Add(w12);
w8.Add(w9);
Modified: trunk/mono-addins/Samples/WriterService/WriterService.mdp
===================================================================
--- trunk/mono-addins/Samples/WriterService/WriterService.mdp 2007-07-05
18:01:50 UTC (rev 81413)
+++ trunk/mono-addins/Samples/WriterService/WriterService.mdp 2007-07-05
18:02:20 UTC (rev 81414)
@@ -34,4 +34,5 @@
<AsmRefVar Sync="True" Name="DLL_REFERENCES" />
<ProjectRefVar Sync="True" Name="PROJECT_REFERENCES" />
</MonoDevelop.Autotools.MakefileInfo>
+ <Deployment.LinuxDeployData scriptName="writerservice"
generatePcFile="False" />
</Project>
\ No newline at end of file
Modified:
trunk/mono-addins/Samples/WriterService.SampleExtender/WriterService.SampleExtender.mdp
===================================================================
---
trunk/mono-addins/Samples/WriterService.SampleExtender/WriterService.SampleExtender.mdp
2007-07-05 18:01:50 UTC (rev 81413)
+++
trunk/mono-addins/Samples/WriterService.SampleExtender/WriterService.SampleExtender.mdp
2007-07-05 18:02:20 UTC (rev 81414)
@@ -32,4 +32,5 @@
<AsmRefVar Sync="True" Name="DLL_REFERENCES" />
<ProjectRefVar Sync="True" Name="PROJECT_REFERENCES" />
</MonoDevelop.Autotools.MakefileInfo>
+ <Deployment.LinuxDeployData scriptName="writerservice.sampleextender"
generatePcFile="False" />
</Project>
\ No newline at end of file
Modified: trunk/mono-addins/Samples/WriterServiceHost/Makefile.am
===================================================================
--- trunk/mono-addins/Samples/WriterServiceHost/Makefile.am 2007-07-05
18:01:50 UTC (rev 81413)
+++ trunk/mono-addins/Samples/WriterServiceHost/Makefile.am 2007-07-05
18:02:20 UTC (rev 81414)
@@ -10,9 +10,9 @@
all: $(ASSEMBLY)
-FILES = \
- ./Main.cs \
- ./AssemblyInfo.cs
+FILES = \
+ AssemblyInfo.cs \
+ Main.cs
DATA_FILES =
@@ -20,8 +20,7 @@
EXTRAS =
-REFERENCES = \
- -r:System
+REFERENCES = -r:System
DLL_REFERENCES =
Modified: trunk/mono-addins/Samples/WriterServiceHost/WriterServiceHost.mdp
===================================================================
--- trunk/mono-addins/Samples/WriterServiceHost/WriterServiceHost.mdp
2007-07-05 18:01:50 UTC (rev 81413)
+++ trunk/mono-addins/Samples/WriterServiceHost/WriterServiceHost.mdp
2007-07-05 18:02:20 UTC (rev 81414)
@@ -32,4 +32,5 @@
<AsmRefVar Sync="True" Name="DLL_REFERENCES" />
<ProjectRefVar Sync="True" Name="PROJECT_REFERENCES" />
</MonoDevelop.Autotools.MakefileInfo>
+ <Deployment.LinuxDeployData generateScript="False"
scriptName="writerservicehost" />
</Project>
\ No newline at end of file
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
