mac Move assets to UI folder

SparkleShare/Linux/SparkleSetup.cs

@@ -64,9 +64,7 @@ namespace SparkleShare {
                     case PageType.Setup: {
 
                         Header = _("Welcome to SparkleShare!");
-                        Description  = "Before we get started, what's your name and email? " +
-                            "Don't worry, this information will only be visible to team members.";
-
+                        Description  = "First off, what's your name and email?\nThis information is only visible to team members.";
 
                         Table table = new Table (2, 3, true) {
                             RowSpacing    = 6,

SparkleShare/Mac/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleIconFile</key>
-	<string>sparkleshare</string>
+	<string>sparkleshare-app</string>
 	<key>CFBundleIdentifier</key>
 	<string>org.sparkleshare.sparkleshare</string>
 	<key>CFBundleName</key>

SparkleShare/Mac/SparkleSetup.cs

@@ -92,9 +92,7 @@ namespace SparkleShare {
                         case PageType.Setup: {
     
                             Header       = "Welcome to SparkleShare!";
-                            Description  = "Before we get started, what's your name and email?\n" +
-                                "Don't worry, this information will only be visible to team members.";
-    
+                            Description  = "First off, what's your name and email?\nThis information is only visible to team members.";
     
                             FullNameLabel = new NSTextField () {
                                 Alignment       = NSTextAlignment.Right,
@@ -906,7 +904,7 @@ namespace SparkleShare {
                                 };
     
                                 string slide_image_path = Path.Combine (NSBundle.MainBundle.ResourcePath,
-                                    "Pixmaps", "tutorial-slide-1-mac.png");
+                                    "Pixmaps", "tutorial-slide-1.png");
     
                                 SlideImage = new NSImage (slide_image_path) {
                                     Size = new SizeF (350, 200)
@@ -938,7 +936,7 @@ namespace SparkleShare {
                                 };
     
                                 string slide_image_path = Path.Combine (NSBundle.MainBundle.ResourcePath,
-                                    "Pixmaps", "tutorial-slide-2-mac.png");
+                                    "Pixmaps", "tutorial-slide-2.png");
     
                                 SlideImage = new NSImage (slide_image_path) {
                                     Size = new SizeF (350, 200)
@@ -969,7 +967,7 @@ namespace SparkleShare {
                                 };
     
                                 string slide_image_path = Path.Combine (NSBundle.MainBundle.ResourcePath,
-                                    "Pixmaps", "tutorial-slide-3-mac.png");
+                                    "Pixmaps", "tutorial-slide-3.png");
     
                                 SlideImage = new NSImage (slide_image_path) {
                                     Size = new SizeF (350, 200)

SparkleShare/Mac/SparkleShare.csproj

@@ -120,48 +120,48 @@
     <Content Include="..\..\data\side-splash.png">
       <Link>Pixmaps\side-splash.png</Link>
     </Content>
-    <Content Include="..\..\data\sparkleshare-mac.icns">
-      <Link>sparkleshare-mac.icns</Link>
+    <Content Include="Pixmaps\sparkleshare-folder.icns">
+      <Link>sparkleshare-folder.icns</Link>
     </Content>
-    <Content Include="..\..\data\sparkleshare.icns">
-      <Link>sparkleshare.icns</Link>
+    <Content Include="Pixmaps\sparkleshare-app.icns">
+      <Link>sparkleshare-app.icns</Link>
     </Content>
-    <Content Include="..\..\data\icons\process-syncing-sparkleshare-mac-i-active.png">
-      <Link>Pixmaps\process-syncing-sparkleshare-mac-i-active.png</Link>
+    <Content Include="Pixmaps\process-syncing-i-active.png">
+      <Link>Pixmaps\process-syncing-i-active.png</Link>
     </Content>
-    <Content Include="..\..\data\icons\process-syncing-sparkleshare-mac-i.png">
-      <Link>Pixmaps\process-syncing-sparkleshare-mac-i.png</Link>
+    <Content Include="Pixmaps\process-syncing-i.png">
+      <Link>Pixmaps\process-syncing-i.png</Link>
     </Content>
-    <Content Include="..\..\data\icons\process-syncing-sparkleshare-mac-ii-active.png">
-      <Link>Pixmaps\process-syncing-sparkleshare-mac-ii-active.png</Link>
+    <Content Include="Pixmaps\process-syncing-ii-active.png">
+      <Link>Pixmaps\process-syncing-ii-active.png</Link>
     </Content>
-    <Content Include="..\..\data\icons\process-syncing-sparkleshare-mac-ii.png">
-      <Link>Pixmaps\process-syncing-sparkleshare-mac-ii.png</Link>
+    <Content Include="Pixmaps\process-syncing-ii.png">
+      <Link>Pixmaps\process-syncing-ii.png</Link>
     </Content>
-    <Content Include="..\..\data\icons\process-syncing-sparkleshare-mac-iii-active.png">
-      <Link>Pixmaps\process-syncing-sparkleshare-mac-iii-active.png</Link>
+    <Content Include="Pixmaps\process-syncing-iii-active.png">
+      <Link>Pixmaps\process-syncing-iii-active.png</Link>
     </Content>
-    <Content Include="..\..\data\icons\process-syncing-sparkleshare-mac-iii.png">
-      <Link>Pixmaps\process-syncing-sparkleshare-mac-iii.png</Link>
+    <Content Include="Pixmaps\process-syncing-iii.png">
+      <Link>Pixmaps\process-syncing-iii.png</Link>
     </Content>
-    <Content Include="..\..\data\icons\process-syncing-sparkleshare-mac-iiii-active.png">
-      <Link>Pixmaps\process-syncing-sparkleshare-mac-iiii-active.png</Link>
+    <Content Include="Pixmaps\process-syncing-iiii-active.png">
+      <Link>Pixmaps\process-syncing-iiii-active.png</Link>
     </Content>
-    <Content Include="..\..\data\icons\process-syncing-sparkleshare-mac-iiii.png">
-      <Link>Pixmaps\process-syncing-sparkleshare-mac-iiii.png</Link>
+    <Content Include="Pixmaps\process-syncing-iiii.png">
+      <Link>Pixmaps\process-syncing-iiii.png</Link>
     </Content>
-    <Content Include="..\..\data\icons\process-syncing-sparkleshare-mac-iiiii-active.png">
-      <Link>Pixmaps\process-syncing-sparkleshare-mac-iiiii-active.png</Link>
+    <Content Include="Pixmaps\process-syncing-iiiii-active.png">
+      <Link>Pixmaps\process-syncing-iiiii-active.png</Link>
     </Content>
-    <Content Include="..\..\data\icons\process-syncing-sparkleshare-mac-iiiii.png">
-      <Link>Pixmaps\process-syncing-sparkleshare-mac-iiiii.png</Link>
+    <Content Include="Pixmaps\process-syncing-iiiii.png">
+      <Link>Pixmaps\process-syncing-iiiii.png</Link>
     </Content>
     <Content Include="Growl.plist" />
-    <Content Include="..\..\data\icons\sparkleshare-syncing-error-mac.png">
-      <Link>Pixmaps\sparkleshare-syncing-error-mac.png</Link>
+    <Content Include="Pixmaps\process-syncing-error.png">
+      <Link>Pixmaps\process-syncing-error.png</Link>
     </Content>
-    <Content Include="..\..\data\icons\sparkleshare-syncing-error-mac-active.png">
-      <Link>Pixmaps\sparkleshare-syncing-error-mac-active.png</Link>
+    <Content Include="Pixmaps\process-syncing-error-active.png">
+      <Link>Pixmaps\process-syncing-error-active.png</Link>
     </Content>
     <Content Include="..\..\data\icons\document-added-12.png">
       <Link>Pixmaps\document-added-12.png</Link>
@@ -256,22 +256,13 @@
     <Content Include="..\..\data\html\jquery.js">
       <Link>HTML\jquery.js</Link>
     </Content>
-    <Content Include="..\..\data\tutorial-slide-1.png">
+    <Content Include="Pixmaps\tutorial-slide-1.png">
       <Link>Pixmaps\tutorial-slide-1.png</Link>
     </Content>
-    <Content Include="..\..\data\tutorial-slide-1-mac.png">
-      <Link>Pixmaps\tutorial-slide-1-mac.png</Link>
-    </Content>
-    <Content Include="..\..\data\tutorial-slide-2-mac.png">
-      <Link>Pixmaps\tutorial-slide-2-mac.png</Link>
-    </Content>
-    <Content Include="..\..\data\tutorial-slide-3-mac.png">
-      <Link>Pixmaps\tutorial-slide-3-mac.png</Link>
-    </Content>
-    <Content Include="..\..\data\tutorial-slide-2.png">
+    <Content Include="Pixmaps\tutorial-slide-2.png">
       <Link>Pixmaps\tutorial-slide-2.png</Link>
     </Content>
-    <Content Include="..\..\data\tutorial-slide-3.png">
+    <Content Include="Pixmaps\tutorial-slide-3.png">
       <Link>Pixmaps\tutorial-slide-3.png</Link>
     </Content>
     <Content Include="..\..\data\tutorial-slide-4.png">

SparkleShare/Mac/SparkleStatusIcon.cs

@@ -83,7 +83,7 @@ namespace SparkleShare {
 
                 this.folder_image       = NSImage.ImageNamed ("NSFolder");
                 this.caution_image      = NSImage.ImageNamed ("NSCaution");
-                this.sparkleshare_image = NSImage.ImageNamed ("sparkleshare-mac");
+                this.sparkleshare_image = NSImage.ImageNamed ("sparkleshare-folder");
 
                 CreateMenu ();
             }
@@ -330,34 +330,34 @@ namespace SparkleShare {
         {
             this.animation_frames = new NSImage [] {
                 new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath,
-                    "Pixmaps", "process-syncing-sparkleshare-mac-i.png")),
+                    "Pixmaps", "process-syncing-i.png")),
                 new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath,
-                    "Pixmaps", "process-syncing-sparkleshare-mac-ii.png")),
+                    "Pixmaps", "process-syncing-ii.png")),
                 new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath,
-                    "Pixmaps", "process-syncing-sparkleshare-mac-iii.png")),
+                    "Pixmaps", "process-syncing-iii.png")),
                 new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath,
-                    "Pixmaps", "process-syncing-sparkleshare-mac-iiii.png")),
+                    "Pixmaps", "process-syncing-iiii.png")),
                 new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath,
-                    "Pixmaps", "process-syncing-sparkleshare-mac-iiiii.png"))
+                    "Pixmaps", "process-syncing-iiiii.png"))
             };
 
             this.animation_frames_active = new NSImage [] {
                 new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath,
-                    "Pixmaps", "process-syncing-sparkleshare-mac-i-active.png")),
+                    "Pixmaps", "process-syncing-i-active.png")),
                 new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath,
-                    "Pixmaps", "process-syncing-sparkleshare-mac-ii-active.png")),
+                    "Pixmaps", "process-syncing-ii-active.png")),
                 new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath,
-                    "Pixmaps", "process-syncing-sparkleshare-mac-iii-active.png")),
+                    "Pixmaps", "process-syncing-iii-active.png")),
                 new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath,
-                    "Pixmaps", "process-syncing-sparkleshare-mac-iiii-active.png")),
+                    "Pixmaps", "process-syncing-iiii-active.png")),
                 new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath,
-                    "Pixmaps", "process-syncing-sparkleshare-mac-iiiii-active.png"))
+                    "Pixmaps", "process-syncing-iiiii-active.png"))
             };
 			
             this.error_image        = new NSImage (NSBundle.MainBundle.ResourcePath +
-                "/Pixmaps/sparkleshare-syncing-error-mac.png");
+                "/Pixmaps/process-syncing-error.png");
             this.error_image_active = new NSImage (NSBundle.MainBundle.ResourcePath +
-                "/Pixmaps/sparkleshare-syncing-error-mac-active.png");
+                "/Pixmaps/process-syncing-error-active.png");
         }
     }
     

SparkleShare/Mac/SparkleUI.cs

@@ -53,7 +53,7 @@ namespace SparkleShare {
                 GrowlApplicationBridge.Delegate     = new SparkleGrowlDelegate ();
 
                 NSApplication.SharedApplication.ApplicationIconImage =
-					NSImage.ImageNamed ("sparkleshare.icns");
+					NSImage.ImageNamed ("sparkleshare-app.icns");
 
                 SetFolderIcon ();
     

SparkleShare/SparkleControllerBase.cs

@@ -274,7 +274,7 @@ namespace SparkleShare {
 
         public void UIHasLoaded ()
         {
-            if (FirstRun)
+            if (!FirstRun)
                 ShowSetupWindow (PageType.Setup);
             else
                 new Thread (new ThreadStart (PopulateRepositories)).Start ();

SparkleShare/Windows/SparkleSetup.cs

@@ -64,9 +64,7 @@ namespace SparkleShare {
                     switch (type) {
                     case PageType.Setup: {
                         Header      = "Welcome to SparkleShare!";
-                        Description = "Before we get started, what's your name and email?\n" +
-                            "Don't worry, this information will only be visible to team members.";
-        
+                        Description  = "First off, what's your name and email?\nThis information is only visible to team members.";
                         
                         TextBlock name_label = new TextBlock () {
                             Text = "Full Name:",

data/git-hooks/post-update

@@ -1,40 +0,0 @@
-#!/bin/sh
-
-#
-#  This Git hook sends update message to a notification server, so
-#  that manual git pushes to a repository also will be noticed by 
-#  SparkleShare clients.
-#
-#  For information on running your own notification service:
-#  https://github.com/travisghansen/fanout
-#
-#
-#  For use with Gitolite:
-#
-#  Copy this file to .gitolite/hooks/common/post-update.
-#  Run "gl-setup" again.
-#
-#
-#  For use with standard Git repositories:
-#
-#  Copy this file to .git/hooks/post-update in 
-#  the remote repository
-#
-#
-#  Make sure to "chmod -x" this hook after the file has been copied
-#
-
-#  Change these if you run your own service somewhere
-SERVER="notifications.sparkleshare.org"
-PORT="80"
-
-#  Don't edit below this line
-exec > /dev/null 2>&1
-
-CHANNEL=$(git rev-list --reverse HEAD | head -n 1)
-MESSAGE=$(git rev-list HEAD | head -n 1)
-
-DATA="announce ${CHANNEL} ${MESSAGE}"
-echo "${DATA}\n" | socat - TCP-CONNECT:${SERVER}:${PORT} &
-
-exit 0