Skip to content
Permalink
Browse files

Moving to improved project structure

  • Loading branch information...
GeertvanHorrik committed Jan 13, 2015
1 parent 4533bd6 commit ee44b09e1bcd6c8f12c9497bab273b73591557d3
Showing with 1,573 additions and 141 deletions.
  1. BIN deployment/FinalBuilder/LogViewer.CreateSetupPackage.fbp7
  2. BIN deployment/FinalBuilder/LogViewer.CreateSquirrelPackage.fbp7
  3. +4 −0 deployment/InnoSetup/template/readme.txt
  4. BIN deployment/InnoSetup/template/resources/logo.ico
  5. BIN deployment/InnoSetup/template/resources/logo_large.bmp
  6. BIN deployment/InnoSetup/template/resources/logo_large_nightly.bmp
  7. BIN deployment/InnoSetup/template/resources/logo_small.bmp
  8. +260 −0 deployment/InnoSetup/template/setup.iss
  9. BIN deployment/Squirrel/loading.gif
  10. +23 −0 deployment/Squirrel/template/LogViewer.nuspec
  11. BIN design/logo/logo.ico
  12. BIN design/logo/logo_0032.png
  13. BIN design/logo/logo_0055.png
  14. BIN design/logo/logo_0064.png
  15. BIN design/logo/logo_0128.png
  16. BIN design/logo/logo_0256.png
  17. BIN design/logo/logo_0512.png
  18. BIN design/logo/logo_1024.png
  19. +1 −1 src/LogViewer.Tests/LogViewer.Tests.csproj
  20. +1 −1 src/LogViewer.Tests/Properties/AssemblyInfo.cs
  21. +1 −1 src/LogViewer.Tests/packages.config
  22. +2 −2 src/LogViewer.sln.DotSettings
  23. +4 −0 src/LogViewer/App.config
  24. +58 −9 src/LogViewer/App.xaml.cs
  25. +2 −2 src/LogViewer/Behaviors/MultipleSelectionBehavior.cs
  26. +49 −0 src/LogViewer/Configuration/AnalyticsConfigurationSynchronizer.cs
  27. +70 −2 src/LogViewer/Constants.cs
  28. +2 −2 src/LogViewer/Controls/HighlightableTextBlock.cs
  29. +2 −2 src/LogViewer/Extensions/AppDataServiceExtensions.cs
  30. +2 −2 src/LogViewer/Extensions/FilterExtensions.cs
  31. +2 −2 src/LogViewer/Extensions/ItemsControlExtensions.cs
  32. +2 −2 src/LogViewer/Extensions/ListExtensions.cs
  33. +2 −2 src/LogViewer/Extensions/StringExtensions.cs
  34. +10 −2 src/LogViewer/FodyWeavers.xml
  35. +72 −10 src/LogViewer/LogViewer.csproj
  36. +45 −0 src/LogViewer/MethodTimeLogger.cs
  37. +2 −2 src/LogViewer/Models/Base/NavigationNode.cs
  38. +2 −2 src/LogViewer/Models/Base/SimplyClearableModel.cs
  39. +2 −2 src/LogViewer/Models/Company.cs
  40. +2 −2 src/LogViewer/Models/Filter.cs
  41. +2 −2 src/LogViewer/Models/LogFile.cs
  42. +2 −2 src/LogViewer/Models/LogRecord.cs
  43. +2 −2 src/LogViewer/Models/LogViewerModel.cs
  44. +2 −2 src/LogViewer/Models/Product.cs
  45. +2 −2 src/LogViewer/Models/SearchTemplate.cs
  46. +5 −7 src/LogViewer/ModuleInitializer.cs
  47. +1 −1 src/LogViewer/Properties/AssemblyInfo.cs
  48. 0 src/LogViewer/{ → Resources/Fonts}/FontAwesome.cs
  49. BIN src/LogViewer/Resources/Icons/logo.ico
  50. BIN src/LogViewer/Resources/Images/logo_0128.png
  51. +155 −13 src/LogViewer/Services/ApplicationInitializationService.cs
  52. +2 −2 src/LogViewer/Services/CompanyService.cs
  53. +35 −0 src/LogViewer/Services/ConfigurationInitializationService.cs
  54. +2 −2 src/LogViewer/Services/FilterService.cs
  55. +2 −2 src/LogViewer/Services/Interfaces/ICompanyService.cs
  56. +16 −0 src/LogViewer/Services/Interfaces/IConfigurationInitializationService.cs
  57. +2 −2 src/LogViewer/Services/Interfaces/IFilterService.cs
  58. +2 −2 src/LogViewer/Services/Interfaces/ILogFileService.cs
  59. +2 −2 src/LogViewer/Services/Interfaces/ILogRecordService.cs
  60. +20 −0 src/LogViewer/Services/Interfaces/IManageUserDataService.cs
  61. +2 −2 src/LogViewer/Services/Interfaces/IProductService.cs
  62. +2 −2 src/LogViewer/Services/Interfaces/IRegexService.cs
  63. +2 −2 src/LogViewer/Services/LogFileService.cs
  64. +2 −2 src/LogViewer/Services/LogRecordService.cs
  65. +87 −0 src/LogViewer/Services/ManageUserDataService.cs
  66. +2 −2 src/LogViewer/Services/ProductService.cs
  67. +2 −2 src/LogViewer/Services/RegexService.cs
  68. +2 −2 src/LogViewer/Services/RibbonService.cs
  69. +1 −1 src/LogViewer/Themes/Generic.xaml
  70. +2 −2 src/LogViewer/ViewModels/LogNavigatorViewModel.cs
  71. +2 −2 src/LogViewer/ViewModels/LogRecordsTableViewModel.cs
  72. +2 −2 src/LogViewer/ViewModels/MainViewModel.cs
  73. +118 −4 src/LogViewer/ViewModels/RibbonViewModel.cs
  74. +123 −0 src/LogViewer/ViewModels/SettingsViewModel.cs
  75. +85 −2 src/LogViewer/ViewModels/StatusBarViewModel.cs
  76. +2 −2 src/LogViewer/Views/LogNavigatorView.xaml.cs
  77. +2 −2 src/LogViewer/Views/LogRecordsTableView.xaml.cs
  78. +6 −2 src/LogViewer/Views/MainView.xaml.cs
  79. +37 −2 src/LogViewer/Views/RibbonView.xaml
  80. +9 −2 src/LogViewer/Views/RibbonView.xaml.cs
  81. +102 −0 src/LogViewer/Views/SettingsWindow.xaml
  82. +44 −0 src/LogViewer/Views/SettingsWindow.xaml.cs
  83. +43 −3 src/LogViewer/Views/StatusBarView.xaml
  84. +2 −2 src/LogViewer/Views/StatusBarView.xaml.cs
  85. +16 −6 src/LogViewer/packages.config
  86. BIN src/SolutionAssemblyInfo.cs
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,4 @@
Log Viewer readme
=================

For more information, visit http://www.wildgums.com/
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,260 @@
#define AppName "Log Viewer"
#define SourceDirectory ""
; #define AppVersion "3.1"
#define AppVersion "[VERSION]"
; #define AppDisplayVersion "3.1 beta 1"
#define AppDisplayVersion "[VERSION_DISPLAY]"
#define AppNameWithDisplayVersion AppName + " " + AppDisplayVersion
#define AppNameWithVersion AppName + " " + AppVersion
#define OutputPrefix "LogViewer"
#define Website "http://www.wildgums.com/"
#define Company "Wild Gums"
#define IconName "logo"
#define ExecutableName "LogViewer.exe"
#define AppMutex Company + "_" + AppName

#define OutputFileWithSpaces OutputPrefix + "_" + AppDisplayVersion
#define OutputFile StringChange(OutputFileWithSpaces, " ", "_")

[_ISTool]
EnableISX=false
Use7zip=false

[Setup]
AppName={#AppNameWithVersion}
AppVerName={#AppNameWithDisplayVersion}
AppID={#AppMutex}
AppPublisher={#Company}
AppCopyright={#Company}
DefaultDirName={pf32}\{#Company}\{#AppName}
DefaultGroupName={#AppName}
UsePreviousSetupType=true
OutputDir=..\output
OutputBaseFilename={#OutputFile}
UninstallDisplayName={#AppName}
Compression=lzma2/Ultra64
UseSetupLdr=true
SolidCompression=true
ShowLanguageDialog=yes
VersionInfoVersion={#AppVersion}
AppVersion={#AppVersion}
InternalCompressLevel=Ultra64
AppPublisherURL={#Website}
AppSupportURL={#Website}
AppUpdatesURL={#Website}
AppContact={#Website}
VersionInfoCompany={#Company}
AppMutex={#AppMutex}
LanguageDetectionMethod=none
DisableStartupPrompt=True
WizardImageFile=resources\[WIZARDIMAGEFILE].bmp
; WizardImageFile=resources\logo_large_nightly.bmp
WizardSmallImageFile=resources\logo_small.bmp
SetupIconFile=resources\{#IconName}.ico
UninstallDisplayIcon={app}\resources\{#IconName}.ico
SetupLogging=true
; For signing, the following sign tool must be configured
; Name: Signtool
; Command: "C:\Source\SMS_Certificates\Tools\signtool.exe" sign /t "http://timestamp.comodoca.com/authenticode" /f "C:\Source\SMS_Certificates\CodeSigning\current.pfx" "$f"
;SignTool=Signtool

[InnoIDE_Settings]
UseRelativePaths=true

[Dirs]
Name: {app}\doc;
Name: {app}\resources;

[Files]
Source: readme.txt; DestDir: {app};
Source: resources\*; DestDir: {app}\resources; Flags: createallsubdirs recursesubdirs;
Source: resources\{#IconName}.ico; DestDir: {app}\resources;

;--------------------
; Application content
;--------------------

; Copy all files
Source: *; DestDir: {app}\; Excludes: "*.iss"; Flags: createallsubdirs recursesubdirs;

;-----------------
; Application data
;-----------------

; Copy all files
;Source: data\*; DestDir: {app}\data;

[CustomMessages]
DotNetMissing=This setup requires the .NET Framework. Please download and install the .NET Framework and run this setup again. Do you want to download the framework now?

[ThirdPartySettings]
CompileLogMethod=append

[UninstallDelete]
Name: {app}; Type: filesandordirs

[Icons]
Name: "{group}\{#AppName}"; Filename: "{app}\{#ExecutableName}"; WorkingDir: "{app}"
Name: "{group}\Go to website"; Filename: "{#Website}"
Name: "{group}\Uninstall {#AppName}"; Filename: "{app}\unins000.exe"; WorkingDir: "{app}"; IconFilename: "{app}\resources\{#IconName}.ico"

[Types]
Name: Full; Description: "Full installation";
;Name: Custom; Description: Custom; Flags: IsCustom;

[Components]
Name: core; Description: Libraries;
;Name: snippets; Description: "Code snippets"; Types: Full Custom;
;Name: templates; Description: "Project and Item templates"; Types: Full Custom;

[Languages]
Name: "English"; MessagesFile: "compiler:Default.isl"
Name: "Czech"; MessagesFile: "compiler:Languages\Czech.isl"
Name: "Danish"; MessagesFile: "compiler:Languages\Danish.isl"
Name: "Dutch"; MessagesFile: "compiler:Languages\Dutch.isl"
Name: "Finnish"; MessagesFile: "compiler:Languages\Finnish.isl"
Name: "French"; MessagesFile: "compiler:Languages\French.isl"
Name: "German"; MessagesFile: "compiler:Languages\German.isl"
Name: "Hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl"
Name: "Italian"; MessagesFile: "compiler:Languages\Italian.isl"
Name: "Japanese"; MessagesFile: "compiler:Languages\Japanese.isl"
Name: "Norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl"
Name: "Polish"; MessagesFile: "compiler:Languages\Polish.isl"
Name: "Portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl"
Name: "Russian"; MessagesFile: "compiler:Languages\Russian.isl"
Name: "Spanish"; MessagesFile: "compiler:Languages\Spanish.isl"

[Run]
Filename: "{app}\{#ExecutableName}"; WorkingDir: "{app}"; Flags: nowait postinstall runasoriginaluser skipifsilent; Description: "Start {#AppName}"

[ThirdParty]
CompileLogMethod=append

[Code]
//=========================================================================
// GetUninstallString
//=========================================================================

function GetUninstallString(): String;
var
sUnInstPath: String;
sUnInstallString: String;
begin
sUnInstPath := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\{#emit SetupSetting("AppId")}_is1');
sUnInstallString := '';
if not RegQueryStringValue(HKLM, sUnInstPath, 'UninstallString', sUnInstallString) then
RegQueryStringValue(HKCU, sUnInstPath, 'UninstallString', sUnInstallString);
Result := sUnInstallString;
end;

//=========================================================================
// IsDotNetFrameworkInstalled
//=========================================================================

function IsUpgrade(): Boolean;
begin
Result := (GetUninstallString() <> '');
end;

//=========================================================================
// UnInstallOldVersion
//=========================================================================

function UnInstallOldVersion(): Integer;
var
sUnInstallString: String;
iResultCode: Integer;
begin
// Return Values:
// 1 - uninstall string is empty
// 2 - error executing the UnInstallString
// 3 - successfully executed the UnInstallString

// default return value
Result := 0;

// get the uninstall string of the old app
sUnInstallString := GetUninstallString();
if sUnInstallString <> '' then begin
sUnInstallString := RemoveQuotes(sUnInstallString);
if Exec(sUnInstallString, '/SILENT /NORESTART /SUPPRESSMSGBOXES','', SW_HIDE, ewWaitUntilTerminated, iResultCode) then
Result := 3
else
Result := 2;
end else
Result := 1;
end;

//=========================================================================
// CurStepChanged
//=========================================================================

procedure CurStepChanged(CurStep: TSetupStep);
begin
if (CurStep=ssInstall) then
begin
if (IsUpgrade()) then
begin
UnInstallOldVersion();
end;
end;
end;

//=========================================================================
// IsDotNetFrameworkInstalled
//=========================================================================
{
Checks whether the right version of the .NET framework is installed
}

function IsDotNetFrameworkInstalled : Boolean;
var
ErrorCode: Integer;
NetFrameWorkInstalled : Boolean;
begin
// Check if the .NET framework is installed
//NetFrameWorkInstalled := RegKeyExists(HKLM,'SOFTWARE\Microsoft\NET Framework Setup\NDP\v2.0.50727'); // 2.0
//NetFrameWorkInstalled := RegKeyExists(HKLM,'SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.0'); // 3.0
//NetFrameWorkInstalled := RegKeyExists(HKLM,'SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.5'); // 3.5
NetFrameWorkInstalled := RegKeyExists(HKLM,'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4'); // 4.0
//NetFrameWorkInstalled := RegKeyExists(HKLM,'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4'); // 4.5

// If the .NET framework is not installed, show message to user to download the framework
if NetFrameWorkInstalled = false then
begin
if MsgBox(ExpandConstant('{cm:DotNetMissing}'), mbConfirmation, MB_YESNO) = idYes then
begin
ShellExec('open',
//'http://www.microsoft.com/downloads/details.aspx?FamilyID=0856eacb-4362-4b0d-8edd-aab15c5e04f5&displaylang=en', // 2.0
//'http://www.microsoft.com/downloads/details.aspx?FamilyID=10cc340b-f857-4a14-83f5-25634c3bf043&displaylang=en', // 3.0
//'http://www.microsoft.com/downloads/details.aspx?FamilyId=333325fd-ae52-4e35-b531-508d977d32a6&displaylang=en', // 3.5
'http://www.microsoft.com/downloads/details.aspx?familyid=9CFB2D51-5FF4-4491-B0E5-B386F32C0992&displaylang=en', // 4.0
//'http://www.microsoft.com/en-us/download/details.aspx?id=30653', // 4.5
'','',SW_SHOWNORMAL,ewNoWait,ErrorCode);
end;
end;

// Return result
Result := NetFrameWorkInstalled;
end;

//=========================================================================
// INITIALIZESETUP
//=========================================================================
{
This function initializes the setup.
}

function InitializeSetup(): Boolean;
var
sPrevPath: String;
begin
// Check .NET framework
if (IsDotNetFrameworkInstalled() = false) then
begin
Result := false;
exit;
end;

Result := true;
end;
Binary file not shown.
@@ -0,0 +1,23 @@
<?xml version="1.0"?>
<package>
<metadata>
<id>LogViewer</id>
<version>[VERSION]</version>
<title>Log Viewer</title>
<authors>Wild Gums</authors>
<owners>Wild Gums</owners>

<description>
Log Viewer.
</description>
<summary>
</summary>

<tags></tags>

<requireLicenseAcceptance>false</requireLicenseAcceptance>
<copyright>Copyright Wild Gums 2013 - 2015</copyright>

<language>en-US</language>
</metadata>
</package>
BIN +133 KB design/logo/logo.ico
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -32,7 +32,7 @@
<ItemGroup>
<Reference Include="Catel.Core, Version=4.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\Catel.Core.4.1.0-unstable0030\lib\net45\Catel.Core.dll</HintPath>
<HintPath>..\..\lib\Catel.Core.4.1.0-unstable0045\lib\net45\Catel.Core.dll</HintPath>
</Reference>
<Reference Include="Moq">
<HintPath>..\..\lib\Moq.4.2.1409.1722\lib\net40\Moq.dll</HintPath>
@@ -1,6 +1,6 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="AssemblyInfo.cs" company="Wild Gums">
// Copyright (c) 2008 - 2014 Wild Gums. All rights reserved.
// Copyright (c) 2008 - 2015 Wild Gums. All rights reserved.
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Catel.Core" version="4.1.0-unstable0030" targetFramework="net45" />
<package id="Catel.Core" version="4.1.0-unstable0045" targetFramework="net45" />
<package id="Moq" version="4.2.1409.1722" targetFramework="net45" />
<package id="NUnit" version="2.6.4" targetFramework="net45" />
</packages>
@@ -252,8 +252,8 @@ II.2.12 &lt;HandlesEvent /&gt;&#xD;
<s:String x:Key="/Default/CodeStyle/CSharpMemberOrderPattern/LayoutType/@EntryValue">CustomLayout</s:String>
<s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/AddImportsToDeepestScope/@EntryValue">True</s:Boolean>
<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">--------------------------------------------------------------------------------------------------------------------&#xD;
&lt;copyright file="$FILENAME$" company="Orcomp development team"&gt;&#xD;
Copyright (c) 2008 - $CURRENT_YEAR$ Orcomp development team. All rights reserved.&#xD;
&lt;copyright file="$FILENAME$" company="Wild Gums"&gt;&#xD;
Copyright (c) 2014 - $CURRENT_YEAR$ Wild Gums. All rights reserved.&#xD;
&lt;/copyright&gt;&#xD;
--------------------------------------------------------------------------------------------------------------------</s:String>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
@@ -13,6 +13,10 @@
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.6.9.0" newVersion="2.6.9.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.1.10.0" newVersion="2.1.10.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
Oops, something went wrong.

0 comments on commit ee44b09

Please sign in to comment.
You can’t perform that action at this time.