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

use new nsDialogs macros for image handling

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5552 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2008-02-22 18:36:31 +00:00
parent 3f3aef9940
commit bc999b6089
2 changed files with 6 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Contrib/Modern UI 2/Pages/Finish.nsh
View file

@ -17,12 +17,6 @@ Finish page (implemented using nsDialogs)
Var mui.FinishPage.Image Var mui.FinishPage.Image
Var mui.FinishPage.Image.Bitmap Var mui.FinishPage.Image.Bitmap
!ifndef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP_NOSTRETCH
Var mui.FinishPage.Image.Rect
Var mui.FinishPage.Image.Width
Var mui.FinishPage.Image.Height
!endif
Var mui.FinishPage.Title Var mui.FinishPage.Title
Var mui.FinishPage.Title.Font Var mui.FinishPage.Title.Font
@ -273,21 +267,10 @@ Finish page (implemented using nsDialogs)
${NSD_CreateBitmap} 0u 0u 109u 193u "" ${NSD_CreateBitmap} 0u 0u 109u 193u ""
Pop $mui.FinishPage.Image Pop $mui.FinishPage.Image
!ifndef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP_NOSTRETCH !ifndef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP_NOSTRETCH
System::Call '*(i, i, i, i) i.s' ${NSD_SetStretchedImage} $mui.FinishPage.Image $PLUGINSDIR\modern-wizard.bmp $mui.FinishPage.Image.Bitmap
Pop $mui.FinishPage.Image.Rect
${If} $mui.FinishPage.Image.Rect <> 0
System::Call 'user32::GetClientRect(i $mui.FinishPage.Image, i $mui.FinishPage.Image.Rect)'
System::Call '*$mui.FinishPage.Image.Rect(i, i, i .s, i .s)'
System::Free $mui.FinishPage.Image.Rect
Pop $mui.FinishPage.Image.Width
Pop $mui.FinishPage.Image.Height
${EndIf}
System::Call 'user32::LoadImage(i 0, t s, i ${IMAGE_BITMAP}, i $mui.FinishPage.Image.Width, i $mui.FinishPage.Image.Height, i ${LR_LOADFROMFILE}) i.s' "$PLUGINSDIR\modern-wizard.bmp"
!else !else
System::Call 'user32::LoadImage(i 0, t s, i ${IMAGE_BITMAP}, i 0, i 0, i ${LR_LOADFROMFILE}) i.s' "$PLUGINSDIR\modern-wizard.bmp" ${NSD_SetImage} $mui.FinishPage.Image $PLUGINSDIR\modern-wizard.bmp $mui.FinishPage.Image.Bitmap
!endif !endif
Pop $mui.FinishPage.Image.Bitmap
SendMessage $mui.FinishPage.Image ${STM_SETIMAGE} ${IMAGE_BITMAP} $mui.FinishPage.Image.Bitmap
;Positiong of controls ;Positiong of controls
@ -436,7 +419,7 @@ Finish page (implemented using nsDialogs)
!endif !endif
;Delete image from memory ;Delete image from memory
System::Call gdi32::DeleteObject(i$mui.FinishPage.Image.Bitmap) ${NSD_FreeImage} $mui.FinishPage.Image.Bitmap
!insertmacro MUI_UNSET MUI_FINISHPAGE_TITLE_HEIGHT !insertmacro MUI_UNSET MUI_FINISHPAGE_TITLE_HEIGHT
!insertmacro MUI_UNSET MUI_FINISHPAGE_TEXT_TOP !insertmacro MUI_UNSET MUI_FINISHPAGE_TEXT_TOP

23
Contrib/Modern UI 2/Pages/Welcome.nsh
View file

@ -17,12 +17,6 @@ Welcome page (implemented using nsDialogs)
Var mui.WelcomePage.Image Var mui.WelcomePage.Image
Var mui.WelcomePage.Image.Bitmap Var mui.WelcomePage.Image.Bitmap
!ifndef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP_NOSTRETCH
Var mui.WelcomePage.Image.Rect
Var mui.WelcomePage.Image.Width
Var mui.WelcomePage.Image.Height
!endif
Var mui.WelcomePage.Title Var mui.WelcomePage.Title
Var mui.WelcomePage.Title.Font Var mui.WelcomePage.Title.Font
@ -135,21 +129,10 @@ Welcome page (implemented using nsDialogs)
${NSD_CreateBitmap} 0u 0u 109u 193u "" ${NSD_CreateBitmap} 0u 0u 109u 193u ""
Pop $mui.WelcomePage.Image Pop $mui.WelcomePage.Image
!ifndef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP_NOSTRETCH !ifndef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP_NOSTRETCH
System::Call '*(i, i, i, i) i.s' ${NSD_SetStretchedImage} $mui.WelcomePage.Image $PLUGINSDIR\modern-wizard.bmp $mui.WelcomePage.Image.Bitmap
Pop $mui.WelcomePage.Image.Rect
${If} $mui.WelcomePage.Image.Rect <> 0
System::Call 'user32::GetClientRect(i $mui.WelcomePage.Image, i $mui.WelcomePage.Image.Rect)'
System::Call '*$mui.WelcomePage.Image.Rect(i, i, i .s, i .s)'
System::Free $mui.WelcomePage.Image.Rect
Pop $mui.WelcomePage.Image.Width
Pop $mui.WelcomePage.Image.Height
${EndIf}
System::Call 'user32::LoadImage(i 0, t s, i ${IMAGE_BITMAP}, i $mui.WelcomePage.Image.Width, i $mui.WelcomePage.Image.Height, i ${LR_LOADFROMFILE}) i.s' "$PLUGINSDIR\modern-wizard.bmp"
!else !else
System::Call 'user32::LoadImage(i 0, t s, i ${IMAGE_BITMAP}, i 0, i 0, i ${LR_LOADFROMFILE}) i.s' "$PLUGINSDIR\modern-wizard.bmp" ${NSD_SetImage} $mui.WelcomePage.Image $PLUGINSDIR\modern-wizard.bmp $mui.WelcomePage.Image.Bitmap
!endif !endif
Pop $mui.WelcomePage.Image.Bitmap
SendMessage $mui.WelcomePage.Image ${STM_SETIMAGE} ${IMAGE_BITMAP} $mui.WelcomePage.Image.Bitmap
;Positiong of controls ;Positiong of controls
@ -183,7 +166,7 @@ Welcome page (implemented using nsDialogs)
Call ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}muiPageUnloadFullWindow Call ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}muiPageUnloadFullWindow
;Delete image from memory ;Delete image from memory
System::Call gdi32::DeleteObject(i$mui.WelcomePage.Image.Bitmap) ${NSD_FreeImage} $mui.WelcomePage.Image.Bitmap
!insertmacro MUI_UNSET MUI_WELCOMEPAGE_TITLE_HEIGHT !insertmacro MUI_UNSET MUI_WELCOMEPAGE_TITLE_HEIGHT
!insertmacro MUI_UNSET MUI_WELCOMEPAGE_TEXT_TOP !insertmacro MUI_UNSET MUI_WELCOMEPAGE_TEXT_TOP