windows: fix installer names. Closes #603
This commit is contained in:
parent
d594b6532a
commit
eb10a794ba
|
@ -87,8 +87,8 @@ 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 = "Before we get started, what's your name and email?\n" +
|
||||||
"Don't worry, this information will only visible to your team members.";
|
"Don't worry, this information will only visible to any team members.";
|
||||||
|
|
||||||
|
|
||||||
FullNameLabel = new NSTextField () {
|
FullNameLabel = new NSTextField () {
|
||||||
|
|
|
@ -78,7 +78,8 @@ namespace SparkleShare {
|
||||||
BackgroundColor = NSColor.WindowBackground,
|
BackgroundColor = NSColor.WindowBackground,
|
||||||
Bordered = false,
|
Bordered = false,
|
||||||
Editable = false,
|
Editable = false,
|
||||||
Font = SparkleUI.Font
|
Font = NSFontManager.SharedFontManager.FontWithFamily
|
||||||
|
("Lucida Grande", NSFontTraitMask.Condensed, 0, 11)
|
||||||
};
|
};
|
||||||
|
|
||||||
if (Program.UI != null)
|
if (Program.UI != null)
|
||||||
|
@ -108,17 +109,20 @@ namespace SparkleShare {
|
||||||
ContentView.AddSubview (SideSplashView);
|
ContentView.AddSubview (SideSplashView);
|
||||||
|
|
||||||
int i = 1;
|
int i = 1;
|
||||||
|
int x = 0;
|
||||||
if (Buttons.Count > 0) {
|
if (Buttons.Count > 0) {
|
||||||
DefaultButtonCell = Buttons [0].Cell;
|
DefaultButtonCell = Buttons [0].Cell;
|
||||||
|
|
||||||
foreach (NSButton button in Buttons) {
|
foreach (NSButton button in Buttons) {
|
||||||
button.BezelStyle = NSBezelStyle.Rounded;
|
button.BezelStyle = NSBezelStyle.Rounded;
|
||||||
button.Frame = new RectangleF (Frame.Width - 15 - (105 * i), 12, 105, 32);
|
button.Frame = new RectangleF (Frame.Width - 15 - x - (105 * i), 12, 105, 32);
|
||||||
|
|
||||||
// Make the button a bit wider if the text is
|
// Make the button a bit wider if the text is
|
||||||
// likely to be longer
|
// likely to be longer
|
||||||
if (button.Title.Contains (" "))
|
if (button.Title.Contains (" ")) {
|
||||||
button.Frame = new RectangleF (Frame.Width - 30 - (105 * i), 12, 120, 32);
|
button.Frame = new RectangleF (Frame.Width - 30 - (105 * i), 12, 120, 32);
|
||||||
|
x += 15;
|
||||||
|
}
|
||||||
|
|
||||||
button.Font = SparkleUI.Font;
|
button.Font = SparkleUI.Font;
|
||||||
ContentView.AddSubview (button);
|
ContentView.AddSubview (button);
|
||||||
|
|
|
@ -33,15 +33,18 @@ namespace SparkleShare {
|
||||||
|
|
||||||
// Short alias for the translations
|
// Short alias for the translations
|
||||||
public static string _ (string s)
|
public static string _ (string s)
|
||||||
{
|
{
|
||||||
#if __MonoCS__
|
#if __MonoCS__
|
||||||
return Catalog.GetString (s);
|
return Catalog.GetString (s);
|
||||||
#else
|
#else
|
||||||
return Strings.T (s);
|
return Strings.T (s);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#if !__MonoCS__
|
||||||
|
[STAThread]
|
||||||
|
#endif
|
||||||
public static void Main (string [] args)
|
public static void Main (string [] args)
|
||||||
{
|
{
|
||||||
// Parse the command line options
|
// Parse the command line options
|
||||||
|
@ -73,6 +76,12 @@ namespace SparkleShare {
|
||||||
UI = new SparkleUI ();
|
UI = new SparkleUI ();
|
||||||
UI.Run ();
|
UI.Run ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if !__MonoCS__
|
||||||
|
// Suppress assertion messages in debug mode
|
||||||
|
GC.Collect (GC.MaxGeneration, GCCollectionMode.Forced);
|
||||||
|
GC.WaitForPendingFinalizers ();
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -101,7 +110,6 @@ namespace SparkleShare {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Prints the version information
|
|
||||||
public static void PrintVersion ()
|
public static void PrintVersion ()
|
||||||
{
|
{
|
||||||
Console.WriteLine (_("SparkleShare " + Defines.VERSION));
|
Console.WriteLine (_("SparkleShare " + Defines.VERSION));
|
||||||
|
|
|
@ -1,119 +0,0 @@
|
||||||
// SparkleShare, a collaboration and sharing tool.
|
|
||||||
// Copyright (C) 2010 Hylke Bons <hylkebons@gmail.com>
|
|
||||||
//
|
|
||||||
// This program is free software: you can redistribute it and/or modify
|
|
||||||
// it under the terms of the GNU General Public License as published by
|
|
||||||
// the Free Software Foundation, either version 3 of the License, or
|
|
||||||
// (at your option) any later version.
|
|
||||||
//
|
|
||||||
// This program is distributed in the hope that it will be useful,
|
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
// GNU General Public License for more details.
|
|
||||||
//
|
|
||||||
// You should have received a copy of the GNU General Public License
|
|
||||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
|
|
||||||
using System;
|
|
||||||
|
|
||||||
#if __MonoCS__
|
|
||||||
using Mono.Unix;
|
|
||||||
#endif
|
|
||||||
using SparkleLib;
|
|
||||||
|
|
||||||
namespace SparkleShare {
|
|
||||||
|
|
||||||
// This is SparkleShare!
|
|
||||||
public class Program {
|
|
||||||
|
|
||||||
public static SparkleController Controller;
|
|
||||||
public static SparkleUI UI;
|
|
||||||
|
|
||||||
|
|
||||||
// Short alias for the translations
|
|
||||||
public static string _ (string s)
|
|
||||||
{
|
|
||||||
#if __MonoCS__
|
|
||||||
return Catalog.GetString (s);
|
|
||||||
#else
|
|
||||||
return Strings.T (s);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#if !__MonoCS__
|
|
||||||
[STAThread]
|
|
||||||
#endif
|
|
||||||
public static void Main (string [] args)
|
|
||||||
{
|
|
||||||
// Parse the command line options
|
|
||||||
bool show_help = false;
|
|
||||||
OptionSet option_set = new OptionSet () {
|
|
||||||
{ "v|version", _("Print version information"), v => { PrintVersion (); } },
|
|
||||||
{ "h|help", _("Show this help text"), v => show_help = v != null }
|
|
||||||
};
|
|
||||||
|
|
||||||
try {
|
|
||||||
option_set.Parse (args);
|
|
||||||
|
|
||||||
} catch (OptionException e) {
|
|
||||||
Console.Write ("SparkleShare: ");
|
|
||||||
Console.WriteLine (e.Message);
|
|
||||||
Console.WriteLine ("Try `sparkleshare --help' for more information.");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (show_help)
|
|
||||||
ShowHelp (option_set);
|
|
||||||
|
|
||||||
|
|
||||||
// Initialize the controller this way so that
|
|
||||||
// there aren't any exceptions in the OS specific UI's
|
|
||||||
Controller = new SparkleController ();
|
|
||||||
Controller.Initialize ();
|
|
||||||
|
|
||||||
if (Controller != null) {
|
|
||||||
UI = new SparkleUI ();
|
|
||||||
UI.Run ();
|
|
||||||
}
|
|
||||||
|
|
||||||
#if !__MonoCS__
|
|
||||||
// Suppress assertion messages in debug mode
|
|
||||||
GC.Collect (GC.MaxGeneration, GCCollectionMode.Forced);
|
|
||||||
GC.WaitForPendingFinalizers ();
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Prints the help output
|
|
||||||
public static void ShowHelp (OptionSet option_set)
|
|
||||||
{
|
|
||||||
Console.WriteLine (" ");
|
|
||||||
Console.WriteLine (_("SparkleShare, a collaboration and sharing tool."));
|
|
||||||
Console.WriteLine (_("Copyright (C) 2010 Hylke Bons"));
|
|
||||||
Console.WriteLine (" ");
|
|
||||||
Console.WriteLine (_("This program comes with ABSOLUTELY NO WARRANTY."));
|
|
||||||
Console.WriteLine (" ");
|
|
||||||
Console.WriteLine (_("This is free software, and you are welcome to redistribute it "));
|
|
||||||
Console.WriteLine (_("under certain conditions. Please read the GNU GPLv3 for details."));
|
|
||||||
Console.WriteLine (" ");
|
|
||||||
Console.WriteLine (_("SparkleShare is a collaboration and sharing tool that is "));
|
|
||||||
Console.WriteLine (_("designed to keep things simple and to stay out of your way."));
|
|
||||||
Console.WriteLine (" ");
|
|
||||||
Console.WriteLine (_("Usage: sparkleshare [start|stop|restart|version] [OPTION]..."));
|
|
||||||
Console.WriteLine (_("Sync SparkleShare folder with remote repositories."));
|
|
||||||
Console.WriteLine (" ");
|
|
||||||
Console.WriteLine (_("Arguments:"));
|
|
||||||
|
|
||||||
option_set.WriteOptionDescriptions (Console.Out);
|
|
||||||
Environment.Exit (0);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public static void PrintVersion ()
|
|
||||||
{
|
|
||||||
Console.WriteLine (_("SparkleShare " + Defines.VERSION));
|
|
||||||
Environment.Exit (0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -108,7 +108,7 @@ namespace SparkleShare {
|
||||||
this.updates = new Label () {
|
this.updates = new Label () {
|
||||||
Content = "Checking for updates...",
|
Content = "Checking for updates...",
|
||||||
FontSize = 11,
|
FontSize = 11,
|
||||||
Foreground = new SolidColorBrush (Color.FromRgb (45, 62, 81))
|
Foreground = new SolidColorBrush (Color.FromRgb (45, 62, 81)) // TODO: color looks off
|
||||||
};
|
};
|
||||||
|
|
||||||
TextBlock credits = new TextBlock () {
|
TextBlock credits = new TextBlock () {
|
||||||
|
|
|
@ -123,7 +123,6 @@
|
||||||
<Compile Include="SparkleController.cs" />
|
<Compile Include="SparkleController.cs" />
|
||||||
<Compile Include="SparkleEventLog.cs" />
|
<Compile Include="SparkleEventLog.cs" />
|
||||||
<Compile Include="SparkleSetup.cs" />
|
<Compile Include="SparkleSetup.cs" />
|
||||||
<Compile Include="Program.cs" />
|
|
||||||
<Compile Include="SparkleStatusIcon.cs" />
|
<Compile Include="SparkleStatusIcon.cs" />
|
||||||
<Compile Include="SparkleUIHelpers.cs" />
|
<Compile Include="SparkleUIHelpers.cs" />
|
||||||
<Compile Include="Strings.cs">
|
<Compile Include="Strings.cs">
|
||||||
|
@ -135,6 +134,9 @@
|
||||||
<Link>SparkleEventLogController.cs</Link>
|
<Link>SparkleEventLogController.cs</Link>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="SparkleSetupWindow.cs" />
|
<Compile Include="SparkleSetupWindow.cs" />
|
||||||
|
<Compile Include="..\Program.cs">
|
||||||
|
<Link>Program.cs</Link>
|
||||||
|
</Compile>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\..\SparkleLib\windows\SparkleLib.csproj">
|
<ProjectReference Include="..\..\SparkleLib\windows\SparkleLib.csproj">
|
||||||
|
|
|
@ -18,8 +18,8 @@
|
||||||
<Component Id='SparkleShare.exe' Guid='0DA582D5-4ABE-4251-9F62-E7DEA76F10E1'>
|
<Component Id='SparkleShare.exe' Guid='0DA582D5-4ABE-4251-9F62-E7DEA76F10E1'>
|
||||||
<File Id='SparkleShare.exe' Name='SparkleShare.exe' Source='!(wix.root)\bin\SparkleShare.exe' KeyPath='yes' DiskId='1' />
|
<File Id='SparkleShare.exe' Name='SparkleShare.exe' Source='!(wix.root)\bin\SparkleShare.exe' KeyPath='yes' DiskId='1' />
|
||||||
</Component>
|
</Component>
|
||||||
<Component Id='SparkleShareInviteOpen.exe' Guid='0DA582D5-4ABE-4251-9F62-E7DEA76F28E1'>
|
<Component Id='SparkleShareInviteOpener.exe' Guid='0DA582D5-4ABE-4251-9F62-E7DEA76F28E1'>
|
||||||
<File Id='SparkleShareInviteOpen.exe' Name='SparkleShareInviteOpen.exe' Source='!(wix.root)\bin\SparkleShareInviteOpen.exe' DiskId='1' />
|
<File Id='SparkleShareInviteOpener.exe' Name='SparkleShareInviteOpener.exe' Source='!(wix.root)\bin\SparkleShareInviteOpener.exe' DiskId='1' />
|
||||||
</Component>
|
</Component>
|
||||||
<Component Id='Libraries' Guid='0DA692D5-4DBE-4251-9F62-E7C1A76F10E1'>
|
<Component Id='Libraries' Guid='0DA692D5-4DBE-4251-9F62-E7C1A76F10E1'>
|
||||||
<File Id='SparkleLib.Git.dll' Name='SparkleLib.Git.dll' Source='!(wix.root)\bin\SparkleLib.Git.dll' DiskId='1' />
|
<File Id='SparkleLib.Git.dll' Name='SparkleLib.Git.dll' Source='!(wix.root)\bin\SparkleLib.Git.dll' DiskId='1' />
|
||||||
|
@ -62,7 +62,7 @@
|
||||||
|
|
||||||
<Feature Id='SparkleShareFeature' Title='SparkleShare' Description='This is the SparkleShare executables.' Level='1' AllowAdvertise='no'>
|
<Feature Id='SparkleShareFeature' Title='SparkleShare' Description='This is the SparkleShare executables.' Level='1' AllowAdvertise='no'>
|
||||||
<ComponentRef Id="SparkleShare.exe" />
|
<ComponentRef Id="SparkleShare.exe" />
|
||||||
<ComponentRef Id="SparkleShareInviteOpen.exe" />
|
<ComponentRef Id="SparkleShareInviteOpener.exe" />
|
||||||
<ComponentRef Id="Libraries" />
|
<ComponentRef Id="Libraries" />
|
||||||
<ComponentRef Id="ApplicationShortcut" />
|
<ComponentRef Id="ApplicationShortcut" />
|
||||||
<ComponentRef Id="Autostart" />
|
<ComponentRef Id="Autostart" />
|
||||||
|
|
Loading…
Reference in a new issue