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

fix 3-line title on welcome/finish page

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5344 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
joostverburg 2007-10-26 19:31:13 +00:00
parent 7c25e338ce
commit 917820dc29
2 changed files with 666 additions and 650 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -359,9 +359,9 @@ Finish page (implemented using nsDialogs)
;Finish text ;Finish text
!ifndef MUI_FINISHPAGE_RUN & MUI_FINISHPAGE_SHOWREADME !ifndef MUI_FINISHPAGE_RUN & MUI_FINISHPAGE_SHOWREADME
${NSD_CreateLabel} 120u 45u 195u ${MUI_FINISHPAGE_TEXT_HEIGHT}u "${MUI_FINISHPAGE_TEXT}" ${NSD_CreateLabel} 120u ${MUI_FINISHPAGE_TEXT_TOP}u 195u ${MUI_FINISHPAGE_TEXT_HEIGHT}u "${MUI_FINISHPAGE_TEXT}"
!else !else
${NSD_CreateLabel} 120u 45u 195u ${MUI_FINISHPAGE_TEXT_HEIGHT_BUTTONS}u "${MUI_FINISHPAGE_TEXT}" ${NSD_CreateLabel} 120u ${MUI_FINISHPAGE_TEXT_TOP}u 195u ${MUI_FINISHPAGE_TEXT_HEIGHT_BUTTONS}u "${MUI_FINISHPAGE_TEXT}"
!endif !endif
Pop $mui.FinishPage.Text Pop $mui.FinishPage.Text
SetCtlColors $mui.FinishPage.Text "" "${MUI_BGCOLOR}" SetCtlColors $mui.FinishPage.Text "" "${MUI_BGCOLOR}"

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

@ -120,38 +120,54 @@ Welcome page (implemented using nsDialogs)
!insertmacro MUI_PAGE_FUNCTION_CUSTOM PRE !insertmacro MUI_PAGE_FUNCTION_CUSTOM PRE
;Create dialog ;Create dialog
nsDialogs::Create /NOUNLOAD 1044 nsDialogs::Create /NOUNLOAD 1044
Pop $mui.WelcomePage Pop $mui.WelcomePage
nsDialogs::SetRTL /NOUNLOAD $(^RTL) nsDialogs::SetRTL /NOUNLOAD $(^RTL)
SetCtlColors $mui.WelcomePage "" "${MUI_BGCOLOR}" SetCtlColors $mui.WelcomePage "" "${MUI_BGCOLOR}"
;Image control ;Image control
${NSD_CreateBitmap} 0u 0u 109u 193u "" ${NSD_CreateBitmap} 0u 0u 109u 193u ""
Pop $mui.WelcomePage.Image Pop $mui.WelcomePage.Image
System::Call 'user32::LoadImage(i 0, t "$PLUGINSDIR\modern-wizard.bmp", i ${IMAGE_BITMAP}, i 0, i 0, i ${LR_LOADFROMFILE}) i.s' System::Call 'user32::LoadImage(i 0, t "$PLUGINSDIR\modern-wizard.bmp", i ${IMAGE_BITMAP}, i 0, i 0, i ${LR_LOADFROMFILE}) i.s'
Pop $mui.WelcomePage.Image.Bitmap Pop $mui.WelcomePage.Image.Bitmap
SendMessage $mui.WelcomePage.Image ${STM_SETIMAGE} ${IMAGE_BITMAP} $mui.WelcomePage.Image.Bitmap SendMessage $mui.WelcomePage.Image ${STM_SETIMAGE} ${IMAGE_BITMAP} $mui.WelcomePage.Image.Bitmap
;Positiong of controls
;Title ;Title
${NSD_CreateLabel} 120u 10u 195u 28u "${MUI_WELCOMEPAGE_TITLE}" !ifndef MUI_WELCOMEPAGE_TITLE_3LINES
Pop $mui.WelcomePage.Title !define MUI_WELCOMEPAGE_TITLE_HEIGHT 28
!else
!define MUI_WELCOMEPAGE_TITLE_HEIGHT 38
!endif
;Text
;17 = 10 (top margin) + 7 (distance between texts)
!define /math MUI_WELCOMEPAGE_TEXT_TOP 17 + ${MUI_WELCOMEPAGE_TITLE_HEIGHT}
;Title
${NSD_CreateLabel} 120u 10u 195u ${MUI_WELCOMEPAGE_TITLE_HEIGHT}u "${MUI_WELCOMEPAGE_TITLE}"
Pop $mui.WelcomePage.Title
SetCtlColors $mui.WelcomePage.Title "" "${MUI_BGCOLOR}" SetCtlColors $mui.WelcomePage.Title "" "${MUI_BGCOLOR}"
CreateFont $mui.WelcomePage.Title.Font "$(^Font)" "12" "700" CreateFont $mui.WelcomePage.Title.Font "$(^Font)" "12" "700"
SendMessage $mui.WelcomePage.Title ${WM_SETFONT} $mui.WelcomePage.Title.Font 0 SendMessage $mui.WelcomePage.Title ${WM_SETFONT} $mui.WelcomePage.Title.Font 0
;Welcome text ;Welcome text
${NSD_CreateLabel} 120u 45u 195u 130u "${MUI_WELCOMEPAGE_TEXT}" ${NSD_CreateLabel} 120u ${MUI_WELCOMEPAGE_TEXT_TOP}u 195u 130u "${MUI_WELCOMEPAGE_TEXT}"
Pop $mui.WelcomePage.Text Pop $mui.WelcomePage.Text
SetCtlColors $mui.WelcomePage.Text "" "${MUI_BGCOLOR}" SetCtlColors $mui.WelcomePage.Text "" "${MUI_BGCOLOR}"
;Show page ;Show page
Call ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}muiPageLoadFullWindow Call ${MUI_PAGE_UNINSTALLER_FUNCPREFIX}muiPageLoadFullWindow
!insertmacro MUI_PAGE_FUNCTION_CUSTOM SHOW !insertmacro MUI_PAGE_FUNCTION_CUSTOM SHOW
nsDialogs::Show nsDialogs::Show
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) System::Call gdi32::DeleteObject(i$mui.WelcomePage.Image.Bitmap)
!insertmacro MUI_UNSET MUI_WELCOMEPAGE_TITLE_HEIGHT
!insertmacro MUI_UNSET MUI_WELCOMEPAGE_TEXT_TOP
FunctionEnd FunctionEnd