diff --git a/src/AddIns/Misc/StartPage/Project/Src/ICSharpCodePage.cs b/src/AddIns/Misc/StartPage/Project/Src/ICSharpCodePage.cs index 629be722e0..000f462175 100644 --- a/src/AddIns/Misc/StartPage/Project/Src/ICSharpCodePage.cs +++ b/src/AddIns/Misc/StartPage/Project/Src/ICSharpCodePage.cs @@ -202,7 +202,7 @@ namespace ICSharpCode.StartPage StaticStyleSheet = startPageLocation + "/Layout/default.css"; MetaAuthor = "Christoph Wille - christophw@alphasierrapapa.com"; - MetaCopyright = "(c) 2001-2007 AlphaSierraPapa"; + MetaCopyright = "(c) 2001-2008 AlphaSierraPapa"; ShowLeftMenu = false; ShowRightBox = false; @@ -475,7 +475,7 @@ namespace ICSharpCode.StartPage builder.Append(m_strMainColColor); builder.Append("\" class=\"copy\">"); builder.Append(""); - builder.Append("Copyright ©2000-2007 IC#SharpCode. "); builder.Append(ICSharpCode.SharpDevelop.Gui.AboutSharpDevelopTabPage.LicenseSentence); diff --git a/src/Main/Base/Project/Resources/CommonAboutDialog.xfrm b/src/Main/Base/Project/Resources/CommonAboutDialog.xfrm index 4321c7ba91..7d12f05618 100644 --- a/src/Main/Base/Project/Resources/CommonAboutDialog.xfrm +++ b/src/Main/Base/Project/Resources/CommonAboutDialog.xfrm @@ -26,7 +26,7 @@ - + diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/CommonAboutDialog.cs b/src/Main/Base/Project/Src/Gui/Dialogs/CommonAboutDialog.cs index 77182ec98e..795c08703f 100644 --- a/src/Main/Base/Project/Src/Gui/Dialogs/CommonAboutDialog.cs +++ b/src/Main/Base/Project/Src/Gui/Dialogs/CommonAboutDialog.cs @@ -7,6 +7,7 @@ using System; using System.Drawing; +using System.Runtime.Serialization; using System.Windows.Forms; using ICSharpCode.Core; @@ -68,12 +69,25 @@ namespace ICSharpCode.SharpDevelop.Gui "On two occasions, I have been asked [by members of Parliament], 'Pray, Mr. Babbage, if you put into the machine wrong figures, will the right answers come out?' I am not able to rightly apprehend the kind of confusion of ideas that could provoke such a question.\"\n -- Charles Babbage (1791-1871)" }; + // randomize the order in which the texts are displayed + Random rnd = new Random(); + for (int i = 0; i < text.Length; i++) { + Swap(ref text[i], ref text[rnd.Next(i, text.Length)]); + } + timer = new Timer(); timer.Interval = 40; timer.Tick += new EventHandler(ScrollDown); timer.Start(); } + void Swap(ref string a, ref string b) + { + string c = a; + a = b; + b = c; + } + void ScrollDown(object sender, EventArgs e) { ++scroll; @@ -91,14 +105,14 @@ namespace ICSharpCode.SharpDevelop.Gui { Graphics g = pe.Graphics; if (textHeights == null) { - textHeights = new int[text.Length]; + textHeights = new int[text.Length]; for (int i = 0; i < text.Length; ++i) { textHeights[i] = (int)g.MeasureString(text[i], Font, new SizeF(Width / 2, Height * 2)).Height; } } g.DrawString(text[curText], Font, - Brushes.Black, + Brushes.Black, new Rectangle(Width / 2, 0 - scroll, Width / 2, Height * 2)); if (scroll > textHeights[curText]) { diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/SharpDevelopAboutPanels.cs b/src/Main/Base/Project/Src/Gui/Dialogs/SharpDevelopAboutPanels.cs index b57aaac365..87f110e4d8 100644 --- a/src/Main/Base/Project/Src/Gui/Dialogs/SharpDevelopAboutPanels.cs +++ b/src/Main/Base/Project/Src/Gui/Dialogs/SharpDevelopAboutPanels.cs @@ -6,10 +6,12 @@ // using System; +using System.Globalization; using System.Reflection; using System.Runtime.Serialization; using System.Text; using System.Windows.Forms; +using System.Diagnostics.CodeAnalysis; using ICSharpCode.Core; @@ -24,8 +26,7 @@ namespace ICSharpCode.SharpDevelop.Gui TextBox versionTextBox = new TextBox(); Label sponsorLabel = new Label(); - - Button throwExceptionButton = new Button(); + TextBox versionInfoTextBox = new TextBox(); public AboutSharpDevelopTabPage() { @@ -61,14 +62,19 @@ namespace ICSharpCode.SharpDevelop.Gui sponsorLabel.Size = new System.Drawing.Size(362, 24); sponsorLabel.TabIndex = 8; Controls.Add(sponsorLabel); - Dock = DockStyle.Fill; - throwExceptionButton.Location = new System.Drawing.Point(8, sponsorLabel.Bounds.Bottom + 1); - throwExceptionButton.AutoSize = true; - throwExceptionButton.Text = ResourceService.GetString("Dialog.About.ThrowExceptionButton"); - throwExceptionButton.Size = new System.Drawing.Size(96, 24); - throwExceptionButton.Click += new EventHandler(ThrowExceptionButtonClick); - Controls.Add(throwExceptionButton); + versionInfoTextBox.Location = new System.Drawing.Point(8, 34 + 28); + versionInfoTextBox.Size = new System.Drawing.Size(362, 100); + versionInfoTextBox.Multiline = true; + versionInfoTextBox.ReadOnly = true; + versionInfoTextBox.WordWrap = false; + versionInfoTextBox.Text = GetVersionInformationString(); + versionInfoTextBox.ScrollBars = ScrollBars.Both; + versionInfoTextBox.TabIndex = 9; + versionInfoTextBox.Font = ResourceService.LoadFont("Courier New", 8); + Controls.Add(versionInfoTextBox); + + Dock = DockStyle.Fill; } public static string LicenseSentence { @@ -78,29 +84,44 @@ namespace ICSharpCode.SharpDevelop.Gui } } - [Serializable()] - class ClownFishException : System.Exception + [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")] + public static string GetVersionInformationString() { - public ClownFishException() : base() - { - } - - public ClownFishException(string message) : base(message) - { - } - - public ClownFishException(string message, Exception innerException) : base(message, innerException) - { - } - - protected ClownFishException(SerializationInfo info, StreamingContext context) : base(info, context) - { - } - } - - void ThrowExceptionButtonClick(object sender, EventArgs e) - { - throw new ClownFishException(); + string str = ""; + Version v = typeof(AboutSharpDevelopTabPage).Assembly.GetName().Version; + str += "SharpDevelop Version : " + v.ToString() + Environment.NewLine; + str += ".NET Version : " + Environment.Version.ToString() + Environment.NewLine; + str += "OS Version : " + Environment.OSVersion.ToString() + Environment.NewLine; + string cultureName = null; + try { + cultureName = CultureInfo.CurrentCulture.Name; + str += "Current culture : " + CultureInfo.CurrentCulture.EnglishName + " (" + cultureName + ")" + Environment.NewLine; + } catch {} + try { + if (cultureName == null || !cultureName.StartsWith(ResourceService.Language)) { + str += "Current UI language : " + ResourceService.Language + Environment.NewLine; + } + } catch {} + try { + if (IntPtr.Size != 4) { + str += "Running as " + (IntPtr.Size * 8) + " bit process" + Environment.NewLine; + } + string PROCESSOR_ARCHITEW6432 = Environment.GetEnvironmentVariable("PROCESSOR_ARCHITEW6432"); + if (!string.IsNullOrEmpty(PROCESSOR_ARCHITEW6432)) { + str += "Running under WOW6432, processor architecture: " + PROCESSOR_ARCHITEW6432; + } + } catch {} + try { + if (SystemInformation.TerminalServerSession) { + str += "Terminal Server Session" + Environment.NewLine; + } + if (SystemInformation.BootMode != BootMode.Normal) { + str += "Boot Mode : " + SystemInformation.BootMode + Environment.NewLine; + } + } catch {} + str += "Working Set Memory : " + (Environment.WorkingSet / 1024) + "kb" + Environment.NewLine; + str += "GC Heap Memory : " + (GC.GetTotalMemory(false) / 1024) + "kb" + Environment.NewLine; + return str; } } diff --git a/src/Main/Base/Project/Src/Project/CompilableProject.cs b/src/Main/Base/Project/Src/Project/CompilableProject.cs index 6bc7aa3117..359e2c50ce 100644 --- a/src/Main/Base/Project/Src/Project/CompilableProject.cs +++ b/src/Main/Base/Project/Src/Project/CompilableProject.cs @@ -147,6 +147,7 @@ namespace ICSharpCode.SharpDevelop.Project get; } + [Browsable(false)] public string TargetFrameworkVersion { get { return GetEvaluatedProperty("TargetFrameworkVersion") ?? "v2.0"; } set { SetProperty("TargetFrameworkVersion", value); } diff --git a/src/Main/Base/Project/Src/Services/IconService.cs b/src/Main/Base/Project/Src/Services/IconService.cs index 6e0ac1c666..b5dbfd54fe 100644 --- a/src/Main/Base/Project/Src/Services/IconService.cs +++ b/src/Main/Base/Project/Src/Services/IconService.cs @@ -64,7 +64,13 @@ namespace ICSharpCode.SharpDevelop public static Bitmap GetBitmap(string name) { - Bitmap bmp = ResourceService.GetBitmap(name); + Bitmap bmp; + try { + bmp = ResourceService.GetBitmap(name); + } catch (ResourceNotFoundException ex) { + LoggingService.Warn(ex); + bmp = null; + } if (bmp != null) { return bmp; } diff --git a/src/Main/Core/Project/Src/AddInTree/AddInTree.cs b/src/Main/Core/Project/Src/AddInTree/AddInTree.cs index 899760a5c0..73ce35f297 100644 --- a/src/Main/Core/Project/Src/AddInTree/AddInTree.cs +++ b/src/Main/Core/Project/Src/AddInTree/AddInTree.cs @@ -416,7 +416,13 @@ namespace ICSharpCode.Core } } foreach (AddIn addIn in list) { - InsertAddIn(addIn); + try { + InsertAddIn(addIn); + } catch (AddInLoadException ex) { + LoggingService.Error(ex); + MessageService.ShowError("Error loading AddIn " + addIn.FileName + ":\n" + + ex.Message); + } } } } diff --git a/src/Main/GlobalAssemblyInfo.template b/src/Main/GlobalAssemblyInfo.template index 2dbcf51c3d..f44700ea57 100644 --- a/src/Main/GlobalAssemblyInfo.template +++ b/src/Main/GlobalAssemblyInfo.template @@ -19,7 +19,7 @@ using System.Reflection; [assembly: System.Runtime.InteropServices.ComVisible(false)] [assembly: AssemblyCompany("ic#code")] [assembly: AssemblyProduct("SharpDevelop")] -[assembly: AssemblyCopyright("2000-2007 AlphaSierraPapa")] +[assembly: AssemblyCopyright("2000-2008 AlphaSierraPapa")] [assembly: AssemblyVersion(RevisionClass.FullVersion)] internal static class RevisionClass diff --git a/src/Main/ICSharpCode.SharpDevelop.Sda/Src/ExceptionBox.cs b/src/Main/ICSharpCode.SharpDevelop.Sda/Src/ExceptionBox.cs index 75bfe278e9..c14d6eb1b3 100644 --- a/src/Main/ICSharpCode.SharpDevelop.Sda/Src/ExceptionBox.cs +++ b/src/Main/ICSharpCode.SharpDevelop.Sda/Src/ExceptionBox.cs @@ -119,37 +119,9 @@ namespace ICSharpCode.SharpDevelop.Sda } } - [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")] string getClipboardString() { - string str = ""; - Version v = typeof(ExceptionBox).Assembly.GetName().Version; - str += "SharpDevelop Version : " + v.ToString() + Environment.NewLine; - str += ".NET Version : " + Environment.Version.ToString() + Environment.NewLine; - str += "OS Version : " + Environment.OSVersion.ToString() + Environment.NewLine; - string cultureName = null; - try { - cultureName = CultureInfo.CurrentCulture.Name; - str += "Current culture : " + CultureInfo.CurrentCulture.EnglishName + " (" + cultureName + ")" + Environment.NewLine; - } catch {} - try { - if (cultureName == null || !cultureName.StartsWith(ResourceService.Language)) { - str += "Current UI language : " + ResourceService.Language + Environment.NewLine; - } - } catch {} - try { - if (IntPtr.Size != 4) { - str += "Running as " + (IntPtr.Size * 8) + " bit process" + Environment.NewLine; - } - if (SystemInformation.TerminalServerSession) { - str += "Terminal Server Session" + Environment.NewLine; - } - if (SystemInformation.BootMode != BootMode.Normal) { - str += "Boot Mode : " + SystemInformation.BootMode + Environment.NewLine; - } - } catch {} - str += "Working Set Memory : " + (Environment.WorkingSet / 1024) + "kb" + Environment.NewLine; - str += "GC Heap Memory : " + (GC.GetTotalMemory(false) / 1024) + "kb" + Environment.NewLine; + string str = Gui.AboutSharpDevelopTabPage.GetVersionInformationString(); str += Environment.NewLine;