mac Move assets to UI folder
|
@ -64,9 +64,7 @@ namespace SparkleShare {
|
||||||
case PageType.Setup: {
|
case PageType.Setup: {
|
||||||
|
|
||||||
Header = _("Welcome to SparkleShare!");
|
Header = _("Welcome to SparkleShare!");
|
||||||
Description = "Before we get started, what's your name and email? " +
|
Description = "First off, what's your name and email?\nThis information is only visible to team members.";
|
||||||
"Don't worry, this information will only be visible to team members.";
|
|
||||||
|
|
||||||
|
|
||||||
Table table = new Table (2, 3, true) {
|
Table table = new Table (2, 3, true) {
|
||||||
RowSpacing = 6,
|
RowSpacing = 6,
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<plist version="1.0">
|
<plist version="1.0">
|
||||||
<dict>
|
<dict>
|
||||||
<key>CFBundleIconFile</key>
|
<key>CFBundleIconFile</key>
|
||||||
<string>sparkleshare</string>
|
<string>sparkleshare-app</string>
|
||||||
<key>CFBundleIdentifier</key>
|
<key>CFBundleIdentifier</key>
|
||||||
<string>org.sparkleshare.sparkleshare</string>
|
<string>org.sparkleshare.sparkleshare</string>
|
||||||
<key>CFBundleName</key>
|
<key>CFBundleName</key>
|
||||||
|
|
Before Width: | Height: | Size: 540 B After Width: | Height: | Size: 540 B |
Before Width: | Height: | Size: 613 B After Width: | Height: | Size: 613 B |
Before Width: | Height: | Size: 622 B After Width: | Height: | Size: 622 B |
Before Width: | Height: | Size: 639 B After Width: | Height: | Size: 639 B |
Before Width: | Height: | Size: 643 B After Width: | Height: | Size: 643 B |
Before Width: | Height: | Size: 641 B After Width: | Height: | Size: 641 B |
Before Width: | Height: | Size: 637 B After Width: | Height: | Size: 637 B |
Before Width: | Height: | Size: 646 B After Width: | Height: | Size: 646 B |
Before Width: | Height: | Size: 646 B After Width: | Height: | Size: 646 B |
Before Width: | Height: | Size: 652 B After Width: | Height: | Size: 652 B |
Before Width: | Height: | Size: 652 B After Width: | Height: | Size: 652 B |
Before Width: | Height: | Size: 662 B After Width: | Height: | Size: 662 B |
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 29 KiB |
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 42 KiB |
Before Width: | Height: | Size: 90 KiB After Width: | Height: | Size: 90 KiB |
|
@ -92,9 +92,7 @@ namespace SparkleShare {
|
||||||
case PageType.Setup: {
|
case PageType.Setup: {
|
||||||
|
|
||||||
Header = "Welcome to SparkleShare!";
|
Header = "Welcome to SparkleShare!";
|
||||||
Description = "Before we get started, what's your name and email?\n" +
|
Description = "First off, what's your name and email?\nThis information is only visible to team members.";
|
||||||
"Don't worry, this information will only be visible to team members.";
|
|
||||||
|
|
||||||
|
|
||||||
FullNameLabel = new NSTextField () {
|
FullNameLabel = new NSTextField () {
|
||||||
Alignment = NSTextAlignment.Right,
|
Alignment = NSTextAlignment.Right,
|
||||||
|
@ -906,7 +904,7 @@ namespace SparkleShare {
|
||||||
};
|
};
|
||||||
|
|
||||||
string slide_image_path = Path.Combine (NSBundle.MainBundle.ResourcePath,
|
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) {
|
SlideImage = new NSImage (slide_image_path) {
|
||||||
Size = new SizeF (350, 200)
|
Size = new SizeF (350, 200)
|
||||||
|
@ -938,7 +936,7 @@ namespace SparkleShare {
|
||||||
};
|
};
|
||||||
|
|
||||||
string slide_image_path = Path.Combine (NSBundle.MainBundle.ResourcePath,
|
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) {
|
SlideImage = new NSImage (slide_image_path) {
|
||||||
Size = new SizeF (350, 200)
|
Size = new SizeF (350, 200)
|
||||||
|
@ -969,7 +967,7 @@ namespace SparkleShare {
|
||||||
};
|
};
|
||||||
|
|
||||||
string slide_image_path = Path.Combine (NSBundle.MainBundle.ResourcePath,
|
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) {
|
SlideImage = new NSImage (slide_image_path) {
|
||||||
Size = new SizeF (350, 200)
|
Size = new SizeF (350, 200)
|
||||||
|
|
|
@ -120,48 +120,48 @@
|
||||||
<Content Include="..\..\data\side-splash.png">
|
<Content Include="..\..\data\side-splash.png">
|
||||||
<Link>Pixmaps\side-splash.png</Link>
|
<Link>Pixmaps\side-splash.png</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\sparkleshare-mac.icns">
|
<Content Include="Pixmaps\sparkleshare-folder.icns">
|
||||||
<Link>sparkleshare-mac.icns</Link>
|
<Link>sparkleshare-folder.icns</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\sparkleshare.icns">
|
<Content Include="Pixmaps\sparkleshare-app.icns">
|
||||||
<Link>sparkleshare.icns</Link>
|
<Link>sparkleshare-app.icns</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\icons\process-syncing-sparkleshare-mac-i-active.png">
|
<Content Include="Pixmaps\process-syncing-i-active.png">
|
||||||
<Link>Pixmaps\process-syncing-sparkleshare-mac-i-active.png</Link>
|
<Link>Pixmaps\process-syncing-i-active.png</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\icons\process-syncing-sparkleshare-mac-i.png">
|
<Content Include="Pixmaps\process-syncing-i.png">
|
||||||
<Link>Pixmaps\process-syncing-sparkleshare-mac-i.png</Link>
|
<Link>Pixmaps\process-syncing-i.png</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\icons\process-syncing-sparkleshare-mac-ii-active.png">
|
<Content Include="Pixmaps\process-syncing-ii-active.png">
|
||||||
<Link>Pixmaps\process-syncing-sparkleshare-mac-ii-active.png</Link>
|
<Link>Pixmaps\process-syncing-ii-active.png</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\icons\process-syncing-sparkleshare-mac-ii.png">
|
<Content Include="Pixmaps\process-syncing-ii.png">
|
||||||
<Link>Pixmaps\process-syncing-sparkleshare-mac-ii.png</Link>
|
<Link>Pixmaps\process-syncing-ii.png</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\icons\process-syncing-sparkleshare-mac-iii-active.png">
|
<Content Include="Pixmaps\process-syncing-iii-active.png">
|
||||||
<Link>Pixmaps\process-syncing-sparkleshare-mac-iii-active.png</Link>
|
<Link>Pixmaps\process-syncing-iii-active.png</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\icons\process-syncing-sparkleshare-mac-iii.png">
|
<Content Include="Pixmaps\process-syncing-iii.png">
|
||||||
<Link>Pixmaps\process-syncing-sparkleshare-mac-iii.png</Link>
|
<Link>Pixmaps\process-syncing-iii.png</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\icons\process-syncing-sparkleshare-mac-iiii-active.png">
|
<Content Include="Pixmaps\process-syncing-iiii-active.png">
|
||||||
<Link>Pixmaps\process-syncing-sparkleshare-mac-iiii-active.png</Link>
|
<Link>Pixmaps\process-syncing-iiii-active.png</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\icons\process-syncing-sparkleshare-mac-iiii.png">
|
<Content Include="Pixmaps\process-syncing-iiii.png">
|
||||||
<Link>Pixmaps\process-syncing-sparkleshare-mac-iiii.png</Link>
|
<Link>Pixmaps\process-syncing-iiii.png</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\icons\process-syncing-sparkleshare-mac-iiiii-active.png">
|
<Content Include="Pixmaps\process-syncing-iiiii-active.png">
|
||||||
<Link>Pixmaps\process-syncing-sparkleshare-mac-iiiii-active.png</Link>
|
<Link>Pixmaps\process-syncing-iiiii-active.png</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\icons\process-syncing-sparkleshare-mac-iiiii.png">
|
<Content Include="Pixmaps\process-syncing-iiiii.png">
|
||||||
<Link>Pixmaps\process-syncing-sparkleshare-mac-iiiii.png</Link>
|
<Link>Pixmaps\process-syncing-iiiii.png</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="Growl.plist" />
|
<Content Include="Growl.plist" />
|
||||||
<Content Include="..\..\data\icons\sparkleshare-syncing-error-mac.png">
|
<Content Include="Pixmaps\process-syncing-error.png">
|
||||||
<Link>Pixmaps\sparkleshare-syncing-error-mac.png</Link>
|
<Link>Pixmaps\process-syncing-error.png</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\icons\sparkleshare-syncing-error-mac-active.png">
|
<Content Include="Pixmaps\process-syncing-error-active.png">
|
||||||
<Link>Pixmaps\sparkleshare-syncing-error-mac-active.png</Link>
|
<Link>Pixmaps\process-syncing-error-active.png</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\icons\document-added-12.png">
|
<Content Include="..\..\data\icons\document-added-12.png">
|
||||||
<Link>Pixmaps\document-added-12.png</Link>
|
<Link>Pixmaps\document-added-12.png</Link>
|
||||||
|
@ -256,22 +256,13 @@
|
||||||
<Content Include="..\..\data\html\jquery.js">
|
<Content Include="..\..\data\html\jquery.js">
|
||||||
<Link>HTML\jquery.js</Link>
|
<Link>HTML\jquery.js</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\tutorial-slide-1.png">
|
<Content Include="Pixmaps\tutorial-slide-1.png">
|
||||||
<Link>Pixmaps\tutorial-slide-1.png</Link>
|
<Link>Pixmaps\tutorial-slide-1.png</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\tutorial-slide-1-mac.png">
|
<Content Include="Pixmaps\tutorial-slide-2.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">
|
|
||||||
<Link>Pixmaps\tutorial-slide-2.png</Link>
|
<Link>Pixmaps\tutorial-slide-2.png</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\tutorial-slide-3.png">
|
<Content Include="Pixmaps\tutorial-slide-3.png">
|
||||||
<Link>Pixmaps\tutorial-slide-3.png</Link>
|
<Link>Pixmaps\tutorial-slide-3.png</Link>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\..\data\tutorial-slide-4.png">
|
<Content Include="..\..\data\tutorial-slide-4.png">
|
||||||
|
|
|
@ -83,7 +83,7 @@ namespace SparkleShare {
|
||||||
|
|
||||||
this.folder_image = NSImage.ImageNamed ("NSFolder");
|
this.folder_image = NSImage.ImageNamed ("NSFolder");
|
||||||
this.caution_image = NSImage.ImageNamed ("NSCaution");
|
this.caution_image = NSImage.ImageNamed ("NSCaution");
|
||||||
this.sparkleshare_image = NSImage.ImageNamed ("sparkleshare-mac");
|
this.sparkleshare_image = NSImage.ImageNamed ("sparkleshare-folder");
|
||||||
|
|
||||||
CreateMenu ();
|
CreateMenu ();
|
||||||
}
|
}
|
||||||
|
@ -330,34 +330,34 @@ namespace SparkleShare {
|
||||||
{
|
{
|
||||||
this.animation_frames = new NSImage [] {
|
this.animation_frames = new NSImage [] {
|
||||||
new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath,
|
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,
|
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,
|
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,
|
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,
|
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 [] {
|
this.animation_frames_active = new NSImage [] {
|
||||||
new NSImage (Path.Combine (NSBundle.MainBundle.ResourcePath,
|
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,
|
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,
|
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,
|
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,
|
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 +
|
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 +
|
this.error_image_active = new NSImage (NSBundle.MainBundle.ResourcePath +
|
||||||
"/Pixmaps/sparkleshare-syncing-error-mac-active.png");
|
"/Pixmaps/process-syncing-error-active.png");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -53,7 +53,7 @@ namespace SparkleShare {
|
||||||
GrowlApplicationBridge.Delegate = new SparkleGrowlDelegate ();
|
GrowlApplicationBridge.Delegate = new SparkleGrowlDelegate ();
|
||||||
|
|
||||||
NSApplication.SharedApplication.ApplicationIconImage =
|
NSApplication.SharedApplication.ApplicationIconImage =
|
||||||
NSImage.ImageNamed ("sparkleshare.icns");
|
NSImage.ImageNamed ("sparkleshare-app.icns");
|
||||||
|
|
||||||
SetFolderIcon ();
|
SetFolderIcon ();
|
||||||
|
|
||||||
|
|
Before Width: | Height: | Size: 859 KiB After Width: | Height: | Size: 859 KiB |
Before Width: | Height: | Size: 682 KiB After Width: | Height: | Size: 682 KiB |
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 855 KiB After Width: | Height: | Size: 855 KiB |
Before Width: | Height: | Size: 928 KiB After Width: | Height: | Size: 928 KiB |
Before Width: | Height: | Size: 988 KiB After Width: | Height: | Size: 988 KiB |
Before Width: | Height: | Size: 53 KiB After Width: | Height: | Size: 53 KiB |
Before Width: | Height: | Size: 458 KiB After Width: | Height: | Size: 458 KiB |
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 726 KiB After Width: | Height: | Size: 726 KiB |
Before Width: | Height: | Size: 2 MiB After Width: | Height: | Size: 2 MiB |
|
@ -274,7 +274,7 @@ namespace SparkleShare {
|
||||||
|
|
||||||
public void UIHasLoaded ()
|
public void UIHasLoaded ()
|
||||||
{
|
{
|
||||||
if (FirstRun)
|
if (!FirstRun)
|
||||||
ShowSetupWindow (PageType.Setup);
|
ShowSetupWindow (PageType.Setup);
|
||||||
else
|
else
|
||||||
new Thread (new ThreadStart (PopulateRepositories)).Start ();
|
new Thread (new ThreadStart (PopulateRepositories)).Start ();
|
||||||
|
|
|
@ -64,9 +64,7 @@ namespace SparkleShare {
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case PageType.Setup: {
|
case PageType.Setup: {
|
||||||
Header = "Welcome to SparkleShare!";
|
Header = "Welcome to SparkleShare!";
|
||||||
Description = "Before we get started, what's your name and email?\n" +
|
Description = "First off, what's your name and email?\nThis information is only visible to team members.";
|
||||||
"Don't worry, this information will only be visible to team members.";
|
|
||||||
|
|
||||||
|
|
||||||
TextBlock name_label = new TextBlock () {
|
TextBlock name_label = new TextBlock () {
|
||||||
Text = "Full Name:",
|
Text = "Full Name:",
|
||||||
|
|
|
@ -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
|
|