GNOME.org
 

[longomatch/refactor] WIP

commit 7e0f6c6a373c37fff40e6acb12b8cdc8b0036070
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Wed Nov 2 23:18:19 2011 +0100

    WIP

 .../LongoMatch.GUI.Multimedia.mdp                  |   22 ++++++--------
 LongoMatch.GUI.Multimedia/gtk-gui/objects.xml      |   20 ++++++------
 LongoMatch.GUI/LongoMatch.GUI.mdp                  |    2 +
 .../gtk-gui/LongoMatch.Gui.MainWindow.cs           |    2 +-
 LongoMatch.GUI/gtk-gui/generated.cs                |    4 --
 LongoMatch.GUI/gtk-gui/gui.stetic                  |    9 +-----
 LongoMatch.GUI/gtk-gui/objects.xml                 |   30 ++++++++++----------
 LongoMatch.mds                                     |    8 ++--
 LongoMatch/Makefile.am                             |   10 ------
 libcesarplayer/liblongomatch.mdp                   |    2 +-
 10 files changed, 43 insertions(+), 66 deletions(-)
---
diff --git a/LongoMatch.GUI.Multimedia/LongoMatch.GUI.Multimedia.mdp b/LongoMatch.GUI.Multimedia/LongoMatch.GUI.Multimedia.mdp
index 1178417..e00be8f 100644
--- a/LongoMatch.GUI.Multimedia/LongoMatch.GUI.Multimedia.mdp
+++ b/LongoMatch.GUI.Multimedia/LongoMatch.GUI.Multimedia.mdp
@@ -11,33 +11,29 @@
   </MonoDevelop.Autotools.MakefileInfo>
   <Configurations active="Release">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="../bin" assembly="a" assemblyKeyFile="/home/andoni/Proyectos/longomatch/CesarPlayer/." />
+      <Output directory="../bin" assembly="LongoMatch.GUI.Multimedia" assemblyKeyFile="/home/andoni/Proyectos/longomatch/CesarPlayer/." />
       <Build debugmode="True" target="Library" />
       <Execution consolepause="True" runwithwarnings="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="True" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
-      <Output directory="../bin" assembly="CesarPlayer.dll" assemblyKeyFile="/home/andoni/Proyectos/longomatch/CesarPlayer/." />
+      <Output directory="../bin" assembly="LongoMatch.GUI.Multimedia" assemblyKeyFile="/home/andoni/Proyectos/longomatch/CesarPlayer/." />
       <Build debugmode="True" target="Library" />
       <Execution consolepause="True" runwithwarnings="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="True" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
   </Configurations>
   <Contents>
-    <File subtype="Code" buildaction="EmbedAsResource" name="gtk-gui/objects.xml" />
-    <File subtype="Code" buildaction="EmbedAsResource" name="gtk-gui/gui.stetic" />
-    <File subtype="Code" buildaction="Compile" name="gtk-gui/generated.cs" />
     <File subtype="Directory" buildaction="Compile" name="Gui" />
-    <File subtype="Code" buildaction="Compile" name="gtk-gui/LongoMatch.Gui.PlayerBin.cs" />
-    <File subtype="Code" buildaction="Compile" name="gtk-gui/LongoMatch.Gui.VolumeWindow.cs" />
-    <File subtype="Code" buildaction="Compile" name="Gui/VolumeWindow.cs" />
     <File subtype="Code" buildaction="Compile" name="Gui/CapturerBin.cs" />
     <File subtype="Code" buildaction="Compile" name="Gui/PlayerBin.cs" />
-    <File subtype="Code" buildaction="Compile" name="gtk-gui/LongoMatch.Gui.CapturerBin.cs" />
-    <File subtype="Directory" buildaction="Compile" name="." />
-    <File subtype="Directory" buildaction="Compile" name="." />
-    <File subtype="Directory" buildaction="Compile" name="." />
+    <File subtype="Code" buildaction="Compile" name="Gui/VolumeWindow.cs" />
     <File subtype="Directory" buildaction="Compile" name="." />
+    <File subtype="Code" buildaction="EmbedAsResource" name="gtk-gui/gui.stetic" />
+    <File subtype="Code" buildaction="Compile" name="gtk-gui/generated.cs" />
+    <File subtype="Code" buildaction="Compile" name="gtk-gui/LongoMatch.Gui.CapturerBin.cs" />
+    <File subtype="Code" buildaction="Compile" name="gtk-gui/LongoMatch.Gui.VolumeWindow.cs" />
+    <File subtype="Code" buildaction="Compile" name="gtk-gui/LongoMatch.Gui.PlayerBin.cs" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
@@ -50,4 +46,4 @@
     <ProjectReference type="Project" localcopy="True" refto="LongoMatch.Core" />
   </References>
   <LanguageParameters ApplicationIcon="." CodePage="65001" ctype="CSharpProjectParameters" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/LongoMatch.GUI.Multimedia/gtk-gui/objects.xml b/LongoMatch.GUI.Multimedia/gtk-gui/objects.xml
index ecf433e..7556235 100644
--- a/LongoMatch.GUI.Multimedia/gtk-gui/objects.xml
+++ b/LongoMatch.GUI.Multimedia/gtk-gui/objects.xml
@@ -1,4 +1,13 @@
 <objects attr-sync="on">
+  <object type="LongoMatch.Gui.CapturerBin" palette-category="CesarPlayer" allow-children="false" base-type="Gtk.Bin">
+    <itemgroups />
+    <signals>
+      <itemgroup label="CapturerBin Signals">
+        <signal name="CaptureFinished" />
+        <signal name="Error" />
+      </itemgroup>
+    </signals>
+  </object>
   <object type="LongoMatch.Gui.PlayerBin" palette-category="LongoMatch" allow-children="false" base-type="Gtk.Bin">
     <itemgroups>
       <itemgroup label="PlayerBin Properties">
@@ -11,20 +20,11 @@
         <signal name="SegmentClosedEvent" />
         <signal name="Tick" />
         <signal name="Error" />
+        <signal name="PlayStateChanged" />
         <signal name="Next" />
         <signal name="Prev" />
         <signal name="DrawFrame" />
         <signal name="SeekEvent" />
-        <signal name="PlayStateChanged" />
-      </itemgroup>
-    </signals>
-  </object>
-  <object type="LongoMatch.Gui.CapturerBin" palette-category="CesarPlayer" allow-children="false" base-type="Gtk.Bin">
-    <itemgroups />
-    <signals>
-      <itemgroup label="CapturerBin Signals">
-        <signal name="CaptureFinished" />
-        <signal name="Error" />
       </itemgroup>
     </signals>
   </object>
diff --git a/LongoMatch.GUI/LongoMatch.GUI.mdp b/LongoMatch.GUI/LongoMatch.GUI.mdp
index 582d83b..cf3bc91 100644
--- a/LongoMatch.GUI/LongoMatch.GUI.mdp
+++ b/LongoMatch.GUI/LongoMatch.GUI.mdp
@@ -138,6 +138,8 @@
     <File subtype="Directory" buildaction="Compile" name="." />
     <File subtype="Directory" buildaction="Compile" name="." />
     <File subtype="Code" buildaction="Compile" name="Gui/Dialog/About.cs" />
+    <File subtype="Directory" buildaction="Compile" name="images" />
+    <File subtype="Code" buildaction="Nothing" name="../images/longomatch.png" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
diff --git a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.MainWindow.cs b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.MainWindow.cs
index ec0cd18..a218920 100644
--- a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.MainWindow.cs
+++ b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.MainWindow.cs
@@ -188,7 +188,7 @@ namespace LongoMatch.Gui
 			this.ImportProjectAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("_Import Project");
 			w1.Add (this.ImportProjectAction, "<Control>i");
 			this.ManualTaggingViewAction = new global::Gtk.RadioAction ("ManualTaggingViewAction", global::Mono.Unix.Catalog.GetString ("Manual tagging view"), null, null, 0);
-			this.ManualTaggingViewAction.Group = this.TaggingViewAction.Group;
+			this.ManualTaggingViewAction.Group = this.TimelineViewAction.Group;
 			this.ManualTaggingViewAction.Sensitive = false;
 			this.ManualTaggingViewAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("Free Capture Mode");
 			w1.Add (this.ManualTaggingViewAction, "<Control>f");
diff --git a/LongoMatch.GUI/gtk-gui/generated.cs b/LongoMatch.GUI/gtk-gui/generated.cs
index a6e11f4..559a39e 100644
--- a/LongoMatch.GUI/gtk-gui/generated.cs
+++ b/LongoMatch.GUI/gtk-gui/generated.cs
@@ -10,10 +10,6 @@ namespace Stetic
 		{
 			if ((Stetic.Gui.initialized == false)) {
 				Stetic.Gui.initialized = true;
-				global::Gtk.IconFactory w1 = new global::Gtk.IconFactory ();
-				global::Gtk.IconSet w2 = new global::Gtk.IconSet (global::Gdk.Pixbuf.LoadFromResource ("longomatch.png"));
-				w1.Add ("longomatch", w2);
-				w1.AddDefault ();
 			}
 		}
 	}
diff --git a/LongoMatch.GUI/gtk-gui/gui.stetic b/LongoMatch.GUI/gtk-gui/gui.stetic
index b517c3d..52d2649 100644
--- a/LongoMatch.GUI/gtk-gui/gui.stetic
+++ b/LongoMatch.GUI/gtk-gui/gui.stetic
@@ -5,18 +5,11 @@
     <target-gtk-version>2.12</target-gtk-version>
   </configuration>
   <import>
-    <widget-library name="../../bin/a.dll" />
+    <widget-library name="../../bin/LongoMatch.GUI.Multimedia.dll" />
     <widget-library name="../../bin/LongoMatch.Multimedia.dll" />
     <widget-library name="../../bin/LongoMatch.Core.dll" />
     <widget-library name="../../bin/LongoMatch.Gui.dll" internal="true" />
   </import>
-  <icon-factory>
-    <icon-set id="longomatch">
-      <source>
-        <property name="Image">resource:longomatch.png</property>
-      </source>
-    </icon-set>
-  </icon-factory>
   <widget class="Gtk.Bin" id="LongoMatch.Gui.Component.ProjectDetailsWidget" design-size="378 268">
     <property name="MemberName" />
     <child>
diff --git a/LongoMatch.GUI/gtk-gui/objects.xml b/LongoMatch.GUI/gtk-gui/objects.xml
index 66d7a6b..3667914 100644
--- a/LongoMatch.GUI/gtk-gui/objects.xml
+++ b/LongoMatch.GUI/gtk-gui/objects.xml
@@ -88,21 +88,6 @@
     <itemgroups />
     <signals />
   </object>
-  <object type="LongoMatch.Gui.Component.TimeLineWidget" palette-category="LongoMatch" allow-children="false" base-type="Gtk.Bin">
-    <itemgroups>
-      <itemgroup label="TimeLineWidget Properties">
-        <property name="CurrentFrame" />
-      </itemgroup>
-    </itemgroups>
-    <signals>
-      <itemgroup label="TimeLineWidget Signals">
-        <signal name="TimeNodeChanged" />
-        <signal name="TimeNodeSelected" />
-        <signal name="TimeNodeDeleted" />
-        <signal name="NewMarkEvent" />
-      </itemgroup>
-    </signals>
-  </object>
   <object type="LongoMatch.Gui.SubCategoriesTreeView" palette-category="LongoMatch" allow-children="false" base-type="Gtk.TreeView">
     <itemgroups />
     <signals>
@@ -300,4 +285,19 @@
       </itemgroup>
     </signals>
   </object>
+  <object type="LongoMatch.Gui.Component.TimeLineWidget" palette-category="LongoMatch" allow-children="false" base-type="Gtk.Bin">
+    <itemgroups>
+      <itemgroup label="TimeLineWidget Properties">
+        <property name="CurrentFrame" />
+      </itemgroup>
+    </itemgroups>
+    <signals>
+      <itemgroup label="TimeLineWidget Signals">
+        <signal name="TimeNodeChanged" />
+        <signal name="TimeNodeSelected" />
+        <signal name="TimeNodeDeleted" />
+        <signal name="NewMarkEvent" />
+      </itemgroup>
+    </signals>
+  </object>
 </objects>
\ No newline at end of file
diff --git a/LongoMatch.mds b/LongoMatch.mds
index da88d06..1407ee6 100644
--- a/LongoMatch.mds
+++ b/LongoMatch.mds
@@ -20,38 +20,38 @@
     <Configuration name="Debug" ctype="CombineConfiguration">
       <Entry build="True" name="LongoMatch.GUI" configuration="Debug" />
       <Entry build="True" name="libcesarplayer" configuration="Debug" />
-      <Entry build="True" name="LongoMatch.GUI.Multimedia" configuration="Debug" />
       <Entry build="True" name="LongoMatch.Core" configuration="Debug" />
       <Entry build="True" name="LongoMatch" configuration="Debug" />
       <Entry build="True" name="LongoMatch.Multimedia" configuration="Debug" />
       <Entry build="True" name="LongoMatch.Services" configuration="Debug" />
+      <Entry build="True" name="LongoMatch.GUI.Multimedia" configuration="Debug" />
     </Configuration>
     <Configuration name="Release" ctype="CombineConfiguration">
       <Entry build="True" name="LongoMatch.GUI" configuration="Release" />
       <Entry build="True" name="libcesarplayer" configuration="Release" />
-      <Entry build="True" name="LongoMatch.GUI.Multimedia" configuration="Release" />
       <Entry build="True" name="LongoMatch.Core" configuration="Release" />
       <Entry build="True" name="LongoMatch" configuration="Release" />
       <Entry build="True" name="LongoMatch.Multimedia" configuration="Release" />
       <Entry build="True" name="LongoMatch.Services" configuration="Release" />
+      <Entry build="True" name="LongoMatch.GUI.Multimedia" configuration="Release" />
     </Configuration>
   </Configurations>
   <StartMode startupentry="LongoMatch" single="True">
     <Execute type="None" entry="LongoMatch.GUI" />
     <Execute type="None" entry="libcesarplayer" />
-    <Execute type="None" entry="LongoMatch.GUI.Multimedia" />
     <Execute type="None" entry="LongoMatch.Core" />
     <Execute type="None" entry="LongoMatch" />
     <Execute type="None" entry="LongoMatch.Multimedia" />
     <Execute type="None" entry="LongoMatch.Services" />
+    <Execute type="None" entry="LongoMatch.GUI.Multimedia" />
   </StartMode>
   <Entries>
     <Entry filename="LongoMatch.GUI/LongoMatch.GUI.mdp" />
     <Entry filename="libcesarplayer/liblongomatch.mdp" />
-    <Entry filename="CesarPlayer/LongoMatch.GUI.Multimedia.mdp" />
     <Entry filename="LongoMatch.Core/LongoMatch.Core.mdp" />
     <Entry filename="LongoMatch/LongoMatch.mdp" />
     <Entry filename="LongoMatch.Multimedia/LongoMatch.Multimedia.mdp" />
     <Entry filename="LongoMatch.Services/LongoMatch.Services.mdp" />
+    <Entry filename="LongoMatch.GUI.Multimedia/LongoMatch.GUI.Multimedia.mdp" />
   </Entries>
 </Combine>
\ No newline at end of file
diff --git a/LongoMatch/Makefile.am b/LongoMatch/Makefile.am
index 98b0212..d6d561f 100644
--- a/LongoMatch/Makefile.am
+++ b/LongoMatch/Makefile.am
@@ -11,16 +11,6 @@ IMAGES = $(top_srcdir)/images/longomatch.png \
 
 LOGO = $(top_srcdir)/images/logo_48x48.png
 
-RESOURCES = \
-	$(top_srcdir)/images/longomatch.png\
-	$(top_srcdir)/images/stock_draw-line-45.png\
-	$(top_srcdir)/images/stock_draw-circle-unfilled.png\
-	$(top_srcdir)/images/stock_draw-line-ends-with-arrow.png\
-	$(top_srcdir)/images/stock_draw-rectangle-unfilled.png\
-	$(top_srcdir)/images/stock_draw-freeform-line.png\
-	$(top_srcdir)/images/camera-video.png\
-	$(top_srcdir)/images/video.png
-
 bin_SCRIPTS = longomatch
 
 DESKTOP_FILE = longomatch.desktop.in
diff --git a/libcesarplayer/liblongomatch.mdp b/libcesarplayer/liblongomatch.mdp
index 2338b21..2b6078b 100644
--- a/libcesarplayer/liblongomatch.mdp
+++ b/libcesarplayer/liblongomatch.mdp
@@ -10,7 +10,7 @@
   </MonoDevelop.Autotools.MakefileInfo>
   <Configurations active="Release">
     <Configuration name="Debug" SourceDirectory="." ctype="CProjectConfiguration">
-      <Output directory="../LongoMatch/bin/Debug" output="libcesarplayer.dll" />
+      <Output directory="../bin" output="libcesarplayer.dll" />
       <Build debugmode="True" target="SharedLibrary" />
       <Execution consolepause="True" runwithwarnings="True" />
       <CodeGeneration WarningLevel="Normal" WarningsAsErrors="False" OptimizationLevel="0" ExtraCompilerArguments="" ExtraLinkerArguments="" DefineSymbols="DEBUG MONODEVELOP" ctype="CCompilationParameters" />
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]