Author: akhaldi Date: Sat Jun 6 18:27:12 2015 New Revision: 68051
URL: http://svn.reactos.org/svn/reactos?rev=68051&view=rev Log: [LAUTUS] Make the text files UTF-8 without BOM, and convert them to UTF-16 LE at compile time. Remove the now unneeded application/octet-stream type property and set native EOL one. CORE-9770
Modified: trunk/reactos/media/themes/lautus.msstyles/CMakeLists.txt trunk/reactos/media/themes/lautus.msstyles/lautus.rc trunk/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI (contents, props changed) trunk/reactos/media/themes/lautus.msstyles/textfiles/LargeFontsNormal.INI (contents, props changed) trunk/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI (contents, props changed)
Modified: trunk/reactos/media/themes/lautus.msstyles/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyle... ============================================================================== --- trunk/reactos/media/themes/lautus.msstyles/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/themes/lautus.msstyles/CMakeLists.txt [iso-8859-1] Sat Jun 6 18:27:12 2015 @@ -1,4 +1,22 @@
+list(APPEND TEXTFILES + textfiles/ExtraLargeNormal.INI + textfiles/LargeFontsNormal.INI + textfiles/NormalNormal.INI) + +foreach(_file ${TEXTFILES}) + get_filename_component(_file_name ${_file} NAME_WE) + string(REPLACE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} _converted_file "${_file}") + string(REPLACE ${_file_name} "${_file_name}_utf16" _converted_file ${_converted_file}) + set(_file ${CMAKE_CURRENT_SOURCE_DIR}/${_file}) + set(_converted_file ${CMAKE_CURRENT_BINARY_DIR}/${_converted_file}) + add_custom_command(OUTPUT ${_converted_file} + COMMAND native-utf16le ${_file} ${_converted_file} + DEPENDS native-utf16le ${_file}) + list(APPEND _converted_files ${_converted_file}) +endforeach() + +set_source_files_properties(lautus.rc PROPERTIES OBJECT_DEPENDS "${_converted_files}") add_library(lautus.msstyles SHARED lautus.rc) set_module_type(lautus.msstyles module) set_target_properties(lautus.msstyles PROPERTIES SUFFIX "")
Modified: trunk/reactos/media/themes/lautus.msstyles/lautus.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyle... ============================================================================== --- trunk/reactos/media/themes/lautus.msstyles/lautus.rc [iso-8859-1] (original) +++ trunk/reactos/media/themes/lautus.msstyles/lautus.rc [iso-8859-1] Sat Jun 6 18:27:12 2015 @@ -15,9 +15,9 @@ 1 SIZENAMES {L"Normal Size\0Large Fonts\0Extra Large Fonts\0\0"} 1 MINDEPTH {0x000F,0x000F,0x000F,0x000F,0x000F,0x000F,0x000F,0x000F,0x000F,0x0000,}
-EXTRALARGENORMAL_INI TEXTFILE "textfiles/ExtraLargeNormal.INI" -LARGEFONTSNORMAL_INI TEXTFILE "textfiles/LargeFontsNormal.INI" -NORMALNORMAL_INI TEXTFILE "textfiles/NormalNormal.INI" +EXTRALARGENORMAL_INI TEXTFILE "textfiles/ExtraLargeNormal_utf16.INI" +LARGEFONTSNORMAL_INI TEXTFILE "textfiles/LargeFontsNormal_utf16.INI" +NORMALNORMAL_INI TEXTFILE "textfiles/NormalNormal_utf16.INI" THEMES_INI TEXTFILE {L"\r\n"}
NORMAL_BALLOONCLOSE_BMP BITMAP "bitmaps/NORMAL_BALLOONCLOSE.bmp"
Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyle... ============================================================================== Binary files - no diff available.
Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI ------------------------------------------------------------------------------ svn:eol-style = native
Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type (removed) @@ -1 +0,0 @@ -application/octet-stream
Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/LargeFontsNormal.INI URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyle... ============================================================================== Binary files - no diff available.
Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/LargeFontsNormal.INI ------------------------------------------------------------------------------ svn:eol-style = native
Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/LargeFontsNormal.INI ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type (removed) @@ -1 +0,0 @@ -application/octet-stream
Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyle... ============================================================================== Binary files - no diff available.
Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI ------------------------------------------------------------------------------ svn:eol-style = native
Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type (removed) @@ -1 +0,0 @@ -application/octet-stream