diff --git a/SparkleShare/Windows/SparkleShare.Windows.csproj b/SparkleShare/Windows/SparkleShare.Windows.csproj
index 9bb56d02..843eef96 100644
--- a/SparkleShare/Windows/SparkleShare.Windows.csproj
+++ b/SparkleShare/Windows/SparkleShare.Windows.csproj
@@ -101,42 +101,30 @@
-
- BubblesController.cs
-
-
- BaseController.cs
-
-
- NoteController.cs
-
-
- StatusIconController.cs
-
-
-
-
- Note.xaml
-
-
-
-
-
-
-
-
-
-
- SparkleEventLogController.cs
+
+
+
+
+
+
+
+
+
+
+
+
+ Note.xaml
-
-
- SparkleShare.cs
-
-
-
+
+
+
+
+
+
+
+
@@ -295,7 +283,7 @@
-
+
Designer
MSBuild:Compile
diff --git a/SparkleShare/Windows/About.cs b/SparkleShare/Windows/UserInterface/About.cs
similarity index 97%
rename from SparkleShare/Windows/About.cs
rename to SparkleShare/Windows/UserInterface/About.cs
index af9f3991..a8cf7328 100644
--- a/SparkleShare/Windows/About.cs
+++ b/SparkleShare/Windows/UserInterface/About.cs
@@ -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 () {
diff --git a/SparkleShare/Windows/Bubbles.cs b/SparkleShare/Windows/UserInterface/Bubbles.cs
similarity index 100%
rename from SparkleShare/Windows/Bubbles.cs
rename to SparkleShare/Windows/UserInterface/Bubbles.cs
diff --git a/SparkleShare/Windows/Controller.cs b/SparkleShare/Windows/UserInterface/Controller.cs
similarity index 94%
rename from SparkleShare/Windows/Controller.cs
rename to SparkleShare/Windows/UserInterface/Controller.cs
index 4fe2d868..6e979908 100644
--- a/SparkleShare/Windows/Controller.cs
+++ b/SparkleShare/Windows/UserInterface/Controller.cs
@@ -63,22 +63,22 @@ namespace SparkleShare {
public override string EventLogHTML {
get {
- string html = SparkleUIHelpers.GetHTML ("event-log.html");
- return html.Replace ("", SparkleUIHelpers.GetHTML ("jquery.js"));
+ string html = UserInterfaceHelpers.GetHTML ("event-log.html");
+ return html.Replace ("", 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");
}
}
diff --git a/SparkleShare/Windows/EventLog.cs b/SparkleShare/Windows/UserInterface/EventLog.cs
similarity index 98%
rename from SparkleShare/Windows/EventLog.cs
rename to SparkleShare/Windows/UserInterface/EventLog.cs
index de38cff2..00037124 100644
--- a/SparkleShare/Windows/EventLog.cs
+++ b/SparkleShare/Windows/UserInterface/EventLog.cs
@@ -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))
diff --git a/SparkleShare/Windows/Note.xaml b/SparkleShare/Windows/UserInterface/Note.xaml
similarity index 100%
rename from SparkleShare/Windows/Note.xaml
rename to SparkleShare/Windows/UserInterface/Note.xaml
diff --git a/SparkleShare/Windows/Note.xaml.cs b/SparkleShare/Windows/UserInterface/Note.xaml.cs
similarity index 93%
rename from SparkleShare/Windows/Note.xaml.cs
rename to SparkleShare/Windows/UserInterface/Note.xaml.cs
index f317dbcc..d90caa0f 100644
--- a/SparkleShare/Windows/Note.xaml.cs
+++ b/SparkleShare/Windows/UserInterface/Note.xaml.cs
@@ -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;
diff --git a/SparkleShare/Windows/NotifyIcon.cs b/SparkleShare/Windows/UserInterface/NotifyIcon.cs
similarity index 100%
rename from SparkleShare/Windows/NotifyIcon.cs
rename to SparkleShare/Windows/UserInterface/NotifyIcon.cs
diff --git a/SparkleShare/Windows/Setup.cs b/SparkleShare/Windows/UserInterface/Setup.cs
similarity index 100%
rename from SparkleShare/Windows/Setup.cs
rename to SparkleShare/Windows/UserInterface/Setup.cs
diff --git a/SparkleShare/Windows/SetupWindow.cs b/SparkleShare/Windows/UserInterface/SetupWindow.cs
similarity index 97%
rename from SparkleShare/Windows/SetupWindow.cs
rename to SparkleShare/Windows/UserInterface/SetupWindow.cs
index c4e47eab..2e756052 100644
--- a/SparkleShare/Windows/SetupWindow.cs
+++ b/SparkleShare/Windows/UserInterface/SetupWindow.cs
@@ -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);
diff --git a/SparkleShare/Windows/Shortcut.cs b/SparkleShare/Windows/UserInterface/Shortcut.cs
similarity index 100%
rename from SparkleShare/Windows/Shortcut.cs
rename to SparkleShare/Windows/UserInterface/Shortcut.cs
diff --git a/SparkleShare/Windows/Spinner.cs b/SparkleShare/Windows/UserInterface/Spinner.cs
similarity index 96%
rename from SparkleShare/Windows/Spinner.cs
rename to SparkleShare/Windows/UserInterface/Spinner.cs
index 5d78b7bc..d1e1ae98 100644
--- a/SparkleShare/Windows/Spinner.cs
+++ b/SparkleShare/Windows/UserInterface/Spinner.cs
@@ -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;
diff --git a/SparkleShare/Windows/StatusIcon.cs b/SparkleShare/Windows/UserInterface/StatusIcon.cs
similarity index 93%
rename from SparkleShare/Windows/StatusIcon.cs
rename to SparkleShare/Windows/UserInterface/StatusIcon.cs
index 7c83d099..6cbc7215 100644
--- a/SparkleShare/Windows/StatusIcon.cs
+++ b/SparkleShare/Windows/UserInterface/StatusIcon.cs
@@ -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
}
diff --git a/SparkleShare/Windows/UserInterface.cs b/SparkleShare/Windows/UserInterface/UserInterface.cs
similarity index 100%
rename from SparkleShare/Windows/UserInterface.cs
rename to SparkleShare/Windows/UserInterface/UserInterface.cs
diff --git a/SparkleShare/Windows/SparkleUIHelpers.cs b/SparkleShare/Windows/UserInterface/UserInterfaceHelpers.cs
similarity index 98%
rename from SparkleShare/Windows/SparkleUIHelpers.cs
rename to SparkleShare/Windows/UserInterface/UserInterfaceHelpers.cs
index 7742bc64..901ab8e2 100644
--- a/SparkleShare/Windows/SparkleUIHelpers.cs
+++ b/SparkleShare/Windows/UserInterface/UserInterfaceHelpers.cs
@@ -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)
{