Reverted "Examples\Modern UI\StartMenu.nsi" and "Plugins\StartMenu.dll" to previous version, little size optimization
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3117 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
8d7ae56749
commit
359868c88e
3 changed files with 12 additions and 10 deletions
|
@ -34,8 +34,8 @@
|
||||||
;--------------------------------
|
;--------------------------------
|
||||||
;Pages
|
;Pages
|
||||||
|
|
||||||
;!insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Contrib\Modern UI\License.txt"
|
!insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Contrib\Modern UI\License.txt"
|
||||||
;!insertmacro MUI_PAGE_COMPONENTS
|
!insertmacro MUI_PAGE_COMPONENTS
|
||||||
!insertmacro MUI_PAGE_DIRECTORY
|
!insertmacro MUI_PAGE_DIRECTORY
|
||||||
|
|
||||||
;Start Menu Folder Page Configuration
|
;Start Menu Folder Page Configuration
|
||||||
|
|
Binary file not shown.
|
@ -1364,32 +1364,34 @@ static BOOL CALLBACK SelProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
|
||||||
|
|
||||||
int ui_st_updateflag=0x6;
|
int ui_st_updateflag=0x6;
|
||||||
|
|
||||||
void NSISCALL update_status_text(int strtab, const char *text)
|
void NSISCALL update_status_text(int strtab, const char *text) {
|
||||||
{
|
|
||||||
static char tmp[NSIS_MAX_STRLEN*2];
|
static char tmp[NSIS_MAX_STRLEN*2];
|
||||||
LVITEM new_item;
|
LVITEM new_item;
|
||||||
HWND linsthwnd = insthwnd;
|
HWND linsthwnd = insthwnd;
|
||||||
if (linsthwnd)
|
if (linsthwnd)
|
||||||
{
|
{
|
||||||
int tmplen = mystrlen(tmp);
|
int updateflag = ui_st_updateflag;
|
||||||
|
int tmplen;
|
||||||
|
|
||||||
if (!(ui_st_updateflag & 1))
|
if (!(updateflag & 1))
|
||||||
GetNSISString(tmp, strtab);
|
GetNSISString(tmp, strtab);
|
||||||
|
|
||||||
|
tmplen = mystrlen(tmp);
|
||||||
|
|
||||||
if (text)
|
if (text)
|
||||||
{
|
{
|
||||||
if (tmplen + mystrlen(text) >= sizeof(tmp)) return;
|
if (tmplen + mystrlen(text) >= sizeof(tmp)) return;
|
||||||
lstrcat(tmp, text);
|
lstrcat(tmp, text);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((ui_st_updateflag & 4)) my_SetWindowText(insthwnd2, tmp);
|
if ((updateflag & 4)) my_SetWindowText(insthwnd2, tmp);
|
||||||
if ((ui_st_updateflag & 2))
|
if ((updateflag & 2))
|
||||||
{
|
{
|
||||||
new_item.mask = LVIF_TEXT;
|
new_item.mask = LVIF_TEXT;
|
||||||
new_item.pszText = tmp;
|
new_item.pszText = tmp;
|
||||||
new_item.iItem = ListView_GetItemCount(linsthwnd);
|
new_item.iItem = ListView_GetItemCount(linsthwnd);
|
||||||
new_item.iSubItem = 0;
|
new_item.iSubItem = 0;
|
||||||
if (ui_st_updateflag & 1)
|
if (updateflag & 1)
|
||||||
{
|
{
|
||||||
new_item.iItem--;
|
new_item.iItem--;
|
||||||
ListView_SetItem(linsthwnd, &new_item);
|
ListView_SetItem(linsthwnd, &new_item);
|
||||||
|
@ -1399,7 +1401,7 @@ void NSISCALL update_status_text(int strtab, const char *text)
|
||||||
ListView_EnsureVisible(linsthwnd, new_item.iItem, 0);
|
ListView_EnsureVisible(linsthwnd, new_item.iItem, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ui_st_updateflag & 1)
|
if (updateflag & 1)
|
||||||
tmp[tmplen]=0;
|
tmp[tmplen]=0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue