Version number fixes

- About Dialog shows v1.3.6 instead of v1.3.7 - added 7-Zip ZS Homepage to About Dialog - also some headers needed to be fixed
mcmilk · Oct 25, 2018 · cc10eb2 · cc10eb2
1 parent f745dfb
commit cc10eb2
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 35 deletions.
diff --git a/C/7zVersion.h b/C/7zVersion.h
@@ -1,7 +1,7 @@
 #define MY_VER_MAJOR 18
 #define MY_VER_MINOR 05
 #define MY_VER_BUILD 0
-#define MY_VERSION_NUMBERS "18.05 ZS v1.3.6 R1"
+#define MY_VERSION_NUMBERS "18.05 ZS v1.3.7 R2"
 #define MY_VERSION MY_VERSION_NUMBERS
 
 #ifdef MY_CPU_NAME
@@ -10,12 +10,12 @@
   #define MY_VERSION_CPU MY_VERSION
 #endif
 
-#define MY_DATE "2018-10-21"
+#define MY_DATE "2018-10-25"
 #undef MY_COPYRIGHT
 #undef MY_VERSION_COPYRIGHT_DATE
 #define MY_AUTHOR_NAME "Igor Pavlov, Tino Reichardt"
 #define MY_COPYRIGHT_PD "Igor Pavlov : Public domain"
-#define MY_COPYRIGHT_CR "Copyright (c) 1999-2018 Igor Pavlov"
+#define MY_COPYRIGHT_CR "Copyright (c) 1999-2018 Igor Pavlov, 2016-2018 Tino Reichardt"
 
 #ifdef USE_COPYRIGHT_CR
   #define MY_COPYRIGHT MY_COPYRIGHT_CR

diff --git a/C/7zVersionTr.h b/C/7zVersionTr.h
@@ -1,11 +1,11 @@
-#define MY_VER_MAJOR 1
-#define MY_VER_MINOR 3
-#define MY_VER_BUILD 1
-#define MY_VERSION_NUMBERS "1.3.2 R1"
+#define MY_VER_MAJOR 18
+#define MY_VER_MINOR 05
+#define MY_VER_BUILD 0
+#define MY_VERSION_NUMBERS "1.3.7 R2"
 #define MY_VERSION         MY_VERSION_NUMBERS
-#define MY_DATE            "2017-10-31"
+#define MY_DATE            "2018-10-25"
 #undef MY_COPYRIGHT
 #undef MY_VERSION_COPYRIGHT_DATE
 #define MY_AUTHOR_NAME     "Tino Reichardt"
-#define MY_COPYRIGHT       "Copyright (c) 2016 - 2017 Tino Reichardt"
+#define MY_COPYRIGHT       "Copyright (c) 2016 - 2018 Tino Reichardt"
 #define MY_VERSION_COPYRIGHT_DATE MY_VERSION " : " MY_COPYRIGHT " : " MY_DATE
diff --git a/CPP/7zip/Bundles/Codec_zstd/resource.rc b/CPP/7zip/Bundles/Codec_zstd/resource.rc
@@ -1,6 +1,6 @@
 #include "../../../../C/7zVersionTr.h"
 #include "../../../../C/7zVersion.rc"
 
-MY_VERSION_INFO_DLL("7-Zip Zstandard Plugin v1.3.6", "zstd")
+MY_VERSION_INFO_DLL("7-Zip Zstandard Plugin v1.3.7", "zstd")
 
 101  ICON  "../../Archive/Icons/zst.ico"
diff --git a/CPP/7zip/Bundles/Codec_zstdF/resource.rc b/CPP/7zip/Bundles/Codec_zstdF/resource.rc
@@ -1,6 +1,6 @@
 #include "../../../../C/7zVersionTr.h"
 #include "../../../../C/7zVersion.rc"
 
-MY_VERSION_INFO_DLL("7-Zip Zstandard Plugin v1.3.6", "zstd")
+MY_VERSION_INFO_DLL("7-Zip Zstandard Plugin v1.3.7", "zstd")
 
 101  ICON  "../../Archive/Icons/zst.ico"
diff --git a/CPP/7zip/UI/FileManager/AboutDialog.cpp b/CPP/7zip/UI/FileManager/AboutDialog.cpp
@@ -17,7 +17,8 @@ static const UInt32 kLangIDs[] =
   IDT_ABOUT_INFO
 };
 
-#define kHomePageURL TEXT("http://www.7-zip.org/")
+#define kHomePageURL  TEXT("http://www.7-zip.org/")
+#define kHomePageURL2 TEXT("http://github.com/mcmilk/7-Zip-zstd/")
 #define kHelpTopic "start.htm"
 
 #define LLL_(quote) L##quote
@@ -45,19 +46,16 @@ bool CAboutDialog::OnButtonClicked(int buttonID, HWND buttonHWND)
   switch (buttonID)
   {
     case IDB_ABOUT_HOMEPAGE: url = kHomePageURL; break;
+    case IDB_ABOUT_HOMEPAGE2: url = kHomePageURL2; break;
     default:
       return CModalDialog::OnButtonClicked(buttonID, buttonHWND);
   }
 
-  #ifdef UNDER_CE
   SHELLEXECUTEINFO s;
   memset(&s, 0, sizeof(s));
   s.cbSize = sizeof(s);
   s.lpFile = url;
   ::ShellExecuteEx(&s);
-  #else
-  ::ShellExecute(NULL, NULL, url, NULL, NULL, SW_SHOWNORMAL);
-  #endif
 
   return true;
 }
diff --git a/CPP/7zip/UI/FileManager/AboutDialog.rc b/CPP/7zip/UI/FileManager/AboutDialog.rc
@@ -1,26 +1,26 @@
+#include <windows.h>
+#include <commctrl.h>
+#include <richedit.h>
 #include "AboutDialogRes.h"
-#include "../../GuiCommon.rc"
-#include "../../MyVersion.h"
+#include "..\..\GuiCommon.rc"
+#include "..\..\MyVersion.h"
 
-#define xc 144
-#define yc 144
+LANGUAGE LANG_ENGLISH,SUBLANG_ENGLISH_US
 
-#define y 93
+IDI_LOGO ICON "7zipLogo.ico"
 
-IDI_LOGO ICON "../../UI/FileManager/7zipLogo.ico"
-
-#ifndef SS_REALSIZEIMAGE
-#define SS_REALSIZEIMAGE 0x800
-#endif
-
-IDD_ABOUT DIALOG 0, 0, xs, ys  MY_MODAL_DIALOG_STYLE  MY_FONT
+IDD_ABOUT DIALOG DISCARDABLE 0, 0, 224, 132
+STYLE WS_POPUP|DS_MODALFRAME|DS_CENTER|WS_CAPTION|WS_SYSMENU
 CAPTION "About 7-Zip"
+FONT 8, "MS Shell Dlg"
 {
-  DEFPUSHBUTTON  "OK", IDOK, bx1, by, bxs, bys
-  PUSHBUTTON  "www.7-zip.org", IDB_ABOUT_HOMEPAGE, bx2, by, bxs, bys
-  ICON   IDI_LOGO, -1, m, m, 32, 32, SS_REALSIZEIMAGE,
-  LTEXT  "", IDT_ABOUT_VERSION, m, 54, xc, 8
-  LTEXT  "", IDT_ABOUT_DATE, m, 67, xc, 8
-  LTEXT  MY_COPYRIGHT, -1, m, 80, xc, 8
-  LTEXT  "7-Zip is free software", IDT_ABOUT_INFO, m, y, xc, (by - y - 1)
+  CONTROL "OK", IDOK, "Button", BS_DEFPUSHBUTTON|WS_TABSTOP, 4, 112, 64, 16
+  CONTROL "www.7-zip.org", IDB_ABOUT_HOMEPAGE, "Button", WS_TABSTOP, 72, 112, 64, 16
+  CONTROL IDI_LOGO, -1, "Static", SS_ICON|SS_REALSIZEIMAGE, 8, 8, 32, 32
+  CONTROL "", IDT_ABOUT_VERSION, "Static", WS_GROUP, 8, 54, 208, 8
+  CONTROL "", IDT_ABOUT_DATE, "Static", WS_GROUP, 8, 67, 208, 8
+  CONTROL MY_COPYRIGHT_CR, -1, "Static", WS_GROUP, 8, 80, 208, 8
+  CONTROL "7-Zip is free software", IDT_ABOUT_INFO, "Static", WS_GROUP, 8, 93, 208, 19
+  CONTROL "7-Zip ZS Homepage", IDB_ABOUT_HOMEPAGE2, "Button", WS_TABSTOP, 140, 112, 76, 16
 }
+
diff --git a/CPP/7zip/UI/FileManager/AboutDialogRes.h b/CPP/7zip/UI/FileManager/AboutDialogRes.h
@@ -6,3 +6,4 @@
 #define IDT_ABOUT_VERSION    101
 #define IDT_ABOUT_DATE       102
 #define IDB_ABOUT_HOMEPAGE   110
+#define IDB_ABOUT_HOMEPAGE2  111