[longomatch] Embed longomatch.png as resource and don't deploy debian folder
- From: Andoni Morales Alastruey <amorales src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [longomatch] Embed longomatch.png as resource and don't deploy debian folder
- Date: Tue, 8 Sep 2009 19:25:41 +0000 (UTC)
commit 8c5e7da0520c4cf9fde858d001800f94be72d8e4
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date: Tue Sep 8 16:48:46 2009 +0200
Embed longomatch.png as resource and don't deploy debian folder
LongoMatch/LongoMatch.mdp | 4 ++--
LongoMatch/Makefile.am | 3 ++-
LongoMatch/gtk-gui/generated.cs | 2 +-
LongoMatch/gtk-gui/gui.stetic | 2 +-
Makefile.am | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/LongoMatch/LongoMatch.mdp b/LongoMatch/LongoMatch.mdp
index 9b6d4b7..93c59c8 100644
--- a/LongoMatch/LongoMatch.mdp
+++ b/LongoMatch/LongoMatch.mdp
@@ -12,7 +12,7 @@
<Build debugmode="True" target="WinExe" />
<Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
<EnvironmentVariables />
- <CodeGeneration compiler="Mcs" warninglevel="3" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
+ <CodeGeneration compiler="Mcs" warninglevel="3" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" additionalargs="-win32icon:images/minilogo.ico" ctype="CSharpCompilerParameters" />
</Configuration>
</Configurations>
<Contents>
@@ -74,7 +74,7 @@
<File name="gtk-gui/LongoMatch.Gui.Dialog.TemplateEditorDialog.cs" subtype="Code" buildaction="Compile" />
<File name="gtk-gui/LongoMatch.Gui.Component.PlayListWidget.cs" subtype="Code" buildaction="Compile" />
<File name="gtk-gui/LongoMatch.Gui.Component.TimeLineWidget.cs" subtype="Code" buildaction="Compile" />
- <File name="images/longomatch.png" subtype="Code" DeployService.RelativeDeployPath="images/longomatch.png" DeployService.TargetDirectoryId="CommonApplicationDataRoot" buildaction="FileCopy" />
+ <File name="images/longomatch.png" subtype="Code" buildaction="EmbedAsResource" DeployService.RelativeDeployPath="images/longomatch.png" DeployService.TargetDirectoryId="CommonApplicationDataRoot" />
<File name="images" subtype="Directory" buildaction="Compile" />
<File name="images/background.png" subtype="Code" DeployService.RelativeDeployPath="images/background.png" DeployService.TargetDirectoryId="CommonApplicationDataRoot" buildaction="FileCopy" />
<File name="gtk-gui/LongoMatch.Gui.Dialog.VideoEditionProperties.cs" subtype="Code" buildaction="Compile" />
diff --git a/LongoMatch/Makefile.am b/LongoMatch/Makefile.am
index 48685ed..0bf7687 100644
--- a/LongoMatch/Makefile.am
+++ b/LongoMatch/Makefile.am
@@ -194,7 +194,8 @@ DATA_FILES =
RESOURCES = \
gtk-gui/objects.xml \
- gtk-gui/gui.stetic
+ gtk-gui/gui.stetic\
+ images/longomatch.png,longomatch.png
EXTRAS = \
images/longomatch.png\
diff --git a/LongoMatch/gtk-gui/generated.cs b/LongoMatch/gtk-gui/generated.cs
index 9bad47d..789776a 100644
--- a/LongoMatch/gtk-gui/generated.cs
+++ b/LongoMatch/gtk-gui/generated.cs
@@ -19,7 +19,7 @@ namespace Stetic {
if ((Stetic.Gui.initialized == false)) {
Stetic.Gui.initialized = true;
Gtk.IconFactory w1 = new Gtk.IconFactory();
- Gtk.IconSet w2 = new Gtk.IconSet(new Gdk.Pixbuf(System.IO.Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "../../share/longomatch/images/longomatch.png")));
+ Gtk.IconSet w2 = new Gtk.IconSet(Gdk.Pixbuf.LoadFromResource("longomatch.png"));
w1.Add("longomatch", w2);
w1.AddDefault();
}
diff --git a/LongoMatch/gtk-gui/gui.stetic b/LongoMatch/gtk-gui/gui.stetic
index 9b047fb..9f9a143 100755
--- a/LongoMatch/gtk-gui/gui.stetic
+++ b/LongoMatch/gtk-gui/gui.stetic
@@ -11,7 +11,7 @@
<icon-factory>
<icon-set id="longomatch">
<source>
- <property name="Image">file:../../share/longomatch/images/longomatch.png</property>
+ <property name="Image">resource:longomatch.png</property>
</source>
</icon-set>
</icon-factory>
diff --git a/Makefile.am b/Makefile.am
index 6951659..6f64985 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
-EXTRA_DIST = expansions.m4 Build/debian
+EXTRA_DIST = expansions.m4
#Warning: This is an automatically generated file, do not edit!
if ENABLE_DEBUG
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]