diff --git a/SparkleShare/Mac/SparkleSetup.cs b/SparkleShare/Mac/SparkleSetup.cs index 920afbd3..74fb947c 100755 --- a/SparkleShare/Mac/SparkleSetup.cs +++ b/SparkleShare/Mac/SparkleSetup.cs @@ -155,13 +155,13 @@ namespace SparkleShare { Editable = false, Frame = new RectangleF (190 + 196 + 16, Frame.Height - 308, 160, 17), StringValue = "Remote Path:", - Font = SparkleUI.Font, - Enabled = (Controller.SelectedPlugin.Path == null) + Font = SparkleUI.Font }; PathTextField = new NSTextField () { Frame = new RectangleF (190 + 196 + 16, Frame.Height - 336, 196, 22), - StringValue = Controller.PreviousPath + StringValue = Controller.PreviousPath, + Enabled = (Controller.SelectedPlugin.Path == null) }; @@ -359,7 +359,43 @@ namespace SparkleShare { case PageType.Error: { Header = "Something went wrong…"; - Description = ""; + Description = "Please check the following:"; + + // Displaying marked up text with Cocoa is + // a pain, so we just use a webview instead + WebView web_view = new WebView (); + web_view.Frame = new RectangleF (190, Frame.Height - 525, 375, 400); + + string html = "" + + ""; + + web_view.MainFrame.LoadHtmlString (html, new NSUrl ("")); + web_view.DrawsBackground = false; + + ContentView.AddSubview (web_view); TryAgainButton = new NSButton () { Title = "Try again…" diff --git a/SparkleShare/SparkleSetupController.cs b/SparkleShare/SparkleSetupController.cs index 2b04d358..d9dfea81 100755 --- a/SparkleShare/SparkleSetupController.cs +++ b/SparkleShare/SparkleSetupController.cs @@ -189,12 +189,6 @@ namespace SparkleShare { if (ChangePageEvent != null) ChangePageEvent (PageType.Add); - int index; - if (SelectedPlugin == null) - index = 0; - else - index = Plugins.IndexOf (SelectedPlugin); - SelectedPluginChanged (SelectedPluginIndex); }