From 03a79d72a0fda3edb5613638e9036d86c8632739 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Thu, 29 Jul 2010 14:47:09 +0100 Subject: [PATCH] [sparkleintro] fix spinner size --- AUTHORS | 1 + SparkleShare/SparkleDialog.cs | 32 +--------- SparkleShare/SparkleIntro.cs | 97 +++++++++++++++++++++++++++++- SparkleShare/SparkleRepo.cs | 10 +++ SparkleShare/SparkleSpinner.cs | 29 ++++++--- data/icons/Makefile.am | 1 + data/icons/process-working-22.png | Bin 0 -> 7061 bytes 7 files changed, 133 insertions(+), 37 deletions(-) create mode 100644 data/icons/process-working-22.png diff --git a/AUTHORS b/AUTHORS index 230a6c16..691d6dbe 100644 --- a/AUTHORS +++ b/AUTHORS @@ -5,6 +5,7 @@ Maintainer: Contributors: Andreas Nilsson + Benjamin Podszun Bertrand Lorentz Garrett LeSage Jakub Steiner diff --git a/SparkleShare/SparkleDialog.cs b/SparkleShare/SparkleDialog.cs index ffb8f724..eb55eb03 100644 --- a/SparkleShare/SparkleDialog.cs +++ b/SparkleShare/SparkleDialog.cs @@ -115,24 +115,6 @@ namespace SparkleShare { int SlashPos = RepoRemoteUrl.LastIndexOf ("/"); int ColumnPos = RepoRemoteUrl.LastIndexOf (":"); - // Check whether a "/" or ":" is used to separate the - // repo name from the domain. - string RepoName; - if (SlashPos > ColumnPos) - RepoName = RepoRemoteUrl.Substring (SlashPos + 1); - else - RepoName = RepoRemoteUrl.Substring (ColumnPos + 1); - - SparkleBubble SyncingBubble; - SyncingBubble = new SparkleBubble (String.Format(_("Syncing folder ‘{0}’"), RepoName), - _("SparkleShare will notify you when this is done.")); - - SyncingBubble.AddAction ("", _("Dismiss"), - delegate { - SyncingBubble.Close (); - }); - - SyncingBubble.Show (); Process Process = new Process (); Process.EnableRaisingEvents = true; @@ -154,23 +136,13 @@ namespace SparkleShare { if (Process.ExitCode != 0) { - SparkleBubble ErrorBubble; - ErrorBubble = new SparkleBubble (String.Format(_("Something went wrong while syncing ‘{0}’"), RepoName), - "Please double check the address and\n" + - "network connection."); + // error try { Directory.Delete (SparkleHelpers.CombineMore (SparklePaths.SparkleTmpPath, RepoName)); } catch (System.IO.DirectoryNotFoundException) { SparkleHelpers.DebugInfo ("Config", "[" + RepoName + "] Temporary directory did not exist..."); } - - ErrorBubble.AddAction ("", _("Try Again…"), - delegate { - SparkleDialog SparkleDialog = new SparkleDialog (RepoRemoteUrl); - SparkleDialog.ShowAll (); - }); - ErrorBubble.Show (); } else { @@ -188,6 +160,8 @@ namespace SparkleShare { Writer.WriteLine (".DS_store"); // Ignore OSX's invisible directories Writer.Close (); + // TODO: Install username and email from global file + File.Create (SparkleHelpers.CombineMore (SparklePaths.SparklePath, RepoName, ".emblems")); diff --git a/SparkleShare/SparkleIntro.cs b/SparkleShare/SparkleIntro.cs index d9570d1e..9beca187 100644 --- a/SparkleShare/SparkleIntro.cs +++ b/SparkleShare/SparkleIntro.cs @@ -303,6 +303,8 @@ namespace SparkleShare { AddButton.Clicked += delegate { + ShowStepTwoAndAHalf (); + // TODO }; @@ -331,13 +333,106 @@ namespace SparkleShare { Add (layout_horizontal); - CheckStepOneFields (); + CheckStepTwoFields (); ShowAll (); } + private void ShowStepTwoAndAHalf () + { + + Title = _("Add Remote Folder"); + + Remove (Child); + + HBox layout_horizontal = new HBox (false, 6); + + Image side_splash = new Image (SparkleHelpers.CombineMore (Defines.PREFIX, "share", "pixmaps", + "side-splash.png")); + + VBox wrapper = new VBox (false, 0); + + VBox layout_vertical = new VBox (false, 0) { + BorderWidth = 30 + }; + + Label introduction = new Label ("" + + String.Format (_("Retrieving folder ‘{0}’…"), FolderEntry.Text) + + "") { + UseMarkup = true, + Xalign = 0 + }; + + Label information = new Label ("" + + _("This may take a while.\n") + + _("You sure it’s not coffee o-clock?" + + "")) { + UseMarkup = true, + Xalign = 0 + }; + + HButtonBox controls = new HButtonBox () { + BorderWidth = 12, + Layout = ButtonBoxStyle.End, + Spacing = 6 + }; + + Button button = new Button ("") { + Sensitive = false + }; + + if (StepTwoOnly) { + + button.Label = _("Finish"); + button.Clicked += delegate { + Destroy (); + }; + + } else { + + button.Label = _("Next"); + button.Clicked += delegate { + ShowStepThree (); + }; + + } + + controls.Add (button); + + SparkleSpinner spinner = new SparkleSpinner (22); + + Table table = new Table (2, 2, false) { + RowSpacing = 12, + ColumnSpacing = 9 + }; + + HBox box = new HBox (false, 0); + + table.Attach (spinner, 0, 1, 0, 1); + table.Attach (introduction, 1, 2, 0, 1); + table.Attach (information, 1, 2, 1, 2); + + box.PackStart (table, false, false, 0); + + layout_vertical.PackStart (box, false, false, 0); + + wrapper.PackStart (layout_vertical, true, true, 0); + wrapper.PackStart (controls, false, true, 0); + + layout_horizontal.PackStart (side_splash, false, false, 0); + layout_horizontal.PackStart (wrapper, true, true, 0); + + Add (layout_horizontal); + + CheckStepTwoFields (); + + ShowAll (); + + } + + private void ShowStepThree () { diff --git a/SparkleShare/SparkleRepo.cs b/SparkleShare/SparkleRepo.cs index a9fd266b..8c7e878f 100644 --- a/SparkleShare/SparkleRepo.cs +++ b/SparkleShare/SparkleRepo.cs @@ -66,6 +66,8 @@ namespace SparkleShare { public SparkleRepo (string path) { +// if (Directory.Exists) + LocalPath = path; Name = Path.GetFileName (LocalPath); @@ -130,6 +132,14 @@ namespace SparkleShare { } + public void Init () + { + + + + } + + private void CheckForChanges () { diff --git a/SparkleShare/SparkleSpinner.cs b/SparkleShare/SparkleSpinner.cs index de5ee338..b4ec4389 100644 --- a/SparkleShare/SparkleSpinner.cs +++ b/SparkleShare/SparkleSpinner.cs @@ -15,7 +15,6 @@ // along with this program. If not, see . using Gtk; -using System; using System.Timers; namespace SparkleShare { @@ -38,31 +37,42 @@ namespace SparkleShare { Size = size; - CycleDuration = 750; + CycleDuration = 600; CurrentStep = 0; Gdk.Pixbuf spinner_gallery = SparkleHelpers.GetIcon ("process-working", Size); - int frames_in_width = spinner_gallery.Width / Size; + int frames_in_width = spinner_gallery.Width / Size; int frames_in_height = spinner_gallery.Height / Size; + NumSteps = frames_in_width * frames_in_height; - Images = new Gdk.Pixbuf [NumSteps - 1]; + Images = new Gdk.Pixbuf [NumSteps - 1]; int i = 0; + for (int y = 0; y < frames_in_height; y++) { + for (int x = 0; x < frames_in_width; x++) { + if (!(y == 0 && x == 0)) { + Images [i] = new Gdk.Pixbuf (spinner_gallery, x * Size, y * Size, Size, Size); i++; + } + } + } - Timer = new Timer (); - Timer.Interval = CycleDuration / NumSteps; + Timer = new Timer () { + Interval = CycleDuration / NumSteps + }; + Timer.Elapsed += delegate { NextImage (); }; + Start (); } @@ -82,27 +92,32 @@ namespace SparkleShare { private void SetImage () { - Console.WriteLine (CurrentStep); Pixbuf = Images [CurrentStep]; } public bool IsActive () { + return Active; + } public void Start () { + CurrentStep = 0; Active = true; Timer.Start (); + } public void Stop () { + Active = false; Timer.Stop (); + } } diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index 1f78d471..4907c766 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -4,6 +4,7 @@ hicolordir = $(DESTDIR)$(datadir)/icons/hicolor theme_icons = \ animations,process-syncing-sparkleshare-24.png \ + animations,process-working-22.png \ places,folder-16.png \ places,folder-22.png \ places,folder-24.png \ diff --git a/data/icons/process-working-22.png b/data/icons/process-working-22.png new file mode 100644 index 0000000000000000000000000000000000000000..9005de7573779cece0fc075eeb8b0d969fe6f08e GIT binary patch literal 7061 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 Plg46hYGYDo1Wx@gRu*>z literal 0 HcmV?d00001