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

diff --git a/client/AudioRecorder/FileNameForm.cs b/client/AudioRecorder/FileNameForm.cs
index f876bdc27c4814fa45f5d087bb83a8627ebd369f..ce970e47b403a16bdcdde3bf0806f216e0ffebf5 100644 (file)
--- a/client/AudioRecorder/FileNameForm.cs
+++ b/client/AudioRecorder/FileNameForm.cs
@@ -13,7 +13,6 @@ namespace AudioRecorder {
             InitializeComponent();\r
             this.settings = settings;\r
             this.mainForm = mainForm;\r
-            octopusIDSelector1.Disposeabel = true;\r
             octopusIDSelector1.IDChangedEvent = IdChangedEvent;\r
             octopusIDSelector1.Configuration = new OctopusConfiguration() { Address = settings.getAddress(), Password = settings.getPassword(), UserName = settings.getUserName(), Timeout = settings.getTimeout() };\r
             octopusIDSelector1.KeyDown += (sender, args) => {\r

diff --git a/client/OctopusClient/OctopusIDSelector.Designer.cs b/client/OctopusClient/OctopusIDSelector.Designer.cs
index 34e0a2533c6b83e2fe32e74a1ffe96b3206e18d6..02f186c8a68eccc968c9eeacb49d2db994bd4d6a 100644 (file)
--- a/client/OctopusClient/OctopusIDSelector.Designer.cs
+++ b/client/OctopusClient/OctopusIDSelector.Designer.cs
@@ -75,9 +75,6 @@
             this.treeContent.Name = "treeContent";\r
             this.treeContent.Size = new System.Drawing.Size(251, 273);\r
             this.treeContent.TabIndex = 5;\r
-            this.treeContent.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.treeContent_AfterCheck);\r
-            this.treeContent.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeContent_AfterSelect);\r
-            this.treeContent.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.treeContent_NodeMouseDoubleClick);\r
             this.treeContent.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeContent_KeyDown);\r
             // \r
             // tabControl1\r
@@ -158,7 +155,6 @@
             this.Padding = new System.Windows.Forms.Padding(10);\r
             this.Size = new System.Drawing.Size(271, 376);\r
             this.Load += new System.EventHandler(this.OctopusIDSelector_Load);\r
-            this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OctopusIDSelector_KeyDown);\r
             ((System.ComponentModel.ISupportInitialize)(this.bindingRundown)).EndInit();\r
             this.tabControl1.ResumeLayout(false);\r
             this.tabPage1.ResumeLayout(false);\r

diff --git a/client/OctopusClient/OctopusIDSelector.cs b/client/OctopusClient/OctopusIDSelector.cs
index eac0c3d7a270875f3329a8909311e8c1754bda89..4ea6e690e9a7192560c62145c002019b09dc722d 100644 (file)
--- a/client/OctopusClient/OctopusIDSelector.cs
+++ b/client/OctopusClient/OctopusIDSelector.cs
@@ -12,23 +12,14 @@ namespace OctopusClient {
     public delegate void OctopusErrorReporterDelegate(DateTime time, String level, String message, Color color);\r
 \r
     public partial class OctopusIDSelector : UserControl {\r
-\r
+        private static Logger logger = LogManager.GetCurrentClassLogger();\r
         private string id;\r
-        //TODO!\r
-        //public ClearCheckBox ClearCheckBox { get; set; }\r
-\r
-        public OctopusErrorReporterDelegate ErrorReporter { get; set; }\r
+        private int selectedStoryFolderIndex = -1;\r
+        private int selectedRundownIndex = -1;\r
         private TreeNode selectedNode;\r
-\r
-        public bool Disposeabel { get; set; }\r
-\r
-        private static Logger logger = LogManager.GetCurrentClassLogger();\r
         private OctopusAPI client;\r
-        private int selectedRundownIndex = -1;\r
-        private int selectedStoryFolderIndex = -1;\r
-        public TreeNode previousSelectedNode = null;\r
-        //private bool checkFromCode;\r
 \r
+        public OctopusErrorReporterDelegate ErrorReporter { get; set; }\r
         public OnSelectedIDChanged IDChangedEvent { get; set; }\r
 \r
         public OctopusConfiguration Configuration {\r
@@ -42,6 +33,7 @@ namespace OctopusClient {
         public OctopusIDSelector() {\r
             InitializeComponent();\r
             InitializeControlTexts();\r
+            treeContent.AfterCheck += OnTreeAfterCheck;\r
         }\r
 \r
         private void InitializeControlTexts() {\r
@@ -64,7 +56,7 @@ namespace OctopusClient {
             treeContent.Nodes.Clear();\r
             if (rundown == null)\r
                 return;\r
-            logger.Info("Selected rundown {0}", rundown.ID);\r
+            logger.Info("Selected rundown {0} {1}", rundown.ID, rundown.Name);\r
             IEnumerable<Story> stories = client.GetStories(rundown.ID);\r
             if (stories != null)\r
                 foreach (var story in stories) {\r
@@ -82,7 +74,7 @@ namespace OctopusClient {
             if (storyFolder == null)\r
                 return;\r
             treeContent.Nodes.Clear();\r
-            logger.Info("Selected storyFolder {0} {1}", storyFolder.Name, storyFolder.ID);\r
+            logger.Info("Selected StoryFolder {0} {1}", storyFolder.ID, storyFolder.Name);\r
             if (storyFolder.ID.Equals("0"))\r
                 return;\r
             var stories = client.GetStoriesByStoryFolderID(storyFolder.ID);\r
@@ -150,26 +142,15 @@ namespace OctopusClient {
             }\r
         }\r
 \r
-        private void treeContent_NodeMouseDoubleClick(object sender, TreeNodeMouseClickEventArgs e) {\r
-            if (String.IsNullOrEmpty(e.Node.Name))\r
-                return;\r
-\r
-\r
-            //meghívódik az InnerAfterCheck\r
-            //selectedNode.Checked = !e.Node.Checked;\r
-        }\r
-\r
         public void ClearSelection() {\r
             if (selectedNode == null)\r
                 return;\r
+            treeContent.AfterCheck -= OnTreeAfterCheck;\r
             selectedNode.Checked = false;\r
+            treeContent.AfterCheck += OnTreeAfterCheck;\r
             selectedNode = null;\r
         }\r
 \r
-        //public void IDChangeEventCalledFromOutside(string id) {\r
-        //    IDChangedEvent?.Invoke(id);\r
-        //}\r
-\r
         private void tabControl1_Selected(object sender, TabControlEventArgs e) {\r
             treeContent.Nodes.Clear();\r
             if (e.TabPageIndex == 0)\r
@@ -187,20 +168,6 @@ namespace OctopusClient {
             linkID.Text = value;\r
         }\r
 \r
-        private void treeContent_AfterSelect(object sender, TreeViewEventArgs e) {\r
-            TreeView treeView = sender as TreeView;\r
-            if (sender == null)\r
-                return;\r
-            string id = treeView.SelectedNode.Name;\r
-            if (previousSelectedNode != null) {\r
-                previousSelectedNode.BackColor = treeView.BackColor;\r
-                previousSelectedNode.ForeColor = treeView.ForeColor;\r
-            }\r
-            treeView.SelectedNode.BackColor = System.Drawing.Color.Gainsboro;\r
-            treeView.SelectedNode.ForeColor = System.Drawing.Color.Black;\r
-            previousSelectedNode = treeView.SelectedNode;\r
-        }\r
-\r
         private void RefreshPlaceHolderIDS(String ID) {\r
             treeContent.Nodes.Clear();\r
 \r
@@ -211,11 +178,6 @@ namespace OctopusClient {
                 treeContent.Nodes.Add(story.ID, String.Format($"{story.ID} {story.Name}"));\r
         }\r
 \r
-        private void OctopusIDSelector_KeyDown(object sender, KeyEventArgs e) {\r
-            if (e.KeyCode == Keys.Escape && Disposeabel)\r
-                Dispose();\r
-        }\r
-\r
         private void tabControl1_KeyDown(object sender, KeyEventArgs e) {\r
             this.OnKeyDown(e);\r
         }\r
@@ -224,7 +186,8 @@ namespace OctopusClient {
             this.OnKeyDown(e);\r
         }\r
 \r
-        private void treeContent_AfterCheck(object sender, TreeViewEventArgs e) {\r
+        private void OnTreeAfterCheck(object sender, TreeViewEventArgs e) {\r
+            logger.Debug("Handling {0} {1}", e.Node.Name, e.Node.Text);\r
             if (!e.Node.Equals(selectedNode)) {\r
                 ClearSelection();\r
                 selectedNode = e.Node;\r

diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs
index 8bbc0c03c2d045cbce2311e9cd9ae8043a5e9294..2defe2e03250239e40b33d32b69e950c5fcfb382 100644 (file)
--- a/client/PlanAIRClient/TrafficIDSelector.cs
+++ b/client/PlanAIRClient/TrafficIDSelector.cs
@@ -141,12 +141,11 @@ namespace TrafficClient {
         }\r
 \r
         private void dataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e) {\r
-            if (e.RowIndex == -1 || e.ColumnIndex != 0)\r
+            if (e.RowIndex < 0 || e.ColumnIndex != 0)\r
                 return;\r
             DataGridView gridView = sender as DataGridView;\r
             if (gridView == null)\r
                 return;\r
-            //nincs multiselect\r
             OnSelectionChanged(dataGridView1.SelectedRows[0]);\r
         }\r
 \r