From 1bdf4dec3f973f87bd225a9a4f86be1c06bdfff1 Mon Sep 17 00:00:00 2001 From: WithoutCaps Date: Fri, 19 May 2017 23:54:11 +0300 Subject: [PATCH] Tweaks and stuff --- LimitlessUI.sln | 4 +- LimitlessUI/Chart_WOC.cs | 6 +- LimitlessUI/FlatButton_WOC.cs | 9 +- LimitlessUI/LimitlessUI.csproj | 8 +- LimitlessUI/Properties/AssemblyInfo.cs | 6 +- LimitlessUISample/Chart_WOC.cs | 147 ------------------ LimitlessUISample/Childs/Chart_UC.Designer.cs | 93 +++++++++++ LimitlessUISample/Childs/Chart_UC.cs | 34 ++++ LimitlessUISample/Childs/Chart_UC.resx | 123 +++++++++++++++ LimitlessUISample/LimitlessUISample.csproj | 14 +- LimitlessUISample/MainForm.Designer.cs | 38 ++++- .../Tabs/ArchProgressBar_Tab.Designer.cs | 10 ++ .../Tabs/DropDown_Tab.Designer.cs | 65 ++++---- LimitlessUISample/Tabs/DropDown_Tab.cs | 15 +- 14 files changed, 358 insertions(+), 214 deletions(-) delete mode 100644 LimitlessUISample/Chart_WOC.cs create mode 100644 LimitlessUISample/Childs/Chart_UC.Designer.cs create mode 100644 LimitlessUISample/Childs/Chart_UC.cs create mode 100644 LimitlessUISample/Childs/Chart_UC.resx diff --git a/LimitlessUI.sln b/LimitlessUI.sln index 5548de7..a5d93a4 100644 --- a/LimitlessUI.sln +++ b/LimitlessUI.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26430.6 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LimitlessUI", "LimitlessUI\LimitlessUI.csproj", "{EE394A8D-F664-4D66-8E28-35F075FDC79D}" EndProject diff --git a/LimitlessUI/Chart_WOC.cs b/LimitlessUI/Chart_WOC.cs index aa8d692..2cee6a0 100644 --- a/LimitlessUI/Chart_WOC.cs +++ b/LimitlessUI/Chart_WOC.cs @@ -113,7 +113,9 @@ protected override void OnPaint(PaintEventArgs pe) { pen1.Color = serie.lineColor; float xLineCord = 0; - PointF lastPoint = new PointF(0, -serie.values.First()); + PointF lastPoint; + if (serie.values.Count != 0) + lastPoint = new PointF(0, -serie.values.First()); foreach (int yVal in serie.values) { PointF point = new PointF(xLineCord, -yVal); @@ -177,7 +179,7 @@ public int ChartLength { get { return _chartLength; } set { _chartLength = value; Invalidate(); } - } + } #endregion //-----------------------------------[Serie Class]-----------------------------------// public class Serie diff --git a/LimitlessUI/FlatButton_WOC.cs b/LimitlessUI/FlatButton_WOC.cs index c70aaa7..7456c0a 100644 --- a/LimitlessUI/FlatButton_WOC.cs +++ b/LimitlessUI/FlatButton_WOC.cs @@ -49,7 +49,6 @@ private void onClick(object sender, MouseEventArgs e) if (control is FlatButton_WOC) ((FlatButton_WOC)control).unselect(); _selected = true; - Invalidate(); } } @@ -61,7 +60,6 @@ public void unselect() BackColor = _defaultBackColor; ForeColor = _defaultForeColor; } - Invalidate(); } private void onMouseExit(object sender, EventArgs e) @@ -97,7 +95,7 @@ protected override void OnPaint(PaintEventArgs pe) if (_drawImage && _image != null) { float drawHeight = Height / 2 - _imageSize.Height / 2; - pe.Graphics.DrawImage(_selected || (_mouseHovering && _useActiveImageWhileHovering) ? (_selectedImage != null ? _selectedImage : _image) : _image, drawHeight, drawHeight, _imageSize.Width, _imageSize.Height); + pe.Graphics.DrawImage(_selected || (_mouseHovering && _useActiveImageWhileHovering) ? ( _selectedImage ?? _image) : _image, drawHeight, drawHeight, _imageSize.Width, _imageSize.Height); } } @@ -194,8 +192,6 @@ public ContentAlignment TextAligment } } - - public Image ActiveImage { get { return _selectedImage; } @@ -266,5 +262,4 @@ public SizeF ImageSize } } #endregion -} - +} \ No newline at end of file diff --git a/LimitlessUI/LimitlessUI.csproj b/LimitlessUI/LimitlessUI.csproj index 487832c..e1eac64 100644 --- a/LimitlessUI/LimitlessUI.csproj +++ b/LimitlessUI/LimitlessUI.csproj @@ -8,7 +8,7 @@ Library Properties LimitlessUI - LimitlessUI_1.3.0 + LimitlessUI_1.5.0 v4.5.2 512 @@ -48,6 +48,9 @@ Component + + Component + Component @@ -66,6 +69,9 @@ Component + + Component + Component diff --git a/LimitlessUI/Properties/AssemblyInfo.cs b/LimitlessUI/Properties/AssemblyInfo.cs index 3bfb447..3652e4b 100644 --- a/LimitlessUI/Properties/AssemblyInfo.cs +++ b/LimitlessUI/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("LimitlessUI")] -[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyCopyright("Copyright WithoutCaps © 2017")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.5.0.0")] +[assembly: AssemblyFileVersion("1.5.0.0")] diff --git a/LimitlessUISample/Chart_WOC.cs b/LimitlessUISample/Chart_WOC.cs deleted file mode 100644 index a87136e..0000000 --- a/LimitlessUISample/Chart_WOC.cs +++ /dev/null @@ -1,147 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Diagnostics; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace LimitlessUISample -{ - public partial class Chart_WOC : Control - { - private int _lineThikness = 1; - private int _chartLineThinkness = 3; - private int _minYValue = 0; - private int _maxYValue = 100; - private int _valueInterval = 50; - private int _chartLength = 100; - private bool _hovering = false; - private List _series = new List(); - private PointF _chartArea = new PointF(0, 0); - private float _xLineIncrement; - - private class Serie - { - public List values = new List(); - public Color lineColor = Color.Black; - - public Serie(Color lineColor) - { - this.lineColor = lineColor; - } - } - public Chart_WOC() - { - DoubleBuffered = true; - MouseHover += onMouseHover; - MouseEnter += onMouseEnter; - MouseLeave += onMouseLeave; - SizeChanged += onSizeChanged; - calculateConsts(); - } - - private void onSizeChanged(object sender, EventArgs e) - { - calculateConsts(); - } - - private void onMouseLeave(object sender, EventArgs e) - { - _hovering = false; - } - - private void onMouseEnter(object sender, EventArgs e) - { - _hovering = true; - } - - private void onMouseHover(object sender, EventArgs e) - { - Invalidate(); - } - - protected override void OnPaddingChanged(EventArgs e) - { - base.OnPaddingChanged(e); - calculateConsts(); - Invalidate(); - } - - private void drawChartArea(Graphics g, Pen pen1, float chartAreaLength, float labelsCountY) - { - g.TranslateTransform(Padding.Left, Height - Padding.Bottom); - g.DrawLine(pen1, 0, 0, chartAreaLength, 0); - g.DrawLine(pen1, 0, 0, 0, -(Height - Padding.Top - Padding.Bottom)); - - float yLabelsCord = 0; - for (int i = 0; i <= labelsCountY; i++) - { - string label = (i * _valueInterval).ToString(); - SizeF labelSize = g.MeasureString(label, Font); - g.DrawString(label, Font, new SolidBrush(ForeColor), -labelSize.Width, -(yLabelsCord + labelSize.Height / 2)); - yLabelsCord += (Height - Padding.Top - Padding.Bottom) / labelsCountY; - } - } - - private void calculateConsts() - { - _chartArea.X = Width - Padding.Right - Padding.Left; - _chartArea.Y = Height - Padding.Top - Padding.Bottom; - _xLineIncrement = _chartArea.X / _chartLength; - } - private void drawMouseLine(Graphics g, Pen pen) - { - if (_hovering) - { - pen.Color = ForeColor; - Point cor = PointToClient(Cursor.Position); - g.DrawLine(pen, cor.X - Padding.Left, 0, cor.X - Padding.Left, -_chartArea.Y); - - } - } - protected override void OnPaint(PaintEventArgs pe) - { - base.OnPaint(pe); - Graphics g = pe.Graphics; - Pen pen1 = new Pen(ForeColor, _lineThikness); - - drawChartArea(g, pen1, _chartArea.X, (_maxYValue - _minYValue) / _valueInterval); - - g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias; //check - pen1.Width = _chartLineThinkness; - foreach (Serie serie in _series) - { - pen1.Color = serie.lineColor; - float xLineCord = 0; - PointF lastPoint = new PointF(0, 0); - - foreach (int yVal in serie.values) - { - PointF point = new PointF(xLineCord, -yVal); - g.DrawLine(pen1, lastPoint, point); - lastPoint = point; - xLineCord += _xLineIncrement; - } - } - drawMouseLine(g, pen1); - } - - public void addSerie(Color lineColor) - { - _series.Add(new Serie(lineColor)); - } - public void addValue(int serie, int value) - { - List values = _series.ElementAt(serie).values; - values.Add(value); - Invalidate(); - if (_chartLength < values.Count) - values.Remove(values.First()); - } - - } -} diff --git a/LimitlessUISample/Childs/Chart_UC.Designer.cs b/LimitlessUISample/Childs/Chart_UC.Designer.cs new file mode 100644 index 0000000..7f343eb --- /dev/null +++ b/LimitlessUISample/Childs/Chart_UC.Designer.cs @@ -0,0 +1,93 @@ +namespace LimitlessUISample.Childs +{ + partial class Chart_UC + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + this.timer1 = new System.Windows.Forms.Timer(this.components); + this.legend_WOC2 = new LimitlessUISample.Legend_WOC(); + this.chart_WOC2 = new LimitlessUISample.Chart_WOC(); + this.SuspendLayout(); + // + // timer1 + // + this.timer1.Tick += new System.EventHandler(this.timer1_Tick); + // + // legend_WOC2 + // + this.legend_WOC2.AutoExpand = false; + this.legend_WOC2.AutoScroll = true; + this.legend_WOC2.Chart = this.chart_WOC2; + this.legend_WOC2.Dock = System.Windows.Forms.DockStyle.Bottom; + this.legend_WOC2.Location = new System.Drawing.Point(0, 293); + this.legend_WOC2.Name = "legend_WOC2"; + this.legend_WOC2.Size = new System.Drawing.Size(801, 30); + this.legend_WOC2.TabIndex = 1; + this.legend_WOC2.Text = "legend_WOC2"; + this.legend_WOC2.TextColor = System.Drawing.Color.Empty; + this.legend_WOC2.Vertical = false; + // + // chart_WOC2 + // + this.chart_WOC2.ChartLength = 100; + this.chart_WOC2.ChartLineThikness = 3; + this.chart_WOC2.Dock = System.Windows.Forms.DockStyle.Fill; + this.chart_WOC2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(42)))), ((int)(((byte)(42))))); + this.chart_WOC2.LineThikness = 1; + this.chart_WOC2.Location = new System.Drawing.Point(0, 0); + this.chart_WOC2.MaxYValue = 100; + this.chart_WOC2.MinYValue = 0; + this.chart_WOC2.Name = "chart_WOC2"; + this.chart_WOC2.Padding = new System.Windows.Forms.Padding(30, 30, 30, 10); + this.chart_WOC2.Size = new System.Drawing.Size(801, 293); + this.chart_WOC2.TabIndex = 2; + this.chart_WOC2.Text = "chart_WOC2"; + this.chart_WOC2.ValueInterval = 50; + // + // Chart_UC + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.White; + this.Controls.Add(this.chart_WOC2); + this.Controls.Add(this.legend_WOC2); + this.Name = "Chart_UC"; + this.Size = new System.Drawing.Size(801, 323); + this.ResumeLayout(false); + + } + + #endregion + + private Legend_WOC legend_WOC1; + private Chart_WOC chart_WOC1; + private System.Windows.Forms.Timer timer1; + private Legend_WOC legend_WOC2; + private Chart_WOC chart_WOC2; + } +} diff --git a/LimitlessUISample/Childs/Chart_UC.cs b/LimitlessUISample/Childs/Chart_UC.cs new file mode 100644 index 0000000..f28550e --- /dev/null +++ b/LimitlessUISample/Childs/Chart_UC.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace LimitlessUISample.Childs +{ + public partial class Chart_UC : UserControl + { + public Chart_UC() + { + InitializeComponent(); + timer1.Start(); + chart_WOC2.addSerie(Color.Green, "serie1", true); + chart_WOC2.addSerie(Color.Red, "serie2", false); + legend_WOC2.notifySeriesChanged(); + } + + + private void timer1_Tick(object sender, EventArgs e) + { + Random r = new Random(); + int val = r.Next(100); + chart_WOC2.addValue(0, val); + chart_WOC2.addValue(1, val + 10); + + } + } +} diff --git a/LimitlessUISample/Childs/Chart_UC.resx b/LimitlessUISample/Childs/Chart_UC.resx new file mode 100644 index 0000000..1f666f2 --- /dev/null +++ b/LimitlessUISample/Childs/Chart_UC.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + \ No newline at end of file diff --git a/LimitlessUISample/LimitlessUISample.csproj b/LimitlessUISample/LimitlessUISample.csproj index fa17860..0671986 100644 --- a/LimitlessUISample/LimitlessUISample.csproj +++ b/LimitlessUISample/LimitlessUISample.csproj @@ -33,8 +33,8 @@ 4 - - ..\LimitlessUI\bin\Debug\LimitlessUI_1.3.0.dll + + ..\LimitlessUI\bin\Debug\LimitlessUI_1.5.0.dll @@ -51,8 +51,11 @@ - - Component + + UserControl + + + Chart_UC.cs UserControl @@ -104,6 +107,9 @@ Slider_Tab.cs + + Chart_UC.cs + Other_ListView_Child.cs diff --git a/LimitlessUISample/MainForm.Designer.cs b/LimitlessUISample/MainForm.Designer.cs index f26a2e4..cf79445 100644 --- a/LimitlessUISample/MainForm.Designer.cs +++ b/LimitlessUISample/MainForm.Designer.cs @@ -51,6 +51,8 @@ private void InitializeComponent() this.elipse_WOC1 = new Elipse_WOC(); this.control1 = new System.Windows.Forms.Control(); this.nav_adapter = new TabsAdapter_WOC(); + this.listView_WOC1 = new ListView_WOC(); + this.listView_WOC2 = new ListView_WOC(); this.panel1.SuspendLayout(); this.nav_panel.SuspendLayout(); this.header.SuspendLayout(); @@ -98,6 +100,8 @@ private void InitializeComponent() this.flatButton_WOC6.ActiveColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(43)))), ((int)(((byte)(55))))); this.flatButton_WOC6.ActiveImage = null; this.flatButton_WOC6.ActiveTextColor = System.Drawing.Color.SeaGreen; + this.flatButton_WOC6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(53)))), ((int)(((byte)(65))))); + this.flatButton_WOC6.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(33)))), ((int)(((byte)(45))))); this.flatButton_WOC6.DefaultForeColor = System.Drawing.Color.White; this.flatButton_WOC6.Dock = System.Windows.Forms.DockStyle.Top; this.flatButton_WOC6.DrawImage = true; @@ -125,6 +129,8 @@ private void InitializeComponent() this.flatButton_WOC5.ActiveColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(43)))), ((int)(((byte)(55))))); this.flatButton_WOC5.ActiveImage = null; this.flatButton_WOC5.ActiveTextColor = System.Drawing.Color.SeaGreen; + this.flatButton_WOC5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(53)))), ((int)(((byte)(65))))); + this.flatButton_WOC5.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(33)))), ((int)(((byte)(45))))); this.flatButton_WOC5.DefaultForeColor = System.Drawing.Color.White; this.flatButton_WOC5.Dock = System.Windows.Forms.DockStyle.Top; this.flatButton_WOC5.DrawImage = true; @@ -152,6 +158,8 @@ private void InitializeComponent() this.flatButton_WOC4.ActiveColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(43)))), ((int)(((byte)(55))))); this.flatButton_WOC4.ActiveImage = null; this.flatButton_WOC4.ActiveTextColor = System.Drawing.Color.SeaGreen; + this.flatButton_WOC4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(53)))), ((int)(((byte)(65))))); + this.flatButton_WOC4.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(33)))), ((int)(((byte)(45))))); this.flatButton_WOC4.DefaultForeColor = System.Drawing.Color.White; this.flatButton_WOC4.Dock = System.Windows.Forms.DockStyle.Top; this.flatButton_WOC4.DrawImage = true; @@ -179,6 +187,8 @@ private void InitializeComponent() this.flatButton_WOC3.ActiveColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(43)))), ((int)(((byte)(55))))); this.flatButton_WOC3.ActiveImage = null; this.flatButton_WOC3.ActiveTextColor = System.Drawing.Color.SeaGreen; + this.flatButton_WOC3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(53)))), ((int)(((byte)(65))))); + this.flatButton_WOC3.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(33)))), ((int)(((byte)(45))))); this.flatButton_WOC3.DefaultForeColor = System.Drawing.Color.White; this.flatButton_WOC3.Dock = System.Windows.Forms.DockStyle.Top; this.flatButton_WOC3.DrawImage = true; @@ -206,6 +216,8 @@ private void InitializeComponent() this.flatButton_WOC2.ActiveColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(43)))), ((int)(((byte)(55))))); this.flatButton_WOC2.ActiveImage = null; this.flatButton_WOC2.ActiveTextColor = System.Drawing.Color.SeaGreen; + this.flatButton_WOC2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(53)))), ((int)(((byte)(65))))); + this.flatButton_WOC2.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(33)))), ((int)(((byte)(45))))); this.flatButton_WOC2.DefaultForeColor = System.Drawing.Color.White; this.flatButton_WOC2.Dock = System.Windows.Forms.DockStyle.Top; this.flatButton_WOC2.DrawImage = true; @@ -233,7 +245,8 @@ private void InitializeComponent() this.flatButton_WOC1.ActiveColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(43)))), ((int)(((byte)(55))))); this.flatButton_WOC1.ActiveImage = null; this.flatButton_WOC1.ActiveTextColor = System.Drawing.Color.SeaGreen; - this.flatButton_WOC1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(43)))), ((int)(((byte)(55))))); + this.flatButton_WOC1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(53)))), ((int)(((byte)(65))))); + this.flatButton_WOC1.DefaultBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(33)))), ((int)(((byte)(45))))); this.flatButton_WOC1.DefaultForeColor = System.Drawing.Color.White; this.flatButton_WOC1.Dock = System.Windows.Forms.DockStyle.Top; this.flatButton_WOC1.DrawImage = true; @@ -368,6 +381,7 @@ private void InitializeComponent() // // dragControl_WOC1 // + this.dragControl_WOC1.DraggableInnerControls = false; this.dragControl_WOC1.Fixed = true; this.dragControl_WOC1.MaximiseOnDoubleClick = true; this.dragControl_WOC1.TargetControl = this.header; @@ -389,6 +403,26 @@ private void InitializeComponent() // this.nav_adapter.Control = this.tabs_holder; // + // listView_WOC1 + // + this.listView_WOC1.AutoExpand = false; + this.listView_WOC1.AutoScroll = true; + this.listView_WOC1.Location = new System.Drawing.Point(0, 0); + this.listView_WOC1.Name = "listView_WOC1"; + this.listView_WOC1.Size = new System.Drawing.Size(0, 0); + this.listView_WOC1.TabIndex = 0; + this.listView_WOC1.Vertical = true; + // + // listView_WOC2 + // + this.listView_WOC2.AutoExpand = false; + this.listView_WOC2.AutoScroll = true; + this.listView_WOC2.Location = new System.Drawing.Point(0, 0); + this.listView_WOC2.Name = "listView_WOC2"; + this.listView_WOC2.Size = new System.Drawing.Size(0, 0); + this.listView_WOC2.TabIndex = 0; + this.listView_WOC2.Vertical = true; + // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -436,6 +470,8 @@ private void InitializeComponent() private FlatButton_WOC flatButton_WOC6; private System.Windows.Forms.Control control1; private TabsAdapter_WOC nav_adapter; + private ListView_WOC listView_WOC1; + private ListView_WOC listView_WOC2; } } diff --git a/LimitlessUISample/Tabs/ArchProgressBar_Tab.Designer.cs b/LimitlessUISample/Tabs/ArchProgressBar_Tab.Designer.cs index 5a764e9..7ef79ab 100644 --- a/LimitlessUISample/Tabs/ArchProgressBar_Tab.Designer.cs +++ b/LimitlessUISample/Tabs/ArchProgressBar_Tab.Designer.cs @@ -64,6 +64,7 @@ private void InitializeComponent() this.archProgressBar_WOC11.Font1 = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.archProgressBar_WOC11.Font2 = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.archProgressBar_WOC11.Font3 = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.archProgressBar_WOC11.IgnoreHeight = true; this.archProgressBar_WOC11.Location = new System.Drawing.Point(603, 201); this.archProgressBar_WOC11.Name = "archProgressBar_WOC11"; this.archProgressBar_WOC11.Offset = new System.Drawing.Point(0, 0); @@ -90,6 +91,7 @@ private void InitializeComponent() this.archProgressBar_WOC10.Font1 = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.archProgressBar_WOC10.Font2 = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.archProgressBar_WOC10.Font3 = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.archProgressBar_WOC10.IgnoreHeight = true; this.archProgressBar_WOC10.Location = new System.Drawing.Point(603, 0); this.archProgressBar_WOC10.Name = "archProgressBar_WOC10"; this.archProgressBar_WOC10.Offset = new System.Drawing.Point(0, 0); @@ -116,6 +118,7 @@ private void InitializeComponent() this.archProgressBar_WOC8.Font1 = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.archProgressBar_WOC8.Font2 = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.archProgressBar_WOC8.Font3 = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.archProgressBar_WOC8.IgnoreHeight = true; this.archProgressBar_WOC8.Location = new System.Drawing.Point(201, 394); this.archProgressBar_WOC8.Name = "archProgressBar_WOC8"; this.archProgressBar_WOC8.Offset = new System.Drawing.Point(0, 0); @@ -142,6 +145,7 @@ private void InitializeComponent() this.archProgressBar_WOC9.Font1 = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.archProgressBar_WOC9.Font2 = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.archProgressBar_WOC9.Font3 = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.archProgressBar_WOC9.IgnoreHeight = true; this.archProgressBar_WOC9.Location = new System.Drawing.Point(0, 394); this.archProgressBar_WOC9.Name = "archProgressBar_WOC9"; this.archProgressBar_WOC9.Offset = new System.Drawing.Point(0, 0); @@ -168,6 +172,7 @@ private void InitializeComponent() this.archProgressBar_WOC4.Font1 = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.archProgressBar_WOC4.Font2 = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.archProgressBar_WOC4.Font3 = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.archProgressBar_WOC4.IgnoreHeight = true; this.archProgressBar_WOC4.Location = new System.Drawing.Point(402, 201); this.archProgressBar_WOC4.Name = "archProgressBar_WOC4"; this.archProgressBar_WOC4.Offset = new System.Drawing.Point(0, 0); @@ -194,6 +199,7 @@ private void InitializeComponent() this.archProgressBar_WOC5.Font1 = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.archProgressBar_WOC5.Font2 = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.archProgressBar_WOC5.Font3 = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.archProgressBar_WOC5.IgnoreHeight = true; this.archProgressBar_WOC5.Location = new System.Drawing.Point(201, 201); this.archProgressBar_WOC5.Name = "archProgressBar_WOC5"; this.archProgressBar_WOC5.Offset = new System.Drawing.Point(0, 0); @@ -220,6 +226,7 @@ private void InitializeComponent() this.archProgressBar_WOC6.Font1 = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.archProgressBar_WOC6.Font2 = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.archProgressBar_WOC6.Font3 = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.archProgressBar_WOC6.IgnoreHeight = true; this.archProgressBar_WOC6.Location = new System.Drawing.Point(0, 201); this.archProgressBar_WOC6.Name = "archProgressBar_WOC6"; this.archProgressBar_WOC6.Offset = new System.Drawing.Point(0, 0); @@ -246,6 +253,7 @@ private void InitializeComponent() this.archProgressBar_WOC3.Font1 = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.archProgressBar_WOC3.Font2 = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.archProgressBar_WOC3.Font3 = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.archProgressBar_WOC3.IgnoreHeight = true; this.archProgressBar_WOC3.Location = new System.Drawing.Point(402, 0); this.archProgressBar_WOC3.Name = "archProgressBar_WOC3"; this.archProgressBar_WOC3.Offset = new System.Drawing.Point(0, 0); @@ -272,6 +280,7 @@ private void InitializeComponent() this.archProgressBar_WOC2.Font1 = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.archProgressBar_WOC2.Font2 = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.archProgressBar_WOC2.Font3 = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.archProgressBar_WOC2.IgnoreHeight = true; this.archProgressBar_WOC2.Location = new System.Drawing.Point(201, 0); this.archProgressBar_WOC2.Name = "archProgressBar_WOC2"; this.archProgressBar_WOC2.Offset = new System.Drawing.Point(0, 0); @@ -298,6 +307,7 @@ private void InitializeComponent() this.archProgressBar_WOC1.Font1 = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.archProgressBar_WOC1.Font2 = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.archProgressBar_WOC1.Font3 = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.archProgressBar_WOC1.IgnoreHeight = true; this.archProgressBar_WOC1.Location = new System.Drawing.Point(0, 0); this.archProgressBar_WOC1.Name = "archProgressBar_WOC1"; this.archProgressBar_WOC1.Offset = new System.Drawing.Point(10, 0); diff --git a/LimitlessUISample/Tabs/DropDown_Tab.Designer.cs b/LimitlessUISample/Tabs/DropDown_Tab.Designer.cs index 9d784e5..a928cea 100644 --- a/LimitlessUISample/Tabs/DropDown_Tab.Designer.cs +++ b/LimitlessUISample/Tabs/DropDown_Tab.Designer.cs @@ -29,24 +29,21 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - this.button1 = new System.Windows.Forms.Button(); - this.dropDown_WOC1 = new DropDown_WOC(); - this.chart_WOC1 = new LimitlessUISample.Chart_WOC(); this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer2 = new System.Windows.Forms.Timer(this.components); + this.dropDown_WOC1 = new DropDown_WOC(); this.animator_WOC1 = new Animator_WOC(); + this.listView_WOC1 = new ListView_WOC(); + this.chart_UC1 = new LimitlessUISample.Childs.Chart_UC(); this.SuspendLayout(); // - // button1 + // timer1 + // + // + // timer2 // - this.button1.Dock = System.Windows.Forms.DockStyle.Top; - this.button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 13.25F); - this.button1.Location = new System.Drawing.Point(0, 32); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(803, 104); - this.button1.TabIndex = 1; - this.button1.Text = "Random Button"; - this.button1.UseVisualStyleBackColor = true; + this.timer2.Enabled = true; + this.timer2.Interval = 500; // // dropDown_WOC1 // @@ -57,43 +54,43 @@ private void InitializeComponent() this.dropDown_WOC1.Location = new System.Drawing.Point(0, 0); this.dropDown_WOC1.Name = "dropDown_WOC1"; this.dropDown_WOC1.PointsDown = true; - this.dropDown_WOC1.SetLayout = this.button1; + this.dropDown_WOC1.SetLayout = this.chart_UC1; this.dropDown_WOC1.Size = new System.Drawing.Size(803, 32); this.dropDown_WOC1.TabIndex = 0; this.dropDown_WOC1.Text = "This is dropdown thingy"; this.dropDown_WOC1.TextDistance = 35F; this.dropDown_WOC1.UpImage = null; // - // chart_WOC1 - // - this.chart_WOC1.Location = new System.Drawing.Point(42, 155); - this.chart_WOC1.Name = "chart_WOC1"; - this.chart_WOC1.Padding = new System.Windows.Forms.Padding(20); - this.chart_WOC1.Size = new System.Drawing.Size(728, 199); - this.chart_WOC1.TabIndex = 2; - this.chart_WOC1.Text = "chart_WOC1"; - // - // timer1 + // animator_WOC1 // - this.timer1.Tick += new System.EventHandler(this.timer1_Tick); + this.animator_WOC1.Controls = null; + this.animator_WOC1.Delay = 17; // - // timer2 + // listView_WOC1 // - this.timer2.Enabled = true; - this.timer2.Interval = 500; + this.listView_WOC1.AutoExpand = false; + this.listView_WOC1.AutoScroll = true; + this.listView_WOC1.Location = new System.Drawing.Point(0, 0); + this.listView_WOC1.Name = "listView_WOC1"; + this.listView_WOC1.Size = new System.Drawing.Size(0, 0); + this.listView_WOC1.TabIndex = 0; + this.listView_WOC1.Vertical = true; // - // animator_WOC1 + // chart_UC1 // - this.animator_WOC1.Controls = null; - this.animator_WOC1.Delay = 17; + this.chart_UC1.BackColor = System.Drawing.Color.White; + this.chart_UC1.Dock = System.Windows.Forms.DockStyle.Top; + this.chart_UC1.Location = new System.Drawing.Point(0, 32); + this.chart_UC1.Name = "chart_UC1"; + this.chart_UC1.Size = new System.Drawing.Size(803, 323); + this.chart_UC1.TabIndex = 4; // // DropDown_Tab // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.White; - this.Controls.Add(this.chart_WOC1); - this.Controls.Add(this.button1); + this.Controls.Add(this.chart_UC1); this.Controls.Add(this.dropDown_WOC1); this.Name = "DropDown_Tab"; this.Size = new System.Drawing.Size(803, 507); @@ -104,10 +101,10 @@ private void InitializeComponent() #endregion private DropDown_WOC dropDown_WOC1; - private System.Windows.Forms.Button button1; - private Chart_WOC chart_WOC1; private System.Windows.Forms.Timer timer1; private System.Windows.Forms.Timer timer2; private Animator_WOC animator_WOC1; + private ListView_WOC listView_WOC1; + private Childs.Chart_UC chart_UC1; } } diff --git a/LimitlessUISample/Tabs/DropDown_Tab.cs b/LimitlessUISample/Tabs/DropDown_Tab.cs index e0f8b5d..9416081 100644 --- a/LimitlessUISample/Tabs/DropDown_Tab.cs +++ b/LimitlessUISample/Tabs/DropDown_Tab.cs @@ -18,10 +18,8 @@ public partial class DropDown_Tab : UserControl, Tab_WOC public DropDown_Tab() { InitializeComponent(); - timer1.Start(); - chart_WOC1.addSerie(Color.Green); - chart_WOC1.addSerie(Color.Yellow); + } public static DropDown_Tab getInstance() @@ -35,15 +33,6 @@ public void onShowTab() { Debug.WriteLine("Showing DropDown_Tab"); } - - private void timer1_Tick(object sender, EventArgs e) - { - Random r = new Random(); - int val = r.Next(100); - chart_WOC1.addValue(0,val); - chart_WOC1.addValue(1, val+10); - - - } + } }