beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Windows: Update project file location

Browse source
This commit is contained in:
Kévin LEMELE 2017-03-14 10:59:55 +01:00
parent b88c11a7f3
commit 1dc2a2fcf3
15 changed files with 46 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
SparkleShare/Windows/SparkleShare.Windows.csproj
View file

@ -101,42 +101,30 @@
<Reference Include="System.Xaml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Common\BubblesController.cs">
<Link>BubblesController.cs</Link>
</Compile>
<Compile Include="..\Common\BaseController.cs">
<Link>BaseController.cs</Link>
</Compile>
<Compile Include="..\Common\NoteController.cs">
<Link>NoteController.cs</Link>
</Compile>
<Compile Include="..\Common\StatusIconController.cs">
<Link>StatusIconController.cs</Link>
</Compile>
<Compile Include="..\Common\SetupController.cs" />
<Compile Include="EventLog.cs" />
<Compile Include="Note.xaml.cs">
<DependentUpon>Note.xaml</DependentUpon>
</Compile>
<Compile Include="Shortcut.cs" />
<Compile Include="UserInterface.cs" />
<Compile Include="..\Common\AboutController.cs" />
<Compile Include="..\Common\Avatars.cs" />
<Compile Include="Bubbles.cs" />
<Compile Include="About.cs" />
<Compile Include="Controller.cs" />
<Compile Include="Setup.cs" />
<Compile Include="StatusIcon.cs" />
<Compile Include="SparkleUIHelpers.cs" />
<Compile Include="..\Common\EventLogController.cs">
<Link>SparkleEventLogController.cs</Link>
<Compile Include="..\Common\BaseController.cs" />
<Compile Include="..\Common\BubblesController.cs" />
<Compile Include="..\Common\EventLogController.cs" />
<Compile Include="..\Common\NoteController.cs" />
<Compile Include="..\Common\SetupController.cs" />
<Compile Include="..\Common\SparkleShare.cs" />
<Compile Include="..\Common\StatusIconController.cs" />
<Compile Include="UserInterface\About.cs" />
<Compile Include="UserInterface\Bubbles.cs" />
<Compile Include="UserInterface\EventLog.cs" />
<Compile Include="UserInterface\Controller.cs" />
<Compile Include="UserInterface\Note.xaml.cs">
<DependentUpon>Note.xaml</DependentUpon>
</Compile>
<Compile Include="SetupWindow.cs" />
<Compile Include="..\Common\SparkleShare.cs">
<Link>SparkleShare.cs</Link>
</Compile>
<Compile Include="NotifyIcon.cs" />
<Compile Include="Spinner.cs" />
<Compile Include="UserInterface\NotifyIcon.cs" />
<Compile Include="UserInterface\Setup.cs" />
<Compile Include="UserInterface\SetupWindow.cs" />
<Compile Include="UserInterface\Shortcut.cs" />
<Compile Include="UserInterface\Spinner.cs" />
<Compile Include="UserInterface\StatusIcon.cs" />
<Compile Include="UserInterface\UserInterface.cs" />
<Compile Include="UserInterface\UserInterfaceHelpers.cs" />
</ItemGroup>
<ProjectExtensions>
<VisualStudio />
@ -295,7 +283,7 @@
</Content>
</ItemGroup>
<ItemGroup>
<Page Include="Note.xaml">
<Page Include="UserInterface\Note.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>

4
SparkleShare/Windows/About.cs → SparkleShare/Windows/UserInterface/About.cs
View file

@ -37,7 +37,7 @@ namespace SparkleShare {
ResizeMode = ResizeMode.NoResize;
Height = 288;
Width = 720;
Icon = SparkleUIHelpers.GetImageSource("sparkleshare-app", "ico");
Icon = UserInterfaceHelpers.GetImageSource("sparkleshare-app", "ico");
WindowStartupLocation = WindowStartupLocation.CenterScreen;
Closing += Close;
@ -74,7 +74,7 @@ namespace SparkleShare {
Height = 260
};
image.Source = SparkleUIHelpers.GetImageSource ("about");
image.Source = UserInterfaceHelpers.GetImageSource ("about");
Label version = new Label () {

0
SparkleShare/Windows/Bubbles.cs → SparkleShare/Windows/UserInterface/Bubbles.cs
View file

8
SparkleShare/Windows/Controller.cs → SparkleShare/Windows/UserInterface/Controller.cs
View file

@ -63,22 +63,22 @@ namespace SparkleShare {
public override string EventLogHTML {
get {
string html = SparkleUIHelpers.GetHTML ("event-log.html");
return html.Replace ("<!-- $jquery -->", SparkleUIHelpers.GetHTML ("jquery.js"));
string html = UserInterfaceHelpers.GetHTML ("event-log.html");
return html.Replace ("<!-- $jquery -->", UserInterfaceHelpers.GetHTML ("jquery.js"));
}
}
public override string DayEntryHTML {
get {
return SparkleUIHelpers.GetHTML ("day-entry.html");
return UserInterfaceHelpers.GetHTML ("day-entry.html");
}
}
public override string EventEntryHTML {
get {
return SparkleUIHelpers.GetHTML ("event-entry.html");
return UserInterfaceHelpers.GetHTML ("event-entry.html");
}
}

6
SparkleShare/Windows/EventLog.cs → SparkleShare/Windows/UserInterface/EventLog.cs
View file

@ -57,7 +57,7 @@ namespace SparkleShare
Background = new SolidColorBrush(Color.FromRgb(240, 240, 240));
AllowsTransparency = false;
Icon = SparkleUIHelpers.GetImageSource("sparkleshare-app", "ico");
Icon = UserInterfaceHelpers.GetImageSource("sparkleshare-app", "ico");
WindowStartupLocation = WindowStartupLocation.CenterScreen;
WriteOutImages();
@ -308,7 +308,7 @@ namespace SparkleShare
File.SetAttributes(tmp_path, File.GetAttributes(tmp_path) | FileAttributes.Hidden);
}
BitmapSource image = SparkleUIHelpers.GetImageSource("user-icon-default");
BitmapSource image = UserInterfaceHelpers.GetImageSource("user-icon-default");
string file_path = System.IO.Path.Combine(pixmaps_path, "user-icon-default.png");
using (FileStream stream = new FileStream(file_path, FileMode.Create))
@ -322,7 +322,7 @@ namespace SparkleShare
foreach (string action in actions)
{
image = SparkleUIHelpers.GetImageSource("document-" + action + "-12");
image = UserInterfaceHelpers.GetImageSource("document-" + action + "-12");
file_path = System.IO.Path.Combine(pixmaps_path, "document-" + action + "-12.png");
using (FileStream stream = new FileStream(file_path, FileMode.Create))

0
SparkleShare/Windows/Note.xaml → SparkleShare/Windows/UserInterface/Note.xaml
View file

6
SparkleShare/Windows/Note.xaml.cs → SparkleShare/Windows/UserInterface/Note.xaml.cs
View file

@ -38,7 +38,7 @@ namespace SparkleShare {
Background = new SolidColorBrush(Color.FromRgb(240, 240, 240));
AllowsTransparency = false;
Icon = SparkleUIHelpers.GetImageSource("sparkleshare-app", "ico");
Icon = UserInterfaceHelpers.GetImageSource("sparkleshare-app", "ico");
WindowStartupLocation = WindowStartupLocation.CenterScreen;
Closing += this.OnClosing;
@ -85,10 +85,10 @@ namespace SparkleShare {
private void CreateNote()
{
ImageSource avatar = SparkleUIHelpers.GetImageSource("user-icon-default");
ImageSource avatar = UserInterfaceHelpers.GetImageSource("user-icon-default");
if (File.Exists (Controller.AvatarFilePath)) {
avatar = SparkleUIHelpers.GetImage (Controller.AvatarFilePath);
avatar = UserInterfaceHelpers.GetImage (Controller.AvatarFilePath);
}
this.user_image.ImageSource = avatar;

0
SparkleShare/Windows/NotifyIcon.cs → SparkleShare/Windows/UserInterface/NotifyIcon.cs
View file

0
SparkleShare/Windows/Setup.cs → SparkleShare/Windows/UserInterface/Setup.cs
View file

4
SparkleShare/Windows/SetupWindow.cs → SparkleShare/Windows/UserInterface/SetupWindow.cs
View file

@ -49,7 +49,7 @@ namespace SparkleShare {
Height = 440;
ResizeMode = ResizeMode.NoResize;
Background = new SolidColorBrush (Colors.WhiteSmoke);
Icon = SparkleUIHelpers.GetImageSource ("sparkleshare-app", "ico");
Icon = UserInterfaceHelpers.GetImageSource ("sparkleshare-app", "ico");
TaskbarItemInfo = new TaskbarItemInfo () {
Description = "SparkleShare"
@ -85,7 +85,7 @@ namespace SparkleShare {
Height = 482
};
this.side_splash.Source = SparkleUIHelpers.GetImageSource ("side-splash");
this.side_splash.Source = UserInterfaceHelpers.GetImageSource ("side-splash");
ContentCanvas.Children.Add (this.bar);

0
SparkleShare/Windows/Shortcut.cs → SparkleShare/Windows/UserInterface/Shortcut.cs
View file

2
SparkleShare/Windows/Spinner.cs → SparkleShare/Windows/UserInterface/Spinner.cs
View file

@ -40,7 +40,7 @@ namespace SparkleShare {
Height = size;
int current_frame = 0;
BitmapSource spinner_gallery = SparkleUIHelpers.GetImageSource ("process-working-22");
BitmapSource spinner_gallery = UserInterfaceHelpers.GetImageSource ("process-working-22");
int frames_in_width = spinner_gallery.PixelWidth / size;
int frames_in_height = spinner_gallery.PixelHeight / size;
int frame_count = (frames_in_width * frames_in_height) - 1;

16
SparkleShare/Windows/StatusIcon.cs → SparkleShare/Windows/UserInterface/StatusIcon.cs
View file

@ -30,11 +30,11 @@ namespace SparkleShare {
public StatusIconController Controller = new StatusIconController();
private readonly Drawing.Bitmap syncing_idle_image = SparkleUIHelpers.GetBitmap("process-syncing-idle");
private readonly Drawing.Bitmap syncing_up_image = SparkleUIHelpers.GetBitmap("process-syncing-up");
private readonly Drawing.Bitmap syncing_down_image = SparkleUIHelpers.GetBitmap("process-syncing-down");
private readonly Drawing.Bitmap syncing_image = SparkleUIHelpers.GetBitmap("process-syncing");
private readonly Drawing.Bitmap syncing_error_image = SparkleUIHelpers.GetBitmap("process-syncing-error");
private readonly Drawing.Bitmap syncing_idle_image = UserInterfaceHelpers.GetBitmap("process-syncing-idle");
private readonly Drawing.Bitmap syncing_up_image = UserInterfaceHelpers.GetBitmap("process-syncing-up");
private readonly Drawing.Bitmap syncing_down_image = UserInterfaceHelpers.GetBitmap("process-syncing-down");
private readonly Drawing.Bitmap syncing_image = UserInterfaceHelpers.GetBitmap("process-syncing");
private readonly Drawing.Bitmap syncing_error_image = UserInterfaceHelpers.GetBitmap("process-syncing-error");
private ContextMenu context_menu;
@ -117,7 +117,7 @@ namespace SparkleShare {
};
Image folder_image = new Image {
Source = SparkleUIHelpers.GetImageSource("sparkleshare-folder"),
Source = UserInterfaceHelpers.GetImageSource("sparkleshare-folder"),
Width = 16,
Height = 16
};
@ -215,7 +215,7 @@ namespace SparkleShare {
SparkleMenuItem subfolder_item = new SparkleMenuItem {
Header = project.Name.Replace("_", "__"),
Icon = new Image {
Source = SparkleUIHelpers.GetImageSource("folder"),
Source = UserInterfaceHelpers.GetImageSource("folder"),
Width = 16,
Height = 16
}
@ -233,7 +233,7 @@ namespace SparkleShare {
Header = "Open folder",
Icon = new Image
{
Source = SparkleUIHelpers.GetImageSource("folder"),
Source = UserInterfaceHelpers.GetImageSource("folder"),
Width = 16,
Height = 16
}

0
SparkleShare/Windows/UserInterface.cs → SparkleShare/Windows/UserInterface/UserInterface.cs
View file

2
SparkleShare/Windows/SparkleUIHelpers.cs → SparkleShare/Windows/UserInterface/UserInterfaceHelpers.cs
View file

@ -25,7 +25,7 @@ using Drawing = System.Drawing;
namespace SparkleShare {
public static class SparkleUIHelpers {
public static class UserInterfaceHelpers {
public static string ToHex (this Drawing.Color color)
{