Index: src/Common/DelftTools.Controls.Swf/XPProgressBar.cs =================================================================== diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r5fc71a385897af92ccb092f2f969b5709afab85a --- src/Common/DelftTools.Controls.Swf/XPProgressBar.cs (.../XPProgressBar.cs) (revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9) +++ src/Common/DelftTools.Controls.Swf/XPProgressBar.cs (.../XPProgressBar.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) @@ -13,7 +13,7 @@ Horizontal, HorizontalCenter, Diagonal - } ; + }; public class XPProgressBar : Control { @@ -23,37 +23,53 @@ #endregion - #region " Private Fields " + #region " BackImage " - private Color mColor1 = Color.FromArgb(170, 240, 170); + [RefreshProperties(RefreshProperties.Repaint)] + [Category(CategoryName)] + public override Image BackgroundImage + { + get + { + return base.BackgroundImage; + } + set + { + base.BackgroundImage = value; + InvalidateBuffer(); + } + } - private Color mColor2 = Color.FromArgb(10, 150, 10); + #endregion - private Color mColorBackground = Color.White; + #region " Text Override " - private Color mColorText = Color.Black; + [Category(CategoryName)] + [Description("The Text displayed in the Progress Bar")] + [DefaultValue("")] + public override string Text + { + get + { + return base.Text; + } + set + { + if (base.Text != value) + { + base.Text = value; + Invalidate(); + } + } + } - private Image mDobleBack = null; - - private GradientMode mGradientStyle = GradientMode.VerticalCenter; - - private int mMax = 100; - - private int mMin = 0; - - private int mPosition = 50; - - private byte mSteepDistance = 2; - - private byte mSteepWidth = 6; - #endregion #region " Dispose " protected override void Dispose(bool disposing) { - if (! IsDisposed) + if (!IsDisposed) { if (mPenIn != null) { @@ -95,13 +111,42 @@ #endregion + #region " Private Fields " + + private Color mColor1 = Color.FromArgb(170, 240, 170); + + private Color mColor2 = Color.FromArgb(10, 150, 10); + + private Color mColorBackground = Color.White; + + private Color mColorText = Color.Black; + + private Image mDobleBack = null; + + private GradientMode mGradientStyle = GradientMode.VerticalCenter; + + private int mMax = 100; + + private int mMin = 0; + + private int mPosition = 50; + + private byte mSteepDistance = 2; + + private byte mSteepWidth = 6; + + #endregion + #region " Colors " [Category(CategoryName)] [Description("The Back Color of the Progress Bar")] public Color ColorBackground { - get { return mColorBackground; } + get + { + return mColorBackground; + } set { mColorBackground = value; @@ -113,7 +158,10 @@ [Description("The Border Color of the gradient in the Progress Bar")] public Color ColorBarBorder { - get { return mColor1; } + get + { + return mColor1; + } set { mColor1 = value; @@ -125,7 +173,10 @@ [Description("The Center Color of the gradient in the Progress Bar")] public Color ColorBarCenter { - get { return mColor2; } + get + { + return mColor2; + } set { mColor2 = value; @@ -140,7 +191,10 @@ [DefaultValue(false)] public bool ColorsXP { - get { return false; } + get + { + return false; + } //set //{ // ColorBarBorder = Color.FromArgb(170, 240, 170); @@ -153,7 +207,10 @@ [Description("The Color of the text displayed in the Progress Bar")] public Color ColorText { - get { return mColorText; } + get + { + return mColorText; + } set { mColorText = value; @@ -174,7 +231,10 @@ [Description("The Current Position of the Progress Bar")] public int Position { - get { return mPosition; } + get + { + return mPosition; + } set { if (value > mMax) @@ -198,7 +258,10 @@ [Description("The Max Position of the Progress Bar")] public int PositionMax { - get { return mMax; } + get + { + return mMax; + } set { if (value > mMin) @@ -220,7 +283,10 @@ [Description("The Min Position of the Progress Bar")] public int PositionMin { - get { return mMin; } + get + { + return mMin; + } set { if (value < mMax) @@ -241,7 +307,10 @@ [DefaultValue((byte) 2)] public byte SteepDistance { - get { return mSteepDistance; } + get + { + return mSteepDistance; + } set { if (value >= 0) @@ -261,7 +330,10 @@ [DefaultValue(GradientMode.VerticalCenter)] public GradientMode GradientStyle { - get { return mGradientStyle; } + get + { + return mGradientStyle; + } set { if (mGradientStyle != value) @@ -278,7 +350,10 @@ [DefaultValue((byte) 6)] public byte SteepWidth { - get { return mSteepWidth; } + get + { + return mSteepWidth; + } set { if (value > 0) @@ -291,42 +366,6 @@ #endregion - #region " BackImage " - - [RefreshProperties(RefreshProperties.Repaint)] - [Category(CategoryName)] - public override Image BackgroundImage - { - get { return base.BackgroundImage; } - set - { - base.BackgroundImage = value; - InvalidateBuffer(); - } - } - - #endregion - - #region " Text Override " - - [Category(CategoryName)] - [Description("The Text displayed in the Progress Bar")] - [DefaultValue("")] - public override string Text - { - get { return base.Text; } - set - { - if (base.Text != value) - { - base.Text = value; - Invalidate(); - } - } - } - - #endregion - #region " Text Shadow " private bool mTextShadow = false; @@ -336,7 +375,10 @@ [DefaultValue(true)] public bool TextShadow { - get { return mTextShadow; } + get + { + return mTextShadow; + } set { mTextShadow = value; @@ -355,7 +397,10 @@ [DefaultValue((byte) 150)] public byte TextShadowAlpha { - get { return mTextShadowAlpha; } + get + { + return mTextShadowAlpha; + } set { if (mTextShadowAlpha != value) @@ -433,9 +478,7 @@ } } - protected override void OnPaintBackground(PaintEventArgs pevent) - { - } + protected override void OnPaintBackground(PaintEventArgs pevent) {} #endregion @@ -457,7 +500,10 @@ protected override Size DefaultSize { - get { return new Size(100, 29); } + get + { + return new Size(100, 29); + } } #endregion @@ -579,7 +625,6 @@ mBrush2 = new LinearGradientBrush(mSteepRect2, mColor2, mColor1, LinearGradientMode.Horizontal); break; - case GradientMode.Horizontal: mSteepRect1 = new Rectangle( 0, @@ -597,7 +642,6 @@ mBrush2 = new LinearGradientBrush(mSteepRect2, Color.Red, Color.Red, LinearGradientMode.Horizontal); break; - case GradientMode.HorizontalCenter: mSteepRect1 = new Rectangle( 0, @@ -616,7 +660,6 @@ mBrush2 = new LinearGradientBrush(mSteepRect2, Color.Red, Color.Red, LinearGradientMode.Horizontal); break; - case GradientMode.Diagonal: mSteepRect1 = new Rectangle( 0,