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

setup: Use info instead of warning icon: looks less like an error

Browse source
This commit is contained in:
Hylke Bons 2012-04-15 12:35:58 +02:00
parent 5f137ff0e3
commit effec778fa
3 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
SparkleShare/Linux/SparkleSetup.cs
View file

@ -506,17 +506,17 @@ namespace SparkleShare {
UrgencyHint = true; UrgencyHint = true;
if (!HasToplevelFocus) { if (!HasToplevelFocus) {
string title = _("Project successfully added!"); string title = _("Your shared project is ready!");
string subtext = ""; string subtext = "You can find it in your SparkleShare folder";
SparkleUI.Bubbles.Controller.ShowBubble (title, subtext, null); SparkleUI.Bubbles.Controller.ShowBubble (title, subtext, null);
} }
Header = _("Project ‘" + System.IO.Path.GetFileName (Controller.PreviousPath) + "’ added!"); Header = _("Your shared project is ready!");
Description = _("Access the files from your SparkleShare folder."); Description = _("You can find it in your SparkleShare folder");
// A button that opens the synced folder // A button that opens the synced folder
Button open_folder_button = new Button (_("Open Folder")); Button open_folder_button = new Button (string.Format ("Open {0}", Path.GetFileName (Controller.PreviousPath)));
open_folder_button.Clicked += delegate { open_folder_button.Clicked += delegate {
Controller.OpenFolderClicked (); Controller.OpenFolderClicked ();
@ -531,7 +531,7 @@ namespace SparkleShare {
if (warnings.Length > 0) { if (warnings.Length > 0) {
Image warning_image = new Image ( Image warning_image = new Image (
SparkleUIHelpers.GetIcon ("dialog-warning", 24) SparkleUIHelpers.GetIcon ("dialog-info", 24)
); );
Label warning_label = new Label (warnings [0]) { Label warning_label = new Label (warnings [0]) {

11
SparkleShare/Mac/SparkleSetup.cs
View file

@ -606,12 +606,11 @@ namespace SparkleShare {
case PageType.Finished: { case PageType.Finished: {
Header = "Project ‘" + Path.GetFileName (Controller.PreviousPath) + Header = "Your shared project is ready!";
"’ added!"; Description = "You can find it in your SparkleShare folder";
Description = "Access the files from your SparkleShare folder.";
if (warnings.Length > 0) { if (warnings.Length > 0) {
WarningImage = NSImage.ImageNamed ("NSCaution"); WarningImage = NSImage.ImageNamed ("NSInfo");
WarningImage.Size = new SizeF (24, 24); WarningImage.Size = new SizeF (24, 24);
WarningImageView = new NSImageView () { WarningImageView = new NSImageView () {
@ -620,7 +619,7 @@ namespace SparkleShare {
}; };
WarningTextField = new NSTextField () { WarningTextField = new NSTextField () {
Frame = new RectangleF (230, Frame.Height - 245, 325, 100), Frame = new RectangleF (225, Frame.Height - 245, 325, 100),
StringValue = warnings [0], StringValue = warnings [0],
BackgroundColor = NSColor.WindowBackground, BackgroundColor = NSColor.WindowBackground,
Bordered = false, Bordered = false,
@ -641,7 +640,7 @@ namespace SparkleShare {
}; };
OpenFolderButton = new NSButton () { OpenFolderButton = new NSButton () {
Title = "Open Folder" Title = string.Format ("Open {0}", Path.GetFileName (Controller.PreviousPath))
}; };
OpenFolderButton.Activated += delegate { OpenFolderButton.Activated += delegate {

9
SparkleShare/Windows/SparkleSetup.cs
View file

@ -262,7 +262,7 @@ namespace SparkleShare {
"</DataTemplate>"; "</DataTemplate>";
grid_view.Columns [0].CellTemplate = (DataTemplate) XamlReader.Parse (xaml); grid_view.Columns [0].CellTemplate = (DataTemplate) XamlReader.Parse (xaml);
Style header_style = new Style(typeof (GridViewColumnHeader)); Style header_style = new Style(typeof (GridViewColumnHeader));
header_style.Setters.Add (new Setter (GridViewColumnHeader.VisibilityProperty, Visibility.Collapsed)); header_style.Setters.Add (new Setter (GridViewColumnHeader.VisibilityProperty, Visibility.Collapsed));
grid_view.ColumnHeaderContainerStyle = header_style; grid_view.ColumnHeaderContainerStyle = header_style;
@ -541,8 +541,7 @@ namespace SparkleShare {
} }
case PageType.Finished: { case PageType.Finished: {
Header = "Project ‘" + Path.GetFileName (Controller.PreviousPath) + "’ added!"; Header = "Your shared project is ready!";
Description = "Access the files from your SparkleShare folder."; Description = "Access the files from your SparkleShare folder.";
@ -551,12 +550,12 @@ namespace SparkleShare {
}; };
Button open_folder_button = new Button () { Button open_folder_button = new Button () {
Content = "Open folder" Content = string.Format ("Open {0}", Path.GetFileName (Controller.PreviousPath))
}; };
if (warnings.Length > 0) { if (warnings.Length > 0) {
Image warning_image = new Image () { Image warning_image = new Image () {
Source = Imaging.CreateBitmapSourceFromHIcon (Drawing.SystemIcons.Warning.Handle, Source = Imaging.CreateBitmapSourceFromHIcon (Drawing.SystemIcons.Information.Handle,
Int32Rect.Empty, BitmapSizeOptions.FromEmptyOptions ()) Int32Rect.Empty, BitmapSizeOptions.FromEmptyOptions ())
}; };