diff --git a/SparkleShare.sln b/SparkleShare.sln
index 6370cf34..df1f72c3 100644
--- a/SparkleShare.sln
+++ b/SparkleShare.sln
@@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare.Windows", "Spa
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkleShare.Linux", "SparkleShare\Linux\SparkleShare.Linux.csproj", "{5714D3CA-88A6-4330-A29D-4CA90D1D193C}"
EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SparkleShare", "SparkleShare\Common\SparkleShare.shproj", "{F16E3683-B622-4654-B799-99C8D68AA963}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Release|Any CPU = Release|Any CPU
diff --git a/SparkleShare/Common/BaseController.cs b/SparkleShare/Common/BaseController.cs
index 8ca07466..4a370041 100644
--- a/SparkleShare/Common/BaseController.cs
+++ b/SparkleShare/Common/BaseController.cs
@@ -647,7 +647,8 @@ namespace SparkleShare {
{
this.fetcher.EnableFetchedRepoCrypto (password);
FinishFetcher (StorageType.Encrypted);
- }
+ } // TODO: make this the main method. password optional. need to know storage type before Complete to allow crypto in lfs
+ // Make sure IsCryptoPasswordCorrect works with SparkleShare.txt checkout and LFS
public void FinishFetcher (StorageType selected_storage_type)
diff --git a/SparkleShare/Common/SparkleShare.projitems b/SparkleShare/Common/SparkleShare.projitems
new file mode 100644
index 00000000..9b4eac3b
--- /dev/null
+++ b/SparkleShare/Common/SparkleShare.projitems
@@ -0,0 +1,22 @@
+
+
+
+ $(MSBuildAllProjects);$(MSBuildThisFileFullPath)
+ true
+ {F16E3683-B622-4654-B799-99C8D68AA963}
+
+
+ SparkleShare
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/SparkleShare/Common/SparkleShare.shproj b/SparkleShare/Common/SparkleShare.shproj
new file mode 100644
index 00000000..aa36f2d3
--- /dev/null
+++ b/SparkleShare/Common/SparkleShare.shproj
@@ -0,0 +1,13 @@
+
+
+
+ 8.0.30703
+ 2.0
+ {F16E3683-B622-4654-B799-99C8D68AA963}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/SparkleShare/Linux/Makefile.am b/SparkleShare/Linux/Makefile.am
index 2c308027..0cae5e87 100644
--- a/SparkleShare/Linux/Makefile.am
+++ b/SparkleShare/Linux/Makefile.am
@@ -19,16 +19,16 @@ SOURCES = \
../Common/NoteController.cs \
../Common/SetupController.cs \
../Common/StatusIconController.cs \
- About.cs \
- Bubbles.cs \
- Controller.cs \
- EventLog.cs \
- Note.cs \
- Setup.cs \
- SetupWindow.cs \
- StatusIcon.cs \
- UserInterface.cs \
- UserInterfaceHelpers.cs
+ Userinterface/About.cs \
+ Userinterface/Bubbles.cs \
+ Userinterface/EventLog.cs \
+ Userinterface/Note.cs \
+ Userinterface/Setup.cs \
+ Userinterface/SetupWindow.cs \
+ Userinterface/StatusIcon.cs \
+ Userinterface/UserInterface.cs \
+ Userinterface/UserInterfaceHelpers.cs \
+ Controller.cs
include $(top_srcdir)/build/build.mk
diff --git a/SparkleShare/Linux/SparkleShare.Linux.csproj b/SparkleShare/Linux/SparkleShare.Linux.csproj
index 2ebe1e12..5602fb80 100644
--- a/SparkleShare/Linux/SparkleShare.Linux.csproj
+++ b/SparkleShare/Linux/SparkleShare.Linux.csproj
@@ -72,8 +72,6 @@
-
-
@@ -136,63 +134,19 @@
-
- UserInterface\Avatars.cs
-
-
- UserInterface\About.cs
-
-
- UserInterface\Bubbles.cs
-
-
- UserInterface\Note.cs
-
-
- UserInterface\Setup.cs
-
-
- UserInterface\SetupWindow.cs
-
-
- UserInterface\StatusIcon.cs
-
-
- UserInterface\UserInterface.cs
-
-
- UserInterface\UserInterfaceHelpers.cs
-
SparkleShare.cs
-
- Controllers\AboutController.cs
-
-
- Controllers\BaseController.cs
-
-
- Controllers\BubblesController.cs
-
-
- Controllers\EventLogController.cs
-
-
- Controllers\NoteController.cs
-
-
- Controllers\SetupController.cs
-
-
- Controllers\StatusIconController.cs
-
-
- Controllers\Controller.cs
-
-
- UserInterface\EventLog.cs
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/SparkleShare/Linux/About.cs b/SparkleShare/Linux/UserInterface/About.cs
similarity index 100%
rename from SparkleShare/Linux/About.cs
rename to SparkleShare/Linux/UserInterface/About.cs
diff --git a/SparkleShare/Linux/Bubbles.cs b/SparkleShare/Linux/UserInterface/Bubbles.cs
similarity index 100%
rename from SparkleShare/Linux/Bubbles.cs
rename to SparkleShare/Linux/UserInterface/Bubbles.cs
diff --git a/SparkleShare/Linux/EventLog.cs b/SparkleShare/Linux/UserInterface/EventLog.cs
similarity index 100%
rename from SparkleShare/Linux/EventLog.cs
rename to SparkleShare/Linux/UserInterface/EventLog.cs
diff --git a/SparkleShare/Linux/Setup.cs b/SparkleShare/Linux/UserInterface/Setup.cs
similarity index 100%
rename from SparkleShare/Linux/Setup.cs
rename to SparkleShare/Linux/UserInterface/Setup.cs
diff --git a/SparkleShare/Linux/SetupWindow.cs b/SparkleShare/Linux/UserInterface/SetupWindow.cs
similarity index 100%
rename from SparkleShare/Linux/SetupWindow.cs
rename to SparkleShare/Linux/UserInterface/SetupWindow.cs
diff --git a/SparkleShare/Linux/StatusIcon.cs b/SparkleShare/Linux/UserInterface/StatusIcon.cs
similarity index 100%
rename from SparkleShare/Linux/StatusIcon.cs
rename to SparkleShare/Linux/UserInterface/StatusIcon.cs
diff --git a/SparkleShare/Linux/UserInterface.cs b/SparkleShare/Linux/UserInterface/UserInterface.cs
similarity index 100%
rename from SparkleShare/Linux/UserInterface.cs
rename to SparkleShare/Linux/UserInterface/UserInterface.cs
diff --git a/SparkleShare/Linux/UserInterfaceHelpers.cs b/SparkleShare/Linux/UserInterface/UserInterfaceHelpers.cs
similarity index 100%
rename from SparkleShare/Linux/UserInterfaceHelpers.cs
rename to SparkleShare/Linux/UserInterface/UserInterfaceHelpers.cs
diff --git a/SparkleShare/Mac/SparkleShare.Mac.csproj b/SparkleShare/Mac/SparkleShare.Mac.csproj
index 86334730..b45f7271 100644
--- a/SparkleShare/Mac/SparkleShare.Mac.csproj
+++ b/SparkleShare/Mac/SparkleShare.Mac.csproj
@@ -41,6 +41,7 @@
HttpClientHandler
Default
None
+ True
False
@@ -155,9 +156,7 @@
-
- ..\..\..\monomac\src\MonoMac.dll
-
+
@@ -166,28 +165,7 @@
MainMenu.xib
-
- SparkleShare.cs
-
-
-
- Controllers\AboutController.cs
-
-
- Controllers\BubblesController.cs
-
-
- Controllers\EventLogController.cs
-
-
- Controllers\NoteController.cs
-
-
- Controllers\SetupController.cs
-
-
- Controllers\StatusIconController.cs
-
+
@@ -196,15 +174,10 @@
-
- Controllers\BaseController.cs
-
-
- Controllers\Controller.cs
-
UserInterface\Avatars.cs
+
@@ -212,8 +185,8 @@
+
-
HTML\day-entry.html
diff --git a/SparkleShare/Mac/MacWatcher.cs b/SparkleShare/Mac/Watcher.cs
similarity index 100%
rename from SparkleShare/Mac/MacWatcher.cs
rename to SparkleShare/Mac/Watcher.cs
diff --git a/SparkleShare/Windows/SparkleShare.Windows.csproj b/SparkleShare/Windows/SparkleShare.Windows.csproj
index b33d0398..89d9d7c0 100644
--- a/SparkleShare/Windows/SparkleShare.Windows.csproj
+++ b/SparkleShare/Windows/SparkleShare.Windows.csproj
@@ -32,6 +32,7 @@
Images\sparkleshare-app.ico
+ v4.5
pdbonly
@@ -62,6 +63,7 @@
4
false
+
@@ -276,4 +278,14 @@
MSBuild:Compile
+
+
+ {2C914413-B31C-4362-93C7-1AE34F09112A}
+ Sparkles
+
+
+ {009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}
+ Sparkles.Git
+
+