git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/client/DxPlay/DxPlayer.cs b/client/DxPlay/DxPlayer.cs
index ab20783a954257112e7aecdd3409fd4c47b7bf84..9b310caaf48979350397f04780d2d1be00afa5c6 100644 (file)
--- a/client/DxPlay/DxPlayer.cs
+++ b/client/DxPlay/DxPlayer.cs
@@ -11,6 +11,7 @@ using Microsoft.Win32.SafeHandles;
 using System.ComponentModel;\r
 using System.Drawing.Imaging;\r
 using System.Drawing.Drawing2D;\r
+using System.Collections.Generic;\r
 \r
 namespace DxPlay {\r
     internal class DxPlayer : ISampleGrabberCB, IDisposable {\r
@@ -27,6 +28,8 @@ namespace DxPlay {
             Exiting\r
         }\r
 \r
+        public Dictionary<GraphState, string> stateHunStringValues = new Dictionary<GraphState, string>();\r
+\r
         public MediaDescription MediaDescription { get; internal set; }\r
         public Timecode CurrentTC { get; internal set; }\r
         public GraphState State { get; internal set; }\r
@@ -72,6 +75,7 @@ namespace DxPlay {
         // Play an avi file into a window.  Allow for snapshots.\r
         // (Control to show video in, Avi file to play\r
         public DxPlayer(Control hWin, MediaDescription mediaDesc) {\r
+            FillTheHunStringvalues();\r
             State = GraphState.Stopped;\r
             try {\r
                 int hr;\r
@@ -118,6 +122,13 @@ namespace DxPlay {
             }\r
         }\r
 \r
+        private void FillTheHunStringvalues() {\r
+            stateHunStringValues.Add(GraphState.Exiting, StringResource.KILEPES);\r
+            stateHunStringValues.Add(GraphState.Paused, StringResource.SZUNETELTETETT);\r
+            stateHunStringValues.Add(GraphState.Playing, StringResource.LEJATSZAS);\r
+            stateHunStringValues.Add(GraphState.Stopped, StringResource.MEGALLITVA);\r
+        }\r
+\r
         private void TcWorker_DoWork(object sender, DoWorkEventArgs e) {\r
             while (!e.Cancel) {\r
                 UpdateTC();\r

diff --git a/client/DxPlay/PlayerForm.Designer.cs b/client/DxPlay/PlayerForm.Designer.cs
index 68d2530811bc9b18ebf8e8497609c335c7152a2e..7dfe28400e639d95d10512c7a8e153ae20a8022e 100644 (file)
--- a/client/DxPlay/PlayerForm.Designer.cs
+++ b/client/DxPlay/PlayerForm.Designer.cs
@@ -103,9 +103,9 @@ namespace DxPlay {
             // btnStop\r
             // \r
             this.btnStop.Image = global::DxPlay.Properties.Resources.Stop;\r
-            this.btnStop.Location = new System.Drawing.Point(66, 4);\r
+            this.btnStop.Location = new System.Drawing.Point(89, 3);\r
             this.btnStop.Name = "btnStop";\r
-            this.btnStop.Size = new System.Drawing.Size(61, 25);\r
+            this.btnStop.Size = new System.Drawing.Size(80, 25);\r
             this.btnStop.TabIndex = 16;\r
             this.btnStop.Text = "Stop";\r
             this.btnStop.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;\r
@@ -114,9 +114,9 @@ namespace DxPlay {
             // btnPlay\r
             // \r
             this.btnPlay.Image = global::DxPlay.Properties.Resources.Play;\r
-            this.btnPlay.Location = new System.Drawing.Point(3, 4);\r
+            this.btnPlay.Location = new System.Drawing.Point(3, 3);\r
             this.btnPlay.Name = "btnPlay";\r
-            this.btnPlay.Size = new System.Drawing.Size(61, 25);\r
+            this.btnPlay.Size = new System.Drawing.Size(80, 25);\r
             this.btnPlay.TabIndex = 1;\r
             this.btnPlay.Text = "Play";\r
             this.btnPlay.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;\r
@@ -125,9 +125,9 @@ namespace DxPlay {
             // btnPause\r
             // \r
             this.btnPause.Image = global::DxPlay.Properties.Resources.Pause;\r
-            this.btnPause.Location = new System.Drawing.Point(129, 4);\r
+            this.btnPause.Location = new System.Drawing.Point(175, 3);\r
             this.btnPause.Name = "btnPause";\r
-            this.btnPause.Size = new System.Drawing.Size(61, 25);\r
+            this.btnPause.Size = new System.Drawing.Size(80, 25);\r
             this.btnPause.TabIndex = 11;\r
             this.btnPause.Text = "Pause";\r
             this.btnPause.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;\r

diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs
index 81105327f086a06bb23848fe7245a8ea7109d117..b26d3bc006f035a607765817b33a669d20c79aaa 100644 (file)
--- a/client/DxPlay/PlayerForm.cs
+++ b/client/DxPlay/PlayerForm.cs
@@ -32,6 +32,7 @@ namespace DxPlay {
 \r
         public PlayerForm() {\r
             InitializeComponent();\r
+            InitializeTexts();\r
         }\r
 \r
         public PlayerForm(ref BindingList<MovieSegment> segments) {\r
@@ -48,6 +49,12 @@ namespace DxPlay {
             deleteSegmentToolStripMenuItem.Text = StringResource.SZEGMENS_TORLESE;\r
             menuButtonSegmentActions.Text = StringResource.SZEGMENS_AKCIÓK;\r
 \r
+            btnPause.Text = StringResource.SZUNET;\r
+            btnPlay.Text = StringResource.LEJATSZAS;\r
+            btnStop.Text = StringResource.LEALLITAS;\r
+            labelStatus.Text = StringResource.NINCS_BEMENET;\r
+            label1.Text = StringResource.INDULASI_PONT;\r
+            label2.Text = StringResource.IDOTARTAM;\r
         }\r
 \r
         private void cueue() {\r
@@ -91,7 +98,9 @@ namespace DxPlay {
                 if (!trackBarAtUser)\r
                     trackBar1.Value = m_play.CurrentTC.ZeroBasedFrames;\r
                 textCurrentTC.Text = m_play.CurrentTC.ToString();\r
-                labelStatus.Text = m_play.State.ToString().ToUpper();\r
+                string labelStatusText = labelStatus.Text;\r
+                m_play.stateHunStringValues.TryGetValue(m_play.State, out labelStatusText);//m_play.State.ToString().ToUpper();\r
+                labelStatus.Text = labelStatusText;\r
             }));\r
         }\r
 \r

diff --git a/client/DxPlay/StringResource.Designer.cs b/client/DxPlay/StringResource.Designer.cs
index bb6f5c29efc8b04f865e9137b326d4e5583ae8ac..b7a9f3dd5d1f4c2d197dc9997b4885009aff6e19 100644 (file)
--- a/client/DxPlay/StringResource.Designer.cs
+++ b/client/DxPlay/StringResource.Designer.cs
@@ -87,6 +87,42 @@ namespace DxPlay {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Időtartam.\r
+        /// </summary>\r
+        internal static string IDOTARTAM {\r
+            get {\r
+                return ResourceManager.GetString("IDOTARTAM", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Indítás.\r
+        /// </summary>\r
+        internal static string INDITAS {\r
+            get {\r
+                return ResourceManager.GetString("INDITAS", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Indulási pont.\r
+        /// </summary>\r
+        internal static string INDULASI_PONT {\r
+            get {\r
+                return ResourceManager.GetString("INDULASI_PONT", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Kilépés.\r
+        /// </summary>\r
+        internal static string KILEPES {\r
+            get {\r
+                return ResourceManager.GetString("KILEPES", resourceCulture);\r
+            }\r
+        }\r
+        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Kimenő.\r
         /// </summary>\r
@@ -105,6 +141,42 @@ namespace DxPlay {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Leállítás.\r
+        /// </summary>\r
+        internal static string LEALLITAS {\r
+            get {\r
+                return ResourceManager.GetString("LEALLITAS", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Lejátszás.\r
+        /// </summary>\r
+        internal static string LEJATSZAS {\r
+            get {\r
+                return ResourceManager.GetString("LEJATSZAS", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Megállítva.\r
+        /// </summary>\r
+        internal static string MEGALLITVA {\r
+            get {\r
+                return ResourceManager.GetString("MEGALLITVA", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to NINCS BEMENET.\r
+        /// </summary>\r
+        internal static string NINCS_BEMENET {\r
+            get {\r
+                return ResourceManager.GetString("NINCS_BEMENET", resourceCulture);\r
+            }\r
+        }\r
+        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Szegmens akciók.\r
         /// </summary>\r
@@ -141,6 +213,24 @@ namespace DxPlay {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Szunet.\r
+        /// </summary>\r
+        internal static string SZUNET {\r
+            get {\r
+                return ResourceManager.GetString("SZUNET", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Szüneteltetett.\r
+        /// </summary>\r
+        internal static string SZUNETELTETETT {\r
+            get {\r
+                return ResourceManager.GetString("SZUNETELTETETT", resourceCulture);\r
+            }\r
+        }\r
+        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Választható.\r
         /// </summary>\r

diff --git a/client/DxPlay/StringResource.resx b/client/DxPlay/StringResource.resx
index fac6e8c568572baf66c9a0913980b44ca5f375c5..ff82ae3a841adaa189811a1e4fa954df205f2889 100644 (file)
--- a/client/DxPlay/StringResource.resx
+++ b/client/DxPlay/StringResource.resx
@@ -126,12 +126,36 @@
   <data name="BEMENO" xml:space="preserve">\r
     <value>Bemenő</value>\r
   </data>\r
+  <data name="IDOTARTAM" xml:space="preserve">\r
+    <value>Időtartam</value>\r
+  </data>\r
+  <data name="INDITAS" xml:space="preserve">\r
+    <value>Indítás</value>\r
+  </data>\r
+  <data name="INDULASI_PONT" xml:space="preserve">\r
+    <value>Indulási pont</value>\r
+  </data>\r
+  <data name="KILEPES" xml:space="preserve">\r
+    <value>Kilépés</value>\r
+  </data>\r
   <data name="KIMENŐ" xml:space="preserve">\r
     <value>Kimenő</value>\r
   </data>\r
   <data name="KOMMENT" xml:space="preserve">\r
     <value>Komment</value>\r
   </data>\r
+  <data name="LEALLITAS" xml:space="preserve">\r
+    <value>Leállítás</value>\r
+  </data>\r
+  <data name="LEJATSZAS" xml:space="preserve">\r
+    <value>Lejátszás</value>\r
+  </data>\r
+  <data name="MEGALLITVA" xml:space="preserve">\r
+    <value>Megállítva</value>\r
+  </data>\r
+  <data name="NINCS_BEMENET" xml:space="preserve">\r
+    <value>NINCS BEMENET</value>\r
+  </data>\r
   <data name="SZEGMENS_AKCIÓK" xml:space="preserve">\r
     <value>Szegmens akciók</value>\r
   </data>\r
@@ -144,6 +168,12 @@
   <data name="SZEGMENS_TORLESE" xml:space="preserve">\r
     <value>Szegmens törlése</value>\r
   </data>\r
+  <data name="SZUNET" xml:space="preserve">\r
+    <value>Szunet</value>\r
+  </data>\r
+  <data name="SZUNETELTETETT" xml:space="preserve">\r
+    <value>Szüneteltetett</value>\r
+  </data>\r
   <data name="VALASZTHATO" xml:space="preserve">\r
     <value>Választható</value>\r
   </data>\r

diff --git a/client/Maestro/MaestroForm.cs b/client/Maestro/MaestroForm.cs
index 76456b8ea7c0b87a7ea057a1a254edf8ce406268..5829c36b08af673488fbb538f0be7f1bdb39aba3 100644 (file)
--- a/client/Maestro/MaestroForm.cs
+++ b/client/Maestro/MaestroForm.cs
@@ -261,13 +261,14 @@ namespace Maestro {
             });\r
             newMSGColor = color;\r
             ActivateTabOnTabControl2(1);\r
+            //ObjectExtensions.SafeCall(dataGridMessages, UpdateDataGridMessagesChanged);\r
         }\r
 \r
         private void ActivateTabOnTabControl2(int index) {\r
             ObjectExtensions.SafeCall(tabControl2, () => { tabControl2.SelectedIndex = index; });\r
         }\r
 \r
-        private void UpdateDataChanged() {\r
+        private void UpdateDataGridMessagesChanged() {\r
             dataGridMessages.DataSource = null;\r
             dataGridMessages.DataSource = systemMessageBindingSource;\r
         }\r

diff --git a/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java b/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java
index 096b470f238f7bf41826e9248308e350423b11f9..c57615e57dbc8c4241547272e3fb7eaed47db49a 100644 (file)
--- a/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java
+++ b/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java
@@ -128,6 +128,29 @@ public class OctopusDataMiner implements Runnable {
                        modifiedStory.append(referenceName, references);\r
                }\r
                references.add(new BasicDBObject(ID, referenceID).append(POSITION, position));\r
+               BasicDBObject script = (BasicDBObject) modifiedStory.get("script");\r
+               String scriptContent = new String();\r
+               if(script!= null && !script.isEmpty()) {\r
+                       BasicDBList body = (BasicDBList) script.get("body");\r
+                       if(body != null && !body.isEmpty()){\r
+                               for(Object actualBody  : body) {\r
+                                       BasicDBObject actualDBBody = (BasicDBObject) actualBody;\r
+                                       BasicDBList content = (BasicDBList)actualDBBody.get("content");\r
+                                       if(content != null && !content.isEmpty()){\r
+                                               for(Object actualContent : content) {\r
+                                                       BasicDBObject actualDBContent = (BasicDBObject) actualContent;\r
+                                                       String text = actualDBContent.getString("text");\r
+                                                       if(text != null)\r
+                                                               scriptContent += text + "\n";\r
+                                               }\r
+                                               \r
+                                       }\r
+                                       \r
+                               }\r
+                       }\r
+                       \r
+               }\r
+               modifiedStory.append("script_content", scriptContent);\r
                logger.info(String.format(SAVING_STORY_D, storyID));\r
                collection.save(modifiedStory);\r
        }\r