xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-07 05:15:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix 1/2 of issue #66

Browse Source
This commit is contained in:
Tino Reichardt
2019-01-07 20:55:17 +01:00
parent c6dd3f72ba
commit ea4589d20d
5 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
C/7zVersion.h
View File

@@ -1,7 +1,7 @@
#define MY_VER_MAJOR 18
#define MY_VER_MINOR 06
#define MY_VER_BUILD 0
#define MY_VERSION_NUMBERS "18.06 ZS v1.3.8 R1"
#define MY_VERSION_NUMBERS "18.06 ZS v1.3.8 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-12-30"
#define MY_DATE "2019-01-07"
#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, 2016-2018 Tino Reichardt"
#define MY_COPYRIGHT_CR "Copyright (c) 1999-2019 Igor Pavlov, 2016-2019 Tino Reichardt"
#ifdef USE_COPYRIGHT_CR
#define MY_COPYRIGHT MY_COPYRIGHT_CR

2
C/7zVersionTr.h
View File

@@ -5,7 +5,7 @@
#define MY_AUTHOR_NAME "Tino Reichardt"
#undef MY_COPYRIGHT
#define MY_COPYRIGHT "Copyright (c) 2016 - 2018 Tino Reichardt"
#define MY_COPYRIGHT "Copyright (c) 2016 - 2019 Tino Reichardt"
#undef MY_COPYRIGHT_DATE
#define MY_COPYRIGHT_DATE MY_COPYRIGHT " : " MY_DATE

2
CPP/7zip/UI/FileManager/AboutDialog.cpp
View File

@@ -27,7 +27,7 @@ static const UInt32 kLangIDs[] =
bool CAboutDialog::OnInit()
{
LangSetDlgItems(*this, kLangIDs, ARRAY_SIZE(kLangIDs));
SetItemText(IDT_ABOUT_VERSION, UString("7-Zip " MY_VERSION_CPU));
SetItemText(IDT_ABOUT_VERSION, UString("7-Zip ZS " MY_VERSION_CPU));
SetItemText(IDT_ABOUT_DATE, LLL(MY_DATE));
LangSetWindowText(*this, IDD_ABOUT);

39
CPP/7zip/UI/FileManager/AboutDialog.rc
View File

@@ -1,26 +1,27 @@
#include <windows.h>
#include <commctrl.h>
#include <richedit.h>
#include "AboutDialogRes.h"
#include "..\..\GuiCommon.rc"
#include "..\..\MyVersion.h"
#include "../../GuiCommon.rc"
#include "../../MyVersion.h"
LANGUAGE LANG_ENGLISH,SUBLANG_ENGLISH_US
#define xc 216
#define yc 144
IDI_LOGO ICON "7zipLogo.ico"
#define y 93
IDD_ABOUT DIALOG DISCARDABLE 0, 0, 224, 132
STYLE WS_POPUP|DS_MODALFRAME|DS_CENTER|WS_CAPTION|WS_SYSMENU
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
CAPTION "About 7-Zip"
FONT 8, "MS Shell Dlg"
{
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
DEFPUSHBUTTON "OK", IDOK, bx3-10, by, bxs, bys
PUSHBUTTON "www.7-zip.org", IDB_ABOUT_HOMEPAGE, bx2-10, by, bxs, bys
PUSHBUTTON "7-Zip ZS Hompeage", IDB_ABOUT_HOMEPAGE2, bx1-10, by, bxs+10, 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_CR, -1, m, 80, xc, 8
LTEXT "7-Zip is free software", IDT_ABOUT_INFO, m, y, xc, (by - y - 1)
}

2
CPP/7zip/UI/GUI/CompressDialog.cpp
View File

@@ -1275,7 +1275,7 @@ void CCompressDialog::SetMethod(int keepMethodId)
bool isSfx = IsSFX();
bool weUseSameMethod = false;
#if 0
#if 1
{
wchar_t buf[2000];
wsprintf(buf, L"keep=%d level = %d method=%s", keepMethodId, defaultLevel, (LPCWSTR)defaultMethod);