diff --git a/Install/sws_extension.nsh b/Install/sws_extension.nsh index 09e7ca069..aaf54ad31 100644 --- a/Install/sws_extension.nsh +++ b/Install/sws_extension.nsh @@ -35,9 +35,9 @@ Section "Extension DLL" extension_id Delete "$INSTDIR\Plugins\reaper_fingers.dll" Delete "$INSTDIR\Plugins\reaper_dragzoom.dll" Delete "$INSTDIR\Plugins\reaper_WT_InTheSky.dll" + Delete "$INSTDIR\Plugins\reaper_sws_whatsnew.txt" File ${OUT_DLL} File ${OUT_PY} - File /oname=$INSTDIR\Plugins\reaper_sws_whatsnew.txt ..\whatsnew.txt Abort: SectionEnd diff --git a/SnM/SnM_Util.cpp b/SnM/SnM_Util.cpp index 91641d890..f8620ecda 100644 --- a/SnM/SnM_Util.cpp +++ b/SnM/SnM_Util.cpp @@ -669,6 +669,14 @@ void SNM_UpgradeIniFiles(int _iniVersion) WritePrivateProfileString("NbOfActions", "S&M_LIVECFG_FADES_TGL", NULL, g_SNM_IniFn.Get()); WritePrivateProfileString("NbOfActions", "S&M_LIVECFG_FADES_ON", NULL, g_SNM_IniFn.Get()); WritePrivateProfileString("NbOfActions", "S&M_LIVECFG_FADES_OFF", NULL, g_SNM_IniFn.Get()); + + // reaper_sws_whatsnew.txt is not deployed anymore (replaced with online help) + // note: on Win, this file is removed by NSIS installers +#ifndef _WIN32 + WDL_FastString fn; + fn.SetFormatted(SNM_MAX_PATH, "%s/UserPlugins/reaper_sws_whatsnew.txt", GetResourcePath()); + SNM_DeleteFile(fn.Get(), false); // lazy cleanup +#endif } } diff --git a/reaper_sws.xcodeproj/project.pbxproj b/reaper_sws.xcodeproj/project.pbxproj index d6f715df6..95f9b0263 100644 --- a/reaper_sws.xcodeproj/project.pbxproj +++ b/reaper_sws.xcodeproj/project.pbxproj @@ -262,7 +262,6 @@ 3879391016202B1E000948B5 /* StringUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 387938E216202B1E000948B5 /* StringUtil.h */; }; 3879391116202B1E000948B5 /* TimeMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 387938E316202B1E000948B5 /* TimeMap.cpp */; }; 3879391216202B1E000948B5 /* TimeMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 387938E416202B1E000948B5 /* TimeMap.h */; }; - 389293241601487C00F16794 /* MakeWhatsNew.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 389293231601487C00F16794 /* MakeWhatsNew.cpp */; }; 38B8AD451601269E001F3F3C /* ReaScript.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38B8AD431601269E001F3F3C /* ReaScript.cpp */; }; 4D859DBB16AB128700E34EAA /* BR_Misc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D859DAD16AB128700E34EAA /* BR_Misc.cpp */; }; 4D859DBC16AB128700E34EAA /* BR_Misc.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D859DAE16AB128700E34EAA /* BR_Misc.h */; }; @@ -610,7 +609,6 @@ 387938E216202B1E000948B5 /* StringUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StringUtil.h; path = Fingers/StringUtil.h; sourceTree = ""; }; 387938E316202B1E000948B5 /* TimeMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TimeMap.cpp; path = Fingers/TimeMap.cpp; sourceTree = ""; }; 387938E416202B1E000948B5 /* TimeMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TimeMap.h; path = Fingers/TimeMap.h; sourceTree = ""; }; - 389293231601487C00F16794 /* MakeWhatsNew.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MakeWhatsNew.cpp; path = BuildUtils/MakeWhatsNew.cpp; sourceTree = ""; }; 38B8AD431601269E001F3F3C /* ReaScript.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ReaScript.cpp; sourceTree = ""; }; 4D859DAD16AB128700E34EAA /* BR_Misc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BR_Misc.cpp; path = Breeder/BR_Misc.cpp; sourceTree = ""; }; 4D859DAE16AB128700E34EAA /* BR_Misc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BR_Misc.h; path = Breeder/BR_Misc.h; sourceTree = ""; }; @@ -770,7 +768,6 @@ 981006D80F4768010072D712 /* Freeze.h */, 981006D40F4768010072D712 /* ItemSelState.cpp */, 981006D60F4768010072D712 /* ItemSelState.h */, - 389293231601487C00F16794 /* MakeWhatsNew.cpp */, 981006F10F4768020072D712 /* MarkerActions.cpp */, 981006F20F4768020072D712 /* MarkerActions.h */, 229AC7F2108F985C00E4A962 /* MarkerList.cpp */, @@ -1669,7 +1666,6 @@ 22F7AAEA15201E2600CC1481 /* Label.cpp in Sources */, 22F7AAEB15201E2600CC1481 /* PlaylistImport.cpp in Sources */, 38B8AD451601269E001F3F3C /* ReaScript.cpp in Sources */, - 389293241601487C00F16794 /* MakeWhatsNew.cpp in Sources */, 387938E516202B1E000948B5 /* CommandHandler.cpp in Sources */, 387938E716202B1E000948B5 /* Envelope.cpp in Sources */, 387938E916202B1E000948B5 /* EnvelopeCommands.cpp in Sources */, diff --git a/sws_about.cpp b/sws_about.cpp index bf7b02c72..2b954f011 100644 --- a/sws_about.cpp +++ b/sws_about.cpp @@ -36,17 +36,8 @@ #include "Prompt.h" -#define WHATSNEW_HTM "%ssws_whatsnew.html" -#ifdef _WIN32 -#define WHATSNEW_TXT "%s\\Plugins\\reaper_sws_whatsnew.txt" -#else -#define WHATSNEW_TXT "%s/UserPlugins/reaper_sws_whatsnew.txt" // deprecated, not deployed on OSX anymore -#endif - - static HWND s_hwndAbout = NULL; - bool IsOfficialVersion() { return (_stricmp(SWS_VERSION_TYPE, "Featured") == 0); // otherwise: pre-release, beta, etc @@ -54,49 +45,7 @@ bool IsOfficialVersion() void WhatsNew(COMMAND_T*) { - WDL_FastString fnIn; - fnIn.SetFormatted(BUFFER_SIZE, WHATSNEW_TXT, -#ifdef _WIN32 - GetExePath()); -#else - GetResourcePath()); -#endif - -#ifndef _WIN32 // reaper_sws_whatsnew.txt not deployed on OSX anymore, replaced with online help - if (FileOrDirExistsErrMsg(fnIn.Get(), false)) - { - SNM_DeleteFile(fnIn.Get(), false); // lazy cleanup - } - - if (!IsOfficialVersion()) - { - WDL_FastString url; - url.SetFormatted(512, SWS_URL_BETA_WHATSNEW, SWS_VERSION); - ShellExecute(GetMainHwnd(), "open", url.Get(), NULL, NULL, SW_SHOWNORMAL); - } - else - { - ShellExecute(GetMainHwnd(), "open", SWS_URL_WHATSNEW, NULL, NULL, SW_SHOWNORMAL); - } -#else - if (FileOrDirExistsErrMsg(fnIn.Get())) - { - WDL_FastString fnOut; - char tmpDir[BUFFER_SIZE] = ""; - GetTempPath(sizeof(tmpDir), tmpDir); - fnOut.SetFormatted(BUFFER_SIZE, WHATSNEW_HTM, tmpDir); - - if (!GenHtmlWhatsNew(fnIn.Get(), fnOut.Get(), true, SWS_URL)) - { - ShellExecute(GetMainHwnd(), "open", fnOut.Get(), NULL, NULL, SW_SHOWNORMAL); - } - else - { - MessageBox(GetMainHwnd(), __LOCALIZE("The generation of the \"What's new?\" HTML page has failed!\nOpening a raw text file instead...","sws_DLG_109"), __LOCALIZE("SWS - Warning","sws_DLG_109"), MB_OK); - ShellExecute(GetMainHwnd(), "open", fnIn.Get(), NULL, NULL, SW_SHOWNORMAL); - } - } -#endif + ShellExecute(GetMainHwnd(), "open", IsOfficialVersion() ? SWS_URL_WHATSNEW : SWS_URL_BETA_WHATSNEW, NULL, NULL, SW_SHOWNORMAL); } INT_PTR WINAPI doAbout(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) diff --git a/sws_extension.vcxproj b/sws_extension.vcxproj index 99b99885f..6239cec6c 100644 --- a/sws_extension.vcxproj +++ b/sws_extension.vcxproj @@ -1348,16 +1348,6 @@ echo Copied to "$(REAPER64_DIR)\plugins\$(TargetFilename)" - - - - - - - - - - Create diff --git a/sws_extension.vcxproj.filters b/sws_extension.vcxproj.filters index 2e7cfd491..b22e813f0 100644 --- a/sws_extension.vcxproj.filters +++ b/sws_extension.vcxproj.filters @@ -1037,9 +1037,6 @@ Snapshots - - Core - Core diff --git a/sws_util.h b/sws_util.h index 6357a4fa4..572868d1b 100644 --- a/sws_util.h +++ b/sws_util.h @@ -256,9 +256,6 @@ bool IsLocalizableAction(const char* _customId); TrackEnvelope* SWS_GetTakeEnvelopeByName(MediaItem_Take* take, const char* envname); TrackEnvelope* SWS_GetTrackEnvelopeByName(MediaTrack* track, const char* envname); -// Generate html whatsnew, MakeWhatsNew.cpp -int GenHtmlWhatsNew(const char* fnIn, const char* fnOut, bool bFullHTML, const char* _url); - // Functions export to reascript and c++ plugins, Reascript.cpp bool RegisterExportedFuncs(reaper_plugin_info_t* _rec); void UnregisterExportedFuncs(); diff --git a/url.h b/url.h index 7cfb1c7ac..c134abbda 100644 --- a/url.h +++ b/url.h @@ -5,7 +5,6 @@ #define SWS_URL_VERSION_H SWS_URL "/download/featured/version.h" #define SWS_URL_BETA_DOWNLOAD SWS_URL "/download/pre-release/" #define SWS_URL_BETA_VERSION_H SWS_URL "/download/pre-release/version.h" -#define SWS_URL_HELP_DIR SWS_URL // e.g. SWS_URL_HELP "/reaconsole.php" +#define SWS_URL_HELP_DIR SWS_URL #define SWS_URL_WHATSNEW SWS_URL "/whatsnew.php" -#define SWS_URL_BETA_WHATSNEW SWS_URL "/download/pre-release/whatsnew-v%d.%d.%d.%d.html" - +#define SWS_URL_BETA_WHATSNEW SWS_URL "/download/pre-release/whatsnew.html"