chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Minor changes

Browse Source
This commit is contained in:
Birunthan Mohanathas 2012-04-28 19:39:51 +03:00
parent 9a737f5651
commit 075aebce4f
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Build/Installer/Installer.nsi
View File

@ -268,29 +268,29 @@ Function PageWelcome
SetCtlColors $0 "" "${MUI_BGCOLOR}" SetCtlColors $0 "" "${MUI_BGCOLOR}"
${NSD_CreateRadioButton} 120u 70u 205u 12u "$(STANDARDINST)" ${NSD_CreateRadioButton} 120u 70u 205u 12u "$(STANDARDINST)"
Pop $R0 Pop $R1
SetCtlColors $R0 "" "${MUI_BGCOLOR}" SetCtlColors $R1 "" "${MUI_BGCOLOR}"
${NSD_AddStyle} $R0 ${WS_GROUP} ${NSD_AddStyle} $R1 ${WS_GROUP}
SendMessage $R0 ${WM_SETFONT} $mui.Header.Text.Font 0 SendMessage $R1 ${WM_SETFONT} $mui.Header.Text.Font 0
${NSD_CreateLabel} 132u 82u 185u 24u "$(STANDARDINSTDESC)" ${NSD_CreateLabel} 132u 82u 185u 24u "$(STANDARDINSTDESC)"
Pop $0 Pop $0
SetCtlColors $0 "" "${MUI_BGCOLOR}" SetCtlColors $0 "" "${MUI_BGCOLOR}"
${NSD_CreateRadioButton} 120u 106u 310u 12u "$(PORTABLEINST)" ${NSD_CreateRadioButton} 120u 106u 310u 12u "$(PORTABLEINST)"
Pop $R1 Pop $R2
SetCtlColors $R1 "" "${MUI_BGCOLOR}" SetCtlColors $R2 "" "${MUI_BGCOLOR}"
${NSD_AddStyle} $R1 ${WS_TABSTOP} ${NSD_AddStyle} $R2 ${WS_TABSTOP}
SendMessage $R1 ${WM_SETFONT} $mui.Header.Text.Font 0 SendMessage $R2 ${WM_SETFONT} $mui.Header.Text.Font 0
${NSD_CreateLabel} 132u 118u 185u 52u "$(PORTABLEINSTDESC)" ${NSD_CreateLabel} 132u 118u 185u 52u "$(PORTABLEINSTDESC)"
Pop $0 Pop $0
SetCtlColors $0 "" "${MUI_BGCOLOR}" SetCtlColors $0 "" "${MUI_BGCOLOR}"
${If} $InstallPortable == 1 ${If} $InstallPortable == 1
${NSD_Check} $R1 ${NSD_Check} $R2
${Else} ${Else}
${NSD_Check} $R0 ${NSD_Check} $R1
${EndIf} ${EndIf}
Call muiPageLoadFullWindow Call muiPageLoadFullWindow
@ -300,7 +300,7 @@ Function PageWelcome
FunctionEnd FunctionEnd
Function PageWelcomeOnLeave Function PageWelcomeOnLeave
${NSD_GetState} $R1 $InstallPortable ${NSD_GetState} $R2 $InstallPortable
Call muiPageUnloadFullWindow Call muiPageUnloadFullWindow
FunctionEnd FunctionEnd
@ -389,13 +389,8 @@ Function PageOptions
${NSD_CreateGroupBox} 0 42u -1u $1 "$(ADDITIONALOPTIONS)" ${NSD_CreateGroupBox} 0 42u -1u $1 "$(ADDITIONALOPTIONS)"
${EndIf} ${EndIf}
; Change 'Next' to 'Install' if directory page will be skipped ; Show UAC shield on Install button if requiredd
GetDlgItem $0 $HWNDPARENT 1 GetDlgItem $0 $HWNDPARENT 1
${If} $INSTDIR != ""
${NSD_SetText} $0 "$(^InstallBtn)"
${EndIf}
; Show UAC shield on Install button if required
${If} $InstallPortable == 1 ${If} $InstallPortable == 1
SendMessage $0 ${BCM_SETSHIELD} 0 0 SendMessage $0 ${BCM_SETSHIELD} 0 0
${Else} ${Else}
@ -688,7 +683,7 @@ RainmeterIniDoesntExistLabel:
Delete "$INSTDIR\Rainmeter.exe.config" Delete "$INSTDIR\Rainmeter.exe.config"
Delete "$INSTDIR\Rainmeter.chm" Delete "$INSTDIR\Rainmeter.chm"
Delete "$INSTDIR\Default.ini" Delete "$INSTDIR\Default.ini"
/*
${If} $instArc == "x86" ${If} $instArc == "x86"
!insertmacro InstallFiles "x32" !insertmacro InstallFiles "x32"
${Else} ${Else}
@ -710,7 +705,7 @@ RainmeterIniDoesntExistLabel:
File /r /x "..\Themes\*.*" File /r /x "..\Themes\*.*"
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
*/
${If} $InstallPortable != 1 ${If} $InstallPortable != 1
ReadRegStr $0 HKLM "SOFTWARE\Rainmeter" "" ReadRegStr $0 HKLM "SOFTWARE\Rainmeter" ""
WriteRegStr HKLM "SOFTWARE\Rainmeter" "" "$INSTDIR" WriteRegStr HKLM "SOFTWARE\Rainmeter" "" "$INSTDIR"