[CLT2012]

- Add CLT wallpaper based on Angelus_ReactOS7_Dark_4-3

svn path=/branches/ros-branch-0_3_14-clt2012/; revision=56134

diff --git a/boot/bootdata/hivedef_i386.inf b/boot/bootdata/hivedef_i386.inf
index 5c07741..5923b3f 100644 (file)
Binary files a/boot/bootdata/hivedef_i386.inf and b/boot/bootdata/hivedef_i386.inf differ

diff --git a/boot/bootdata/packages/reactos.dff b/boot/bootdata/packages/reactos.dff
index 574aa08..c71dcce 100644 (file)
--- a/boot/bootdata/packages/reactos.dff
+++ b/boot/bootdata/packages/reactos.dff
@@ -888,6 +888,4 @@ modules\rostests\kmtests\example\example_drv.sys                           7   o
 modules\rostests\kmtests\ntos_io\iodeviceobject_drv.sys                    7   optional
 modules\rostests\kmtests\ntos_io\iohelper_drv.sys                          7   optional
 
-modules\wallpaper\Angelus_ReactOS7_Dark_4-3.bmp                            4   optional
-modules\wallpaper\Angelus_Sea04_FarBeyondTheSea_4x3.bmp                    4   optional
-modules\wallpaper\RainInTheScreen_4x3.bmp                                  4   optional
+modules\wallpaper\dark-clt2012.bmp                                         4   optional

diff --git a/boot/bootdata/packages/reactos.dff.in b/boot/bootdata/packages/reactos.dff.in
index cb44b08..a6472d7 100644 (file)
--- a/boot/bootdata/packages/reactos.dff.in
+++ b/boot/bootdata/packages/reactos.dff.in
@@ -53,4 +53,4 @@ modules\optional\vmx_svga.inf                       6  optional
 modules\optional\vmx_svga.sys                       2  optional
 modules\optional\wine_gecko-1.0.0-x86.cab           4  optional
 
-modules\wallpaper\Angelus_02_ROSWP.bmp                                     4   optional
+modules\wallpaper\dark-clt2012.bmp                  4   optional

diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index f258bd6..22e0cfc 100644 (file)
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -6,3 +6,7 @@ endif()
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/rosapps/)
 add_subdirectory(rosapps)
 endif()
+
+if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/wallpaper/)
+add_subdirectory(wallpaper)
+endif()

diff --git a/modules/wallpaper/Angelus_Sea04_FarBeyondTheSea_4x3.bmp b/modules/wallpaper/Angelus_Sea04_FarBeyondTheSea_4x3.bmp
deleted file mode 100644 (file)
index 1d2c997..0000000
Binary files a/modules/wallpaper/Angelus_Sea04_FarBeyondTheSea_4x3.bmp and /dev/null differ

diff --git a/modules/wallpaper/CMakeLists.txt b/modules/wallpaper/CMakeLists.txt
new file mode 100644 (file)
index 0000000..afa1610
--- /dev/null
+++ b/modules/wallpaper/CMakeLists.txt
@@ -0,0 +1,2 @@
+
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/dark-clt2012.bmp DESTINATION reactos FOR all)

diff --git a/modules/wallpaper/RainInTheScreen_4x3.bmp b/modules/wallpaper/RainInTheScreen_4x3.bmp
deleted file mode 100644 (file)
index cf67004..0000000
Binary files a/modules/wallpaper/RainInTheScreen_4x3.bmp and /dev/null differ

diff --git a/modules/wallpaper/Angelus_ReactOS7_Dark_4-3.bmp b/modules/wallpaper/dark-clt2012.bmp
similarity index 87%
rename from modules/wallpaper/Angelus_ReactOS7_Dark_4-3.bmp
rename to modules/wallpaper/dark-clt2012.bmp
index c7e4ffc..6dd3e65 100644 (file)
Binary files a/modules/wallpaper/Angelus_ReactOS7_Dark_4-3.bmp and b/modules/wallpaper/dark-clt2012.bmp differ

diff --git a/modules/wallpaper/directory.rbuild b/modules/wallpaper/directory.rbuild
index 1a3bc73..4eec9ba 100644 (file)
--- a/modules/wallpaper/directory.rbuild
+++ b/modules/wallpaper/directory.rbuild
@@ -1,7 +1,5 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group>
-  <installfile>Angelus_ReactOS7_Dark_4-3.bmp</installfile>
-  <installfile>Angelus_Sea04_FarBeyondTheSea_4x3.bmp</installfile>
-  <installfile>RainInTheScreen_4x3.bmp</installfile>
+       <installfile>dark-clt2012.bmp</installfile>
 </group>