From 8d9af61d5ea6fb759aadd83ed6eacde799d67b76 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Tue, 11 Oct 2016 12:54:13 +0200 Subject: [PATCH] ZRCOLA_ >> PRODUCT_ --- ZRCola/ZRCola.rc | Bin 5418 -> 5440 bytes ZRCola/zrcolaabout.cpp | 4 ++-- ZRCola/zrcolaapp.cpp | 8 ++++---- ZRCola/zrcolafrm.cpp | 2 +- ZRColaCompile/ZRColaCompile.rc | Bin 3268 -> 3290 bytes ZRColaCompile/main.cpp | 2 +- ZRColaInstall/ZRColaInstall.rc | Bin 4072 -> 4074 bytes include/UpdaterCfg.h | 4 ++-- include/version.h | 22 +++++++++++----------- lib/libZRCola/res/libZRCola.rc | Bin 3284 -> 3306 bytes lib/libZRColaUI/res/libZRColaUI.rc | Bin 3284 -> 3306 bytes 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ZRCola/ZRCola.rc b/ZRCola/ZRCola.rc index 9cff780506a7f13c5999e36cce6fa0644b3a7906..25e65be5041825b3dc31844dbb6e740d9804440d 100644 GIT binary patch delta 280 zcmZ3bbwFza2M=!mLlA>Mg9}3_gEK?OY$#1$a5Is1IUrWeCHn zK89Cp@;V+lEPAMB$L1K`cg&a;Otuo1n%p4BF1?LlA>AgFk~0gX83fJkn@<(aCbWY$#%eyr^n6atlvhz+-}Mr47>Kn E0KpeDzW@LL diff --git a/ZRCola/zrcolaabout.cpp b/ZRCola/zrcolaabout.cpp index 97b7ffa..ecd1573 100644 --- a/ZRCola/zrcolaabout.cpp +++ b/ZRCola/zrcolaabout.cpp @@ -26,7 +26,7 @@ wxZRColaAbout::wxZRColaAbout(wxWindow* parent) : wxZRColaAboutBase(parent) { - m_staticTextVersion->SetLabelText(wxT(ZRCOLA_VERSION_STR)); + m_staticTextVersion->SetLabelText(wxT(PRODUCT_VERSION_STR)); - m_staticTextCopyright->SetLabelText(wxString::Format(_("© 2004-%s ZRC SAZU"), wxT(ZRCOLA_BUILD_YEAR_STR))); + m_staticTextCopyright->SetLabelText(wxString::Format(_("© 2004-%s ZRC SAZU"), wxT(PRODUCT_BUILD_YEAR_STR))); } diff --git a/ZRCola/zrcolaapp.cpp b/ZRCola/zrcolaapp.cpp index 83e8133..cb11d3d 100644 --- a/ZRCola/zrcolaapp.cpp +++ b/ZRCola/zrcolaapp.cpp @@ -43,12 +43,12 @@ bool ZRColaApp::OnInit() // To compensate migration to non-advertised shortcut, do the Microsoft Installer's feature completeness check manually. // If execution got this far in the first place (EXE and dependent DLLs are present and loadable). // Furthermore, this increments program usage counter. - if (::MsiQueryFeatureState(_T(ZRCOLA_VERSION_GUID), _T("featZRCola")) != INSTALLSTATE_UNKNOWN) - ::MsiUseFeature(_T(ZRCOLA_VERSION_GUID), _T("featZRCola")); + if (::MsiQueryFeatureState(_T(PRODUCT_VERSION_GUID), _T("featZRCola")) != INSTALLSTATE_UNKNOWN) + ::MsiUseFeature(_T(PRODUCT_VERSION_GUID), _T("featZRCola")); #endif // Initialize configuration. - wxConfigBase *cfgPrev = wxConfigBase::Set(new wxConfig(wxT(ZRCOLA_CFG_APPLICATION), wxT(ZRCOLA_CFG_VENDOR))); + wxConfigBase *cfgPrev = wxConfigBase::Set(new wxConfig(wxT(PRODUCT_CFG_APPLICATION), wxT(PRODUCT_CFG_VENDOR))); if (cfgPrev) wxDELETE(cfgPrev); if (!wxApp::OnInit()) @@ -65,7 +65,7 @@ bool ZRColaApp::OnInit() #ifdef __WXMSW__ // Create global event. - m_running.attach(::CreateEvent(NULL, FALSE, FALSE, _T(ZRCOLA_CFG_APPLICATION) _T("{BBDE7AAD-29B6-4B83-ADA1-92AFA81A0883}"))); + m_running.attach(::CreateEvent(NULL, FALSE, FALSE, _T(PRODUCT_CFG_APPLICATION) _T("{BBDE7AAD-29B6-4B83-ADA1-92AFA81A0883}"))); if (::GetLastError() == ERROR_ALREADY_EXISTS) { // ZRCola is already running. Find its window. HWND okno = ::FindWindow(_T("wxWindowNR"), _("ZRCola")); diff --git a/ZRCola/zrcolafrm.cpp b/ZRCola/zrcolafrm.cpp index b8a31e3..46ffa57 100644 --- a/ZRCola/zrcolafrm.cpp +++ b/ZRCola/zrcolafrm.cpp @@ -358,7 +358,7 @@ void wxZRColaFrame::OnHelpShortcuts(wxCommandEvent& event) #ifdef __WXMSW__ // Search and try to launch installed PDF. - INSTALLSTATE pdf_is = ::MsiGetComponentPath(_T(ZRCOLA_VERSION_GUID), _T("{68AC2C38-10E2-41A3-B92C-844C03FFDF6A}"), pdf_path); + INSTALLSTATE pdf_is = ::MsiGetComponentPath(_T(PRODUCT_VERSION_GUID), _T("{68AC2C38-10E2-41A3-B92C-844C03FFDF6A}"), pdf_path); if ((pdf_is == INSTALLSTATE_LOCAL || pdf_is == INSTALLSTATE_SOURCE) && wxFileExists(pdf_path) && (int)::ShellExecute(GetHWND(), NULL, pdf_path.c_str(), NULL, NULL, SW_SHOWNORMAL) > 32) return; diff --git a/ZRColaCompile/ZRColaCompile.rc b/ZRColaCompile/ZRColaCompile.rc index a8e34871dd6251aaddf15278c3c24d523106d410..b0c95a7b18db6f4d218aff0afbf0fc5355eeecfb 100644 GIT binary patch delta 239 zcmX>ic}sFb6EklBLlA>Mg9}3_gEK?OwU6Ek-dLlA>AgFk~0gX83WW@$9OsGui^hh3WChMNWNS80<}_zS5xCC9%me_1`z!tc diff --git a/ZRColaCompile/main.cpp b/ZRColaCompile/main.cpp index acfd1f1..bed2081 100644 --- a/ZRColaCompile/main.cpp +++ b/ZRColaCompile/main.cpp @@ -88,7 +88,7 @@ int _tmain(int argc, _TCHAR *argv[]) } // Initialize configuration. - wxConfigBase *cfgPrev = wxConfigBase::Set(new wxConfig(wxT(ZRCOLA_CFG_APPLICATION), wxT(ZRCOLA_CFG_VENDOR))); + wxConfigBase *cfgPrev = wxConfigBase::Set(new wxConfig(wxT(PRODUCT_CFG_APPLICATION), wxT(PRODUCT_CFG_VENDOR))); if (cfgPrev) wxDELETE(cfgPrev); // Initialize locale. diff --git a/ZRColaInstall/ZRColaInstall.rc b/ZRColaInstall/ZRColaInstall.rc index c20df6451eff7a381f384b9711e7d6ac1da2be01..a1f7588ee346d64e920a23ba904b32f9862b0a53 100644 GIT binary patch delta 26 hcmaDM|4M$tCLZ1Zh9Cxi1{a1<24{wl&3k#YnE`X32Uh?9 delta 24 fcmaDQ|3ZGlCLZo6h9CxK27d-02FK0&d9;}UX9))Z diff --git a/include/UpdaterCfg.h b/include/UpdaterCfg.h index 3d1bbc5..c087ef5 100644 --- a/include/UpdaterCfg.h +++ b/include/UpdaterCfg.h @@ -28,9 +28,9 @@ // Product version as a single DWORD // Note: Used for version comparison within C/C++ code. // -#define UPDATER_PRODUCT_VERSION ZRCOLA_VERSION +#define UPDATER_PRODUCT_VERSION PRODUCT_VERSION // // Human readable product version and build year for UI // -#define UPDATER_PRODUCT_VERSION_STR ZRCOLA_VERSION_STR +#define UPDATER_PRODUCT_VERSION_STR PRODUCT_VERSION_STR diff --git a/include/version.h b/include/version.h index 7476c1f..134e36c 100644 --- a/include/version.h +++ b/include/version.h @@ -23,7 +23,7 @@ // Product version as a single DWORD // Note: Used for version comparison within C/C++ code. // -#define ZRCOLA_VERSION 0x01ff1400 +#define PRODUCT_VERSION 0x01ff1400 // // Product version by components @@ -31,31 +31,31 @@ // thus we need to specify major, minor and other version components // separately. // -#define ZRCOLA_VERSION_MAJ 1 -#define ZRCOLA_VERSION_MIN 255 -#define ZRCOLA_VERSION_REV 20 -#define ZRCOLA_VERSION_BUILD 0 +#define PRODUCT_VERSION_MAJ 1 +#define PRODUCT_VERSION_MIN 255 +#define PRODUCT_VERSION_REV 20 +#define PRODUCT_VERSION_BUILD 0 // // Human readable product version and build year for UI // -#define ZRCOLA_VERSION_STR "2.0-beta11" -#define ZRCOLA_BUILD_YEAR_STR "2016" +#define PRODUCT_VERSION_STR "2.0-beta11" +#define PRODUCT_BUILD_YEAR_STR "2016" // // Numerical version presentation for ProductVersion propery in // MSI packages (syntax: N.N[.N[.N]]) // -#define ZRCOLA_VERSION_INST "1.255.20" +#define PRODUCT_VERSION_INST "1.255.20" // // The product code for ProductCode property in MSI packages // Replace with new on every version change, regardless how minor it is. // -#define ZRCOLA_VERSION_GUID "{C949BB90-B6B2-4268-95DA-0C4533595E1A}" +#define PRODUCT_VERSION_GUID "{C949BB90-B6B2-4268-95DA-0C4533595E1A}" // // The product vendor and application name for configuration keeping. // -#define ZRCOLA_CFG_VENDOR "Amebis" -#define ZRCOLA_CFG_APPLICATION "ZRCola" +#define PRODUCT_CFG_VENDOR "Amebis" +#define PRODUCT_CFG_APPLICATION "ZRCola" diff --git a/lib/libZRCola/res/libZRCola.rc b/lib/libZRCola/res/libZRCola.rc index d14dab3a0c52aa6a847e09e946dc5bfcfd7c7051..3786723f8c763c404c63c69d9a05f7c3098a0380 100644 GIT binary patch delta 252 zcmca2`ATxbBxc?Kh9Cxi1{a1<24{wl$%!n|7$Ty=o(z5rIt=J4g(n|i;lNNWJoy=m y*klV9ISd(!P2T*Bg@Xmn*o$1clP7SoO}@Y>FxiGP09AJLbWVLnG@*-J%uE2>$TXb* delta 218 zcmaDQc|~%=Bxdd?h9CxK27d-02FJsS;;#N7F@~DVme( r*f=Kpv2ksdV|{??FmBGt$X0A#&8g3bEHIgyQ+Ki&x6o!a?jwusS;;#N7F@~DVme( i*f=Kpv2ksdW4(jwFm}$#$X0A#&S}huBJiAxnF#