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

diff --git a/client/Maestro/MaestroForm.Source.cs b/client/Maestro/MaestroForm.Source.cs
index 6b86b10483341590dfac9b0724dfa7f95a05d944..43cc83c072a746763677d96da05f3f80edfe25f6 100644 (file)
--- a/client/Maestro/MaestroForm.Source.cs
+++ b/client/Maestro/MaestroForm.Source.cs
@@ -9,7 +9,7 @@ using System.Collections.ObjectModel;
 using System.Drawing;\r
 using System.Linq;\r
 using System.Windows.Forms;\r
-using System.Text;\r
+using System.Linq;\r
 \r
 namespace Maestro {\r
 \r
@@ -113,14 +113,16 @@ namespace Maestro {
         private void SetSourceFromCheckBoxAction(DataGridViewSelectedRowCollection selectedRows) {\r
             String name;\r
             bool valueOfCheckBoxes = GetValueOfCheckBoxes(selectedRows);\r
+            int nameIndex = dataGridSource.Columns.Cast<DataGridViewColumn>().Where(x => x.HeaderText == StringResources.NEV).SingleOrDefault().Index;\r
+            int checkBoxIndex = dataGridSource.Columns.Cast<DataGridViewColumn>().Where(x => x.GetType() == typeof(DataGridViewCheckBoxColumn)).SingleOrDefault().Index;\r
             foreach (DataGridViewRow actualRow in selectedRows) {\r
                 var cells = actualRow.Cells;\r
                 if (cells.Count <= 0)\r
                     return;\r
-                name = cells[1].Value as string;\r
+                name = cells[nameIndex].Value as string;\r
                 if (String.IsNullOrEmpty(name))\r
                     return;\r
-                DataGridViewCheckBoxCell checkBoxCell = cells[0] as DataGridViewCheckBoxCell;\r
+                DataGridViewCheckBoxCell checkBoxCell = cells[checkBoxIndex] as DataGridViewCheckBoxCell;\r
                 if (selectedRows.Count > 1)\r
                     checkBoxCell.Value = valueOfCheckBoxes;\r
                 else\r
@@ -138,9 +140,10 @@ namespace Maestro {
 \r
         private bool GetValueOfCheckBoxes(DataGridViewSelectedRowCollection selectedRows) {\r
             bool result = true;\r
+            int index = dataGridSource.Columns.Cast<DataGridViewColumn>().Where(x => x.GetType() == typeof(DataGridViewCheckBoxColumn)).SingleOrDefault().Index;\r
             foreach (DataGridViewRow actualRow in selectedRows) {\r
                 var cells = actualRow.Cells;\r
-                DataGridViewCheckBoxCell checkBoxCell = cells[0] as DataGridViewCheckBoxCell;\r
+                DataGridViewCheckBoxCell checkBoxCell = cells[index] as DataGridViewCheckBoxCell;\r
                 if (checkBoxCell.Value != null && checkBoxCell.Value.Equals(true))\r
                     result = false;\r
                 else { result = true; return result; }\r
@@ -160,9 +163,9 @@ namespace Maestro {
                 IsSelectedFileAnID();\r
                 return;\r
             }\r
-\r
+            int index = dataGridSource.Columns.Cast<DataGridViewColumn>().Where(x => x.HeaderText == StringResources.NEV).SingleOrDefault().Index;\r
             foreach (DataGridViewRow actual in selectedRows) {\r
-                string name = actual.Cells[1].Value as string;\r
+                string name = actual.Cells[index].Value as string;\r
                 if (!name.StartsWith(String.Format("{0}-", startingName)) &&\r
                     !name.StartsWith(String.Format("{0}_", startingName)) &&\r
                     !name.StartsWith(String.Format("{0}.", startingName))) {\r
@@ -180,8 +183,9 @@ namespace Maestro {
                     startingName = null;\r
                     return;\r
                 }\r
-            string query = selectedRows[0].Cells[1].Value as string;\r
-            int separatorPosition = query.IndexOf("-");//< 0 ? query.IndexOf("_") : query.IndexOf("-");\r
+            int index = dataGridSource.Columns.Cast<DataGridViewColumn>().Where(x => x.HeaderText == StringResources.NEV).SingleOrDefault().Index;\r
+            string query = selectedRows[0].Cells[index].Value as string;\r
+            int separatorPosition = query.IndexOf("-");\r
             int separatorPosition2 = query.IndexOf("_");\r
             int realseparatorPosition = 0;\r
             if (separatorPosition < 0)\r
@@ -203,8 +207,9 @@ namespace Maestro {
 \r
         private void SetTextSelectedSourceTextFromCheckBoxes() {\r
             String selectedNames = "";\r
-            foreach (DataGridViewRow actual in selectedRows)\r
-                selectedNames += actual.Cells[1].Value + " ";\r
+            int index = dataGridSource.Columns.Cast<DataGridViewColumn>().Where(x => x.HeaderText == StringResources.NEV).SingleOrDefault().Index;\r
+            foreach (DataGridViewRow actual in selectedRows) \r
+                selectedNames += actual.Cells[index].Value + " ";\r
             SelectedSource = new SourceInfo() {\r
                 Name = selectedNames\r
             };\r
@@ -216,7 +221,8 @@ namespace Maestro {
             if (Configuration.Source.GetType() == typeof(NEXIOSource))\r
                 selectedSource.FileInfo = null;\r
             else if (selectedRows.Count == 1) {\r
-                string name = selectedRows[0].Cells[1].Value as string;\r
+                int index = dataGridSource.Columns.Cast<DataGridViewColumn>().Where(x => x.HeaderText == StringResources.NEV).SingleOrDefault().Index;\r
+                string name = selectedRows[0].Cells[index].Value as string;\r
                 Uri inputUri = new Uri(String.Format("{0}/{1}", Configuration.Source.Local.Address.LocalPath, name));\r
                 selectedSource.FileInfo = new System.IO.FileInfo(inputUri.LocalPath);\r
             }\r
@@ -244,8 +250,9 @@ namespace Maestro {
         }\r
 \r
         public void SourceDeleted(String fileName) {\r
+            int index = dataGridSource.Columns.Cast<DataGridViewColumn>().Where(x => x.HeaderText == StringResources.NEV).SingleOrDefault().Index;\r
             foreach (DataGridViewRow actual in selectedRows) {\r
-                String actualName = actual.Cells[1].Value as string;\r
+                String actualName = actual.Cells[index].Value as string;\r
                 if (fileName.Equals(actualName)) {\r
                     selectedRows.Remove(actual);\r
                     if (textSelectedSource.InvokeRequired) {\r