mac: add @2x tutorial slides, #1072

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/

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/

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 ();
 

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 ();
         }
     }
 }

SparkleShare/Mac/SparkleShare.csproj

@@ -109,9 +109,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="Info.plist" />
-    <None Include="..\Common\Pixmaps\side-splash%402x.png">
-      <Link>Pixmaps\side-splash%402x.png</Link>
-    </None>
     <None Include="..\Common\Plugins\bitbucket%402x.png">
       <Link>Plugins\bitbucket%402x.png</Link>
     </None>
@@ -127,19 +124,6 @@
     <None Include="..\Common\Plugins\ssnet%402x.png">
       <Link>Plugins\ssnet%402x.png</Link>
     </None>
-    <None Include="Pixmaps\process-syncing-active%402x.png" />
-    <None Include="Pixmaps\process-syncing-down-active%402x.png" />
-    <None Include="Pixmaps\process-syncing-down%402x.png" />
-    <None Include="Pixmaps\process-syncing-error-active%402x.png" />
-    <None Include="Pixmaps\process-syncing-error%402x.png" />
-    <None Include="Pixmaps\process-syncing-idle-active%402x.png" />
-    <None Include="Pixmaps\process-syncing-idle%402x.png" />
-    <None Include="Pixmaps\process-syncing-up-active%402x.png" />
-    <None Include="Pixmaps\process-syncing-up%402x.png" />
-    <None Include="Pixmaps\process-syncing%402x.png" />
-    <None Include="..\Common\Pixmaps\about%402x.png">
-      <Link>Pixmaps\about%402x.png</Link>
-    </None>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Mono\MonoMac\v0.0\Mono.MonoMac.targets" />
@@ -180,12 +164,6 @@
     <Content Include="..\Common\HTML\jquery.js">
       <Link>HTML\jquery.js</Link>
     </Content>
-    <Content Include="Pixmaps\tutorial-slide-1.png">
-      <Link>Pixmaps\tutorial-slide-1.png</Link>
-    </Content>
-    <Content Include="Pixmaps\tutorial-slide-2.png">
-      <Link>Pixmaps\tutorial-slide-2.png</Link>
-    </Content>
     <Content Include="Pixmaps\tutorial-slide-3.png">
       <Link>Pixmaps\tutorial-slide-3.png</Link>
     </Content>
@@ -232,6 +210,34 @@
     <Content Include="..\Common\Pixmaps\user-icon-default.png">
       <Link>Pixmaps\user-icon-default.png</Link>
     </Content>
+    <Content Include="..\Common\Pixmaps\side-splash%402x.png">
+      <Link>Pixmaps\side-splash%402x.png</Link>
+    </Content>
+    <Content Include="Pixmaps\process-syncing-active%402x.png" />
+    <Content Include="Pixmaps\process-syncing-down-active%402x.png" />
+    <Content Include="Pixmaps\process-syncing-down%402x.png" />
+    <Content Include="Pixmaps\process-syncing-error-active%402x.png" />
+    <Content Include="Pixmaps\process-syncing-error%402x.png" />
+    <Content Include="Pixmaps\process-syncing-idle-active%402x.png" />
+    <Content Include="Pixmaps\process-syncing-idle%402x.png" />
+    <Content Include="Pixmaps\process-syncing-up-active%402x.png" />
+    <Content Include="Pixmaps\process-syncing-up%402x.png" />
+    <Content Include="Pixmaps\process-syncing%402x.png" />
+    <Content Include="..\Common\Pixmaps\about%402x.png">
+      <Link>Pixmaps\about%402x.png</Link>
+    </Content>
+    <Content Include="..\Common\Pixmaps\tutorial-slide-1.png">
+      <Link>Pixmaps\tutorial-slide-1.png</Link>
+    </Content>
+    <Content Include="..\Common\Pixmaps\tutorial-slide-1%402x.png">
+      <Link>Pixmaps\tutorial-slide-1%402x.png</Link>
+    </Content>
+    <Content Include="..\Common\Pixmaps\tutorial-slide-2.png">
+      <Link>Pixmaps\tutorial-slide-2.png</Link>
+    </Content>
+    <Content Include="..\Common\Pixmaps\tutorial-slide-2%402x.png">
+      <Link>Pixmaps\tutorial-slide-2%402x.png</Link>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Pixmaps\" />