beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

windows setup: add help bullets to error page

Browse source
This commit is contained in:
Hylke Bons 2012-03-08 23:24:14 +00:00
parent 15ffb214b8
commit 03442b972b
3 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SparkleShare/Linux/SparkleSetup.cs
View file

@ -440,7 +440,7 @@ namespace SparkleShare {
Image list_point_three = new Image (SparkleUIHelpers.GetIcon ("list-point", 16)) { };
Label label_one = new Label () {
Text = "First, have you tried turning it off and on again?",
Text = "Is the host online?",
Wrap = true,
Xalign = 0
};

2
SparkleShare/Mac/SparkleSetup.cs
View file

@ -546,7 +546,7 @@ namespace SparkleShare {
"}" +
"</style>" +
"<ul>" +
" <li>First, have you tried turning it off and on again?</li>" +
" <li>Is the host online?</li>" +
" <li><b>" + Controller.PreviousUrl + "</b> is the address we've compiled. Does this look alright?</li>" +
" <li>The host needs to know who you are. Did you upload the key that's in your SparkleShare folder?</li>" +
"</ul>";

28
SparkleShare/Windows/SparkleSetup.cs
View file

@ -19,6 +19,7 @@ using System;
using System.IO;
using System.Collections.Generic;
using System.ComponentModel;
using System.Windows.Documents;
using System.Windows.Forms.Integration;
using System.Windows;
using System.Windows.Controls;
@ -449,9 +450,22 @@ namespace SparkleShare {
Header = "Something went wrong…";
Description = "Please check the following:";
// TODO: Bullet points
TextBlock help_block = new TextBlock () {
TextWrapping = TextWrapping.Wrap,
Width = 310
};
help_block.Inlines.Add ("Is the host online?\n\n");
help_block.Inlines.Add (new Bold (new Run (Controller.PreviousUrl)));
help_block.Inlines.Add (" is the address we've compiled. Does this look alright?\n\n");
help_block.Inlines.Add ("The host needs to know who you are. Did you upload the key that's in your SparkleShare folder?");
TextBlock bullets_block = new TextBlock () {
Text = "•\n\n•\n\n\n•"
};
Button cancel_button = new Button () {
Content = "Cancel"
};
@ -461,6 +475,16 @@ namespace SparkleShare {
};
ContentCanvas.Children.Add (bullets_block);
Canvas.SetLeft (bullets_block, 195);
Canvas.SetTop (bullets_block, 100);
ContentCanvas.Children.Add (help_block);
Canvas.SetLeft (help_block, 210);
Canvas.SetTop (help_block, 100);
Buttons.Add (try_again_button);
Buttons.Add (cancel_button);