diff --git a/SparkleShare/Windows/SparkleShare.csproj b/SparkleShare/Windows/SparkleShare.csproj
index dd3094a0..6fdea610 100644
--- a/SparkleShare/Windows/SparkleShare.csproj
+++ b/SparkleShare/Windows/SparkleShare.csproj
@@ -29,7 +29,7 @@
1.0.0.%2a
false
true
- ..\..\data\icons\sparkleshare.ico
+ ..\Common\Plugins\icons\sparkleshare.ico
true
@@ -177,266 +177,147 @@
"$(ProjectDir)transform_tt.cmd"
-
+
Pixmaps\about.png
-
+
Pixmaps\side-splash.png
-
- Pixmaps\tutorial-slide-1-windows.png
+
+ Pixmaps\tutorial-slide-1.png
-
- Pixmaps\tutorial-slide-3-windows.png
+
+ Pixmaps\tutorial-slide-2.png
-
- plugins\bitbucket.png
- Always
+
+ Pixmaps\tutorial-slide-3.png
-
+
Pixmaps\tutorial-slide-4.png
-
- Pixmaps\process-syncing-sparkleshare-windows-i.png
+
+ Pixmaps\process-syncing-i.png
-
- Pixmaps\process-syncing-sparkleshare-windows-ii.png
+
+ Pixmaps\process-syncing-ii.png
-
- Pixmaps\process-syncing-sparkleshare-windows-iii.png
+
+ Pixmaps\process-syncing-iii.png
-
- Pixmaps\process-syncing-sparkleshare-windows-iiii.png
+
+ Pixmaps\process-syncing-iiii.png
-
- Pixmaps\process-syncing-sparkleshare-windows-iiiii.png
+
+ Pixmaps\process-syncing-iiiii.png
-
- Pixmaps\sparkleshare-syncing-error-windows.png
+
+ Pixmaps\process-syncing-error.png
-
- Pixmaps\tutorial-slide-2-windows.png
+
+ Pixmaps\folder.png
-
- Pixmaps\folder-sparkleshare-windows-16.png
-
-
- Pixmaps\folder-windows-16.png
-
-
+
HTML\day-entry.html
-
+
HTML\event-entry.html
-
+
HTML\event-log.html
-
+
HTML\jquery.js
-
+
Pixmaps\avatar-a.png
-
+
Pixmaps\avatar-b.png
-
+
Pixmaps\avatar-c.png
-
+
Pixmaps\avatar-d.png
-
+
Pixmaps\avatar-e.png
-
+
Pixmaps\avatar-f.png
-
+
Pixmaps\avatar-g.png
-
+
Pixmaps\avatar-h.png
-
+
Pixmaps\avatar-i.png
-
+
Pixmaps\avatar-j.png
-
+
Pixmaps\avatar-k.png
-
+
Pixmaps\document-added-12.png
-
+
Pixmaps\document-deleted-12.png
-
+
Pixmaps\document-edited-12.png
-
+
Pixmaps\document-moved-12.png
-
+
Pixmaps\process-working-22.png
-
- plugins\github.png
+
+ Plugins\github.png
Always
-
- plugins\gitorious.png
+
+ Plugins\gitorious.png
Always
-
- plugins\gnome.png
+
+ Plugins\gnome.png
Always
-
- plugins\own-server.png
+
+ Plugins\own-server.png
+ Always
+
+
+ Plugins\bitbucket.png
Always
-
- plugins\bitbucket.xml
+
+ Plugins\bitbucket.xml
Always
-
- plugins\github.xml
+
+ Plugins\github.xml
Always
-
- plugins\gitorious.xml
+
+ Plugins\gitorious.xml
Always
-
- plugins\gnome.xml
+
+ Plugins\gnome.xml
Always
-
- plugins\own-server.xml
- Always
-
-
- po\ar.po
- Always
-
-
- po\bg.po
- Always
-
-
- po\ca.po
- Always
-
-
- po\cs_CZ.po
- Always
-
-
- po\da.po
- Always
-
-
- po\de.po
- Always
-
-
- po\el.po
- Always
-
-
- po\eo.po
- Always
-
-
- po\es.po
- Always
-
-
- po\fi.po
- Always
-
-
- po\fr.po
- Always
-
-
- po\he.po
- Always
-
-
- po\hu.po
- Always
-
-
- po\it.po
- Always
-
-
- po\ja.po
- Always
-
-
- po\nl.po
- Always
-
-
- po\nn_NO.po
- Always
-
-
- po\no_NO.po
- Always
-
-
- po\pl.po
- Always
-
-
- po\pt_BR.po
- Always
-
-
- po\ru.po
- Always
-
-
- po\sk.po
- Always
-
-
- po\sl.po
- Always
-
-
- po\sr_RS.po
- Always
-
-
- po\sv.po
- Always
-
-
- po\te.po
- Always
-
-
- po\uk.po
- Always
-
-
- po\zh_CN.po
- Always
-
-
- po\zh_TW.po
+
+ Plugins\own-server.xml
Always
@@ -445,7 +326,7 @@
-
+
diff --git a/SparkleShare/Windows/SparkleStatusIcon.cs b/SparkleShare/Windows/SparkleStatusIcon.cs
index 651c3d64..f9ffe6f4 100644
--- a/SparkleShare/Windows/SparkleStatusIcon.cs
+++ b/SparkleShare/Windows/SparkleStatusIcon.cs
@@ -114,7 +114,7 @@ namespace SparkleShare {
this.notify_icon.HeaderText = "SparkleShare\n" + Controller.StateText;
Image folder_image = new Image () {
- Source = SparkleUIHelpers.GetImageSource ("folder-sparkleshare-windows-16"),
+ Source = SparkleUIHelpers.GetImageSource ("sparkleshare-folder"),
Width = 16,
Height = 16
};
@@ -192,7 +192,7 @@ namespace SparkleShare {
subfolder_item.Click += OpenFolderDelegate (folder_name);
Image subfolder_image = new Image () {
- Source = SparkleUIHelpers.GetImageSource ("folder-windows-16"),
+ Source = SparkleUIHelpers.GetImageSource ("folder"),
Width = 16,
Height = 16
};
@@ -225,7 +225,7 @@ namespace SparkleShare {
subfolder_item.Click += OpenFolderDelegate (folder_name);
Image subfolder_image = new Image () {
- Source = SparkleUIHelpers.GetImageSource ("folder-windows-16"),
+ Source = SparkleUIHelpers.GetImageSource ("folder"),
Width = 16,
Height = 16
};
@@ -282,14 +282,14 @@ namespace SparkleShare {
private void CreateAnimationFrames ()
{
this.animation_frames = new Drawing.Bitmap [] {
- SparkleUIHelpers.GetBitmap ("process-syncing-sparkleshare-windows-i"),
- SparkleUIHelpers.GetBitmap ("process-syncing-sparkleshare-windows-ii"),
- SparkleUIHelpers.GetBitmap ("process-syncing-sparkleshare-windows-iii"),
- SparkleUIHelpers.GetBitmap ("process-syncing-sparkleshare-windows-iiii"),
- SparkleUIHelpers.GetBitmap ("process-syncing-sparkleshare-windows-iiiii")
+ SparkleUIHelpers.GetBitmap ("process-syncing-i"),
+ SparkleUIHelpers.GetBitmap ("process-syncing-ii"),
+ SparkleUIHelpers.GetBitmap ("process-syncing-iii"),
+ SparkleUIHelpers.GetBitmap ("process-syncing-iiii"),
+ SparkleUIHelpers.GetBitmap ("process-syncing-iiiii")
};
- this.error_icon = SparkleUIHelpers.GetBitmap ("sparkleshare-syncing-error-windows");
+ this.error_icon = SparkleUIHelpers.GetBitmap ("process-syncing-error");
}