Menu
▾
▴
[popfile-commit] windows adduser-Version.nsh, 1.6.2.18, 1.6.2.19 adduser.nsi, 1.59.4.20, 1.59.4.21 installer-SecPOPFile-body.nsh, 1.3.2.15, 1.3.2.16 installer-Uninstall.nsh, 1.4.2.18, 1.4.2.19 installer.nsi, 1.242.4.20, 1.242.4.21 pfi-library.nsh, 1.53.4.14, 1.53.4.15
|
From: Brian S. <xue...@us...> - 2007-12-04 20:55:06
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29080 Modified Files: Tag: b0_22_2 adduser-Version.nsh adduser.nsi installer-SecPOPFile-body.nsh installer-Uninstall.nsh installer.nsi pfi-library.nsh Log Message: Remove installer support for the 'Klingon' language. Handle the following changes to the skins shipped with POPFile: (a) use 'simplyblue' as the default skin (b) add 'coolmint' and 'ocean' skins (c) drop 'klingon', 'prjbluegrey' and 'prjsteelbeach' skins (d) drop 'tinydefault' and 'lrclaptop' skins as they are almost identical to the 'smalldefault' skin When upgrading an existing installation do not delete the folders for the skins which have been dropped (because these skins will more or less work in POPFile 1.0.0). If 'klingon', 'prjbluegrey' or 'prjsteelbeach' is currently selected then change popfile.cfg to use 'simplyblue' instead (the new default skin for the 1.0.0 release) If 'tinydefault' or 'lrclaptop' is currently selected then change popfile.cfg to use the 'smalldefault' skin instead. Index: installer-SecPOPFile-body.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-SecPOPFile-body.nsh,v retrieving revision 1.3.2.15 retrieving revision 1.3.2.16 diff -C2 -d -r1.3.2.15 -r1.3.2.16 *** installer-SecPOPFile-body.nsh 19 Nov 2007 10:32:10 -0000 1.3.2.15 --- installer-SecPOPFile-body.nsh 4 Dec 2007 20:54:45 -0000 1.3.2.16 *************** *** 309,315 **** ; Default UI skin (the POPFile UI looks better if a skin is used) ! SetOutPath "$G_ROOTDIR\skins\default" ! File "..\engine\skins\default\*.*" ;----------------------------------------------------------------------- --- 309,316 ---- ; Default UI skin (the POPFile UI looks better if a skin is used) + ; Note: Although there is a skin called "default" POPFile 1.0.0 defaults to "simplyblue" ! SetOutPath "$G_ROOTDIR\skins\simplyblue" ! File "..\engine\skins\simplyblue\*.*" ;----------------------------------------------------------------------- Index: installer.nsi =================================================================== RCS file: /cvsroot/popfile/windows/installer.nsi,v retrieving revision 1.242.4.20 retrieving revision 1.242.4.21 diff -C2 -d -r1.242.4.20 -r1.242.4.21 *** installer.nsi 30 Nov 2007 14:59:41 -0000 1.242.4.20 --- installer.nsi 4 Dec 2007 20:54:45 -0000 1.242.4.21 *************** *** 1255,1258 **** --- 1255,1261 ---- File "..\engine\skins\coolgreen\*.*" + SetOutPath "$G_ROOTDIR\skins\coolmint" + File "..\engine\skins\coolmint\*.*" + SetOutPath "$G_ROOTDIR\skins\coolorange" File "..\engine\skins\coolorange\*.*" *************** *** 1270,1281 **** File "..\engine\skins\green\*.*" - SetOutPath "$G_ROOTDIR\skins\klingon" - File "..\engine\skins\klingon\*.*" - SetOutPath "$G_ROOTDIR\skins\lavish" File "..\engine\skins\lavish\*.*" ! SetOutPath "$G_ROOTDIR\skins\lrclaptop" ! File "..\engine\skins\lrclaptop\*.*" SetOutPath "$G_ROOTDIR\skins\oceanblue" --- 1273,1281 ---- File "..\engine\skins\green\*.*" SetOutPath "$G_ROOTDIR\skins\lavish" File "..\engine\skins\lavish\*.*" ! SetOutPath "$G_ROOTDIR\skins\ocean" ! File "..\engine\skins\ocean\*.*" SetOutPath "$G_ROOTDIR\skins\oceanblue" *************** *** 1285,1303 **** File "..\engine\skins\orange\*.*" - SetOutPath "$G_ROOTDIR\skins\osx" - File "..\engine\skins\osx\*.*" - SetOutPath "$G_ROOTDIR\skins\orangecream" File "..\engine\skins\orangecream\*.*" SetOutPath "$G_ROOTDIR\skins\outlook" File "..\engine\skins\outlook\*.*" - SetOutPath "$G_ROOTDIR\skins\prjbluegrey" - File "..\engine\skins\prjbluegrey\*.*" - - SetOutPath "$G_ROOTDIR\skins\prjsteelbeach" - File "..\engine\skins\prjsteelbeach\*.*" - SetOutPath "$G_ROOTDIR\skins\simplyblue" File "..\engine\skins\simplyblue\*.*" --- 1285,1297 ---- File "..\engine\skins\orange\*.*" SetOutPath "$G_ROOTDIR\skins\orangecream" File "..\engine\skins\orangecream\*.*" + SetOutPath "$G_ROOTDIR\skins\osx" + File "..\engine\skins\osx\*.*" + SetOutPath "$G_ROOTDIR\skins\outlook" File "..\engine\skins\outlook\*.*" SetOutPath "$G_ROOTDIR\skins\simplyblue" File "..\engine\skins\simplyblue\*.*" *************** *** 1318,1324 **** File "..\engine\skins\strawberryrose\*.*" - SetOutPath "$G_ROOTDIR\skins\tinydefault" - File "..\engine\skins\tinydefault\*.*" - SetOutPath "$G_ROOTDIR\skins\tinygrey" File "..\engine\skins\tinygrey\*.*" --- 1312,1315 ---- Index: installer-Uninstall.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-Uninstall.nsh,v retrieving revision 1.4.2.18 retrieving revision 1.4.2.19 diff -C2 -d -r1.4.2.18 -r1.4.2.19 *** installer-Uninstall.nsh 1 Dec 2007 15:18:30 -0000 1.4.2.18 --- installer-Uninstall.nsh 4 Dec 2007 20:54:45 -0000 1.4.2.19 *************** *** 914,917 **** --- 914,918 ---- !insertmacro PFI_DeleteSkin "$G_ROOTDIR\skins\coolbrown" !insertmacro PFI_DeleteSkin "$G_ROOTDIR\skins\coolgreen" + !insertmacro PFI_DeleteSkin "$G_ROOTDIR\skins\coolmint" !insertmacro PFI_DeleteSkin "$G_ROOTDIR\skins\coolorange" !insertmacro PFI_DeleteSkin "$G_ROOTDIR\skins\coolyellow" *************** *** 922,925 **** --- 923,927 ---- !insertmacro PFI_DeleteSkin "$G_ROOTDIR\skins\lavish" !insertmacro PFI_DeleteSkin "$G_ROOTDIR\skins\lrclaptop" + !insertmacro PFI_DeleteSkin "$G_ROOTDIR\skins\ocean" !insertmacro PFI_DeleteSkin "$G_ROOTDIR\skins\oceanblue" !insertmacro PFI_DeleteSkin "$G_ROOTDIR\skins\orange" Index: pfi-library.nsh =================================================================== RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v retrieving revision 1.53.4.14 retrieving revision 1.53.4.15 diff -C2 -d -r1.53.4.14 -r1.53.4.15 *** pfi-library.nsh 3 Nov 2007 11:06:44 -0000 1.53.4.14 --- pfi-library.nsh 4 Dec 2007 20:54:45 -0000 1.53.4.15 *************** *** 60,64 **** #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.3.11" #-------------------------------------------------------------------------- --- 60,64 ---- #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.3.12" #-------------------------------------------------------------------------- *************** *** 378,382 **** ;-------------------------------------------------------------------------- ! ; 'adduser.nsi' macro used to ensure current skin selection uses lowercase ;-------------------------------------------------------------------------- --- 378,384 ---- ;-------------------------------------------------------------------------- ! ; 'adduser.nsi' macro used to ensure current skin selection uses lowercase. ! ; This macro is also used to handle the necessary conversion when an existing ! ; installation uses an obsolete skin which is no longer shipped with POPFile. ;-------------------------------------------------------------------------- Index: adduser-Version.nsh =================================================================== RCS file: /cvsroot/popfile/windows/adduser-Version.nsh,v retrieving revision 1.6.2.18 retrieving revision 1.6.2.19 diff -C2 -d -r1.6.2.18 -r1.6.2.19 *** adduser-Version.nsh 17 Nov 2007 23:39:07 -0000 1.6.2.18 --- adduser-Version.nsh 4 Dec 2007 20:54:44 -0000 1.6.2.19 *************** *** 7,11 **** #-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.3.18" #-------------------------------------------------------------------------- --- 7,11 ---- #-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.3.19" #-------------------------------------------------------------------------- Index: adduser.nsi =================================================================== RCS file: /cvsroot/popfile/windows/adduser.nsi,v retrieving revision 1.59.4.20 retrieving revision 1.59.4.21 diff -C2 -d -r1.59.4.20 -r1.59.4.21 *** adduser.nsi 17 Nov 2007 23:39:07 -0000 1.59.4.20 --- adduser.nsi 4 Dec 2007 20:54:44 -0000 1.59.4.21 *************** *** 1734,1738 **** StrCmp ${L_LANG} "English-UK" special_case StrCmp ${L_LANG} "Hebrew" special_case - StrCmp ${L_LANG} "Klingon" special_case Goto use_installer_lang --- 1734,1737 ---- *************** *** 2326,2331 **** ; (but give priority to any "html_port" entry). - FileOpen ${L_CFG} "$G_USERDIR\popfile.cfg" r FileOpen ${L_CLEANCFG} "$PLUGINSDIR\popfile.cfg" w found_eol: --- 2325,2337 ---- ; (but give priority to any "html_port" entry). FileOpen ${L_CLEANCFG} "$PLUGINSDIR\popfile.cfg" w + ClearErrors + FileOpen ${L_CFG} "$G_USERDIR\popfile.cfg" r + IfErrors 0 found_eol + + ; This is a clean install so set the UI skin to the default setting + ; (there is a skin called 'default' but for the 1.0.0 release we use 'simplyblue') + + FileWrite ${L_CLEANCFG} "html_skin simplyblue${MB_NL}" found_eol: *************** *** 2424,2427 **** --- 2430,2459 ---- Pop ${L_SKIN} + ; Originally the skins were all defined in a single 'skins' + ; folder. When the new skin template system was introduced + ; each skin was given its own folder with the folder's name + ; being used to select the skin. These folder names are in + ; lowercase so if we are upgrading a very old installation + ; we use the 'PFI_SkinCaseChange' macro to ensure that the + ; skin parameter in popfile.cfg uses lowercase. + ; + ; For the 1.0.0 release some significant skin changes have + ; been made: + ; + ; (a) the almost identical 'lrclaptop', 'tinydefault' and + ; 'smalldefault' skins have been merged into a revised + ; version of 'smalldefault' + ; + ; (b) the 'klingon', 'prjbluegrey' and 'prjsteelbeach' skins + ; have been dropped so we fallback to the default skin + ; if any of these skins is currently selected + ; + ; (Note that for the 1.0.0 release the default skin is + ; 'simplyblue' even though there's a skin called 'default') + ; + ; The 'PFI_SkinCaseChange' macro provides an easy way to achieve + ; the necessary changes if the user currently uses any of the + ; merged or dropped skins. + !insertmacro PFI_SkinCaseChange "CoolBlue" "coolblue" !insertmacro PFI_SkinCaseChange "CoolBrown" "coolbrown" *************** *** 2429,2441 **** !insertmacro PFI_SkinCaseChange "CoolOrange" "coolorange" !insertmacro PFI_SkinCaseChange "CoolYellow" "coolyellow" !insertmacro PFI_SkinCaseChange "Lavish" "lavish" ! !insertmacro PFI_SkinCaseChange "LRCLaptop" "lrclaptop" !insertmacro PFI_SkinCaseChange "orangeCream" "orangecream" ! !insertmacro PFI_SkinCaseChange "PRJBlueGrey" "prjbluegrey" ! !insertmacro PFI_SkinCaseChange "PRJSteelBeach" "prjsteelbeach" !insertmacro PFI_SkinCaseChange "SimplyBlue" "simplyblue" !insertmacro PFI_SkinCaseChange "Sleet" "sleet" !insertmacro PFI_SkinCaseChange "Sleet-RTL" "sleet-rtl" !insertmacro PFI_SkinCaseChange "StrawberryRose" "strawberryrose" save_skin_setting: --- 2461,2475 ---- !insertmacro PFI_SkinCaseChange "CoolOrange" "coolorange" !insertmacro PFI_SkinCaseChange "CoolYellow" "coolyellow" + !insertmacro PFI_SkinCaseChange "klingon" "simplyblue" !insertmacro PFI_SkinCaseChange "Lavish" "lavish" ! !insertmacro PFI_SkinCaseChange "LRCLaptop" "smalldefault" !insertmacro PFI_SkinCaseChange "orangeCream" "orangecream" ! !insertmacro PFI_SkinCaseChange "PRJBlueGrey" "simplyblue" ! !insertmacro PFI_SkinCaseChange "PRJSteelBeach" "simplyblue" !insertmacro PFI_SkinCaseChange "SimplyBlue" "simplyblue" !insertmacro PFI_SkinCaseChange "Sleet" "sleet" !insertmacro PFI_SkinCaseChange "Sleet-RTL" "sleet-rtl" !insertmacro PFI_SkinCaseChange "StrawberryRose" "strawberryrose" + !insertmacro PFI_SkinCaseChange "tinydefault" "smalldefault" save_skin_setting: |
