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

diff --git a/client/Maestro/Maestro.csproj b/client/Maestro/Maestro.csproj
index 90a16623bfebba65429f689bf1400c5aef9593d4..839e5c5eccb9371d59683c827ad999c8bd633574 100644 (file)
--- a/client/Maestro/Maestro.csproj
+++ b/client/Maestro/Maestro.csproj
@@ -112,6 +112,7 @@
     <Compile Include="MaestroForm.Target.cs">\r
       <SubType>Form</SubType>\r
     </Compile>\r
+    <Compile Include="Metadata\IDTypes.cs" />\r
     <Compile Include="Metadata\MenuButton.cs">\r
       <SubType>Component</SubType>\r
     </Compile>\r

diff --git a/client/Maestro/MaestroForm.Source.cs b/client/Maestro/MaestroForm.Source.cs
index ef0854afc66fb8d038da0ed603b6632ba2f66412..75e33bf7ab2f7a44f0339c84efce6a327cf1c8f2 100644 (file)
--- a/client/Maestro/MaestroForm.Source.cs
+++ b/client/Maestro/MaestroForm.Source.cs
@@ -18,8 +18,7 @@ namespace Maestro {
         private string startingName;\r
         private List<String> selectedSources = new List<string>();\r
 \r
-        //todo rename\r
-        public bool IsTrafficID { get; set; }\r
+        public IDTypes IDType { get; set; }\r
 \r
         public SourceInfo SelectedSource {\r
             get {\r
@@ -165,12 +164,11 @@ namespace Maestro {
         }\r
 \r
         private void SetStartingName(bool checkBox) {\r
-            if (!checkBox) {\r
-                startingName = null;\r
-                return;\r
-            }\r
-            if (selectedSources == null || selectedSources.Count == 0)\r
-                return;\r
+            if (!checkBox)\r
+                if (selectedSources == null || selectedSources.Count == 0) {\r
+                    startingName = null;\r
+                    return;\r
+                }\r
             string query = selectedSources[0];\r
             int separatorPosition = query.IndexOf("-") == -1 ? query.IndexOf("_") : query.IndexOf("-");\r
             int dotPosition = query.IndexOf(".");\r
@@ -189,8 +187,10 @@ namespace Maestro {
         }\r
 \r
         private void SetSelectedSourceFileInfo(SourceInfo selectedSource) {\r
-            if (selectedSources.Count == 1)\r
-                selectedSource.FileInfo = new System.IO.FileInfo(selectedSources[0]);\r
+            if (selectedSources.Count == 1) {\r
+                Uri inputUri = new Uri(String.Format("{0}/{1}", Configuration.Source.Local.Address.LocalPath, selectedSources[0]));\r
+                selectedSource.FileInfo = new System.IO.FileInfo(inputUri.LocalPath);\r
+            }\r
         }\r
 \r
         private void dataGridSource_CellPainting(object sender, DataGridViewCellPaintingEventArgs e) {\r

diff --git a/client/Maestro/MaestroForm.Target.cs b/client/Maestro/MaestroForm.Target.cs
index c40b22c72cb3cc00ea66b84c4f87bd3209c29ee3..703c0640bd401c428eac4a6f7b2179576f44defb 100644 (file)
--- a/client/Maestro/MaestroForm.Target.cs
+++ b/client/Maestro/MaestroForm.Target.cs
@@ -119,7 +119,14 @@ namespace Maestro {
             //kisbetük kellenek?\r
             string pattern = "[A-Z]{1}[0-9]{6}[A-Z]{1}";\r
             Match match = Regex.Match(startingName, pattern);\r
-            IsTrafficID = match.Success;\r
+            if (match.Success) {\r
+                IDType = IDTypes.TrafficID;\r
+                return;\r
+            } else {\r
+                pattern = "[0-9]{7}";\r
+                match = Regex.Match(startingName, pattern);\r
+                IDType = match.Success ? IDTypes.OctopusID : IDTypes.None;\r
+            }\r
         }\r
 \r
         public void OnTargetPanelsMouseClick(object sender, MouseEventArgs e) {\r

diff --git a/client/Maestro/MaestroForm.cs b/client/Maestro/MaestroForm.cs
index a186f177bb2b95fa7b1e8cbf4d078378949e2933..b1fa0d3f7c4a2d4020e48c25579f3af1d62a7167 100644 (file)
--- a/client/Maestro/MaestroForm.cs
+++ b/client/Maestro/MaestroForm.cs
@@ -171,10 +171,18 @@ namespace Maestro {
 \r
         private void buttonMetadata_Click(object sender, EventArgs e) {\r
             IsSelectedIDTrafficID();\r
-            if (IsTrafficID)\r
-                SetTrafficIDToMetadataText();\r
-            else\r
-                SetOctopusIDToMetadataText();\r
+            switch (IDType) {\r
+                case Metadata.IDTypes.TrafficID:\r
+                    SetTrafficIDToMetadataText();\r
+                    break;\r
+                case Metadata.IDTypes.OctopusID:\r
+                    SetOctopusIDToMetadataText();\r
+                    break;\r
+                case Metadata.IDTypes.None:\r
+                    //todo, itt talán kellene az, hogy nem ID\r
+                    MessageBox.Show(this, StringResources.NINCS_TALALAT);\r
+                    break;\r
+            }\r
         }\r
 \r
         private void SetOctopusIDToMetadataText() {\r
@@ -191,14 +199,11 @@ namespace Maestro {
             }\r
             List<Story> list = stories.ToList();\r
             if (list.Count == 1) {\r
-                //textSelectedMetadata.Text = list[0].ID;\r
-                //return;\r
-                SearchMessageBox box = new SearchMessageBox(list, octopusMetadataSelected);\r
-                box.ShowDialog();\r
+                textSelectedMetadata.Text = list[0].ID;\r
+                return;\r
             }\r
-            //SearchMessageBox box = new SearchMessageBox(list, octopusMetadataSelected);\r
-            //box.ShowDialog();\r
-\r
+            SearchMessageBox box = new SearchMessageBox(list, octopusMetadataSelected);\r
+            box.ShowDialog();\r
         }\r
 \r
         private void SearchMosIDs(OctopusAPI api) {\r
@@ -207,15 +212,13 @@ namespace Maestro {
             if (list == null || list.Count == 0) {\r
                 MessageBox.Show(this, StringResources.NINCS_TALALAT);\r
                 return;\r
-            } if (list.Count == 1) {\r
-                SearchMessageBox box = new SearchMessageBox(list, octopusMetadataSelected);\r
-                box.ShowDialog();\r
-                //textSelectedMetadata.Text = list[0].ID;\r
-                //return;\r
             }\r
-            //SearchMessageBox box = new SearchMessageBox(list, octopusMetadataSelected);\r
-            //box.ShowDialog();\r
-\r
+            if (list.Count == 1) {\r
+                textSelectedMetadata.Text = list[0].ID;\r
+                return;\r
+            }\r
+            SearchMessageBox box = new SearchMessageBox(list, octopusMetadataSelected);\r
+            box.ShowDialog();\r
         }\r
 \r
         private void SetTrafficIDToMetadataText() {\r

diff --git a/client/Maestro/Metadata/IDTypes.cs b/client/Maestro/Metadata/IDTypes.cs
new file mode 100644 (file)
index 0000000..d998c5e
--- /dev/null
+++ b/client/Maestro/Metadata/IDTypes.cs
@@ -0,0 +1,7 @@
+namespace Maestro.Metadata {\r
+    public enum IDTypes {\r
+        TrafficID = 1,\r
+        OctopusID = 2,\r
+        None = 0\r
+    }\r
+}\r

diff --git a/client/OctopusClient/Resources.Designer.cs b/client/OctopusClient/Resources.Designer.cs
index a3481bb95cb25da771dd27881df5040109038eea..6cf734a17d6fb3aed9e7f259c31b5aa03d88e307 100644 (file)
--- a/client/OctopusClient/Resources.Designer.cs
+++ b/client/OctopusClient/Resources.Designer.cs
@@ -69,6 +69,15 @@ namespace OctopusClient {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Global ID.\r
+        /// </summary>\r
+        internal static string GLOBAL_ID {\r
+            get {\r
+                return ResourceManager.GetString("GLOBAL_ID", resourceCulture);\r
+            }\r
+        }\r
+        \r
         /// <summary>\r
         ///   Looks up a localized string similar to ID.\r
         /// </summary>\r
@@ -114,6 +123,15 @@ namespace OctopusClient {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Módosítva.\r
+        /// </summary>\r
+        internal static string MODOSITVA {\r
+            get {\r
+                return ResourceManager.GetString("MODOSITVA", resourceCulture);\r
+            }\r
+        }\r
+        \r
         /// <summary>\r
         ///   Looks up a localized string similar to MosID.\r
         /// </summary>\r
@@ -132,6 +150,24 @@ namespace OctopusClient {
             }\r
         }\r
         \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Objektum ID.\r
+        /// </summary>\r
+        internal static string OBJECT_ID {\r
+            get {\r
+                return ResourceManager.GetString("OBJECT_ID", resourceCulture);\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        ///   Looks up a localized string similar to Objektum típusa.\r
+        /// </summary>\r
+        internal static string OBJECT_TYPE {\r
+            get {\r
+                return ResourceManager.GetString("OBJECT_TYPE", resourceCulture);\r
+            }\r
+        }\r
+        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Válasszon elemet.\r
         /// </summary>\r

diff --git a/client/OctopusClient/Resources.resx b/client/OctopusClient/Resources.resx
index 745542bda13b95097aaa0e21f80c8719227017c2..7fde695dee2160f23a252ca28a5cbd42f1d78043 100644 (file)
--- a/client/OctopusClient/Resources.resx
+++ b/client/OctopusClient/Resources.resx
@@ -120,6 +120,9 @@
   <data name="ADASTUKOR" xml:space="preserve">\r
     <value>Adástükör</value>\r
   </data>\r
+  <data name="GLOBAL_ID" xml:space="preserve">\r
+    <value>Global ID</value>\r
+  </data>\r
   <data name="ID" xml:space="preserve">\r
     <value>ID</value>\r
   </data>\r
@@ -135,12 +138,21 @@
   <data name="MEGSE" xml:space="preserve">\r
     <value>Mégse</value>\r
   </data>\r
+  <data name="MODOSITVA" xml:space="preserve">\r
+    <value>Módosítva</value>\r
+  </data>\r
   <data name="MOS_ID" xml:space="preserve">\r
     <value>MosID</value>\r
   </data>\r
   <data name="NEV" xml:space="preserve">\r
     <value>Név</value>\r
   </data>\r
+  <data name="OBJECT_ID" xml:space="preserve">\r
+    <value>Objektum ID</value>\r
+  </data>\r
+  <data name="OBJECT_TYPE" xml:space="preserve">\r
+    <value>Objektum típusa</value>\r
+  </data>\r
   <data name="VALASSZON_ELEMET" xml:space="preserve">\r
     <value>Válasszon elemet</value>\r
   </data>\r

diff --git a/client/OctopusClient/SearchMessageBox.cs b/client/OctopusClient/SearchMessageBox.cs
index 7998f0721f4f6cffda5d9ddfa301a5e61c756b10..cda74c42b351271a742ec49f4f74136b4079468a 100644 (file)
--- a/client/OctopusClient/SearchMessageBox.cs
+++ b/client/OctopusClient/SearchMessageBox.cs
@@ -45,7 +45,7 @@ namespace OctopusClient {
             dataGridView1.Columns.AddRange(\r
                 new DataGridViewColumn[] {\r
                     new DataGridViewTextBoxColumn() {\r
-                            AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader,\r
+                            AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill,\r
                             DataPropertyName = "ID",\r
                             HeaderText = Resources.ID\r
                     },\r
@@ -62,7 +62,7 @@ namespace OctopusClient {
             dataGridView1.Columns.AddRange(\r
                  new DataGridViewColumn[] {\r
                     new DataGridViewTextBoxColumn() {\r
-                            AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader,\r
+                            AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill,\r
                             DataPropertyName = "ID",\r
                             HeaderText = Resources.ID\r
                     },\r
@@ -70,6 +70,24 @@ namespace OctopusClient {
                         AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill,\r
                             DataPropertyName = "MosID",\r
                             HeaderText = Resources.MOS_ID\r
+                    },new DataGridViewTextBoxColumn() {\r
+                            AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader,\r
+                            DataPropertyName = "ObjID",\r
+                            HeaderText = Resources.OBJECT_ID\r
+                    },\r
+                    new DataGridViewTextBoxColumn() {\r
+                        AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader,\r
+                            DataPropertyName = "ObjectType",\r
+                            HeaderText = Resources.OBJECT_TYPE\r
+                    },new DataGridViewTextBoxColumn() {\r
+                            AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill,\r
+                            DataPropertyName = "Modified",\r
+                            HeaderText = Resources.MODOSITVA\r
+                    },\r
+                    new DataGridViewTextBoxColumn() {\r
+                        AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill,\r
+                            DataPropertyName = "GlobalID",\r
+                            HeaderText = Resources.GLOBAL_ID\r
                     }\r
                  }\r
                  );\r
@@ -113,14 +131,14 @@ namespace OctopusClient {
             this.dataGridView1.Name = "dataGridView1";\r
             this.dataGridView1.RowHeadersVisible = false;\r
             this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
-            this.dataGridView1.Size = new System.Drawing.Size(362, 159);\r
+            this.dataGridView1.Size = new System.Drawing.Size(508, 159);\r
             this.dataGridView1.TabIndex = 0;\r
             this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick);\r
             // \r
             // buttonOk\r
             // \r
             this.buttonOk.Dock = System.Windows.Forms.DockStyle.Right;\r
-            this.buttonOk.Location = new System.Drawing.Point(284, 16);\r
+            this.buttonOk.Location = new System.Drawing.Point(430, 16);\r
             this.buttonOk.Name = "buttonOk";\r
             this.buttonOk.Size = new System.Drawing.Size(75, 32);\r
             this.buttonOk.TabIndex = 2;\r
@@ -131,7 +149,7 @@ namespace OctopusClient {
             // buttonCancel\r
             // \r
             this.buttonCancel.Dock = System.Windows.Forms.DockStyle.Right;\r
-            this.buttonCancel.Location = new System.Drawing.Point(209, 16);\r
+            this.buttonCancel.Location = new System.Drawing.Point(355, 16);\r
             this.buttonCancel.Name = "buttonCancel";\r
             this.buttonCancel.Size = new System.Drawing.Size(75, 32);\r
             this.buttonCancel.TabIndex = 0;\r
@@ -151,7 +169,7 @@ namespace OctopusClient {
             this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top;\r
             this.groupBox1.Location = new System.Drawing.Point(0, 0);\r
             this.groupBox1.Name = "groupBox1";\r
-            this.groupBox1.Size = new System.Drawing.Size(368, 245);\r
+            this.groupBox1.Size = new System.Drawing.Size(514, 245);\r
             this.groupBox1.TabIndex = 3;\r
             this.groupBox1.TabStop = false;\r
             // \r
@@ -162,13 +180,13 @@ namespace OctopusClient {
             this.groupBox2.Dock = System.Windows.Forms.DockStyle.Top;\r
             this.groupBox2.Location = new System.Drawing.Point(3, 175);\r
             this.groupBox2.Name = "groupBox2";\r
-            this.groupBox2.Size = new System.Drawing.Size(362, 51);\r
+            this.groupBox2.Size = new System.Drawing.Size(508, 51);\r
             this.groupBox2.TabIndex = 4;\r
             this.groupBox2.TabStop = false;\r
             // \r
             // SearchMessageBox\r
             // \r
-            this.ClientSize = new System.Drawing.Size(368, 250);\r
+            this.ClientSize = new System.Drawing.Size(514, 224);\r
             this.Controls.Add(this.groupBox1);\r
             this.Name = "SearchMessageBox";\r
             this.Text = "SearchResult";\r

diff --git a/client/PlanAIRClient/SearchResult.cs b/client/PlanAIRClient/SearchResult.cs
index 70db109c495611b0f74ddb322afb744ecbc40d07..c4bf06296c9934d18d3e9cecbeea0d730287c13a 100644 (file)
--- a/client/PlanAIRClient/SearchResult.cs
+++ b/client/PlanAIRClient/SearchResult.cs
@@ -35,12 +35,12 @@ namespace TrafficClient {
             dataGridView1.Columns.AddRange(\r
                 new DataGridViewColumn[] {\r
                     new DataGridViewTextBoxColumn() {\r
-                            AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader,\r
+                            AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill,\r
                             DataPropertyName = "MediaID",\r
                             HeaderText = Resources.TRAFFIC_ID\r
                     },\r
                     new DataGridViewTextBoxColumn() {\r
-                        AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill,\r
+                        AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader,\r
                             DataPropertyName = "Title",\r
                             HeaderText = Resources.CIM\r
                     },\r