diff --git a/SparkleShare/Windows/SparkleAbout.cs b/SparkleShare/Windows/SparkleAbout.cs index b4023f59..1ecff510 100644 --- a/SparkleShare/Windows/SparkleAbout.cs +++ b/SparkleShare/Windows/SparkleAbout.cs @@ -53,28 +53,29 @@ namespace SparkleShare { MaximizeBox = false; MinimizeBox = false; + BackgroundImage = Icons.about; ClientSize = BackgroundImage.Size; AutoScaleDimensions = new SizeF (6F, 13F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size (640, 260); MaximumSize = Size; MinimumSize = Size; - - BackgroundImage = Icons.about; + FormBorderStyle = FormBorderStyle.FixedDialog; SizeGripStyle = SizeGripStyle.Hide; StartPosition = FormStartPosition.CenterScreen; FormClosing += Close; - + CreateHandle (); + CreateAbout (); Controller.ShowWindowEvent += delegate { - Invoke ((Action) delegate { + this.version.Invoke ((Action) delegate { Show (); - Activate (); + BringToFront (); }); }; @@ -146,6 +147,7 @@ namespace SparkleShare { ResumeLayout (false); PerformLayout (); + } diff --git a/SparkleShare/Windows/SparkleStatusIcon.cs b/SparkleShare/Windows/SparkleStatusIcon.cs index feabbfa8..c5e0a6a7 100644 --- a/SparkleShare/Windows/SparkleStatusIcon.cs +++ b/SparkleShare/Windows/SparkleStatusIcon.cs @@ -231,11 +231,12 @@ namespace SparkleShare { ToolStripMenuItem about_item = new ToolStripMenuItem (_("About SparkleShare")); about_item.Click += delegate { - if (SparkleUI.About == null) - SparkleUI.About = new SparkleAbout (); + //if (SparkleUI.About == null) + // SparkleUI.About = new SparkleAbout (); - SparkleUI.About.Show (); - SparkleUI.About.BringToFront (); + //SparkleUI.About.Show (); + //SparkleUI.About.BringToFront (); + Controller.AboutClicked (); }; Menu.Items.Add (about_item); diff --git a/SparkleShare/Windows/SparkleUI.cs b/SparkleShare/Windows/SparkleUI.cs index a8b579f4..37b106d8 100644 --- a/SparkleShare/Windows/SparkleUI.cs +++ b/SparkleShare/Windows/SparkleUI.cs @@ -64,8 +64,8 @@ namespace SparkleShare { #endif Setup = new SparkleSetup (); - EventLog = new SparkleEventLog (); - //About = new SparkleAbout (); + //EventLog = new SparkleEventLog (); + About = new SparkleAbout (); Bubbles = new SparkleBubbles (); StatusIcon = new SparkleStatusIcon ();