diff --git a/SparkleShare/Common/Pixmaps/Makefile.am b/SparkleShare/Common/Pixmaps/Makefile.am index 68f4cad6..bf2a1855 100644 --- a/SparkleShare/Common/Pixmaps/Makefile.am +++ b/SparkleShare/Common/Pixmaps/Makefile.am @@ -1,6 +1,8 @@ dist_pixmaps_DATA = \ side-splash.png \ user-icon-default.png \ + tutorial-slide-1.png\ + tutorial-slide-2.png \ about.png pixmapsdir = $(pkgdatadir)/pixmaps/ diff --git a/SparkleShare/Common/Pixmaps/Sources/tutorial-slides.svg b/SparkleShare/Common/Pixmaps/Sources/tutorial-slides.svg new file mode 100644 index 00000000..c0885a4e --- /dev/null +++ b/SparkleShare/Common/Pixmaps/Sources/tutorial-slides.svg @@ -0,0 +1,6586 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SparkleShare/Common/Pixmaps/about.png b/SparkleShare/Common/Pixmaps/about.png index 6d7ae90f..dd466335 100755 Binary files a/SparkleShare/Common/Pixmaps/about.png and b/SparkleShare/Common/Pixmaps/about.png differ diff --git a/SparkleShare/Common/Pixmaps/about@2x.png b/SparkleShare/Common/Pixmaps/about@2x.png index 2fc61d8a..c67c5fa6 100644 Binary files a/SparkleShare/Common/Pixmaps/about@2x.png and b/SparkleShare/Common/Pixmaps/about@2x.png differ diff --git a/SparkleShare/Common/Pixmaps/side-splash.png b/SparkleShare/Common/Pixmaps/side-splash.png index d51ed514..f84eed1c 100755 Binary files a/SparkleShare/Common/Pixmaps/side-splash.png and b/SparkleShare/Common/Pixmaps/side-splash.png differ diff --git a/SparkleShare/Common/Pixmaps/side-splash@2x.png b/SparkleShare/Common/Pixmaps/side-splash@2x.png index 3990c275..09168f51 100644 Binary files a/SparkleShare/Common/Pixmaps/side-splash@2x.png and b/SparkleShare/Common/Pixmaps/side-splash@2x.png differ diff --git a/SparkleShare/Common/Pixmaps/tutorial-slide-1.png b/SparkleShare/Common/Pixmaps/tutorial-slide-1.png new file mode 100644 index 00000000..51a74553 Binary files /dev/null and b/SparkleShare/Common/Pixmaps/tutorial-slide-1.png differ diff --git a/SparkleShare/Common/Pixmaps/tutorial-slide-1@2x.png b/SparkleShare/Common/Pixmaps/tutorial-slide-1@2x.png new file mode 100644 index 00000000..aa4e7b59 Binary files /dev/null and b/SparkleShare/Common/Pixmaps/tutorial-slide-1@2x.png differ diff --git a/SparkleShare/Common/Pixmaps/tutorial-slide-2.png b/SparkleShare/Common/Pixmaps/tutorial-slide-2.png new file mode 100644 index 00000000..cb572c76 Binary files /dev/null and b/SparkleShare/Common/Pixmaps/tutorial-slide-2.png differ diff --git a/SparkleShare/Common/Pixmaps/tutorial-slide-2@2x.png b/SparkleShare/Common/Pixmaps/tutorial-slide-2@2x.png new file mode 100644 index 00000000..13b4a4b8 Binary files /dev/null and b/SparkleShare/Common/Pixmaps/tutorial-slide-2@2x.png differ diff --git a/SparkleShare/Common/Pixmaps/user-icon-default.png b/SparkleShare/Common/Pixmaps/user-icon-default.png index 74442154..45b523c0 100644 Binary files a/SparkleShare/Common/Pixmaps/user-icon-default.png and b/SparkleShare/Common/Pixmaps/user-icon-default.png differ diff --git a/SparkleShare/Common/Plugins/bitbucket.png b/SparkleShare/Common/Plugins/bitbucket.png index 0a6a9600..c2de0522 100644 Binary files a/SparkleShare/Common/Plugins/bitbucket.png and b/SparkleShare/Common/Plugins/bitbucket.png differ diff --git a/SparkleShare/Common/Plugins/bitbucket@2x.png b/SparkleShare/Common/Plugins/bitbucket@2x.png index 0d6e0567..01ecba85 100644 Binary files a/SparkleShare/Common/Plugins/bitbucket@2x.png and b/SparkleShare/Common/Plugins/bitbucket@2x.png differ diff --git a/SparkleShare/Common/Plugins/github.png b/SparkleShare/Common/Plugins/github.png index ca5dda80..62bb35b7 100644 Binary files a/SparkleShare/Common/Plugins/github.png and b/SparkleShare/Common/Plugins/github.png differ diff --git a/SparkleShare/Common/Plugins/github@2x.png b/SparkleShare/Common/Plugins/github@2x.png index 9a7b4c94..fd32047c 100644 Binary files a/SparkleShare/Common/Plugins/github@2x.png and b/SparkleShare/Common/Plugins/github@2x.png differ diff --git a/SparkleShare/Common/Plugins/gitorious.png b/SparkleShare/Common/Plugins/gitorious.png index 0a9ddb58..731835b7 100644 Binary files a/SparkleShare/Common/Plugins/gitorious.png and b/SparkleShare/Common/Plugins/gitorious.png differ diff --git a/SparkleShare/Common/Plugins/gitorious@2x.png b/SparkleShare/Common/Plugins/gitorious@2x.png index 4443f6f2..806f1138 100644 Binary files a/SparkleShare/Common/Plugins/gitorious@2x.png and b/SparkleShare/Common/Plugins/gitorious@2x.png differ diff --git a/SparkleShare/Common/Plugins/own-server.png b/SparkleShare/Common/Plugins/own-server.png index 59044df8..c5d0a088 100644 Binary files a/SparkleShare/Common/Plugins/own-server.png and b/SparkleShare/Common/Plugins/own-server.png differ diff --git a/SparkleShare/Common/Plugins/own-server@2x.png b/SparkleShare/Common/Plugins/own-server@2x.png index a4fc3ff3..4312338e 100644 Binary files a/SparkleShare/Common/Plugins/own-server@2x.png and b/SparkleShare/Common/Plugins/own-server@2x.png differ diff --git a/SparkleShare/Common/Plugins/ssnet.png b/SparkleShare/Common/Plugins/ssnet.png index 476d8328..8aac4605 100644 Binary files a/SparkleShare/Common/Plugins/ssnet.png and b/SparkleShare/Common/Plugins/ssnet.png differ diff --git a/SparkleShare/Common/Plugins/ssnet@2x.png b/SparkleShare/Common/Plugins/ssnet@2x.png index 556eb651..3449b9e4 100644 Binary files a/SparkleShare/Common/Plugins/ssnet@2x.png and b/SparkleShare/Common/Plugins/ssnet@2x.png differ diff --git a/SparkleShare/Linux/Pixmaps/Makefile.am b/SparkleShare/Linux/Pixmaps/Makefile.am index e3bb71d8..91e7038a 100755 --- a/SparkleShare/Linux/Pixmaps/Makefile.am +++ b/SparkleShare/Linux/Pixmaps/Makefile.am @@ -1,8 +1,6 @@ SUBDIRS = icons dist_pixmaps_DATA = \ - tutorial-slide-1.png \ - tutorial-slide-2.png \ tutorial-slide-3.png pixmapsdir = $(pkgdatadir)/pixmaps/ diff --git a/SparkleShare/Linux/Pixmaps/tutorial-slide-1.png b/SparkleShare/Linux/Pixmaps/tutorial-slide-1.png deleted file mode 100755 index 592c5b50..00000000 Binary files a/SparkleShare/Linux/Pixmaps/tutorial-slide-1.png and /dev/null differ diff --git a/SparkleShare/Linux/Pixmaps/tutorial-slide-2.png b/SparkleShare/Linux/Pixmaps/tutorial-slide-2.png deleted file mode 100755 index 09f993f6..00000000 Binary files a/SparkleShare/Linux/Pixmaps/tutorial-slide-2.png and /dev/null differ diff --git a/SparkleShare/Mac/Pixmaps/process-syncing-active@2x.png b/SparkleShare/Mac/Pixmaps/process-syncing-active@2x.png index 3f358921..85b9aa67 100644 Binary files a/SparkleShare/Mac/Pixmaps/process-syncing-active@2x.png and b/SparkleShare/Mac/Pixmaps/process-syncing-active@2x.png differ diff --git a/SparkleShare/Mac/Pixmaps/process-syncing-down-active@2x.png b/SparkleShare/Mac/Pixmaps/process-syncing-down-active@2x.png index 6ecdd097..9223350d 100644 Binary files a/SparkleShare/Mac/Pixmaps/process-syncing-down-active@2x.png and b/SparkleShare/Mac/Pixmaps/process-syncing-down-active@2x.png differ diff --git a/SparkleShare/Mac/Pixmaps/process-syncing-down@2x.png b/SparkleShare/Mac/Pixmaps/process-syncing-down@2x.png index 40ec378b..9e4c5750 100644 Binary files a/SparkleShare/Mac/Pixmaps/process-syncing-down@2x.png and b/SparkleShare/Mac/Pixmaps/process-syncing-down@2x.png differ diff --git a/SparkleShare/Mac/Pixmaps/process-syncing-error-active@2x.png b/SparkleShare/Mac/Pixmaps/process-syncing-error-active@2x.png index 0ba00b9f..c47de7f8 100644 Binary files a/SparkleShare/Mac/Pixmaps/process-syncing-error-active@2x.png and b/SparkleShare/Mac/Pixmaps/process-syncing-error-active@2x.png differ diff --git a/SparkleShare/Mac/Pixmaps/process-syncing-error@2x.png b/SparkleShare/Mac/Pixmaps/process-syncing-error@2x.png index aa85d10c..df3f611d 100644 Binary files a/SparkleShare/Mac/Pixmaps/process-syncing-error@2x.png and b/SparkleShare/Mac/Pixmaps/process-syncing-error@2x.png differ diff --git a/SparkleShare/Mac/Pixmaps/process-syncing-idle-active@2x.png b/SparkleShare/Mac/Pixmaps/process-syncing-idle-active@2x.png index f735bf05..a2caad28 100644 Binary files a/SparkleShare/Mac/Pixmaps/process-syncing-idle-active@2x.png and b/SparkleShare/Mac/Pixmaps/process-syncing-idle-active@2x.png differ diff --git a/SparkleShare/Mac/Pixmaps/process-syncing-idle@2x.png b/SparkleShare/Mac/Pixmaps/process-syncing-idle@2x.png index 4e2bd746..8849c66b 100644 Binary files a/SparkleShare/Mac/Pixmaps/process-syncing-idle@2x.png and b/SparkleShare/Mac/Pixmaps/process-syncing-idle@2x.png differ diff --git a/SparkleShare/Mac/Pixmaps/process-syncing-up-active@2x.png b/SparkleShare/Mac/Pixmaps/process-syncing-up-active@2x.png index fc8603a0..3d39fd77 100644 Binary files a/SparkleShare/Mac/Pixmaps/process-syncing-up-active@2x.png and b/SparkleShare/Mac/Pixmaps/process-syncing-up-active@2x.png differ diff --git a/SparkleShare/Mac/Pixmaps/process-syncing-up@2x.png b/SparkleShare/Mac/Pixmaps/process-syncing-up@2x.png index 569f9afa..e9e64845 100644 Binary files a/SparkleShare/Mac/Pixmaps/process-syncing-up@2x.png and b/SparkleShare/Mac/Pixmaps/process-syncing-up@2x.png differ diff --git a/SparkleShare/Mac/Pixmaps/process-syncing@2x.png b/SparkleShare/Mac/Pixmaps/process-syncing@2x.png index 8c46c563..abc2ef63 100644 Binary files a/SparkleShare/Mac/Pixmaps/process-syncing@2x.png and b/SparkleShare/Mac/Pixmaps/process-syncing@2x.png differ diff --git a/SparkleShare/Mac/SparkleEventLog.cs b/SparkleShare/Mac/SparkleEventLog.cs index da61d8a6..04dac347 100755 --- a/SparkleShare/Mac/SparkleEventLog.cs +++ b/SparkleShare/Mac/SparkleEventLog.cs @@ -40,10 +40,7 @@ namespace SparkleShare { private NSButton hidden_close_button; - public SparkleEventLog (IntPtr handle) : base (handle) - { - } - + public SparkleEventLog (IntPtr handle) : base (handle) { } public SparkleEventLog () : base () { @@ -283,8 +280,8 @@ namespace SparkleShare { folders = Controller.Folders; this.popup_button.Cell.ControlSize = NSControlSize.Small; - this.popup_button.Font = NSFontManager.SharedFontManager.FontWithFamily - ("Lucida Grande", NSFontTraitMask.Condensed, 0, NSFont.SmallSystemFontSize); + this.popup_button.Font = NSFontManager.SharedFontManager.FontWithFamily ( + "Lucida Grande", NSFontTraitMask.Condensed, 0, NSFont.SmallSystemFontSize); this.popup_button.RemoveAllItems (); diff --git a/SparkleShare/Mac/SparkleSetup.cs b/SparkleShare/Mac/SparkleSetup.cs index 7fe6022a..8f9a9e23 100755 --- a/SparkleShare/Mac/SparkleSetup.cs +++ b/SparkleShare/Mac/SparkleSetup.cs @@ -812,12 +812,12 @@ namespace SparkleShare { if (File.Exists (slide_image_path)) { SlideImage = new NSImage (slide_image_path) { - Size = new SizeF (350, 200) + Size = new SizeF (324, 200) }; SlideImageView = new NSImageView () { Image = SlideImage, - Frame = new RectangleF (215, Frame.Height - 350, 350, 200) + Frame = new RectangleF (228, Frame.Height - 350, 324, 200) }; ContentView.AddSubview (SlideImageView); @@ -1060,14 +1060,12 @@ namespace SparkleShare { public class SparkleTextFieldDelegate : NSTextFieldDelegate { - - public event StringValueChangedHandler StringValueChanged; - public delegate void StringValueChangedHandler (); + + public event Action StringValueChanged = delegate { }; public override void Changed (NSNotification notification) { - if (StringValueChanged != null) StringValueChanged (); } } @@ -1075,14 +1073,12 @@ namespace SparkleShare { public class SparkleTableViewDelegate : NSTableViewDelegate { - public event SelectionChangedHandler SelectionChanged; - public delegate void SelectionChangedHandler (); + public event Action SelectionChanged = delegate { }; public override void SelectionDidChange (NSNotification notification) { - if (SelectionChanged != null) - SelectionChanged (); + SelectionChanged (); } } } diff --git a/SparkleShare/Mac/SparkleShare.csproj b/SparkleShare/Mac/SparkleShare.csproj index 6f77c3b9..4743fcb4 100644 --- a/SparkleShare/Mac/SparkleShare.csproj +++ b/SparkleShare/Mac/SparkleShare.csproj @@ -109,9 +109,6 @@ - - Pixmaps\side-splash%402x.png - Plugins\bitbucket%402x.png @@ -127,19 +124,6 @@ Plugins\ssnet%402x.png - - - - - - - - - - - - Pixmaps\about%402x.png - @@ -180,12 +164,6 @@ HTML\jquery.js - - Pixmaps\tutorial-slide-1.png - - - Pixmaps\tutorial-slide-2.png - Pixmaps\tutorial-slide-3.png @@ -232,6 +210,34 @@ Pixmaps\user-icon-default.png + + Pixmaps\side-splash%402x.png + + + + + + + + + + + + + Pixmaps\about%402x.png + + + Pixmaps\tutorial-slide-1.png + + + Pixmaps\tutorial-slide-1%402x.png + + + Pixmaps\tutorial-slide-2.png + + + Pixmaps\tutorial-slide-2%402x.png +