# HG changeset patch # User sl # Date 1405163597 -7200 # Node ID 745d9ee1a2c0346219b18f08cf91e54955833c6a # Parent f37c5ff8af18c970392e351f764e3f89919d6862 Adding option to connect display on startup. Better show border implementation. Now having an external container for our display to show an external border. diff -r f37c5ff8af18 -r 745d9ee1a2c0 App.config --- a/App.config Thu Jul 10 22:03:29 2014 +0200 +++ b/App.config Sat Jul 12 13:13:17 2014 +0200 @@ -19,6 +19,9 @@ False + + False + \ No newline at end of file diff -r f37c5ff8af18 -r 745d9ee1a2c0 MainForm.Designer.cs --- a/MainForm.Designer.cs Thu Jul 10 22:03:29 2014 +0200 +++ b/MainForm.Designer.cs Sat Jul 12 13:13:17 2014 +0200 @@ -38,9 +38,6 @@ this.buttonClose = new System.Windows.Forms.Button(); this.buttonOpen = new System.Windows.Forms.Button(); this.buttonCapture = new System.Windows.Forms.Button(); - this.tableLayoutPanel = new System.Windows.Forms.TableLayoutPanel(); - this.marqueeLabelTop = new SharpDisplayManager.MarqueeLabel(); - this.marqueeLabelBottom = new SharpDisplayManager.MarqueeLabel(); this.buttonFont = new System.Windows.Forms.Button(); this.tabPageTests = new System.Windows.Forms.TabPage(); this.fontDialog = new System.Windows.Forms.FontDialog(); @@ -48,13 +45,19 @@ this.statusStrip = new System.Windows.Forms.StatusStrip(); this.toolStripStatusLabelConnect = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripStatusLabelSpring = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabelPower = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripStatusLabelFps = new System.Windows.Forms.ToolStripStatusLabel(); - this.toolStripStatusLabelPower = new System.Windows.Forms.ToolStripStatusLabel(); + this.panelDisplay = new System.Windows.Forms.Panel(); + this.tableLayoutPanel = new System.Windows.Forms.TableLayoutPanel(); + this.marqueeLabelTop = new SharpDisplayManager.MarqueeLabel(); + this.marqueeLabelBottom = new SharpDisplayManager.MarqueeLabel(); + this.checkBoxConnectOnStartup = new System.Windows.Forms.CheckBox(); this.tabControl.SuspendLayout(); this.tabPageDisplay.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.trackBarBrightness)).BeginInit(); + this.statusStrip.SuspendLayout(); + this.panelDisplay.SuspendLayout(); this.tableLayoutPanel.SuspendLayout(); - this.statusStrip.SuspendLayout(); this.SuspendLayout(); // // tabControl @@ -72,6 +75,8 @@ // // tabPageDisplay // + this.tabPageDisplay.Controls.Add(this.checkBoxConnectOnStartup); + this.tabPageDisplay.Controls.Add(this.panelDisplay); this.tabPageDisplay.Controls.Add(this.checkBoxShowBorders); this.tabPageDisplay.Controls.Add(this.trackBarBrightness); this.tabPageDisplay.Controls.Add(this.buttonFill); @@ -79,7 +84,6 @@ this.tabPageDisplay.Controls.Add(this.buttonClose); this.tabPageDisplay.Controls.Add(this.buttonOpen); this.tabPageDisplay.Controls.Add(this.buttonCapture); - this.tabPageDisplay.Controls.Add(this.tableLayoutPanel); this.tabPageDisplay.Controls.Add(this.buttonFont); this.tabPageDisplay.Location = new System.Drawing.Point(4, 22); this.tabPageDisplay.Name = "tabPageDisplay"; @@ -164,86 +168,6 @@ this.buttonCapture.UseVisualStyleBackColor = true; this.buttonCapture.Click += new System.EventHandler(this.buttonCapture_Click); // - // tableLayoutPanel - // - this.tableLayoutPanel.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single; - this.tableLayoutPanel.ColumnCount = 1; - this.tableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel.Controls.Add(this.marqueeLabelTop, 0, 0); - this.tableLayoutPanel.Controls.Add(this.marqueeLabelBottom, 0, 1); - this.tableLayoutPanel.Location = new System.Drawing.Point(180, 161); - this.tableLayoutPanel.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel.Name = "tableLayoutPanel"; - this.tableLayoutPanel.RowCount = 2; - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel.Size = new System.Drawing.Size(256, 64); - this.tableLayoutPanel.TabIndex = 4; - // - // marqueeLabelTop - // - this.marqueeLabelTop.AutoEllipsis = true; - this.marqueeLabelTop.BackColor = System.Drawing.Color.Transparent; - this.marqueeLabelTop.Dock = System.Windows.Forms.DockStyle.Fill; - this.marqueeLabelTop.Location = new System.Drawing.Point(1, 1); - this.marqueeLabelTop.Margin = new System.Windows.Forms.Padding(0); - this.marqueeLabelTop.Name = "marqueeLabelTop"; - this.marqueeLabelTop.OwnTimer = false; - this.marqueeLabelTop.PixelsPerSecond = 64; - this.marqueeLabelTop.Separator = "|"; - this.marqueeLabelTop.Size = new System.Drawing.Size(254, 30); - this.marqueeLabelTop.TabIndex = 2; - this.marqueeLabelTop.Text = "ABCDEFGHIJKLMNOPQRST-0123456789"; - this.marqueeLabelTop.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.marqueeLabelTop.UseCompatibleTextRendering = true; - // - // marqueeLabelBottom - // - this.marqueeLabelBottom.AutoEllipsis = true; - this.marqueeLabelBottom.Dock = System.Windows.Forms.DockStyle.Fill; - this.marqueeLabelBottom.Location = new System.Drawing.Point(1, 32); - this.marqueeLabelBottom.Margin = new System.Windows.Forms.Padding(0); - this.marqueeLabelBottom.Name = "marqueeLabelBottom"; - this.marqueeLabelBottom.OwnTimer = false; - this.marqueeLabelBottom.PixelsPerSecond = 64; - this.marqueeLabelBottom.Size = new System.Drawing.Size(254, 31); - this.marqueeLabelBottom.TabIndex = 3; - this.marqueeLabelBottom.Text = "abcdefghijklmnopqrst-0123456789"; - this.marqueeLabelBottom.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.marqueeLabelBottom.UseCompatibleTextRendering = true; - // // buttonFont // this.buttonFont.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); @@ -294,20 +218,125 @@ // toolStripStatusLabelSpring // this.toolStripStatusLabelSpring.Name = "toolStripStatusLabelSpring"; - this.toolStripStatusLabelSpring.Size = new System.Drawing.Size(442, 17); + this.toolStripStatusLabelSpring.Size = new System.Drawing.Size(473, 17); this.toolStripStatusLabelSpring.Spring = true; // + // toolStripStatusLabelPower + // + this.toolStripStatusLabelPower.Name = "toolStripStatusLabelPower"; + this.toolStripStatusLabelPower.Size = new System.Drawing.Size(24, 17); + this.toolStripStatusLabelPower.Text = "NA"; + // // toolStripStatusLabelFps // this.toolStripStatusLabelFps.Name = "toolStripStatusLabelFps"; this.toolStripStatusLabelFps.Size = new System.Drawing.Size(26, 17); this.toolStripStatusLabelFps.Text = "FPS"; // - // toolStripStatusLabelPower + // panelDisplay // - this.toolStripStatusLabelPower.Name = "toolStripStatusLabelPower"; - this.toolStripStatusLabelPower.Size = new System.Drawing.Size(24, 17); - this.toolStripStatusLabelPower.Text = "NA"; + this.panelDisplay.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panelDisplay.Controls.Add(this.tableLayoutPanel); + this.panelDisplay.Location = new System.Drawing.Point(181, 151); + this.panelDisplay.Margin = new System.Windows.Forms.Padding(0); + this.panelDisplay.Name = "panelDisplay"; + this.panelDisplay.Size = new System.Drawing.Size(258, 66); + this.panelDisplay.TabIndex = 12; + // + // tableLayoutPanel + // + this.tableLayoutPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.tableLayoutPanel.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single; + this.tableLayoutPanel.ColumnCount = 1; + this.tableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel.Controls.Add(this.marqueeLabelTop, 0, 0); + this.tableLayoutPanel.Controls.Add(this.marqueeLabelBottom, 0, 1); + this.tableLayoutPanel.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanel.Margin = new System.Windows.Forms.Padding(0); + this.tableLayoutPanel.Name = "tableLayoutPanel"; + this.tableLayoutPanel.RowCount = 2; + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel.Size = new System.Drawing.Size(256, 64); + this.tableLayoutPanel.TabIndex = 5; + // + // marqueeLabelTop + // + this.marqueeLabelTop.AutoEllipsis = true; + this.marqueeLabelTop.BackColor = System.Drawing.Color.Transparent; + this.marqueeLabelTop.Dock = System.Windows.Forms.DockStyle.Fill; + this.marqueeLabelTop.Location = new System.Drawing.Point(1, 1); + this.marqueeLabelTop.Margin = new System.Windows.Forms.Padding(0); + this.marqueeLabelTop.Name = "marqueeLabelTop"; + this.marqueeLabelTop.OwnTimer = false; + this.marqueeLabelTop.PixelsPerSecond = 64; + this.marqueeLabelTop.Separator = "|"; + this.marqueeLabelTop.Size = new System.Drawing.Size(254, 1); + this.marqueeLabelTop.TabIndex = 2; + this.marqueeLabelTop.Text = "ABCDEFGHIJKLMNOPQRST-0123456789"; + this.marqueeLabelTop.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.marqueeLabelTop.UseCompatibleTextRendering = true; + // + // marqueeLabelBottom + // + this.marqueeLabelBottom.AutoEllipsis = true; + this.marqueeLabelBottom.Dock = System.Windows.Forms.DockStyle.Fill; + this.marqueeLabelBottom.Location = new System.Drawing.Point(1, -19); + this.marqueeLabelBottom.Margin = new System.Windows.Forms.Padding(0); + this.marqueeLabelBottom.Name = "marqueeLabelBottom"; + this.marqueeLabelBottom.OwnTimer = false; + this.marqueeLabelBottom.PixelsPerSecond = 64; + this.marqueeLabelBottom.Separator = null; + this.marqueeLabelBottom.Size = new System.Drawing.Size(254, 20); + this.marqueeLabelBottom.TabIndex = 3; + this.marqueeLabelBottom.Text = "abcdefghijklmnopqrst-0123456789"; + this.marqueeLabelBottom.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.marqueeLabelBottom.UseCompatibleTextRendering = true; + // + // checkBoxConnectOnStartup + // + this.checkBoxConnectOnStartup.AutoSize = true; + this.checkBoxConnectOnStartup.Location = new System.Drawing.Point(113, 321); + this.checkBoxConnectOnStartup.Name = "checkBoxConnectOnStartup"; + this.checkBoxConnectOnStartup.Size = new System.Drawing.Size(119, 17); + this.checkBoxConnectOnStartup.TabIndex = 13; + this.checkBoxConnectOnStartup.Text = "Connect on stratup "; + this.checkBoxConnectOnStartup.UseVisualStyleBackColor = true; + this.checkBoxConnectOnStartup.CheckedChanged += new System.EventHandler(this.checkBoxConnectOnStartup_CheckedChanged); // // MainForm // @@ -319,13 +348,15 @@ this.MinimumSize = new System.Drawing.Size(640, 480); this.Name = "MainForm"; this.Text = "Sharp Display Manager"; + this.Load += new System.EventHandler(this.MainForm_Load); this.tabControl.ResumeLayout(false); this.tabPageDisplay.ResumeLayout(false); this.tabPageDisplay.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.trackBarBrightness)).EndInit(); - this.tableLayoutPanel.ResumeLayout(false); this.statusStrip.ResumeLayout(false); this.statusStrip.PerformLayout(); + this.panelDisplay.ResumeLayout(false); + this.tableLayoutPanel.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -338,9 +369,6 @@ private System.Windows.Forms.TabPage tabPageTests; private System.Windows.Forms.Button buttonFont; private System.Windows.Forms.FontDialog fontDialog; - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel; - private MarqueeLabel marqueeLabelTop; - private MarqueeLabel marqueeLabelBottom; private System.Windows.Forms.Button buttonCapture; private System.Windows.Forms.Timer timer; private System.Windows.Forms.Button buttonFill; @@ -354,6 +382,11 @@ private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelSpring; private System.Windows.Forms.CheckBox checkBoxShowBorders; private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelPower; + private System.Windows.Forms.Panel panelDisplay; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel; + private MarqueeLabel marqueeLabelTop; + private MarqueeLabel marqueeLabelBottom; + private System.Windows.Forms.CheckBox checkBoxConnectOnStartup; } } diff -r f37c5ff8af18 -r 745d9ee1a2c0 MainForm.cs --- a/MainForm.cs Thu Jul 10 22:03:29 2014 +0200 +++ b/MainForm.cs Sat Jul 12 13:13:17 2014 +0200 @@ -23,12 +23,26 @@ InitializeComponent(); UpdateStatus(); + //Load settings marqueeLabelTop.Font = Properties.Settings.Default.DisplayFont; marqueeLabelBottom.Font = Properties.Settings.Default.DisplayFont; checkBoxShowBorders.Checked = Properties.Settings.Default.DisplayShowBorders; + checkBoxConnectOnStartup.Checked = Properties.Settings.Default.DisplayConnectOnStartup; + // + tableLayoutPanel.CellBorderStyle = (checkBoxShowBorders.Checked ? TableLayoutPanelCellBorderStyle.Single : TableLayoutPanelCellBorderStyle.None); } + private void MainForm_Load(object sender, EventArgs e) + { + if (Properties.Settings.Default.DisplayConnectOnStartup) + { + iDisplay.Open(); + UpdateStatus(); + } + } + + private void buttonFont_Click(object sender, EventArgs e) { //fontDialog.ShowColor = true; @@ -126,7 +140,8 @@ unchecked { uint color=(uint)bmp.GetPixel(i, j).ToArgb(); - iDisplay.SetPixel(i, j, Convert.ToInt32((checkBoxShowBorders.Checked?color!=0xFFFFFFFF:color == 0xFF000000))); + //(checkBoxShowBorders.Checked?color!=0xFFFFFFFF:color == 0xFF000000) + iDisplay.SetPixel(i, j, Convert.ToInt32(color != 0xFFFFFFFF)); } } } @@ -213,10 +228,20 @@ } } + + private void checkBoxShowBorders_CheckedChanged(object sender, EventArgs e) { + tableLayoutPanel.CellBorderStyle = (checkBoxShowBorders.Checked ? TableLayoutPanelCellBorderStyle.Single : TableLayoutPanelCellBorderStyle.None); Properties.Settings.Default.DisplayShowBorders = checkBoxShowBorders.Checked; Properties.Settings.Default.Save(); } + + private void checkBoxConnectOnStartup_CheckedChanged(object sender, EventArgs e) + { + Properties.Settings.Default.DisplayConnectOnStartup = checkBoxConnectOnStartup.Checked; + Properties.Settings.Default.Save(); + } + } } diff -r f37c5ff8af18 -r 745d9ee1a2c0 Properties/Settings.Designer.cs --- a/Properties/Settings.Designer.cs Thu Jul 10 22:03:29 2014 +0200 +++ b/Properties/Settings.Designer.cs Sat Jul 12 13:13:17 2014 +0200 @@ -58,5 +58,17 @@ this["DisplayShowBorders"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool DisplayConnectOnStartup { + get { + return ((bool)(this["DisplayConnectOnStartup"])); + } + set { + this["DisplayConnectOnStartup"] = value; + } + } } } diff -r f37c5ff8af18 -r 745d9ee1a2c0 Properties/Settings.settings --- a/Properties/Settings.settings Thu Jul 10 22:03:29 2014 +0200 +++ b/Properties/Settings.settings Sat Jul 12 13:13:17 2014 +0200 @@ -11,5 +11,8 @@ False + + False + \ No newline at end of file