mirror of
https://github.com/Xevion/easy7zip.git
synced 2025-12-13 18:11:37 -06:00
4.25 beta
This commit is contained in:
Igor Pavlov
committed by
Kornel Lesiński
Kornel Lesiński
parent
47f4915611
commit
af1fe52701
@@ -332,10 +332,13 @@ void CProgressDialog::SetTitleText()
|
||||
title = pausedString;
|
||||
title += L" ";
|
||||
}
|
||||
wchar_t s[64];
|
||||
ConvertUInt64ToString(_prevPercentValue, s);
|
||||
title += s;
|
||||
title += L"%";
|
||||
if (_prevPercentValue != UInt32(-1))
|
||||
{
|
||||
wchar_t s[64];
|
||||
ConvertUInt64ToString(_prevPercentValue, s);
|
||||
title += s;
|
||||
title += L"%";
|
||||
}
|
||||
if (!_foreground)
|
||||
{
|
||||
title += L" ";
|
||||
|
||||
16
7zip/FileManager/Resource/ProgressDialog2/StdAfx.h
Executable file
16
7zip/FileManager/Resource/ProgressDialog2/StdAfx.h
Executable file
@@ -0,0 +1,16 @@
|
||||
// stdafx.h
|
||||
|
||||
#ifndef __STDAFX_H
|
||||
#define __STDAFX_H
|
||||
|
||||
#define _WIN32_WINNT 0x0400
|
||||
|
||||
// it's for Windows NT supporting (MENUITEMINFOW)
|
||||
#define WINVER 0x0400
|
||||
|
||||
#include <windows.h>
|
||||
#include <commctrl.h>
|
||||
|
||||
#include "Common/NewHandler.h"
|
||||
|
||||
#endif
|
||||
@@ -1,7 +1,3 @@
|
||||
//{{NO_DEPENDENCIES}}
|
||||
// Microsoft Developer Studio generated include file.
|
||||
// Used by resource.rc
|
||||
//
|
||||
#define IDC_BUTTON_PAUSE 3
|
||||
#define IDC_BUTTON_PROGRESS_PRIORITY 4
|
||||
#define IDD_DIALOG_PROGRESS 500
|
||||
@@ -19,14 +15,3 @@
|
||||
#define IDC_PROGRESS_TOTAL 1008
|
||||
#define IDC_PROGRESS_SPEED_TOTAL_VALUE 1009
|
||||
#define IDC_PROGRESS_FILE_NAME 1010
|
||||
|
||||
// Next default values for new objects
|
||||
//
|
||||
#ifdef APSTUDIO_INVOKED
|
||||
#ifndef APSTUDIO_READONLY_SYMBOLS
|
||||
#define _APS_NEXT_RESOURCE_VALUE 157
|
||||
#define _APS_NEXT_COMMAND_VALUE 40001
|
||||
#define _APS_NEXT_CONTROL_VALUE 1006
|
||||
#define _APS_NEXT_SYMED_VALUE 101
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -1,128 +1,57 @@
|
||||
//Microsoft Developer Studio generated resource script.
|
||||
//
|
||||
#include "resource.h"
|
||||
#include "../../../GuiCommon.rc"
|
||||
|
||||
#define APSTUDIO_READONLY_SYMBOLS
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Generated from the TEXTINCLUDE 2 resource.
|
||||
//
|
||||
#include "afxres.h"
|
||||
#define xSize2 290
|
||||
#define ySize2 76
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#undef APSTUDIO_READONLY_SYMBOLS
|
||||
#define xSize (xSize2 + marg + marg)
|
||||
#define ySize (ySize2 + marg + marg)
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Russian resources
|
||||
#define bYPos (ySize - marg - bYSize)
|
||||
|
||||
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
|
||||
#ifdef _WIN32
|
||||
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
|
||||
#pragma code_page(1251)
|
||||
#endif //_WIN32
|
||||
#undef bXSize
|
||||
#define bXSize 72
|
||||
|
||||
#ifdef APSTUDIO_INVOKED
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// TEXTINCLUDE
|
||||
//
|
||||
#define bXPos1 (xSize - marg - bXSize)
|
||||
#define bXPos2 (bXPos1 - 10 - bXSize)
|
||||
#define bXPos3 (bXPos2 - 10 - bXSize)
|
||||
|
||||
1 TEXTINCLUDE DISCARDABLE
|
||||
BEGIN
|
||||
"resource.h\0"
|
||||
END
|
||||
#define valSize 42
|
||||
#define timeSize 91
|
||||
#define labelPos 178
|
||||
#define valPos1 (marg + timeSize)
|
||||
#define valPos2 (xSize - marg - valSize)
|
||||
#define labelSize (valPos2 - labelPos)
|
||||
|
||||
2 TEXTINCLUDE DISCARDABLE
|
||||
BEGIN
|
||||
"#include ""afxres.h""\r\n"
|
||||
"\0"
|
||||
END
|
||||
|
||||
3 TEXTINCLUDE DISCARDABLE
|
||||
BEGIN
|
||||
"\0"
|
||||
END
|
||||
|
||||
#endif // APSTUDIO_INVOKED
|
||||
|
||||
#endif // Russian resources
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#undef yPos
|
||||
#define yPos (marg + 11)
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// English (U.S.) resources
|
||||
|
||||
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
|
||||
#ifdef _WIN32
|
||||
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
||||
#pragma code_page(1252)
|
||||
#endif //_WIN32
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Dialog
|
||||
//
|
||||
|
||||
IDD_DIALOG_PROGRESS DIALOG DISCARDABLE 0, 0, 304, 90
|
||||
STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
|
||||
WS_CAPTION | WS_SYSMENU
|
||||
IDD_DIALOG_PROGRESS DIALOG 0, 0, xSize, ySize MY_MODAL_DIALOG_STYLE | WS_MINIMIZEBOX
|
||||
CAPTION "Progress"
|
||||
FONT 8, "MS Shell Dlg"
|
||||
MY_FONT
|
||||
BEGIN
|
||||
PUSHBUTTON "&Background",IDC_BUTTON_PROGRESS_PRIORITY,61,69,72,14
|
||||
PUSHBUTTON "&Pause",IDC_BUTTON_PAUSE,143,69,72,14
|
||||
PUSHBUTTON "Cancel",IDCANCEL,225,69,72,14
|
||||
LTEXT "Elapsed time:",IDC_PROGRESS_ELAPSED,7,7,91,8
|
||||
RTEXT "00:00:00",IDC_PROGRESS_ELAPSED_VALUE,98,7,42,8
|
||||
LTEXT "Remaining time:",IDC_PROGRESS_REMAINING,7,18,91,8
|
||||
RTEXT "",IDC_PROGRESS_REMAINING_VALUE,98,18,42,8
|
||||
LTEXT "Size:",IDC_PROGRESS_TOTAL,178,7,77,8
|
||||
RTEXT "",IDC_PROGRESS_SPEED_TOTAL_VALUE,255,7,42,8
|
||||
LTEXT "Speed:",IDC_PROGRESS_SPEED,178,18,77,8
|
||||
RTEXT "",IDC_PROGRESS_SPEED_VALUE,255,18,42,8
|
||||
CONTROL "Progress1",IDC_PROGRESS1,"msctls_progress32",PBS_SMOOTH |
|
||||
WS_BORDER,7,49,290,13
|
||||
LTEXT "",IDC_PROGRESS_FILE_NAME,7,34,290,8
|
||||
PUSHBUTTON "&Background", IDC_BUTTON_PROGRESS_PRIORITY, bXPos3, bYPos, bXSize, bYSize
|
||||
PUSHBUTTON "&Pause", IDC_BUTTON_PAUSE, bXPos2, bYPos, bXSize, bYSize
|
||||
PUSHBUTTON "Cancel", IDCANCEL, bXPos1, bYPos, bXSize, bYSize
|
||||
LTEXT "Elapsed time:", IDC_PROGRESS_ELAPSED, marg, marg, timeSize, 8
|
||||
LTEXT "Remaining time:", IDC_PROGRESS_REMAINING, marg, yPos, timeSize, 8
|
||||
LTEXT "Size:", IDC_PROGRESS_TOTAL, labelPos, marg, labelSize, 8
|
||||
LTEXT "Speed:", IDC_PROGRESS_SPEED, labelPos, yPos, labelSize, 8
|
||||
RTEXT "00:00:00", IDC_PROGRESS_ELAPSED_VALUE, valPos1, marg, valSize, 8
|
||||
RTEXT "", IDC_PROGRESS_REMAINING_VALUE, valPos1, yPos, valSize, 8
|
||||
RTEXT "", IDC_PROGRESS_SPEED_TOTAL_VALUE, valPos2, marg, valSize, 8
|
||||
RTEXT "", IDC_PROGRESS_SPEED_VALUE, valPos2, yPos, valSize, 8
|
||||
LTEXT "", IDC_PROGRESS_FILE_NAME, marg, yPos + 16, xSize2, 8
|
||||
CONTROL "Progress1", IDC_PROGRESS1, "msctls_progress32", PBS_SMOOTH | WS_BORDER,
|
||||
marg, bYPos - 20, xSize2, 13
|
||||
END
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// DESIGNINFO
|
||||
//
|
||||
|
||||
#ifdef APSTUDIO_INVOKED
|
||||
GUIDELINES DESIGNINFO DISCARDABLE
|
||||
BEGIN
|
||||
IDD_DIALOG_PROGRESS, DIALOG
|
||||
BEGIN
|
||||
LEFTMARGIN, 7
|
||||
RIGHTMARGIN, 297
|
||||
VERTGUIDE, 98
|
||||
VERTGUIDE, 140
|
||||
VERTGUIDE, 178
|
||||
VERTGUIDE, 255
|
||||
TOPMARGIN, 7
|
||||
BOTTOMMARGIN, 83
|
||||
END
|
||||
END
|
||||
#endif // APSTUDIO_INVOKED
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// String Table
|
||||
//
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_PROGRESS_PAUSED "Paused"
|
||||
IDS_PROGRESS_FOREGROUND "&Foreground"
|
||||
IDS_PROGRESS_CONTINUE "&Continue"
|
||||
IDS_PROGRESS_ASK_CANCEL "Are you sure you want to cancel?"
|
||||
IDS_PROGRESS_PAUSED "Paused"
|
||||
IDS_PROGRESS_FOREGROUND "&Foreground"
|
||||
IDS_PROGRESS_CONTINUE "&Continue"
|
||||
IDS_PROGRESS_ASK_CANCEL "Are you sure you want to cancel?"
|
||||
END
|
||||
|
||||
#endif // English (U.S.) resources
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user