diff --git a/SparkleShare/Linux/SparkleAbout.cs b/SparkleShare/Linux/SparkleAbout.cs index 907afecf..5c3bafa2 100755 --- a/SparkleShare/Linux/SparkleAbout.cs +++ b/SparkleShare/Linux/SparkleAbout.cs @@ -144,7 +144,8 @@ namespace SparkleShare { SparkleLink website_link = new SparkleLink ("Website", Controller.WebsiteLinkAddress); SparkleLink credits_link = new SparkleLink ("Credits", Controller.CreditsLinkAddress); - SparkleLink report_problem_link = new SparkleLink ("Report a problem", Controller.ReportProblemLinkAddress); + SparkleLink report_problem_link = new SparkleLink ("Report a problem", Controller.ReportProblemLinkAddress); + SparkleLink report_problem_link = new SparkleLink ("Debug log", Controller.DebugLogLinkAddress); links_layout.PackStart (new Label (""), false, false, 143); links_layout.PackStart (website_link, false, false, 9); diff --git a/SparkleShare/Mac/SparkleAbout.cs b/SparkleShare/Mac/SparkleAbout.cs index 198106a6..4f74b58a 100755 --- a/SparkleShare/Mac/SparkleAbout.cs +++ b/SparkleShare/Mac/SparkleAbout.cs @@ -39,6 +39,7 @@ namespace SparkleShare { private SparkleLink website_link; private SparkleLink credits_link; private SparkleLink report_problem_link; + private SparkleLink debug_log_link; public SparkleAbout (IntPtr handle) : base (handle) { } @@ -71,6 +72,11 @@ namespace SparkleShare { new PointF (this.credits_link.Frame.X + this.credits_link.Frame.Width + 10, 25), this.report_problem_link.Frame.Size); + this.debug_log_link = new SparkleLink ("Debug log", Controller.DebugLogLinkAddress); + this.debug_log_link.Frame = new RectangleF ( + new PointF (this.report_problem_link.Frame.X + this.report_problem_link.Frame.Width + 10, 25), + this.debug_log_link.Frame.Size); + this.hidden_close_button = new NSButton () { Frame = new RectangleF (0, 0, 0, 0), KeyEquivalentModifierMask = NSEventModifierMask.CommandKeyMask, @@ -89,6 +95,7 @@ namespace SparkleShare { ContentView.AddSubview (this.website_link); ContentView.AddSubview (this.credits_link); ContentView.AddSubview (this.report_problem_link); + ContentView.AddSubview (this.debug_log_link); } Controller.HideWindowEvent += delegate { @@ -183,10 +190,10 @@ namespace SparkleShare { this.credits_text_field = new NSTextField () { StringValue = @"Copyright © 2010–" + DateTime.Now.Year + " Hylke Bons and others." + - "\n" + - "\n" + - "SparkleShare is Open Source software. You are free to use, modify, and redistribute it " + - "under the GNU General Public License version 3 or later.", + "\n" + + "\n" + + "SparkleShare is Open Source software. You are free to use, modify, and redistribute it " + + "under the GNU General Public License version 3 or later.", Frame = new RectangleF (295, Frame.Height - 260, 318, 98), TextColor = NSColor.White, DrawsBackground = false, diff --git a/SparkleShare/SparkleAboutController.cs b/SparkleShare/SparkleAboutController.cs index 0092fb87..506e1712 100755 --- a/SparkleShare/SparkleAboutController.cs +++ b/SparkleShare/SparkleAboutController.cs @@ -36,6 +36,7 @@ namespace SparkleShare { public readonly string WebsiteLinkAddress = "http://www.sparkleshare.org/"; public readonly string CreditsLinkAddress = "http://www.github.com/hbons/SparkleShare/tree/master/legal/AUTHORS"; public readonly string ReportProblemLinkAddress = "http://www.github.com/hbons/SparkleShare/issues"; + public readonly string DebugLogLinkAddress = "file://" + Program.Controller.ConfigPath; public string RunningVersion { get { diff --git a/SparkleShare/SparkleControllerBase.cs b/SparkleShare/SparkleControllerBase.cs index 4711e1f4..d1c9adff 100644 --- a/SparkleShare/SparkleControllerBase.cs +++ b/SparkleShare/SparkleControllerBase.cs @@ -94,6 +94,12 @@ namespace SparkleShare { } } + public string ConfigPath { + get { + return this.config.LogFilePath; + } + } + public SparkleUser CurrentUser { get { return this.config.User; diff --git a/SparkleShare/Windows/SparkleAbout.cs b/SparkleShare/Windows/SparkleAbout.cs index 1b8a2c25..e2fe3298 100644 --- a/SparkleShare/Windows/SparkleAbout.cs +++ b/SparkleShare/Windows/SparkleAbout.cs @@ -119,7 +119,8 @@ namespace SparkleShare { SparkleLink website_link = new SparkleLink ("Website", Controller.WebsiteLinkAddress); SparkleLink credits_link = new SparkleLink ("Credits", Controller.CreditsLinkAddress); - SparkleLink report_problem_link = new SparkleLink ("Report a problem", Controller.ReportProblemLinkAddress); + SparkleLink report_problem_link = new SparkleLink ("Report a problem", Controller.ReportProblemLinkAddress); + SparkleLink debug_log_link = new SparkleLink ("Debig log", Controller.DebugLogLinkAddress); Canvas canvas = new Canvas (); @@ -147,9 +148,14 @@ namespace SparkleShare { Canvas.SetLeft (credits_link, 289 + website_link.ActualWidth + 60); Canvas.SetTop (credits_link, 222); - canvas.Children.Add (report_problem_link); + canvas.Children.Add (report_problem_link); Canvas.SetLeft (report_problem_link, 289 + website_link.ActualWidth + credits_link.ActualWidth + 115); - Canvas.SetTop (report_problem_link, 222); + Canvas.SetTop (report_problem_link, 222); + + canvas.Children.Add (debug_log_link); + Canvas.SetLeft (debug_log_link, 289 + website_link.ActualWidth + credits_link.ActualWidth + + report_problem_link.ActualWidth + 180); + Canvas.SetTop (debug_log_link, 222); Content = canvas; }