diff --git a/SparkleShare/Mac/SparkleIntro.cs b/SparkleShare/Mac/SparkleIntro.cs index d021ae61..40c9db8f 100644 --- a/SparkleShare/Mac/SparkleIntro.cs +++ b/SparkleShare/Mac/SparkleIntro.cs @@ -48,7 +48,6 @@ namespace SparkleShare { private NSButtonCell ButtonCellProto; private NSMatrix Matrix; private int ServerType; - private bool ServerFormOnly; @@ -556,4 +555,4 @@ namespace SparkleShare { } -} \ No newline at end of file +} diff --git a/SparkleShare/SparkleIntro.cs b/SparkleShare/SparkleIntro.cs index 8b189af8..d5e47a69 100644 --- a/SparkleShare/SparkleIntro.cs +++ b/SparkleShare/SparkleIntro.cs @@ -14,12 +14,15 @@ // You should have received a copy of the GNU General private License // along with this program. If not, see . -using Gtk; -using Mono.Unix; + using System; using System.Diagnostics; using System.IO; using System.Text.RegularExpressions; +using System.Timers; + +using Gtk; +using Mono.Unix; namespace SparkleShare { @@ -287,7 +290,7 @@ namespace SparkleShare { FolderEntry.Changed += CheckServerForm; - Label folder_label = new Label ("" + _("Folder Name:") + "") { + Label folder_label = new Label (_("Folder Name:")) { UseMarkup = true, Xalign = 1 }; @@ -611,17 +614,13 @@ namespace SparkleShare { } -// private ProgressBar ProgressBar; + // The page shown whilst syncing private void ShowSyncingPage (string name) { Reset (); -// ProgressBar = new ProgressBar () { -// Fraction = 0 -// }; - VBox layout_vertical = new VBox (false, 0); Label header = new Label ("" + @@ -662,11 +661,25 @@ namespace SparkleShare { table.Attach (spinner, 0, 1, 0, 1); table.Attach (header, 1, 2, 0, 1); table.Attach (information, 1, 2, 1, 2); - //table.Attach (ProgressBar, 2, 3, 0, 2); box.PackStart (table, false, false, 0); + ProgressBar progress_bar = new ProgressBar () { + + }; + + Timer timer = new Timer () { + Interval = 100 + }; + + timer.Elapsed += delegate { + progress_bar.Pulse (); + }; + layout_vertical.PackStart (box, false, false, 0); + layout_vertical.PackStart (progress_bar, true, false, 0); + + timer.Start (); Add (layout_vertical); diff --git a/SparkleShare/SparkleWindow.cs b/SparkleShare/SparkleWindow.cs index 5183f480..32ebf35a 100644 --- a/SparkleShare/SparkleWindow.cs +++ b/SparkleShare/SparkleWindow.cs @@ -42,27 +42,36 @@ namespace SparkleShare { Resizable = true; WindowPosition = WindowPosition.Center; - SetDefaultSize (640, 480); - - Buttons = CreateButtonBox (); + SetDefaultSize (640, 425); HBox = new HBox (false, 6); - string image_path = SparkleHelpers.CombineMore (Defines.DATAROOTDIR, "sparkleshare", - "pixmaps", "side-splash.png"); - - Image side_splash = new Image (image_path); - VBox = new VBox (false, 0); Wrapper = new VBox (false, 0) { BorderWidth = 30 }; + Buttons = CreateButtonBox (); + VBox.PackStart (Wrapper, true, true, 0); VBox.PackStart (Buttons, false, false, 0); - HBox.PackStart (side_splash, false, false, 0); + EventBox box = new EventBox (); + Gdk.Color bg_color = new Gdk.Color (); + Gdk.Color.Parse ("#2e3336", ref bg_color); + box.ModifyBg (StateType.Normal, bg_color); + + string image_path = SparkleHelpers.CombineMore (Defines.DATAROOTDIR, "sparkleshare", + "pixmaps", "side-splash.png"); + + Image side_splash = new Image (image_path) { + Yalign = 1 + }; + + box.Add (side_splash); + + HBox.PackStart (box, true, true, 0); HBox.PackStart (VBox, true, true, 0); base.Add (HBox); diff --git a/data/side-splash.png b/data/side-splash.png index 47ae13ec..bbc815e3 100644 Binary files a/data/side-splash.png and b/data/side-splash.png differ