Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Commit

Permalink
Pre Merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@wjch-krl
wjch-krl committed Jan 17, 2015
1 parent 303ba8c commit a96a589
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 51 deletions.
12 changes: 3 additions & 9 deletions PiggySync/PiggySync.GuiShared/MainPresenter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace PiggySync.GuiShared
{
public class MainPresenter
public class MainPresenter : IStatusWather
{
private static readonly SyncManager main;
private readonly IMainView mainView;
Expand All @@ -13,20 +13,14 @@ static MainPresenter()
main = new SyncManager();
// FileWatcher.Initialize(main);
main.Run();
main.Observers.Add (this);
}

public MainPresenter(IMainView mainView)
{
this.mainView = mainView;
this.mainView.SyncStatus = SyncStatus.UpToDate;
}

public void Synchronize()
{
if (!main.IsSynchronizing)
{
main.ForceSync();
}
}

}
}
2 changes: 1 addition & 1 deletion PiggySync/PiggySync.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ Global
{8204A504-96BC-47B3-93B5-4B5861762A47} = {00DD8DB4-E43F-4F0B-A1BE-B970E5BA9235}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = PiggySync.MonoMacGui\PiggySync.MonoMacGui.csproj
StartupItem = PiggySync.IosApp\PiggySync.IosApp.csproj
Policies = $0
$0.DotNetNamingPolicy = $1
$1.DirectoryNamespaceAssociation = None
Expand Down
49 changes: 8 additions & 41 deletions PiggySync/PiggySync.userprefs
View file
Original file line number Diff line number Diff line change
@@ -1,53 +1,20 @@
<Properties GitUserInfo="UsingGIT" StartupItem="PiggySync.MonoMacGui/PiggySync.MonoMacGui.csproj">
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.Workbench ActiveDocument="PiggySync.Model/DatabaseManager.cs">
<MonoDevelop.Ide.Workbench ActiveDocument="PiggySync.WinApp/MainForm.cs">
<Files>
<File FileName="PiggySync.StandardTypeResolver/DirectoryHelper.cs" Line="1" Column="1" />
<File FileName="PiggySync.StandardTypeResolver/IpHelper.cs" Line="1" Column="1" />
<File FileName="PiggySync.StandardTypeResolver/StandardTcpListener.cs" Line="1" Column="1" />
<File FileName="PiggySync.StandardTypeResolver/StandardTcpClient.cs" Line="1" Column="1" />
<File FileName="PiggySync.StandardTypeResolver/StandardUdpClient.cs" Line="1" Column="1" />
<File FileName="PiggySync.StandardTypeResolver/StandardIpEndPoint.cs" Line="1" Column="1" />
<File FileName="PiggySync.Domain/Concrete/XmlSettingsRepository.cs" Line="3" Column="3" />
<File FileName="PiggySync.MonoMacGui/LogWindow.cs" Line="1" Column="1" />
<File FileName="PiggySync.MonoMacGui/LogWindowController.cs" Line="88" Column="88" />
<File FileName="PiggySync.MonoMacGui/MainWindow.cs" Line="1" Column="1" />
<File FileName="PiggySync.MonoMacGui/MainWindowController.cs" Line="50" Column="50" />
<File FileName="PiggySync.MonoMacGui/Main.cs" Line="7" Column="7" />
<File FileName="PiggySync.GuiShared/HostsPresenter.cs" Line="1" Column="1" />
<File FileName="PiggySync.Model/DatabaseManager.cs" Line="39" Column="39" />
<File FileName="PiggySync.Core/SyncManager.cs" Line="16" Column="16" />
<File FileName="PiggySync.GuiShared/MainPresenter.cs" Line="25" Column="25" />
<File FileName="PiggySync.MonoMacGui/MainWindowController.cs" Line="5" Column="5" />
<File FileName="PiggySync.GuiShared/IMainView.cs" Line="32" Column="32" />
<File FileName="PiggySync.GuiShared/SyncStatus.cs" Line="13" Column="13" />
<File FileName="PiggySync.WinApp/MainForm.cs" Line="4" Column="4" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State expanded="True">
<Node name="Common" expanded="True">
<Node name="PiggySync.Common" expanded="True" />
<Node name="PiggySync.Domain" expanded="True">
<Node name="Concrete" expanded="True" />
</Node>
<Node name="PiggySync.GuiShared" expanded="True" />
<Node name="PiggySync.Model" expanded="True">
<Node name="Packages" expanded="True" selected="True" />
</Node>
<Node name="PiggySync.StandardTypeResolver" expanded="True" />
</Node>
<Node name="Platforms" expanded="True">
<Node name="Desktop" expanded="True">
<Node name="PiggySync.MonoMacGui" expanded="True">
<Node name="LogWindow.cs" expanded="True" />
<Node name="MainWindow.cs" expanded="True" />
</Node>
<Node name="PiggySync.WinApp" expanded="True" />
</Node>
</Node>
</State>
</Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
<Breakpoint file="/Users/wojciechkrol/OneDrive/PJN/4/SimpleCrawler/SimpleCrawler/Program.cs" line="29" column="1" />
<Breakpoint file="/Users/wojciechkrol/Documents/Praca inż/PiggySync/PiggySync.Model/FileInf.cs" line="36" column="1" />
<Breakpoint file="/Users/wojciechkrol/Documents/Praca inz/PiggySync/PiggySync.Core/Sync.cs" line="126" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
Expand Down
2 changes: 2 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
DuckSyncWin
===========

Pozdro 6000

0 comments on commit a96a589

Please sign in to comment.