From: Vásáry Dániel Date: Fri, 20 Oct 2017 11:53:37 +0000 (+0000) Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=43cadc0ae3a29daa84c060aa58f17cefd2b3f67e;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30656 --- diff --git a/client/AudioRecorder/FileNameForm.cs b/client/AudioRecorder/FileNameForm.cs index f876bdc2..ce970e47 100644 --- a/client/AudioRecorder/FileNameForm.cs +++ b/client/AudioRecorder/FileNameForm.cs @@ -13,7 +13,6 @@ namespace AudioRecorder { InitializeComponent(); this.settings = settings; this.mainForm = mainForm; - octopusIDSelector1.Disposeabel = true; octopusIDSelector1.IDChangedEvent = IdChangedEvent; octopusIDSelector1.Configuration = new OctopusConfiguration() { Address = settings.getAddress(), Password = settings.getPassword(), UserName = settings.getUserName(), Timeout = settings.getTimeout() }; octopusIDSelector1.KeyDown += (sender, args) => { diff --git a/client/OctopusClient/OctopusIDSelector.Designer.cs b/client/OctopusClient/OctopusIDSelector.Designer.cs index 34e0a253..02f186c8 100644 --- a/client/OctopusClient/OctopusIDSelector.Designer.cs +++ b/client/OctopusClient/OctopusIDSelector.Designer.cs @@ -75,9 +75,6 @@ this.treeContent.Name = "treeContent"; this.treeContent.Size = new System.Drawing.Size(251, 273); this.treeContent.TabIndex = 5; - this.treeContent.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.treeContent_AfterCheck); - this.treeContent.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeContent_AfterSelect); - this.treeContent.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.treeContent_NodeMouseDoubleClick); this.treeContent.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeContent_KeyDown); // // tabControl1 @@ -158,7 +155,6 @@ this.Padding = new System.Windows.Forms.Padding(10); this.Size = new System.Drawing.Size(271, 376); this.Load += new System.EventHandler(this.OctopusIDSelector_Load); - this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OctopusIDSelector_KeyDown); ((System.ComponentModel.ISupportInitialize)(this.bindingRundown)).EndInit(); this.tabControl1.ResumeLayout(false); this.tabPage1.ResumeLayout(false); diff --git a/client/OctopusClient/OctopusIDSelector.cs b/client/OctopusClient/OctopusIDSelector.cs index eac0c3d7..4ea6e690 100644 --- 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); public partial class OctopusIDSelector : UserControl { - + private static Logger logger = LogManager.GetCurrentClassLogger(); private string id; - //TODO! - //public ClearCheckBox ClearCheckBox { get; set; } - - public OctopusErrorReporterDelegate ErrorReporter { get; set; } + private int selectedStoryFolderIndex = -1; + private int selectedRundownIndex = -1; private TreeNode selectedNode; - - public bool Disposeabel { get; set; } - - private static Logger logger = LogManager.GetCurrentClassLogger(); private OctopusAPI client; - private int selectedRundownIndex = -1; - private int selectedStoryFolderIndex = -1; - public TreeNode previousSelectedNode = null; - //private bool checkFromCode; + public OctopusErrorReporterDelegate ErrorReporter { get; set; } public OnSelectedIDChanged IDChangedEvent { get; set; } public OctopusConfiguration Configuration { @@ -42,6 +33,7 @@ namespace OctopusClient { public OctopusIDSelector() { InitializeComponent(); InitializeControlTexts(); + treeContent.AfterCheck += OnTreeAfterCheck; } private void InitializeControlTexts() { @@ -64,7 +56,7 @@ namespace OctopusClient { treeContent.Nodes.Clear(); if (rundown == null) return; - logger.Info("Selected rundown {0}", rundown.ID); + logger.Info("Selected rundown {0} {1}", rundown.ID, rundown.Name); IEnumerable stories = client.GetStories(rundown.ID); if (stories != null) foreach (var story in stories) { @@ -82,7 +74,7 @@ namespace OctopusClient { if (storyFolder == null) return; treeContent.Nodes.Clear(); - logger.Info("Selected storyFolder {0} {1}", storyFolder.Name, storyFolder.ID); + logger.Info("Selected StoryFolder {0} {1}", storyFolder.ID, storyFolder.Name); if (storyFolder.ID.Equals("0")) return; var stories = client.GetStoriesByStoryFolderID(storyFolder.ID); @@ -150,26 +142,15 @@ namespace OctopusClient { } } - private void treeContent_NodeMouseDoubleClick(object sender, TreeNodeMouseClickEventArgs e) { - if (String.IsNullOrEmpty(e.Node.Name)) - return; - - - //meghívódik az InnerAfterCheck - //selectedNode.Checked = !e.Node.Checked; - } - public void ClearSelection() { if (selectedNode == null) return; + treeContent.AfterCheck -= OnTreeAfterCheck; selectedNode.Checked = false; + treeContent.AfterCheck += OnTreeAfterCheck; selectedNode = null; } - //public void IDChangeEventCalledFromOutside(string id) { - // IDChangedEvent?.Invoke(id); - //} - private void tabControl1_Selected(object sender, TabControlEventArgs e) { treeContent.Nodes.Clear(); if (e.TabPageIndex == 0) @@ -187,20 +168,6 @@ namespace OctopusClient { linkID.Text = value; } - private void treeContent_AfterSelect(object sender, TreeViewEventArgs e) { - TreeView treeView = sender as TreeView; - if (sender == null) - return; - string id = treeView.SelectedNode.Name; - if (previousSelectedNode != null) { - previousSelectedNode.BackColor = treeView.BackColor; - previousSelectedNode.ForeColor = treeView.ForeColor; - } - treeView.SelectedNode.BackColor = System.Drawing.Color.Gainsboro; - treeView.SelectedNode.ForeColor = System.Drawing.Color.Black; - previousSelectedNode = treeView.SelectedNode; - } - private void RefreshPlaceHolderIDS(String ID) { treeContent.Nodes.Clear(); @@ -211,11 +178,6 @@ namespace OctopusClient { treeContent.Nodes.Add(story.ID, String.Format($"{story.ID} {story.Name}")); } - private void OctopusIDSelector_KeyDown(object sender, KeyEventArgs e) { - if (e.KeyCode == Keys.Escape && Disposeabel) - Dispose(); - } - private void tabControl1_KeyDown(object sender, KeyEventArgs e) { this.OnKeyDown(e); } @@ -224,7 +186,8 @@ namespace OctopusClient { this.OnKeyDown(e); } - private void treeContent_AfterCheck(object sender, TreeViewEventArgs e) { + private void OnTreeAfterCheck(object sender, TreeViewEventArgs e) { + logger.Debug("Handling {0} {1}", e.Node.Name, e.Node.Text); if (!e.Node.Equals(selectedNode)) { ClearSelection(); selectedNode = e.Node; diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs index 8bbc0c03..2defe2e0 100644 --- a/client/PlanAIRClient/TrafficIDSelector.cs +++ b/client/PlanAIRClient/TrafficIDSelector.cs @@ -141,12 +141,11 @@ namespace TrafficClient { } private void dataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e) { - if (e.RowIndex == -1 || e.ColumnIndex != 0) + if (e.RowIndex < 0 || e.ColumnIndex != 0) return; DataGridView gridView = sender as DataGridView; if (gridView == null) return; - //nincs multiselect OnSelectionChanged(dataGridView1.SelectedRows[0]); }