diff --git a/README b/README index dd50fc37..d379ba88 100644 --- a/README +++ b/README @@ -1,30 +1,21 @@ -SparkleShare -============ +# SparkleShare SparkleShare is a collaboration and sharing tool that is designed to keep things simple and to stay out of your way. It allows you to instantly sync with any Git repository you have access to. -Though SparkleShare is not made to be a graphical frontend -for git or a backup tool, it may be useful for other kinds of purposes as well, -like backing up small files or monitoring your favourite project. In contrast -to the projects name, we will very likely refuse to implement your personal -ponies. - SparkleShare currently works on Linux and Mac. A Windows port and mobile device support are planned for the future. -License -======= +# License SparkleShare is free software and licensed under the GNU GPLv3 or later. You are welcome to change and redistribute it under certain conditions. For more information see the LICENSE file or visit http://www.gnu.org/licenses/gpl-3.0.html -Run on Linux: -============= +# Run on Linux Requirements: @@ -41,7 +32,6 @@ Requirements: - webkitgtk - webkit-sharp - Run the service, either click the SparkleShare launcher or: $ sparkleshare start @@ -61,20 +51,18 @@ Note: own server by hand. -Build on Linux: -=============== +# Build on Linux Installing the build dependencies on Debian or Ubuntu: $ sudo apt-get install gtk-sharp2 mono-runtime mono-devel monodevelop \ - libndesk-dbus1.0-cil-dev nant libnotify-cil-dev libgtk2.0-cil-dev \ + libndesk-dbus1.0-cil-dev nant libnotify-cil-dev libgtk2.0-cil-dev mono-gmcs \ libwebkit-cil-dev intltool libtool python-nautilus libndesk-dbus-glib1.0-cil-dev For Ubuntu libappindicator support, run the following before building: $ sudo apt-get install libappindicator0.1-cil-dev - - + On Fedora: $ sudo yum install gtk-sharp2-devel mono-core mono-devel monodevelop \ @@ -82,7 +70,6 @@ On Fedora: notify-sharp-devel webkit-sharp-devel webkitgtk-devel libtool intltool \ gnome-doc-utils - You can build and install SparkleShare like this: $ ./configure --prefix=/usr (or ./autogen.sh if you build from the repository) @@ -94,14 +81,12 @@ Note: Use '--prefix=/usr' if you want the Nautilus extension to work. -Run on Mac: -=========== +# Run on Mac -Just double-click the SparkleShare.app. +Just double-click the SparkleShare bundle. -Build on Mac: -============= +# Build on Mac Install the Mono Framework, MonoDevelop and the MonoMac plugin (you find it in Add-in Manager). @@ -111,58 +96,15 @@ You may need to adjust some environment variables to let the build environment t $ export PKG_CONFIG=/Library/Frameworks/Mono.framework/Versions/Current/bin/pkg-config $ export PKG_CONFIG_PATH=/Library/Frameworks/Mono.framework/Versions/Current/lib/pkgconfig -Then you need either MacPorts or Homebrew. Go on and choose one of the next two sections. - - -Using MacPorts --------------- - -Install git, automake, and intltool: +Install git, automake, and intltool using MacPorts: $ sudo port install git-core automake intltool - + Start the first part of the build: $ ./autogen.sh --enable-gtkui=no $ make - -The last step will give you some errors in SparkleShare.exe, ignore these and go on to the -MonoDevelop section. - - -Using Homebrew --------------- - -Because there are old versions of autoconf and automake installed on OS X, they are not in -the official master branch. It's easy to create the formulas: - - $ brew create $url -Now install the formulas. - -You can have a look at this branch for the created Formulas: -https://github.com/toabi/homebrew/commits/sparkleshare - -You also have to comment out the 'keg_only' in gettext and remove it if you already -installed it. If you created the formulas install them: - - $ brew install git autoconf automake intltool gettext - -Now start the first part of the build: - - $ export ACLOCAL_FLAGS="-I /usr/local/share/aclocal" - $ cd SmartIrc4net - $ ./autogen.sh - $ cd .. - $ ./autogen.sh --enable-gtkui=no - $ make - -Ignore the error and continue to the MonoDevelop-part. - - -Building the Mac UI -------------------- - Now that you have compiled the libraries, open 'SparkleShare/Mac/SparkleShare.sln' in MonoDevelop and start the build. @@ -175,11 +117,10 @@ https://raw.github.com/gist/1aeffa61bac73fc08eca/0c0f09ef9e36864c35f34fd5e8bf4f9 Copy /Library/Frameworks/Mono.framework/Versions/Current/lib/libintl.dylib to SparkleShare.app/Contents/Resources -Now you should have a working .app that you can run. +Now you should have a working bundle that you can run. -Info -==== +# Info Official website: http://www.sparkleshare.org/ diff --git a/SparkleShare/Mac/SparkleAbout.cs b/SparkleShare/Mac/SparkleAbout.cs index e145b120..64a3fc93 100755 --- a/SparkleShare/Mac/SparkleAbout.cs +++ b/SparkleShare/Mac/SparkleAbout.cs @@ -69,14 +69,15 @@ namespace SparkleShare { InvokeOnMainThread (delegate { UpdatesTextField.StringValue = "You are running the latest version."; UpdatesTextField.TextColor = - NSColor.FromCalibratedRgba (0.31f, 0.60f, 0.02f, 1.0f); // Tango Chameleon #3 + NSColor.FromCalibratedRgba (0.45f, 0.62f, 0.81f, 1.0f); // Tango Sky Blue #1 }); }; Controller.CheckingForNewVersionEvent += delegate { InvokeOnMainThread (delegate { UpdatesTextField.StringValue = "Checking for updates..."; - UpdatesTextField.TextColor = NSColor.DisabledControlText; + UpdatesTextField.TextColor = + NSColor.FromCalibratedRgba (0.45f, 0.62f, 0.81f, 1.0f); // Tango Sky Blue #1 }); }; } @@ -117,7 +118,8 @@ namespace SparkleShare { DrawsBackground = false, Font = NSFontManager.SharedFontManager.FontWithFamily ("Lucida Grande", NSFontTraitMask.Unbold, 0, 11), - TextColor = NSColor.DisabledControlText + TextColor = + NSColor.FromCalibratedRgba (0.45f, 0.62f, 0.81f, 1.0f) // Tango Sky Blue #1 }; CreditsTextField = new NSTextField () { diff --git a/SparkleShare/Mac/SparkleSetupWindow.cs b/SparkleShare/Mac/SparkleSetupWindow.cs index 58d2bc67..d0a6ed79 100755 --- a/SparkleShare/Mac/SparkleSetupWindow.cs +++ b/SparkleShare/Mac/SparkleSetupWindow.cs @@ -56,12 +56,12 @@ namespace SparkleShare { "Pixmaps", "side-splash.png"); SideSplash = new NSImage (side_splash_path) { - Size = new SizeF (150, 407) + Size = new SizeF (150, 482) }; SideSplashView = new NSImageView () { Image = SideSplash, - Frame = new RectangleF (0, 0, 150, 407) + Frame = new RectangleF (0, 0, 150, 482) }; Buttons = new List (); diff --git a/SparkleShare/SparkleAbout.cs b/SparkleShare/SparkleAbout.cs index 7bb6e2ad..6d0a18f9 100755 --- a/SparkleShare/SparkleAbout.cs +++ b/SparkleShare/SparkleAbout.cs @@ -75,7 +75,7 @@ namespace SparkleShare { Controller.VersionUpToDateEvent += delegate { Application.Invoke (delegate { - this.updates.Markup = String.Format ("{0}", + this.updates.Markup = String.Format ("{0}", _("You are running the latest version.")); this.updates.ShowAll (); @@ -84,7 +84,7 @@ namespace SparkleShare { Controller.CheckingForNewVersionEvent += delegate { Application.Invoke (delegate { - this.updates.Markup = String.Format ("{0}", + this.updates.Markup = String.Format ("{0}", _("Checking for updates...")); this.updates.ShowAll (); @@ -109,7 +109,7 @@ namespace SparkleShare { }; this.updates = new Label () { - Markup = "" + + Markup = "" + _("Checking for updates...") + "", Xalign = 0, diff --git a/SparkleShare/SparkleSetup.cs b/SparkleShare/SparkleSetup.cs index 6df1cbd1..2c63755d 100755 --- a/SparkleShare/SparkleSetup.cs +++ b/SparkleShare/SparkleSetup.cs @@ -25,7 +25,6 @@ using System.Collections.Generic; using Gtk; using Mono.Unix; - namespace SparkleShare { public class SparkleSetup : SparkleSetupWindow { diff --git a/data/about.png b/data/about.png index c1cd2236..9f01b2ef 100755 Binary files a/data/about.png and b/data/about.png differ diff --git a/data/side-splash.png b/data/side-splash.png index 32b3b832..4f3cbc4b 100755 Binary files a/data/side-splash.png and b/data/side-splash.png differ diff --git a/data/src/about-dialog.svg b/data/src/about-dialog.svg old mode 100755 new mode 100644 index 88ab5a97..fcd66520 --- a/data/src/about-dialog.svg +++ b/data/src/about-dialog.svg @@ -30,49 +30,6 @@ offset="1" style="stop-color:#3f3f3f;stop-opacity:1" /> - - - - - - - - - - - - + + + + + + + + + + + + image/svg+xml - + @@ -603,16 +609,174 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1"> - + + + + + + + + + + + + + + + + + - s s + + + + + + + inkscape:window-width="1440" + inkscape:window-height="842" + inkscape:window-x="-1" + inkscape:window-y="26" + inkscape:window-maximized="1" /> + + + + + + + + + + + + + + + + @@ -615,7 +717,7 @@ image/svg+xml - + @@ -627,17 +729,184 @@ - + + + + + + + + + + + + + + + + + + clip-path="url(#clipPath8463)" + inkscape:export-filename="/home/hbons/Projects/SparkleShare/data/side-splash.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + clip-path="url(#clipPath8482)" + inkscape:export-filename="/home/hbons/Projects/SparkleShare/data/side-splash.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + y="103.66534" + transform="scale(-1,1)" + inkscape:export-filename="/home/hbons/Projects/SparkleShare/data/side-splash.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + style="opacity:0.2;color:#000000;fill:url(#linearGradient3734);fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + inkscape:export-filename="/home/hbons/Projects/SparkleShare/data/side-splash.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + y="103.66534" + transform="scale(-1,1)" + inkscape:export-filename="/home/hbons/Projects/SparkleShare/data/side-splash.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" />