dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

size optimizations

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3912 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2005-02-25 15:28:37 +00:00
parent 4bb5e9b310
commit b9ecd8f65c
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Source/exehead/Ui.c
View file

@ -778,22 +778,25 @@ static BOOL CALLBACK UninstProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
#endif #endif
static char * NSISCALL inttosizestr(unsigned kb, char *str) static void NSISCALL SetSizeText(int dlgItem, int prefix, unsigned kb)
{ {
char scalestr[32], byte[32]; char scalestr[32], byte[32];
char sh=20; unsigned sh=20;
int scale=LANG_GIGA; int scale=LANG_GIGA;
if (kb < 1024) { sh=0; scale=LANG_KILO; } if (kb < 1024) { sh=0; scale=LANG_KILO; }
else if (kb < 1024*1024) { sh=10; scale=LANG_MEGA; } else if (kb < 1024*1024) { sh=10; scale=LANG_MEGA; }
wsprintf( wsprintf(
str+mystrlen(str), GetNSISString(g_tmp,prefix)+mystrlen(g_tmp),
"%u.%u%s%s", "%u.%u%s%s",
kb>>sh, kb>>sh,
((kb*10)>>sh)%10, ((kb*10)>>sh)%10,
GetNSISString(scalestr,scale), GetNSISString(scalestr,scale),
GetNSISString(byte,LANG_BYTE) GetNSISString(byte,LANG_BYTE)
); );
return str;
my_SetDialogItemText(m_curwnd,dlgItem,g_tmp);
} }
static int NSISCALL _sumsecsfield(int idx) static int NSISCALL _sumsecsfield(int idx)
@ -941,9 +944,9 @@ static BOOL CALLBACK DirProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
error = NSIS_INSTDIR_NOT_ENOUGH_SPACE; error = NSIS_INSTDIR_NOT_ENOUGH_SPACE;
if (LANG_STR_TAB(LANG_SPACE_REQ)) { if (LANG_STR_TAB(LANG_SPACE_REQ)) {
SetUITextNT(IDC_SPACEREQUIRED,inttosizestr(total,GetNSISString(s,LANG_SPACE_REQ))); SetSizeText(IDC_SPACEREQUIRED,LANG_SPACE_REQ,total);
if (available_set) if (available_set)
SetUITextNT(IDC_SPACEAVAILABLE,inttosizestr(available,GetNSISString(s,LANG_SPACE_AVAIL))); SetSizeText(IDC_SPACEAVAILABLE,LANG_SPACE_AVAIL,available);
else else
SetUITextNT(IDC_SPACEAVAILABLE,""); SetUITextNT(IDC_SPACEAVAILABLE,"");
} }
@ -1350,7 +1353,7 @@ static BOOL CALLBACK SelProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
RefreshComponents(hwndTree1, hTreeItems); RefreshComponents(hwndTree1, hTreeItems);
if (LANG_STR_TAB(LANG_SPACE_REQ)) { if (LANG_STR_TAB(LANG_SPACE_REQ)) {
SetUITextNT(IDC_SPACEREQUIRED,inttosizestr(sumsecsfield(size_kb),GetNSISString(g_tmp,LANG_SPACE_REQ))); SetSizeText(IDC_SPACEREQUIRED,LANG_SPACE_REQ,sumsecsfield(size_kb));
} }
} }