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
This commit is contained in:
Tino Reichardt
2018-10-25 20:34:16 +02:00
parent f745dfb818
commit cc10eb2d9b
7 changed files with 34 additions and 35 deletions

View File

@@ -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;
}

View File

@@ -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
}

View File

@@ -6,3 +6,4 @@
#define IDT_ABOUT_VERSION 101
#define IDT_ABOUT_DATE 102
#define IDB_ABOUT_HOMEPAGE 110
#define IDB_ABOUT_HOMEPAGE2 111