From effec778fa04deb375256c3875c37e3efcf7d750 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Sun, 15 Apr 2012 12:35:58 +0200 Subject: [PATCH] setup: Use info instead of warning icon: looks less like an error --- SparkleShare/Linux/SparkleSetup.cs | 12 ++++++------ SparkleShare/Mac/SparkleSetup.cs | 11 +++++------ SparkleShare/Windows/SparkleSetup.cs | 9 ++++----- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/SparkleShare/Linux/SparkleSetup.cs b/SparkleShare/Linux/SparkleSetup.cs index 5b2f18a4..d94d148e 100755 --- a/SparkleShare/Linux/SparkleSetup.cs +++ b/SparkleShare/Linux/SparkleSetup.cs @@ -506,17 +506,17 @@ namespace SparkleShare { UrgencyHint = true; if (!HasToplevelFocus) { - string title = _("Project successfully added!"); - string subtext = ""; + string title = _("Your shared project is ready!"); + string subtext = "You can find it in your SparkleShare folder"; SparkleUI.Bubbles.Controller.ShowBubble (title, subtext, null); } - Header = _("Project ‘" + System.IO.Path.GetFileName (Controller.PreviousPath) + "’ added!"); - Description = _("Access the files from your SparkleShare folder."); + Header = _("Your shared project is ready!"); + Description = _("You can find it in your SparkleShare 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 { Controller.OpenFolderClicked (); @@ -531,7 +531,7 @@ namespace SparkleShare { if (warnings.Length > 0) { Image warning_image = new Image ( - SparkleUIHelpers.GetIcon ("dialog-warning", 24) + SparkleUIHelpers.GetIcon ("dialog-info", 24) ); Label warning_label = new Label (warnings [0]) { diff --git a/SparkleShare/Mac/SparkleSetup.cs b/SparkleShare/Mac/SparkleSetup.cs index 79e36c31..c561f478 100755 --- a/SparkleShare/Mac/SparkleSetup.cs +++ b/SparkleShare/Mac/SparkleSetup.cs @@ -606,12 +606,11 @@ namespace SparkleShare { case PageType.Finished: { - Header = "Project ‘" + Path.GetFileName (Controller.PreviousPath) + - "’ added!"; - Description = "Access the files from your SparkleShare folder."; + Header = "Your shared project is ready!"; + Description = "You can find it in your SparkleShare folder"; if (warnings.Length > 0) { - WarningImage = NSImage.ImageNamed ("NSCaution"); + WarningImage = NSImage.ImageNamed ("NSInfo"); WarningImage.Size = new SizeF (24, 24); WarningImageView = new NSImageView () { @@ -620,7 +619,7 @@ namespace SparkleShare { }; WarningTextField = new NSTextField () { - Frame = new RectangleF (230, Frame.Height - 245, 325, 100), + Frame = new RectangleF (225, Frame.Height - 245, 325, 100), StringValue = warnings [0], BackgroundColor = NSColor.WindowBackground, Bordered = false, @@ -641,7 +640,7 @@ namespace SparkleShare { }; OpenFolderButton = new NSButton () { - Title = "Open Folder" + Title = string.Format ("Open {0}", Path.GetFileName (Controller.PreviousPath)) }; OpenFolderButton.Activated += delegate { diff --git a/SparkleShare/Windows/SparkleSetup.cs b/SparkleShare/Windows/SparkleSetup.cs index f2b9eb09..a883a1a8 100644 --- a/SparkleShare/Windows/SparkleSetup.cs +++ b/SparkleShare/Windows/SparkleSetup.cs @@ -262,7 +262,7 @@ namespace SparkleShare { ""; grid_view.Columns [0].CellTemplate = (DataTemplate) XamlReader.Parse (xaml); - + Style header_style = new Style(typeof (GridViewColumnHeader)); header_style.Setters.Add (new Setter (GridViewColumnHeader.VisibilityProperty, Visibility.Collapsed)); grid_view.ColumnHeaderContainerStyle = header_style; @@ -541,8 +541,7 @@ namespace SparkleShare { } case PageType.Finished: { - Header = "Project ‘" + Path.GetFileName (Controller.PreviousPath) + "’ added!"; - + Header = "Your shared project is ready!"; Description = "Access the files from your SparkleShare folder."; @@ -551,12 +550,12 @@ namespace SparkleShare { }; Button open_folder_button = new Button () { - Content = "Open folder" + Content = string.Format ("Open {0}", Path.GetFileName (Controller.PreviousPath)) }; if (warnings.Length > 0) { Image warning_image = new Image () { - Source = Imaging.CreateBitmapSourceFromHIcon (Drawing.SystemIcons.Warning.Handle, + Source = Imaging.CreateBitmapSourceFromHIcon (Drawing.SystemIcons.Information.Handle, Int32Rect.Empty, BitmapSizeOptions.FromEmptyOptions ()) };