From 07d22db18ddf2c7ff1a6ccff79a652a04df4c094 Mon Sep 17 00:00:00 2001 From: Derick Payne Date: Wed, 22 Jun 2016 13:53:54 +0200 Subject: [PATCH] Fixed Favorites Function Fixed Favorites Function --- Version.ini | 2 +- distrib/Changes.txt | 2 +- distrib/notepad3_setup.iss | 7 ++++++- minipath/Version.ini | 2 +- minipath/res/MiniPath.exe.manifest | 2 +- minipath/src/VersionEx.h | 2 +- res/Notepad3.exe.manifest | 2 +- src/VersionEx.h | 2 +- 8 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Version.ini b/Version.ini index 9e5740293..d4c5e69e2 100644 --- a/Version.ini +++ b/Version.ini @@ -7,7 +7,7 @@ Language=CPlusPlus Major=auto Minor=auto Maintenance=auto -Build=312 +Build=315 [CSharp] AssemConfig=Rizonesoft.Voice.Win\Properties\AssemblyInfo.cs.conf diff --git a/distrib/Changes.txt b/distrib/Changes.txt index 2058a9b3c..e883e2067 100644 --- a/distrib/Changes.txt +++ b/distrib/Changes.txt @@ -6,7 +6,7 @@ Notepad3 Build 0000 (11 June 2016) - Removed Visual Studio 2010 to 2013 Support - Added Visual Studio 2015 Update 2 version number - Added Support for Inno Setup 5.5.9 -- +- Fixed Favorites Function - - - \ No newline at end of file diff --git a/distrib/notepad3_setup.iss b/distrib/notepad3_setup.iss index 1c056f926..1be63f386 100644 --- a/distrib/notepad3_setup.iss +++ b/distrib/notepad3_setup.iss @@ -124,6 +124,9 @@ Source: {#bindir}\Release_x64\minipath.exe; DestDir: {app}; Source: {#bindir}\Release_x86\minipath.exe; DestDir: {app}; Flags: ignoreversion; Check: not Is64BitInstallMode() Source: minipath.ini; DestDir: {userappdata}\Rizonesoft\Notepad3; Flags: onlyifdoesntexist uninsneveruninstall +[Dirs] +Name: "{userappdata}\Rizonesoft\Notepad3\Favorites" + [Icons] Name: {commondesktop}\{#app_name}; Filename: {app}\Notepad3.exe; Tasks: desktopicon\common; Comment: {#app_name} {#app_version}; WorkingDir: {app}; AppUserModelID: Notepad3; IconFilename: {app}\Notepad3.exe; IconIndex: 0 Name: {userdesktop}\{#app_name}; Filename: {app}\Notepad3.exe; Tasks: desktopicon\user; Comment: {#app_name} {#app_version}; WorkingDir: {app}; AppUserModelID: Notepad3; IconFilename: {app}\Notepad3.exe; IconIndex: 0 @@ -135,6 +138,8 @@ Name: {#quick_launch}\{#app_name}; Filename: {app}\Notepad3.exe; Tasks: quicklau Filename: {app}\Notepad3.ini; Section: Notepad3; Key: Notepad3.ini; String: %APPDATA%\Rizonesoft\Notepad3\Notepad3.ini Filename: {app}\minipath.ini; Section: minipath; Key: minipath.ini; String: %APPDATA%\Rizonesoft\Notepad3\minipath.ini +Filename: {userappdata}\Rizonesoft\Notepad3\Notepad3.ini; Section: Settings; Key: Favorites; String: %APPDATA%\Rizonesoft\Notepad3\Favorites\ + [Run] Filename: {app}\Notepad3.exe; Description: {cm:LaunchProgram,{#app_name}}; WorkingDir: {app}; Flags: nowait postinstall skipifsilent unchecked @@ -155,7 +160,6 @@ Type: files; Name: {app}\Notepad3.ini Type: files; Name: {app}\minipath.ini Type: dirifempty; Name: {app} - [Code] const IFEO = 'SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\notepad.exe'; @@ -274,6 +278,7 @@ end; procedure CleanUpSettings(); begin DeleteFile(ExpandConstant('{userappdata}\Rizonesoft\Notepad3\Notepad3.ini')); + DeleteFile(ExpandConstant('{userappdata}\Rizonesoft\Notepad3\minipath.ini')); RemoveDir(ExpandConstant('{userappdata}\Rizonesoft\Notepad3')); end; diff --git a/minipath/Version.ini b/minipath/Version.ini index ab2d843d1..e51146951 100644 --- a/minipath/Version.ini +++ b/minipath/Version.ini @@ -1,4 +1,4 @@ [Version] -Build=82 +Build=85 VersionHeader=src\VersionEx.h ManifestConfig=res\MiniPath.exe.manifest.conf diff --git a/minipath/res/MiniPath.exe.manifest b/minipath/res/MiniPath.exe.manifest index b1eda70af..c4cf6d29c 100644 --- a/minipath/res/MiniPath.exe.manifest +++ b/minipath/res/MiniPath.exe.manifest @@ -3,7 +3,7 @@ metapath diff --git a/minipath/src/VersionEx.h b/minipath/src/VersionEx.h index 9e924ea8b..04ad48bbf 100644 --- a/minipath/src/VersionEx.h +++ b/minipath/src/VersionEx.h @@ -1,4 +1,4 @@ #define VERSION_MAJOR 0 #define VERSION_MINOR 0 #define VERSION_REV 8 -#define VERSION_BUILD 82 +#define VERSION_BUILD 85 diff --git a/res/Notepad3.exe.manifest b/res/Notepad3.exe.manifest index 9e8f57215..3fca47e0b 100644 --- a/res/Notepad3.exe.manifest +++ b/res/Notepad3.exe.manifest @@ -3,7 +3,7 @@ Notepad3 diff --git a/src/VersionEx.h b/src/VersionEx.h index da0f10e9c..f2d0b3cae 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -1,4 +1,4 @@ #define VERSION_MAJOR 0 #define VERSION_MINOR 3 #define VERSION_REV 1 -#define VERSION_BUILD 312 +#define VERSION_BUILD 315