From 5c00d9064e07f1a10254623b56462faa07ee65f3 Mon Sep 17 00:00:00 2001 From: Vincent BOUQUET Date: Wed, 21 Feb 2024 21:40:26 +0100 Subject: [PATCH] ui --- StreamViewer.Designer.cs | 127 +++++++++++++++++++++++++++++---------- 1 file changed, 95 insertions(+), 32 deletions(-) diff --git a/StreamViewer.Designer.cs b/StreamViewer.Designer.cs index f9a8c20..d993ba4 100644 --- a/StreamViewer.Designer.cs +++ b/StreamViewer.Designer.cs @@ -38,14 +38,17 @@ namespace robospot_camera_finder btnZoomMin = new Button(); btnZoomMax = new Button(); grpSACN = new GroupBox(); + cbEnableSACN = new CheckBox(); tbTilt = new TrackBar(); + cbEnableXboxCtrl = new CheckBox(); tbPan = new TrackBar(); label2 = new Label(); numDMXAddr = new NumericUpDown(); label1 = new Label(); numUniv = new NumericUpDown(); timerDMX = new System.Windows.Forms.Timer(components); - cbEnableXboxCtrl = new CheckBox(); + splitContainerMain = new SplitContainer(); + btnSidePanel = new Button(); ((System.ComponentModel.ISupportInitialize)videoView).BeginInit(); ((System.ComponentModel.ISupportInitialize)tbZoom).BeginInit(); grpSACN.SuspendLayout(); @@ -53,6 +56,10 @@ namespace robospot_camera_finder ((System.ComponentModel.ISupportInitialize)tbPan).BeginInit(); ((System.ComponentModel.ISupportInitialize)numDMXAddr).BeginInit(); ((System.ComponentModel.ISupportInitialize)numUniv).BeginInit(); + ((System.ComponentModel.ISupportInitialize)splitContainerMain).BeginInit(); + splitContainerMain.Panel1.SuspendLayout(); + splitContainerMain.Panel2.SuspendLayout(); + splitContainerMain.SuspendLayout(); SuspendLayout(); // // videoView @@ -62,19 +69,20 @@ namespace robospot_camera_finder videoView.Location = new Point(12, 12); videoView.MediaPlayer = null; videoView.Name = "videoView"; - videoView.Size = new Size(823, 495); + videoView.Size = new Size(730, 490); videoView.TabIndex = 0; + videoView.TabStop = false; videoView.Text = "videoView"; // // tbZoom // tbZoom.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Right; tbZoom.LargeChange = 20; - tbZoom.Location = new Point(841, 31); + tbZoom.Location = new Point(748, 31); tbZoom.Maximum = 9999; tbZoom.Name = "tbZoom"; tbZoom.Orientation = Orientation.Vertical; - tbZoom.Size = new Size(45, 459); + tbZoom.Size = new Size(45, 416); tbZoom.SmallChange = 10; tbZoom.TabIndex = 1; tbZoom.TickFrequency = 300; @@ -93,7 +101,7 @@ namespace robospot_camera_finder // btnZoomMin.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; btnZoomMin.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - btnZoomMin.Location = new Point(838, 484); + btnZoomMin.Location = new Point(748, 442); btnZoomMin.Name = "btnZoomMin"; btnZoomMin.Size = new Size(42, 23); btnZoomMin.TabIndex = 2; @@ -105,7 +113,7 @@ namespace robospot_camera_finder // btnZoomMax.Anchor = AnchorStyles.Top | AnchorStyles.Right; btnZoomMax.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - btnZoomMax.Location = new Point(838, 12); + btnZoomMax.Location = new Point(748, 3); btnZoomMax.Name = "btnZoomMax"; btnZoomMax.Size = new Size(42, 23); btnZoomMax.TabIndex = 3; @@ -116,22 +124,36 @@ namespace robospot_camera_finder // grpSACN // grpSACN.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Right; + grpSACN.Controls.Add(cbEnableSACN); grpSACN.Controls.Add(tbTilt); + grpSACN.Controls.Add(cbEnableXboxCtrl); grpSACN.Controls.Add(tbPan); grpSACN.Controls.Add(label2); grpSACN.Controls.Add(numDMXAddr); grpSACN.Controls.Add(label1); grpSACN.Controls.Add(numUniv); - grpSACN.Location = new Point(892, 12); + grpSACN.Location = new Point(12, 3); grpSACN.Name = "grpSACN"; - grpSACN.Size = new Size(236, 253); + grpSACN.Size = new Size(236, 508); grpSACN.TabIndex = 4; grpSACN.TabStop = false; grpSACN.Text = "sACN Control"; // + // cbEnableSACN + // + cbEnableSACN.AutoSize = true; + cbEnableSACN.Location = new Point(19, 22); + cbEnableSACN.Name = "cbEnableSACN"; + cbEnableSACN.Size = new Size(117, 19); + cbEnableSACN.TabIndex = 6; + cbEnableSACN.Text = "Enable sACN Out"; + cbEnableSACN.UseVisualStyleBackColor = true; + cbEnableSACN.CheckedChanged += cbEnableSACN_CheckedChanged; + // // tbTilt // - tbTilt.Location = new Point(19, 97); + tbTilt.Enabled = false; + tbTilt.Location = new Point(19, 131); tbTilt.Maximum = 65535; tbTilt.Name = "tbTilt"; tbTilt.Orientation = Orientation.Vertical; @@ -140,9 +162,22 @@ namespace robospot_camera_finder tbTilt.TickFrequency = 10; tbTilt.Value = 32768; // + // cbEnableXboxCtrl + // + cbEnableXboxCtrl.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + cbEnableXboxCtrl.AutoSize = true; + cbEnableXboxCtrl.Enabled = false; + cbEnableXboxCtrl.Location = new Point(19, 480); + cbEnableXboxCtrl.Name = "cbEnableXboxCtrl"; + cbEnableXboxCtrl.Size = new Size(152, 19); + cbEnableXboxCtrl.TabIndex = 5; + cbEnableXboxCtrl.Text = "Enable Xbox360 Control"; + cbEnableXboxCtrl.UseVisualStyleBackColor = true; + // // tbPan // - tbPan.Location = new Point(70, 150); + tbPan.Enabled = false; + tbPan.Location = new Point(70, 184); tbPan.Maximum = 65535; tbPan.Name = "tbPan"; tbPan.Size = new Size(150, 45); @@ -153,7 +188,7 @@ namespace robospot_camera_finder // label2 // label2.AutoSize = true; - label2.Location = new Point(26, 64); + label2.Location = new Point(26, 98); label2.Name = "label2"; label2.Size = new Size(78, 15); label2.TabIndex = 3; @@ -162,7 +197,8 @@ namespace robospot_camera_finder // // numDMXAddr // - numDMXAddr.Location = new Point(110, 62); + numDMXAddr.Enabled = false; + numDMXAddr.Location = new Point(110, 96); numDMXAddr.Maximum = new decimal(new int[] { 504, 0, 0, 0 }); numDMXAddr.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); numDMXAddr.Name = "numDMXAddr"; @@ -174,7 +210,7 @@ namespace robospot_camera_finder // label1 // label1.AutoSize = true; - label1.Location = new Point(19, 35); + label1.Location = new Point(19, 69); label1.Name = "label1"; label1.Size = new Size(85, 15); label1.TabIndex = 1; @@ -183,7 +219,8 @@ namespace robospot_camera_finder // // numUniv // - numUniv.Location = new Point(110, 33); + numUniv.Enabled = false; + numUniv.Location = new Point(110, 67); numUniv.Maximum = new decimal(new int[] { 63999, 0, 0, 0 }); numUniv.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); numUniv.Name = "numUniv"; @@ -193,33 +230,52 @@ namespace robospot_camera_finder // // timerDMX // - timerDMX.Enabled = true; timerDMX.Tick += timerDMX_Tick; // - // cbEnableXboxCtrl + // splitContainerMain // - cbEnableXboxCtrl.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; - cbEnableXboxCtrl.AutoSize = true; - cbEnableXboxCtrl.Location = new Point(892, 271); - cbEnableXboxCtrl.Name = "cbEnableXboxCtrl"; - cbEnableXboxCtrl.Size = new Size(152, 19); - cbEnableXboxCtrl.TabIndex = 5; - cbEnableXboxCtrl.Text = "Enable Xbox360 Control"; - cbEnableXboxCtrl.UseVisualStyleBackColor = true; + splitContainerMain.Dock = DockStyle.Fill; + splitContainerMain.Location = new Point(0, 0); + splitContainerMain.Name = "splitContainerMain"; + // + // splitContainerMain.Panel1 + // + splitContainerMain.Panel1.Controls.Add(btnSidePanel); + splitContainerMain.Panel1.Controls.Add(btnZoomMin); + splitContainerMain.Panel1.Controls.Add(tbZoom); + splitContainerMain.Panel1.Controls.Add(btnZoomMax); + splitContainerMain.Panel1.Controls.Add(videoView); + splitContainerMain.Panel1MinSize = 800; + // + // splitContainerMain.Panel2 + // + splitContainerMain.Panel2.Controls.Add(grpSACN); + splitContainerMain.Size = new Size(1064, 514); + splitContainerMain.SplitterDistance = 800; + splitContainerMain.TabIndex = 6; + splitContainerMain.TabStop = false; + // + // btnSidePanel + // + btnSidePanel.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + btnSidePanel.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); + btnSidePanel.Location = new Point(748, 479); + btnSidePanel.Name = "btnSidePanel"; + btnSidePanel.Size = new Size(42, 23); + btnSidePanel.TabIndex = 4; + btnSidePanel.Text = ">>"; + btnSidePanel.UseVisualStyleBackColor = true; + btnSidePanel.Click += btnSidePanel_Click; // // StreamViewer // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1140, 519); - Controls.Add(cbEnableXboxCtrl); - Controls.Add(grpSACN); - Controls.Add(btnZoomMax); - Controls.Add(btnZoomMin); - Controls.Add(tbZoom); - Controls.Add(videoView); + ClientSize = new Size(1064, 514); + Controls.Add(splitContainerMain); Icon = (Icon)resources.GetObject("$this.Icon"); Margin = new Padding(4, 3, 4, 3); + MinimumSize = new Size(1080, 553); Name = "StreamViewer"; Text = "Camera"; FormClosed += StreamViewer_FormClosed; @@ -231,8 +287,12 @@ namespace robospot_camera_finder ((System.ComponentModel.ISupportInitialize)tbPan).EndInit(); ((System.ComponentModel.ISupportInitialize)numDMXAddr).EndInit(); ((System.ComponentModel.ISupportInitialize)numUniv).EndInit(); + splitContainerMain.Panel1.ResumeLayout(false); + splitContainerMain.Panel1.PerformLayout(); + splitContainerMain.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)splitContainerMain).EndInit(); + splitContainerMain.ResumeLayout(false); ResumeLayout(false); - PerformLayout(); } #endregion @@ -251,5 +311,8 @@ namespace robospot_camera_finder private NumericUpDown numUniv; private System.Windows.Forms.Timer timerDMX; private CheckBox cbEnableXboxCtrl; + private SplitContainer splitContainerMain; + private CheckBox cbEnableSACN; + private Button btnSidePanel; } } \ No newline at end of file