Improve startup screen
This commit is contained in:
parent
28554164dd
commit
3db91fa9d9
|
@ -1 +1,41 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{005CCA8E-DFBF-464A-B6DA-452C62D4589C}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>notifysharp</RootNamespace>
<AssemblyName>notify-sharp</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Compile Include="Global.cs" />
<Compile Include="Notification.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="NDesk.DBus, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099" />
<Reference Include="NDesk.DBus.GLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099" />
<Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||||
|
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||||
|
<ProductVersion>8.0.50727</ProductVersion>
|
||||||
|
<SchemaVersion>2.0</SchemaVersion>
|
||||||
|
<ProjectGuid>{005CCA8E-DFBF-464A-B6DA-452C62D4589C}</ProjectGuid>
|
||||||
|
<OutputType>Library</OutputType>
|
||||||
|
<RootNamespace>notifysharp</RootNamespace>
|
||||||
|
<AssemblyName>notify-sharp</AssemblyName>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
|
<DebugSymbols>true</DebugSymbols>
|
||||||
|
<DebugType>full</DebugType>
|
||||||
|
<Optimize>false</Optimize>
|
||||||
|
<OutputPath>bin\Debug</OutputPath>
|
||||||
|
<DefineConstants>DEBUG</DefineConstants>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
<WarningLevel>4</WarningLevel>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
|
<DebugType>none</DebugType>
|
||||||
|
<Optimize>false</Optimize>
|
||||||
|
<OutputPath>bin\Release</OutputPath>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
<WarningLevel>4</WarningLevel>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="Global.cs" />
|
||||||
|
<Compile Include="Notification.cs" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Reference Include="NDesk.DBus, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099" />
|
||||||
|
<Reference Include="NDesk.DBus.GLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099" />
|
||||||
|
<Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
|
||||||
|
<Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
|
||||||
|
<Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
|
@ -5,6 +5,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare", "SparkleShar
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NotifySharp", "NotifySharp\NotifySharp.csproj", "{005CCA8E-DFBF-464A-B6DA-452C62D4589C}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NotifySharp", "NotifySharp\NotifySharp.csproj", "{005CCA8E-DFBF-464A-B6DA-452C62D4589C}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpSSH", "SharpSSH\SharpSSH.csproj", "{BB50B7E2-4622-4D8B-B7FF-5E5D8F02D91F}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
|
@ -19,10 +21,13 @@ Global
|
||||||
{728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Release|Any CPU.Build.0 = Release|Any CPU
|
{728483AA-E34B-4441-BF2C-C8BC2901E4E0}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{BB50B7E2-4622-4D8B-B7FF-5E5D8F02D91F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{BB50B7E2-4622-4D8B-B7FF-5E5D8F02D91F}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{BB50B7E2-4622-4D8B-B7FF-5E5D8F02D91F}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{BB50B7E2-4622-4D8B-B7FF-5E5D8F02D91F}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(MonoDevelopProperties) = preSolution
|
GlobalSection(MonoDevelopProperties) = preSolution
|
||||||
name = SparkleShare
|
|
||||||
version = 0.1
|
|
||||||
StartupItem = SparkleShare\SparkleShare.csproj
|
StartupItem = SparkleShare\SparkleShare.csproj
|
||||||
|
name = SparkleShare
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
EndGlobal
|
EndGlobal
|
||||||
|
|
|
@ -39,7 +39,7 @@ namespace SparkleShare {
|
||||||
{
|
{
|
||||||
|
|
||||||
BorderWidth = 0;
|
BorderWidth = 0;
|
||||||
SetSizeRequest (600, 400);
|
SetSizeRequest (640, 400);
|
||||||
Resizable = false;
|
Resizable = false;
|
||||||
IconName = "folder-sparkleshare";
|
IconName = "folder-sparkleshare";
|
||||||
|
|
||||||
|
@ -55,13 +55,14 @@ namespace SparkleShare {
|
||||||
|
|
||||||
VBox layout_vertical = new VBox (false, 0);
|
VBox layout_vertical = new VBox (false, 0);
|
||||||
|
|
||||||
Label introduction = new Label ("<span size='xx-large'><b>Welcome to SparkleShare!</b></span>");
|
Label introduction = new Label ("<span size='x-large'><b>Welcome to SparkleShare!</b></span>");
|
||||||
introduction.UseMarkup = true;
|
introduction.UseMarkup = true;
|
||||||
introduction.Xalign = 0;
|
introduction.Xalign = 0;
|
||||||
|
|
||||||
Label information = new Label ("Before we can create a SparkleShare folder on this \n" +
|
Label information = new Label ("Before we can create a SparkleShare folder on this " +
|
||||||
"computer, we need a few bits of information from you.");
|
"computer, we need a few bits of information from you.");
|
||||||
information.Xalign = 0;
|
information.Xalign = 0;
|
||||||
|
information.Wrap = true;
|
||||||
|
|
||||||
|
|
||||||
Entry name_entry = new Entry ("");
|
Entry name_entry = new Entry ("");
|
||||||
|
@ -113,7 +114,21 @@ namespace SparkleShare {
|
||||||
|
|
||||||
HButtonBox controls = new HButtonBox ();
|
HButtonBox controls = new HButtonBox ();
|
||||||
controls.Layout = ButtonBoxStyle.End;
|
controls.Layout = ButtonBoxStyle.End;
|
||||||
Button done_button = new Button ("Next");
|
|
||||||
|
Button done_button = new Button (_("Next"));
|
||||||
|
|
||||||
|
done_button.Clicked += delegate (object o, EventArgs args) {
|
||||||
|
done_button.Remove (done_button.Child);
|
||||||
|
HBox hbox = new HBox ();
|
||||||
|
hbox.Add (new SparkleSpinner ());
|
||||||
|
hbox.Add (new Label ("Configuring…"));
|
||||||
|
done_button.Add (hbox);
|
||||||
|
done_button.Sensitive = false;
|
||||||
|
table.Sensitive = false;
|
||||||
|
done_button.ShowAll ();
|
||||||
|
ShowStepTwo ();
|
||||||
|
};
|
||||||
|
|
||||||
controls.Add (done_button);
|
controls.Add (done_button);
|
||||||
|
|
||||||
layout_vertical.PackStart (introduction, false, false, 0);
|
layout_vertical.PackStart (introduction, false, false, 0);
|
||||||
|
@ -132,6 +147,70 @@ namespace SparkleShare {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public void ShowStepTwo ()
|
||||||
|
{
|
||||||
|
|
||||||
|
Remove (Child);
|
||||||
|
|
||||||
|
HBox layout_horizontal = new HBox (false, 6);
|
||||||
|
|
||||||
|
Image side_splash = new Image ("/home/hbons/github/SparkleShare/data/side-splash.png");
|
||||||
|
|
||||||
|
layout_horizontal.PackStart (side_splash, false, false, 0);
|
||||||
|
|
||||||
|
VBox wrapper = new VBox (false, 0);
|
||||||
|
|
||||||
|
VBox layout_vertical = new VBox (false, 0);
|
||||||
|
layout_vertical.BorderWidth = 30;
|
||||||
|
|
||||||
|
Label introduction;
|
||||||
|
introduction = new Label ("<span size='x-large'><b>SparkleShare ready to go!</b></span>");
|
||||||
|
|
||||||
|
introduction.UseMarkup = true;
|
||||||
|
introduction.Xalign = 0;
|
||||||
|
|
||||||
|
Label information;
|
||||||
|
information = new Label ("You can now start accepting invitations from others. " +
|
||||||
|
"Just click on invitations you get by email and " +
|
||||||
|
"we'll take care of the rest.");
|
||||||
|
|
||||||
|
information.UseMarkup = true;
|
||||||
|
information.Wrap = true;
|
||||||
|
information.Xalign = 0;
|
||||||
|
|
||||||
|
HBox link_wrapper = new HBox (false, 0);
|
||||||
|
LinkButton link = new LinkButton ("http://www.sparkleshare.org/",
|
||||||
|
_("Learn how to host your own SparkleSpace"));
|
||||||
|
|
||||||
|
link_wrapper.PackStart (link, false, false, 0);
|
||||||
|
|
||||||
|
layout_vertical.PackStart (introduction, false, false, 0);
|
||||||
|
layout_vertical.PackStart (information, false, false, 21);
|
||||||
|
layout_vertical.PackStart (link_wrapper, false, false, 0);
|
||||||
|
|
||||||
|
HButtonBox controls = new HButtonBox ();
|
||||||
|
controls.Layout = ButtonBoxStyle.End;
|
||||||
|
controls.BorderWidth = 12;
|
||||||
|
|
||||||
|
Button finish_button = new Button (_("Finish"));
|
||||||
|
|
||||||
|
finish_button.Clicked += delegate (object o, EventArgs args) {
|
||||||
|
Destroy ();
|
||||||
|
};
|
||||||
|
|
||||||
|
controls.Add (finish_button);
|
||||||
|
|
||||||
|
wrapper.PackStart (layout_vertical, true, true, 0);
|
||||||
|
wrapper.PackStart (controls, false, false, 0);
|
||||||
|
|
||||||
|
layout_horizontal.Add (wrapper);
|
||||||
|
|
||||||
|
Add (layout_horizontal);
|
||||||
|
ShowAll ();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,9 +48,9 @@
|
||||||
<Compile Include="SparkleWindow.cs" />
|
<Compile Include="SparkleWindow.cs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\notify-sharp\notify-sharp.csproj">
|
<ProjectReference Include="..\NotifySharp\NotifySharp.csproj">
|
||||||
<Project>{005CCA8E-DFBF-464A-B6DA-452C62D4589C}</Project>
|
<Project>{005CCA8E-DFBF-464A-B6DA-452C62D4589C}</Project>
|
||||||
<Name>notify-sharp</Name>
|
<Name>NotifySharp</Name>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -37,20 +37,20 @@ namespace SparkleShare {
|
||||||
|
|
||||||
CycleDuration = 750;
|
CycleDuration = 750;
|
||||||
CurrentStep = 0;
|
CurrentStep = 0;
|
||||||
Size = 24;
|
Size = 16;
|
||||||
|
|
||||||
Gdk.Pixbuf SpinnerGallery = SparkleHelpers.GetIcon ("process-working", Size);
|
Gdk.Pixbuf spinner_gallery = SparkleHelpers.GetIcon ("process-working", Size);
|
||||||
|
|
||||||
int FramesInWidth = SpinnerGallery.Width / Size;
|
int frames_in_width = spinner_gallery.Width / Size;
|
||||||
int FramesInHeight = SpinnerGallery.Height / Size;
|
int frames_in_height = spinner_gallery.Height / Size;
|
||||||
NumSteps = FramesInWidth * FramesInHeight;
|
NumSteps = frames_in_width * frames_in_height;
|
||||||
Images = new Gdk.Pixbuf [NumSteps - 1];
|
Images = new Gdk.Pixbuf [NumSteps - 1];
|
||||||
|
|
||||||
int i = 0;
|
int i = 0;
|
||||||
for (int y = 0; y < FramesInHeight; y++) {
|
for (int y = 0; y < frames_in_height; y++) {
|
||||||
for (int x = 0; x < FramesInWidth; x++) {
|
for (int x = 0; x < frames_in_width; x++) {
|
||||||
if (!(y == 0 && x == 0)) {
|
if (!(y == 0 && x == 0)) {
|
||||||
Images [i] = new Gdk.Pixbuf (SpinnerGallery, x * Size, y * Size, Size, Size);
|
Images [i] = new Gdk.Pixbuf (spinner_gallery, x * Size, y * Size, Size, Size);
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue