Ros-diffs February 2019

ros-diffs@reactos.org

23 participants
208 discussions

[reactos] 01/01: [MODULES] Fix CMakeLists.txt for wallpapers module. (#1294)

by Dylan Navas

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=07608028b31e76ef69c20… commit 07608028b31e76ef69c2025fe8572558650170e2 Author: Dylan Navas <Dylan2018.2019(a)gmail.com> AuthorDate: Sun Feb 24 14:08:26 2019 -0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Feb 24 18:08:26 2019 +0100 [MODULES] Fix CMakeLists.txt for wallpapers module. (#1294) * Add all wallpapers to the ISO and can look how enable the module in ReadMe.txt * Remove blanks in name. * Moving to folder with same wallpaper style. * Adding and updating CMakeLists.txt. * Update ReadMe.txt. --- modules/wallpapers/Angelus/Bliss/CMakeLists.txt | 10 ++++++++++ modules/wallpapers/Angelus/BlueHorizon/CMakeLists.txt | 2 ++ modules/wallpapers/Angelus/CMakeLists.txt | 13 +++++++++++++ modules/wallpapers/Angelus/DeepSea/CMakeLists.txt | 2 ++ modules/wallpapers/Angelus/Fisherman/CMakeLists.txt | 2 ++ modules/wallpapers/Angelus/Flower/CMakeLists.txt | 3 +++ modules/wallpapers/Angelus/Rain/CMakeLists.txt | 3 +++ modules/wallpapers/Angelus/ReactOS/CMakeLists.txt | 8 ++++++++ ...A New Hope_16x9.jpg => Angelus.ROS A_New_Hope_16x9.jpg} | Bin ...S A New Hope_4x3.jpg => Angelus.ROS A_New_Hope_4x3.jpg} | Bin modules/wallpapers/Angelus/ReactOSNewHope/CMakeLists.txt | 2 ++ modules/wallpapers/Angelus/ReactOSSea/CMakeLists.txt | 2 ++ modules/wallpapers/Angelus/ReactOSSunset/CMakeLists.txt | 1 + modules/wallpapers/Angelus/Sea/CMakeLists.txt | 6 ++++++ modules/wallpapers/Angelus/Sky/CMakeLists.txt | 12 ++++++++++++ .../VistaReactOS}/Angelus_02_ROSWP_4-3_1024x768.jpg | Bin .../VistaReactOS}/Angelus_02_ROSWP_4-3_1440x1080.jpg | Bin modules/wallpapers/Angelus/VistaReactOS/CMakeLists.txt | 10 ++++++++++ modules/wallpapers/CMakeLists.txt | 12 ++++++++++-- modules/wallpapers/ReadMe.txt | 10 ++++++++++ 20 files changed, 96 insertions(+), 2 deletions(-) diff --git a/modules/wallpapers/Angelus/Bliss/CMakeLists.txt b/modules/wallpapers/Angelus/Bliss/CMakeLists.txt new file mode 100644 index 0000000000..c980095e1a --- /dev/null +++ b/modules/wallpapers/Angelus/Bliss/CMakeLists.txt @@ -0,0 +1,10 @@ +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.06_ROS.Bliss.v2_16-9.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.06_ROS.Bliss.v2_4-3.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.06_ROS.Bliss_16-9_1365x768.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.06_ROS.Bliss_4-3_1024x768.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/CristalROS.Bliss.16x10.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/CristalROS.Bliss.16x9.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/CristalROS.Bliss.4x3.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Dream.Bliss.16x10.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Dream.Bliss.16x9.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Dream.Bliss.4x3.jpg DESTINATION reactos/Web/Wallpaper FOR all) diff --git a/modules/wallpapers/Angelus/BlueHorizon/CMakeLists.txt b/modules/wallpapers/Angelus/BlueHorizon/CMakeLists.txt new file mode 100644 index 0000000000..3412ebbe8d --- /dev/null +++ b/modules/wallpapers/Angelus/BlueHorizon/CMakeLists.txt @@ -0,0 +1,2 @@ +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.BlueHorizon_16x9.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.BlueHorizon_4x3.jpg DESTINATION reactos/Web/Wallpaper FOR all) diff --git a/modules/wallpapers/Angelus/CMakeLists.txt b/modules/wallpapers/Angelus/CMakeLists.txt new file mode 100644 index 0000000000..1cb2669561 --- /dev/null +++ b/modules/wallpapers/Angelus/CMakeLists.txt @@ -0,0 +1,13 @@ +add_subdirectory(Bliss) +add_subdirectory(BlueHorizon) +add_subdirectory(DeepSea) +add_subdirectory(Fisherman) +add_subdirectory(Flower) +add_subdirectory(Rain) +add_subdirectory(ReactOS) +add_subdirectory(ReactOSNewHope) +add_subdirectory(ReactOSSea) +add_subdirectory(ReactOSSunset) +add_subdirectory(Sea) +add_subdirectory(Sky) +add_subdirectory(VistaReactOS) diff --git a/modules/wallpapers/Angelus/DeepSea/CMakeLists.txt b/modules/wallpapers/Angelus/DeepSea/CMakeLists.txt new file mode 100644 index 0000000000..e8b050118c --- /dev/null +++ b/modules/wallpapers/Angelus/DeepSea/CMakeLists.txt @@ -0,0 +1,2 @@ +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.04_DeepSea_16-9_1920x1080.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.04_DeepSea_4-3_1440x1080.jpg DESTINATION reactos/Web/Wallpaper FOR all) diff --git a/modules/wallpapers/Angelus/Fisherman/CMakeLists.txt b/modules/wallpapers/Angelus/Fisherman/CMakeLists.txt new file mode 100644 index 0000000000..417321f7d6 --- /dev/null +++ b/modules/wallpapers/Angelus/Fisherman/CMakeLists.txt @@ -0,0 +1,2 @@ +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.Fisherman_16x9.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.Fisherman_4x3.jpg DESTINATION reactos/Web/Wallpaper FOR all) diff --git a/modules/wallpapers/Angelus/Flower/CMakeLists.txt b/modules/wallpapers/Angelus/Flower/CMakeLists.txt new file mode 100644 index 0000000000..e82ae8eca2 --- /dev/null +++ b/modules/wallpapers/Angelus/Flower/CMakeLists.txt @@ -0,0 +1,3 @@ +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/WaterLily.16x10.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/WaterLily.16x9.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/WaterLily.4x3.jpg DESTINATION reactos/Web/Wallpaper FOR all) diff --git a/modules/wallpapers/Angelus/Rain/CMakeLists.txt b/modules/wallpapers/Angelus/Rain/CMakeLists.txt new file mode 100644 index 0000000000..8e5b4a15a1 --- /dev/null +++ b/modules/wallpapers/Angelus/Rain/CMakeLists.txt @@ -0,0 +1,3 @@ +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/RainInTheScreen.16x10.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/RainInTheScreen.16x9.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/RainInTheScreen.4x3.jpg DESTINATION reactos/Web/Wallpaper FOR all) diff --git a/modules/wallpapers/Angelus/ReactOS/CMakeLists.txt b/modules/wallpapers/Angelus/ReactOS/CMakeLists.txt new file mode 100644 index 0000000000..508e13c8c5 --- /dev/null +++ b/modules/wallpapers/Angelus/ReactOS/CMakeLists.txt @@ -0,0 +1,8 @@ +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.ReactOS7.Blue_16-9.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.ReactOS7.Blue_4-3.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.ReactOS7.Dark_16-9.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.ReactOS7.Dark_4-3.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.ReactOS7.Green_16-9.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.ReactOS7.Green_4-3.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.ReactOS7.Light_16-9.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.ReactOS7.Light_4-3.jpg DESTINATION reactos/Web/Wallpaper FOR all) diff --git a/modules/wallpapers/Angelus/ReactOSNewHope/Angelus.ROS A New Hope_16x9.jpg b/modules/wallpapers/Angelus/ReactOSNewHope/Angelus.ROS A_New_Hope_16x9.jpg similarity index 100% rename from modules/wallpapers/Angelus/ReactOSNewHope/Angelus.ROS A New Hope_16x9.jpg rename to modules/wallpapers/Angelus/ReactOSNewHope/Angelus.ROS A_New_Hope_16x9.jpg diff --git a/modules/wallpapers/Angelus/ReactOSNewHope/Angelus.ROS A New Hope_4x3.jpg b/modules/wallpapers/Angelus/ReactOSNewHope/Angelus.ROS A_New_Hope_4x3.jpg similarity index 100% rename from modules/wallpapers/Angelus/ReactOSNewHope/Angelus.ROS A New Hope_4x3.jpg rename to modules/wallpapers/Angelus/ReactOSNewHope/Angelus.ROS A_New_Hope_4x3.jpg diff --git a/modules/wallpapers/Angelus/ReactOSNewHope/CMakeLists.txt b/modules/wallpapers/Angelus/ReactOSNewHope/CMakeLists.txt new file mode 100644 index 0000000000..40577f6b59 --- /dev/null +++ b/modules/wallpapers/Angelus/ReactOSNewHope/CMakeLists.txt @@ -0,0 +1,2 @@ +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.ROS_A_New_Hope_16x9.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.ROS_A_New_Hope_4x3.jpg DESTINATION reactos/Web/Wallpaper FOR all) diff --git a/modules/wallpapers/Angelus/ReactOSSea/CMakeLists.txt b/modules/wallpapers/Angelus/ReactOSSea/CMakeLists.txt new file mode 100644 index 0000000000..f3bb65bb50 --- /dev/null +++ b/modules/wallpapers/Angelus/ReactOSSea/CMakeLists.txt @@ -0,0 +1,2 @@ +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.Sea04.FarBeyondTheSea_16x9.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.Sea04.FarBeyondTheSea_4x3.jpg DESTINATION reactos/Web/Wallpaper FOR all) diff --git a/modules/wallpapers/Angelus/ReactOSSunset/CMakeLists.txt b/modules/wallpapers/Angelus/ReactOSSunset/CMakeLists.txt new file mode 100644 index 0000000000..c12f9a75c7 --- /dev/null +++ b/modules/wallpapers/Angelus/ReactOSSunset/CMakeLists.txt @@ -0,0 +1 @@ +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.05_ROS.Sunset_4-3_1152x864.jpg DESTINATION reactos/Web/Wallpaper FOR all) diff --git a/modules/wallpapers/Angelus/Sea/CMakeLists.txt b/modules/wallpapers/Angelus/Sea/CMakeLists.txt new file mode 100644 index 0000000000..58c73bdbfe --- /dev/null +++ b/modules/wallpapers/Angelus/Sea/CMakeLists.txt @@ -0,0 +1,6 @@ +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.Sea01_16x9.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.Sea01_4x3.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.Sea02_16x9.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.Sea02_4x3.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.Sea03_16x9.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.Sea03_4x3.jpg DESTINATION reactos/Web/Wallpaper FOR all) diff --git a/modules/wallpapers/Angelus/Sky/CMakeLists.txt b/modules/wallpapers/Angelus/Sky/CMakeLists.txt new file mode 100644 index 0000000000..e636f7859f --- /dev/null +++ b/modules/wallpapers/Angelus/Sky/CMakeLists.txt @@ -0,0 +1,12 @@ +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.Sky1_16x9.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.Sky1_4x3.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.Sky2_16x9.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.Sky2_4x3.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.Sky4_16x9.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.Sky4_4x3.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.Sky5_16x9.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.Sky5_4x3.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.Sky7_16x9.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.Sky7_4x3.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.Sky9_16x9.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.Sky9_4x3.jpg DESTINATION reactos/Web/Wallpaper FOR all) diff --git a/modules/wallpapers/Angelus_02_ROSWP_4-3_1024x768.jpg b/modules/wallpapers/Angelus/VistaReactOS/Angelus_02_ROSWP_4-3_1024x768.jpg similarity index 100% rename from modules/wallpapers/Angelus_02_ROSWP_4-3_1024x768.jpg rename to modules/wallpapers/Angelus/VistaReactOS/Angelus_02_ROSWP_4-3_1024x768.jpg diff --git a/modules/wallpapers/Angelus_02_ROSWP_4-3_1440x1080.jpg b/modules/wallpapers/Angelus/VistaReactOS/Angelus_02_ROSWP_4-3_1440x1080.jpg similarity index 100% rename from modules/wallpapers/Angelus_02_ROSWP_4-3_1440x1080.jpg rename to modules/wallpapers/Angelus/VistaReactOS/Angelus_02_ROSWP_4-3_1440x1080.jpg diff --git a/modules/wallpapers/Angelus/VistaReactOS/CMakeLists.txt b/modules/wallpapers/Angelus/VistaReactOS/CMakeLists.txt new file mode 100644 index 0000000000..fd7a7a2c35 --- /dev/null +++ b/modules/wallpapers/Angelus/VistaReactOS/CMakeLists.txt @@ -0,0 +1,10 @@ +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.02_ROSWP_16-9_1920x1080.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.02_ROSWP_16-9_1920x1080_WOT.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.02_ROSWP_4-3_1440x1080.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.02_ROSWP_4-3_1440x1080_WOT.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.03_ROSWP_16-9_1920x1080.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.03_ROSWP_16-9_1920x1080_WOT.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.03_ROSWP_4-3_1440x1080.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus.03_ROSWP_4-3_1440x1080_WOT.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus_02_ROSWP_4-3_1024x768.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus_02_ROSWP_4-3_1440x1080.jpg DESTINATION reactos/Web/Wallpaper FOR all) diff --git a/modules/wallpapers/CMakeLists.txt b/modules/wallpapers/CMakeLists.txt index c6068d7168..2d44a83d19 100644 --- a/modules/wallpapers/CMakeLists.txt +++ b/modules/wallpapers/CMakeLists.txt @@ -1,2 +1,10 @@ - -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus_02_ROSWP_4-3_1024x768.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/1920px_Polarlicht.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/clouds.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/grass.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/lake.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_CirclesBlue_1.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_CirclesBlue_2.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_CirclesGold_1.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_CirclesGold_2.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_Hexagons.jpg DESTINATION reactos/Web/Wallpaper FOR all) +add_subdirectory(Angelus) diff --git a/modules/wallpapers/ReadMe.txt b/modules/wallpapers/ReadMe.txt index 015737b22b..1393cfb9d7 100644 --- a/modules/wallpapers/ReadMe.txt +++ b/modules/wallpapers/ReadMe.txt @@ -15,3 +15,13 @@ ReactOS_CirclesBlue_2.jpg | See above ReactOS_CirclesGold_1.jpg | See above | See above ReactOS_CirclesGold_2.jpg | See above | See above ReactOS_Hexagons.jpg | See above | http://www.reactos.org/forum/viewtopic.php?p=109866#p109866 + +To include the module in your build folder, run the configure script with the flags -DENABLE_WALLPAPERS=1 + +# For Windows users + + configure.cmd -DENABLE_WALLPAPERS=1 + +# For UNIX users + + ./configure.sh -DENABLE_WALLPAPERS=1 \ No newline at end of file

5 years, 10 months

[reactos] 01/01: [KMTEST] Fix 3 Clang-Cl warnings about Status and Callbacks (#502)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c5d1638e1eae49af252ca… commit c5d1638e1eae49af252ca677ef10f72d47579827 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun Feb 24 17:53:39 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Feb 24 17:53:38 2019 +0100 [KMTEST] Fix 3 Clang-Cl warnings about Status and Callbacks (#502) * 1 "warning: variable 'Status' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]" * 2 "warning: comparison of unsigned expression < 0 is always false [-Wtautological-unsigned-zero-compare]" * Use a consistent type for "i" and fix a comment * Also update licence header. CORE-14306 --- .../kmtests/kmtest_drv/kmtest_fsminifilter.c | 29 +++++++++++++--------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/modules/rostests/kmtests/kmtest_drv/kmtest_fsminifilter.c b/modules/rostests/kmtests/kmtest_drv/kmtest_fsminifilter.c index 3bb686de9e..3305e2fe77 100644 --- a/modules/rostests/kmtests/kmtest_drv/kmtest_fsminifilter.c +++ b/modules/rostests/kmtests/kmtest_drv/kmtest_fsminifilter.c @@ -1,9 +1,9 @@ /* - * PROJECT: ReactOS kernel-mode tests - Filter Manager - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: FS Mini-filter wrapper to host the filter manager tests - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> - * Ged Murphy <ged.murphy(a)reactos.org> + * PROJECT: ReactOS kernel-mode tests - Filter Manager + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: FS Mini-filter wrapper to host the filter manager tests + * COPYRIGHT: Copyright 2017 Thomas Faber <thomas.faber(a)reactos.org> + * Copyright 2017 Ged Murphy <ged.murphy(a)reactos.org> */ #include <ntifs.h> @@ -39,6 +39,7 @@ static PDRIVER_OBJECT TestDriverObject; static PDEVICE_OBJECT KmtestDeviceObject; static FILTER_DATA FilterData; static PFLT_OPERATION_REGISTRATION Callbacks = NULL; +static ULONG CallbacksCount = 0; static PFLT_CONTEXT_REGISTRATION Contexts = NULL; static PFLT_CONNECT_NOTIFY FilterConnect = NULL; @@ -296,6 +297,7 @@ FilterUnload( { ExFreePoolWithTag(Callbacks, KMTEST_FILTER_POOL_TAG); Callbacks = NULL; + CallbacksCount = 0; } return STATUS_SUCCESS; @@ -337,7 +339,7 @@ FilterInstanceSetup( UNICODE_STRING VolumeName; ULONG ReportedSectorSize = 0; ULONG SectorSize = 0; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); @@ -437,7 +439,7 @@ KmtFilterRegisterCallbacks( _In_ CONST FLT_OPERATION_REGISTRATION *OperationRegistration) { ULONG Count = 0; - INT i; + ULONG i; if (Callbacks) { @@ -461,7 +463,7 @@ KmtFilterRegisterCallbacks( return STATUS_INSUFFICIENT_RESOURCES; } - /* Copy the array, but using the our own pre/post callbacks */ + /* Copy the array, but using our own pre/post callbacks */ for (i = 0; i < Count; i++) { Callbacks[i].MajorFunction = OperationRegistration[i].MajorFunction; @@ -473,6 +475,9 @@ KmtFilterRegisterCallbacks( /* Terminate the array */ Callbacks[Count].MajorFunction = IRP_MJ_OPERATION_END; + /* Save the count of IRPs, not counting IRP_MJ_OPERATION_END last entry */ + CallbacksCount = Count; + return STATUS_SUCCESS; } @@ -514,12 +519,12 @@ FilterPreOperation( { FLT_PREOP_CALLBACK_STATUS Status; UCHAR MajorFunction; - INT i; + ULONG i; Status = FLT_PREOP_SUCCESS_NO_CALLBACK; MajorFunction = Data->Iopb->MajorFunction; - for (i = 0; i < sizeof(Callbacks) / sizeof(Callbacks[0]); i++) + for (i = 0; i < CallbacksCount; i++) { if (MajorFunction == Callbacks[i].MajorFunction) { @@ -543,12 +548,12 @@ FilterPostOperation( { FLT_POSTOP_CALLBACK_STATUS Status; UCHAR MajorFunction; - INT i; + ULONG i; Status = FLT_POSTOP_FINISHED_PROCESSING; MajorFunction = Data->Iopb->MajorFunction; - for (i = 0; i < sizeof(Callbacks) / sizeof(Callbacks[0]); i++) + for (i = 0; i < CallbacksCount; i++) { if (MajorFunction == Callbacks[i].MajorFunction) {

5 years, 10 months

[reactos] 01/01: [MMSYS] Volume page: Initialize the volume trackbar before it might be disabled because the tick marks must be visible on a disabled trackbar.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=77e3fbfad5221d0eaac2c… commit 77e3fbfad5221d0eaac2cbb1f4c3e384ef939ab8 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 24 17:15:13 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 24 17:15:13 2019 +0100 [MMSYS] Volume page: Initialize the volume trackbar before it might be disabled because the tick marks must be visible on a disabled trackbar. --- dll/cpl/mmsys/volume.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dll/cpl/mmsys/volume.c b/dll/cpl/mmsys/volume.c index a64642f862..4c3189bbbe 100644 --- a/dll/cpl/mmsys/volume.c +++ b/dll/cpl/mmsys/volume.c @@ -301,6 +301,10 @@ InitVolumeControls(HWND hwndDlg, PGLOBAL_DATA pGlobalData) LoadString(hApplet, IDS_NO_DEVICES, szNoDevices, _countof(szNoDevices)); + SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(VOLUME_MIN, VOLUME_MAX)); + SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETTICFREQ, VOLUME_TICFREQ, 0); + SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETPAGESIZE, 0, VOLUME_PAGESIZE); + NumMixers = mixerGetNumDevs(); if (!NumMixers) { @@ -351,9 +355,6 @@ InitVolumeControls(HWND hwndDlg, PGLOBAL_DATA pGlobalData) GetVolumeValue(pGlobalData); SendDlgItemMessage(hwndDlg, IDC_DEVICE_NAME, WM_SETTEXT, 0, (LPARAM)mxc.szPname); - SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(VOLUME_MIN, VOLUME_MAX)); - SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETTICFREQ, VOLUME_TICFREQ, 0); - SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETPAGESIZE, 0, VOLUME_PAGESIZE); SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)(pGlobalData->maxVolume - pGlobalData->volumeMinimum) / pGlobalData->volumeStep); }

5 years, 10 months

[reactos] 01/01: [MMSYS] Sounds page: Update the 'Play' button and the current item in the 'Program events' treeview when a sound is selected or deselected.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=601b2532e1cc9edc6d3fa… commit 601b2532e1cc9edc6d3fa1abda73eb0374e49039 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 24 16:56:55 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 24 16:56:55 2019 +0100 [MMSYS] Sounds page: Update the 'Play' button and the current item in the 'Program events' treeview when a sound is selected or deselected. --- dll/cpl/mmsys/sounds.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dll/cpl/mmsys/sounds.c b/dll/cpl/mmsys/sounds.c index 79ee1f28a7..8b6b7d296a 100644 --- a/dll/cpl/mmsys/sounds.c +++ b/dll/cpl/mmsys/sounds.c @@ -1236,20 +1236,39 @@ SoundsDlgProc(HWND hwndDlg, if (lResult == CB_ERR || lResult == 0) { if (lIndex != pLabelContext->szValue[0]) + { + /* Update the tree view item image */ + item.mask = TVIF_IMAGE | TVIF_SELECTEDIMAGE; + item.iImage = IMAGE_SOUND_NONE; + item.iSelectedImage = IMAGE_SOUND_NONE; + TreeView_SetItem(GetDlgItem(hwndDlg, IDC_SCHEME_LIST), &item); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), FALSE); + } + pLabelContext->szValue[0] = L'\0'; + break; } if (_tcsicmp(pLabelContext->szValue, (TCHAR*)lResult) || (lIndex != pLabelContext->szValue[0])) { + /* Update the tree view item image */ + item.mask = TVIF_IMAGE | TVIF_SELECTEDIMAGE; + item.iImage = IMAGE_SOUND_ASSIGNED; + item.iSelectedImage = IMAGE_SOUND_ASSIGNED; + TreeView_SetItem(GetDlgItem(hwndDlg, IDC_SCHEME_LIST), &item); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - /// - /// Should store in current member - /// - _tcscpy(pLabelContext->szValue, (TCHAR*)lResult); + + /// + /// Should store in current member + /// + _tcscpy(pLabelContext->szValue, (TCHAR*)lResult); } + if (_tcslen((TCHAR*)lResult) && lIndex != 0 && pGlobalData->NumWavOut != 0) { EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), TRUE);

5 years, 10 months

[reactos] 01/01: [SNDVOL32] Disable only the 'Play' button, when no audio device is avaiblable.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=722797c779e1bd8f2b927… commit 722797c779e1bd8f2b927e22f5b841db64901707 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 24 16:12:55 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 24 16:16:53 2019 +0100 [SNDVOL32] Disable only the 'Play' button, when no audio device is avaiblable. --- dll/cpl/mmsys/sounds.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/dll/cpl/mmsys/sounds.c b/dll/cpl/mmsys/sounds.c index 5d89dfd6aa..79ee1f28a7 100644 --- a/dll/cpl/mmsys/sounds.c +++ b/dll/cpl/mmsys/sounds.c @@ -57,6 +57,7 @@ typedef struct _GLOBAL_DATA HIMAGELIST hSoundsImageList; PLABEL_MAP pLabelMap; PAPP_MAP pAppMap; + UINT NumWavOut; } GLOBAL_DATA, *PGLOBAL_DATA; @@ -1107,11 +1108,11 @@ SoundsDlgProc(HWND hwndDlg, { case WM_INITDIALOG: { - UINT NumWavOut = waveOutGetNumDevs(); - pGlobalData = (PGLOBAL_DATA)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA)); SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + pGlobalData->NumWavOut = waveOutGetNumDevs(); + SendMessage(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), BM_SETIMAGE,(WPARAM)IMAGE_ICON, (LPARAM)(HANDLE)LoadIcon(hApplet, MAKEINTRESOURCE(IDI_PLAY_ICON))); @@ -1127,14 +1128,6 @@ SoundsDlgProc(HWND hwndDlg, LoadSoundFiles(hwndDlg); ShowSoundScheme(pGlobalData, hwndDlg); - if (!NumWavOut) - { - EnableWindow(GetDlgItem(hwndDlg, IDC_SOUND_SCHEME), FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_SAVEAS_BTN), FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_DELETE_BTN), FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_SCHEME_LIST), FALSE); - } - if (wParam == (WPARAM)GetDlgItem(hwndDlg, IDC_SOUND_SCHEME)) return TRUE; SetFocus(GetDlgItem(hwndDlg, IDC_SOUND_SCHEME)); @@ -1257,7 +1250,7 @@ SoundsDlgProc(HWND hwndDlg, /// _tcscpy(pLabelContext->szValue, (TCHAR*)lResult); } - if (_tcslen((TCHAR*)lResult) && lIndex != 0) + if (_tcslen((TCHAR*)lResult) && lIndex != 0 && pGlobalData->NumWavOut != 0) { EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), TRUE); } @@ -1322,7 +1315,8 @@ SoundsDlgProc(HWND hwndDlg, break; } - EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), TRUE); + if (pGlobalData->NumWavOut != 0) + EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), TRUE); lCount = ComboBox_GetCount(GetDlgItem(hwndDlg, IDC_SOUND_LIST)); for (lIndex = 0; lIndex < lCount; lIndex++)

5 years, 10 months

[reactos] 03/03: [MSGINA] Add bar bitmap to logon and shutdown dialogs

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c90a67da6bd96a8e60a0… commit 8c90a67da6bd96a8e60a039694cfa926d7a56967 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Feb 24 00:44:12 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 24 15:52:49 2019 +0100 [MSGINA] Add bar bitmap to logon and shutdown dialogs --- dll/win32/msgina/lang/bg-BG.rc | 2 ++ dll/win32/msgina/lang/cs-CZ.rc | 2 ++ dll/win32/msgina/lang/de-DE.rc | 2 ++ dll/win32/msgina/lang/en-US.rc | 2 ++ dll/win32/msgina/lang/es-ES.rc | 2 ++ dll/win32/msgina/lang/fr-FR.rc | 2 ++ dll/win32/msgina/lang/he-IL.rc | 2 ++ dll/win32/msgina/lang/id-ID.rc | 2 ++ dll/win32/msgina/lang/it-IT.rc | 2 ++ dll/win32/msgina/lang/ja-JP.rc | 2 ++ dll/win32/msgina/lang/no-NO.rc | 2 ++ dll/win32/msgina/lang/pl-PL.rc | 2 ++ dll/win32/msgina/lang/ro-RO.rc | 2 ++ dll/win32/msgina/lang/ru-RU.rc | 2 ++ dll/win32/msgina/lang/sk-SK.rc | 2 ++ dll/win32/msgina/lang/sq-AL.rc | 2 ++ dll/win32/msgina/lang/tr-TR.rc | 2 ++ dll/win32/msgina/lang/uk-UA.rc | 2 ++ dll/win32/msgina/lang/zh-CN.rc | 2 ++ dll/win32/msgina/lang/zh-TW.rc | 2 ++ 20 files changed, 40 insertions(+) diff --git a/dll/win32/msgina/lang/bg-BG.rc b/dll/win32/msgina/lang/bg-BG.rc index 315d59e457..3d60beef6c 100644 --- a/dll/win32/msgina/lang/bg-BG.rc +++ b/dll/win32/msgina/lang/bg-BG.rc @@ -27,6 +27,7 @@ CAPTION "Вход" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 LTEXT "Потребител:", IDC_STATIC, 6, 60, 52, 8 EDITTEXT IDC_LOGON_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL LTEXT "Парола:", IDC_STATIC, 6, 78, 52, 8 @@ -122,6 +123,7 @@ CAPTION "Изключване на РеактОС" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Какво искате да направи компютъра?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/dll/win32/msgina/lang/cs-CZ.rc b/dll/win32/msgina/lang/cs-CZ.rc index db3f8b7fb0..ed00909155 100644 --- a/dll/win32/msgina/lang/cs-CZ.rc +++ b/dll/win32/msgina/lang/cs-CZ.rc @@ -32,6 +32,7 @@ CAPTION "Přihlášení" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 LTEXT "Jméno:", IDC_STATIC, 6, 60, 52, 8 EDITTEXT IDC_LOGON_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL LTEXT "Heslo:", IDC_STATIC, 6, 78, 52, 8 @@ -127,6 +128,7 @@ CAPTION "Vypnout ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Co má počítač provést?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/dll/win32/msgina/lang/de-DE.rc b/dll/win32/msgina/lang/de-DE.rc index fb18ef9a67..6d622924be 100644 --- a/dll/win32/msgina/lang/de-DE.rc +++ b/dll/win32/msgina/lang/de-DE.rc @@ -27,6 +27,7 @@ CAPTION "Anmeldung" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 LTEXT "Benutzername:", IDC_STATIC, 6, 60, 52, 8 EDITTEXT IDC_LOGON_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL LTEXT "Passwort:", IDC_STATIC, 6, 78, 52, 8 @@ -122,6 +123,7 @@ CAPTION "ReactOS herunterfahren" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Welcher Vorgang soll durchgeführt werden?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/dll/win32/msgina/lang/en-US.rc b/dll/win32/msgina/lang/en-US.rc index 78244b595b..b043c356cd 100644 --- a/dll/win32/msgina/lang/en-US.rc +++ b/dll/win32/msgina/lang/en-US.rc @@ -27,6 +27,7 @@ CAPTION "Logon" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 LTEXT "Username:", IDC_STATIC, 6, 60, 52, 8 EDITTEXT IDC_LOGON_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL LTEXT "Password:", IDC_STATIC, 6, 78, 52, 8 @@ -123,6 +124,7 @@ CAPTION "Shut Down ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/dll/win32/msgina/lang/es-ES.rc b/dll/win32/msgina/lang/es-ES.rc index 1f5c7767d2..c11e18434e 100644 --- a/dll/win32/msgina/lang/es-ES.rc +++ b/dll/win32/msgina/lang/es-ES.rc @@ -35,6 +35,7 @@ CAPTION "Iniciar sesión" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 LTEXT "Usuario:", IDC_STATIC, 6, 60, 61, 8, SS_RIGHT EDITTEXT IDC_LOGON_USERNAME, 71, 57, 144, 14, ES_AUTOHSCROLL LTEXT "Contraseña:", IDC_STATIC, 6, 78, 61, 8, SS_RIGHT @@ -130,6 +131,7 @@ CAPTION "Apagar ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "¿&Qué desea hacer con el equipo?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/dll/win32/msgina/lang/fr-FR.rc b/dll/win32/msgina/lang/fr-FR.rc index 8a199276c5..1ad151e67b 100644 --- a/dll/win32/msgina/lang/fr-FR.rc +++ b/dll/win32/msgina/lang/fr-FR.rc @@ -27,6 +27,7 @@ CAPTION "Connexion" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 LTEXT "Utilisateur :", IDC_STATIC, 6, 60, 52, 8 EDITTEXT IDC_LOGON_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL LTEXT "Mot de passe :", IDC_STATIC, 6, 78, 52, 8 @@ -122,6 +123,7 @@ CAPTION "Arrêt de ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Que voulez-vous que l'ordinateur fasse ?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/dll/win32/msgina/lang/he-IL.rc b/dll/win32/msgina/lang/he-IL.rc index 5feb207d34..1e52496ebf 100644 --- a/dll/win32/msgina/lang/he-IL.rc +++ b/dll/win32/msgina/lang/he-IL.rc @@ -27,6 +27,7 @@ CAPTION "כניסה" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 LTEXT "שם משתמש:", IDC_STATIC, 6, 60, 52, 8 EDITTEXT IDC_LOGON_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL LTEXT "סיסמה:", IDC_STATIC, 6, 78, 52, 8 @@ -122,6 +123,7 @@ CAPTION "Shut Down ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/dll/win32/msgina/lang/id-ID.rc b/dll/win32/msgina/lang/id-ID.rc index f9cfecc3c6..314e145ed2 100644 --- a/dll/win32/msgina/lang/id-ID.rc +++ b/dll/win32/msgina/lang/id-ID.rc @@ -27,6 +27,7 @@ CAPTION "Masuk" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 LTEXT "Nama pengguna:", IDC_STATIC, 6, 60, 52, 8 EDITTEXT IDC_LOGON_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL LTEXT "Kata sandi:", IDC_STATIC, 6, 78, 42, 8 @@ -122,6 +123,7 @@ CAPTION "Shut Down ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/dll/win32/msgina/lang/it-IT.rc b/dll/win32/msgina/lang/it-IT.rc index 19a81fccaa..d2c620c419 100644 --- a/dll/win32/msgina/lang/it-IT.rc +++ b/dll/win32/msgina/lang/it-IT.rc @@ -36,6 +36,7 @@ CAPTION "Logon" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 LTEXT "Utente:", IDC_STATIC, 6, 60, 52, 8 EDITTEXT IDC_LOGON_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL LTEXT "Password:", IDC_STATIC, 6, 78, 52, 8 @@ -131,6 +132,7 @@ CAPTION "Spegnimento di ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Cosa volete che faccia ReactOS?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/dll/win32/msgina/lang/ja-JP.rc b/dll/win32/msgina/lang/ja-JP.rc index d1e2a2047f..887e94034d 100644 --- a/dll/win32/msgina/lang/ja-JP.rc +++ b/dll/win32/msgina/lang/ja-JP.rc @@ -27,6 +27,7 @@ CAPTION "ログオン" FONT 9, "MS UI Gothic", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 LTEXT "ユーザー名:", IDC_STATIC, 6, 60, 52, 8 EDITTEXT IDC_LOGON_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL LTEXT "パスワード:", IDC_STATIC, 6, 78, 52, 8 @@ -122,6 +123,7 @@ CAPTION "ReactOSのシャットダウン" FONT 9,"MS UI Gothic", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&コンピュータの動作を選択してください", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/dll/win32/msgina/lang/no-NO.rc b/dll/win32/msgina/lang/no-NO.rc index 9952fd2a40..728fedd84b 100644 --- a/dll/win32/msgina/lang/no-NO.rc +++ b/dll/win32/msgina/lang/no-NO.rc @@ -27,6 +27,7 @@ CAPTION "Logg på ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 LTEXT "Brukernavn:", IDC_STATIC, 36, 75, 40, 8 EDITTEXT IDC_LOGON_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL LTEXT "Passord:", IDC_STATIC, 36, 93, 42, 8 @@ -122,6 +123,7 @@ CAPTION "Slå av ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Hva vil du at datamaskinen skal gjøre?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/dll/win32/msgina/lang/pl-PL.rc b/dll/win32/msgina/lang/pl-PL.rc index 89c2b20911..c545cdcdc9 100644 --- a/dll/win32/msgina/lang/pl-PL.rc +++ b/dll/win32/msgina/lang/pl-PL.rc @@ -37,6 +37,7 @@ CAPTION "Logowanie" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 LTEXT "Nazwa użytkownika:", IDC_STATIC, 6, 60, 70, 8 EDITTEXT IDC_LOGON_USERNAME, 73, 57, 142, 14, ES_AUTOHSCROLL LTEXT "Hasło:", IDC_STATIC, 6, 78, 52, 8 @@ -132,6 +133,7 @@ CAPTION "Zamknij ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Co chcesz, aby zrobił komputer?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/dll/win32/msgina/lang/ro-RO.rc b/dll/win32/msgina/lang/ro-RO.rc index f6bc934ab4..7288fc10f4 100644 --- a/dll/win32/msgina/lang/ro-RO.rc +++ b/dll/win32/msgina/lang/ro-RO.rc @@ -36,6 +36,7 @@ CAPTION "Autentificare" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 LTEXT "Nume utilizator:", IDC_STATIC, 6, 60, 52, 8 EDITTEXT IDC_LOGON_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL LTEXT "Parola:", IDC_STATIC, 6, 78, 52, 8 @@ -131,6 +132,7 @@ CAPTION "Închidere ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Ce doriți să se întâmple?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/dll/win32/msgina/lang/ru-RU.rc b/dll/win32/msgina/lang/ru-RU.rc index 82265c179a..f30ff46fac 100644 --- a/dll/win32/msgina/lang/ru-RU.rc +++ b/dll/win32/msgina/lang/ru-RU.rc @@ -29,6 +29,7 @@ CAPTION "Вход" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 LTEXT "Пользователь:", IDC_STATIC, 6, 60, 52, 8 EDITTEXT IDC_LOGON_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL LTEXT "Пароль:", IDC_STATIC, 6, 78, 52, 8 @@ -124,6 +125,7 @@ CAPTION "Завершение работы ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Выберите желаемое действие:", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/dll/win32/msgina/lang/sk-SK.rc b/dll/win32/msgina/lang/sk-SK.rc index 6c28c5927a..b19e3d4dd9 100644 --- a/dll/win32/msgina/lang/sk-SK.rc +++ b/dll/win32/msgina/lang/sk-SK.rc @@ -32,6 +32,7 @@ CAPTION "Prihlásenie" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 LTEXT "Meno používateľa:", IDC_STATIC, 6, 60, 59, 8 EDITTEXT IDC_LOGON_USERNAME, 67, 57, 148, 14, ES_AUTOHSCROLL LTEXT "Heslo:", IDC_STATIC, 6, 78, 59, 8 @@ -127,6 +128,7 @@ CAPTION "Vypnutie systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Čo chcete aby počítač urobil?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/dll/win32/msgina/lang/sq-AL.rc b/dll/win32/msgina/lang/sq-AL.rc index 55bcd3048c..87f81dd55d 100644 --- a/dll/win32/msgina/lang/sq-AL.rc +++ b/dll/win32/msgina/lang/sq-AL.rc @@ -31,6 +31,7 @@ CAPTION "Hzr" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 LTEXT "Përdoruesi:", IDC_STATIC, 6, 60, 52, 8 EDITTEXT IDC_LOGON_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL LTEXT "Fjalëkalimi:", IDC_STATIC, 6, 78, 52, 8 @@ -126,6 +127,7 @@ CAPTION "Shut Down ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/dll/win32/msgina/lang/tr-TR.rc b/dll/win32/msgina/lang/tr-TR.rc index ededb869b8..b7bed5c32a 100644 --- a/dll/win32/msgina/lang/tr-TR.rc +++ b/dll/win32/msgina/lang/tr-TR.rc @@ -29,6 +29,7 @@ CAPTION "Oturum Aç" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 LTEXT "Kullanıcı Adı:", IDC_STATIC, 6, 60, 59, 8 EDITTEXT IDC_LOGON_USERNAME, 67, 57, 148, 14, ES_AUTOHSCROLL LTEXT "Şifre:", IDC_STATIC, 6, 78, 59, 8 @@ -124,6 +125,7 @@ CAPTION "Bilgisayarı Kapat" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Bilgisayarın ne yapmasını istiyorsunuz?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/dll/win32/msgina/lang/uk-UA.rc b/dll/win32/msgina/lang/uk-UA.rc index 1be1116f80..3068bb433c 100644 --- a/dll/win32/msgina/lang/uk-UA.rc +++ b/dll/win32/msgina/lang/uk-UA.rc @@ -35,6 +35,7 @@ CAPTION "Вхід" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 LTEXT "Користувач:", IDC_STATIC, 6, 60, 40, 8 EDITTEXT IDC_LOGON_USERNAME, 54, 57, 159, 14, ES_AUTOHSCROLL LTEXT "Пароль:",IDC_STATIC, 6, 78, 42, 8 @@ -130,6 +131,7 @@ CAPTION "Завершення роботи ReactOS" FONT 8, "MS Shell Dlg" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "&Виберіть бажану дію:", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/dll/win32/msgina/lang/zh-CN.rc b/dll/win32/msgina/lang/zh-CN.rc index 0f9770c07d..6357e23b6c 100644 --- a/dll/win32/msgina/lang/zh-CN.rc +++ b/dll/win32/msgina/lang/zh-CN.rc @@ -30,6 +30,7 @@ CAPTION "登录" FONT 9, "宋体", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 LTEXT "用户名:", IDC_STATIC, 6, 60, 52, 8 EDITTEXT IDC_LOGON_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL LTEXT "密码:", IDC_STATIC, 6, 78, 52, 8 @@ -125,6 +126,7 @@ CAPTION "关闭 ReactOS" FONT 9, "宋体" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "你想让计算机做什么?(&W)", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/dll/win32/msgina/lang/zh-TW.rc b/dll/win32/msgina/lang/zh-TW.rc index 849cb4bbf5..d088c985ea 100644 --- a/dll/win32/msgina/lang/zh-TW.rc +++ b/dll/win32/msgina/lang/zh-TW.rc @@ -29,6 +29,7 @@ CAPTION "登入" FONT 9, "新細明體", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 LTEXT "使用者名:", IDC_STATIC, 6, 60, 52, 8 EDITTEXT IDC_LOGON_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL LTEXT "密碼:", IDC_STATIC, 6, 78, 52, 8 @@ -124,6 +125,7 @@ CAPTION "關閉 ReactOS" FONT 9, "新細明體" BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 ICON IDI_SHUTDOWN, IDC_STATIC, 9, 57, 21, 20, WS_GROUP LTEXT "你想讓電腦做什麼?(&W)", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_ACTION, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

5 years, 10 months

[reactos] 02/03: [MSGINA] Improve Ctrl-Alt-Del invitation window

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fe1d611e0facd87a909ba… commit fe1d611e0facd87a909bace5a4bb4bf05ea27750 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Feb 23 23:52:22 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 24 15:52:49 2019 +0100 [MSGINA] Improve Ctrl-Alt-Del invitation window --- dll/win32/msgina/lang/bg-BG.rc | 7 ++++--- dll/win32/msgina/lang/cs-CZ.rc | 7 ++++--- dll/win32/msgina/lang/de-DE.rc | 7 ++++--- dll/win32/msgina/lang/en-US.rc | 7 ++++--- dll/win32/msgina/lang/es-ES.rc | 7 ++++--- dll/win32/msgina/lang/fr-FR.rc | 7 ++++--- dll/win32/msgina/lang/he-IL.rc | 7 ++++--- dll/win32/msgina/lang/id-ID.rc | 7 ++++--- dll/win32/msgina/lang/it-IT.rc | 7 ++++--- dll/win32/msgina/lang/ja-JP.rc | 7 ++++--- dll/win32/msgina/lang/no-NO.rc | 7 ++++--- dll/win32/msgina/lang/pl-PL.rc | 7 ++++--- dll/win32/msgina/lang/ro-RO.rc | 7 ++++--- dll/win32/msgina/lang/ru-RU.rc | 7 ++++--- dll/win32/msgina/lang/sk-SK.rc | 7 ++++--- dll/win32/msgina/lang/sq-AL.rc | 7 ++++--- dll/win32/msgina/lang/tr-TR.rc | 7 ++++--- dll/win32/msgina/lang/uk-UA.rc | 7 ++++--- dll/win32/msgina/lang/zh-CN.rc | 7 ++++--- dll/win32/msgina/lang/zh-TW.rc | 7 ++++--- 20 files changed, 80 insertions(+), 60 deletions(-) diff --git a/dll/win32/msgina/lang/bg-BG.rc b/dll/win32/msgina/lang/bg-BG.rc index e0895a300b..315d59e457 100644 --- a/dll/win32/msgina/lang/bg-BG.rc +++ b/dll/win32/msgina/lang/bg-BG.rc @@ -10,14 +10,15 @@ BEGIN LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END -IDD_WELCOME DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "РеактОС ви приветства" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 - LTEXT "Натиснете едновременно Ctrl-Alt-Del", IDC_STATIC, 38, 60, 230, 14 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 53, 32, 32 + LTEXT "Натиснете едновременно Ctrl-Alt-Del", IDC_STATIC, 38, 59, 230, 14 END IDD_LOGON DIALOGEX 0, 0, 275, 147 diff --git a/dll/win32/msgina/lang/cs-CZ.rc b/dll/win32/msgina/lang/cs-CZ.rc index 76f25dc507..db3f8b7fb0 100644 --- a/dll/win32/msgina/lang/cs-CZ.rc +++ b/dll/win32/msgina/lang/cs-CZ.rc @@ -15,14 +15,15 @@ BEGIN LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END -IDD_WELCOME DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Vítejte v systému ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 - LTEXT "Stiskněte klávesy Ctrl-Alt-Delete", IDC_STATIC, 38, 60, 230, 14 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 53, 32, 32 + LTEXT "Stiskněte klávesy Ctrl-Alt-Delete", IDC_STATIC, 38, 59, 230, 14 END IDD_LOGON DIALOGEX 0, 0, 275, 147 diff --git a/dll/win32/msgina/lang/de-DE.rc b/dll/win32/msgina/lang/de-DE.rc index cd14ffc66e..fb18ef9a67 100644 --- a/dll/win32/msgina/lang/de-DE.rc +++ b/dll/win32/msgina/lang/de-DE.rc @@ -10,14 +10,15 @@ BEGIN LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END -IDD_WELCOME DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Willkommen bei ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 - LTEXT "Drücken Sie Strg+Alt+Entf", IDC_STATIC, 38, 60, 230, 14 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 53, 32, 32 + LTEXT "Drücken Sie Strg+Alt+Entf", IDC_STATIC, 38, 59, 230, 14 END IDD_LOGON DIALOGEX 0, 0, 275, 147 diff --git a/dll/win32/msgina/lang/en-US.rc b/dll/win32/msgina/lang/en-US.rc index ba8979fd70..78244b595b 100644 --- a/dll/win32/msgina/lang/en-US.rc +++ b/dll/win32/msgina/lang/en-US.rc @@ -10,14 +10,15 @@ BEGIN LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END -IDD_WELCOME DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Welcome to ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 - LTEXT "Press Ctrl-Alt-Delete to begin.", IDC_STATIC, 38, 60, 230, 14 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 53, 32, 32 + LTEXT "Press Ctrl-Alt-Delete to begin.", IDC_STATIC, 38, 59, 230, 14 END IDD_LOGON DIALOGEX 0, 0, 275, 147 diff --git a/dll/win32/msgina/lang/es-ES.rc b/dll/win32/msgina/lang/es-ES.rc index f3f1061afe..1f5c7767d2 100644 --- a/dll/win32/msgina/lang/es-ES.rc +++ b/dll/win32/msgina/lang/es-ES.rc @@ -18,14 +18,15 @@ BEGIN LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END -IDD_WELCOME DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Bienvenido a ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 - LTEXT "Para empezar, presione Ctrl-Alt-Supr.", IDC_STATIC, 38, 60, 230, 14 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 53, 32, 32 + LTEXT "Para empezar, presione Ctrl-Alt-Supr.", IDC_STATIC, 38, 59, 230, 14 END IDD_LOGON DIALOGEX 0, 0, 275, 147 diff --git a/dll/win32/msgina/lang/fr-FR.rc b/dll/win32/msgina/lang/fr-FR.rc index 07eab457a0..8a199276c5 100644 --- a/dll/win32/msgina/lang/fr-FR.rc +++ b/dll/win32/msgina/lang/fr-FR.rc @@ -10,14 +10,15 @@ BEGIN LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END -IDD_WELCOME DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Bienvenue dans ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 - LTEXT "Appuyer sur les touches Ctrl-Alt-Suppr", IDC_STATIC, 38, 60, 230, 14 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 53, 32, 32 + LTEXT "Appuyer sur les touches Ctrl-Alt-Suppr", IDC_STATIC, 38, 59, 230, 14 END IDD_LOGON DIALOGEX 0, 0, 275, 147 diff --git a/dll/win32/msgina/lang/he-IL.rc b/dll/win32/msgina/lang/he-IL.rc index dfcadc3b92..5feb207d34 100644 --- a/dll/win32/msgina/lang/he-IL.rc +++ b/dll/win32/msgina/lang/he-IL.rc @@ -10,14 +10,15 @@ BEGIN LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END -IDD_WELCOME DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ברוכים הבאים לReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 - LTEXT "לחץ על Ctrl-Alt-Del בו זמנית", IDC_STATIC, 38, 60, 230, 14 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 53, 32, 32 + LTEXT "לחץ על Ctrl-Alt-Del בו זמנית", IDC_STATIC, 38, 59, 230, 14 END IDD_LOGON DIALOGEX 0, 0, 275, 147 diff --git a/dll/win32/msgina/lang/id-ID.rc b/dll/win32/msgina/lang/id-ID.rc index 686ac7bb85..f9cfecc3c6 100644 --- a/dll/win32/msgina/lang/id-ID.rc +++ b/dll/win32/msgina/lang/id-ID.rc @@ -10,14 +10,15 @@ BEGIN LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END -IDD_WELCOME DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Selamat datang di ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 - LTEXT "Tekan kombinasi tombol Kontrol-Alt-Delete", IDC_STATIC, 38, 60, 230, 14 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 53, 32, 32 + LTEXT "Tekan kombinasi tombol Kontrol-Alt-Delete", IDC_STATIC, 38, 59, 230, 14 END IDD_LOGON DIALOGEX 0, 0, 275, 147 diff --git a/dll/win32/msgina/lang/it-IT.rc b/dll/win32/msgina/lang/it-IT.rc index ad93ddef15..19a81fccaa 100644 --- a/dll/win32/msgina/lang/it-IT.rc +++ b/dll/win32/msgina/lang/it-IT.rc @@ -19,14 +19,15 @@ BEGIN LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END -IDD_WELCOME DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Benvenuti in ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 - LTEXT "Premere i tasti Ctrl-Alt-Canc ", IDC_STATIC, 38, 60, 230, 14 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 53, 32, 32 + LTEXT "Premere i tasti Ctrl-Alt-Canc ", IDC_STATIC, 38, 59, 230, 14 END IDD_LOGON DIALOGEX 0, 0, 275, 147 diff --git a/dll/win32/msgina/lang/ja-JP.rc b/dll/win32/msgina/lang/ja-JP.rc index df22e8453b..d1e2a2047f 100644 --- a/dll/win32/msgina/lang/ja-JP.rc +++ b/dll/win32/msgina/lang/ja-JP.rc @@ -10,14 +10,15 @@ BEGIN LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END -IDD_WELCOME DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ReactOS へようこそ" FONT 9, "MS UI Gothic", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 - LTEXT "Ctrl-Alt-Del キーの組み合わせを押してください", IDC_STATIC, 38, 60, 230, 14 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 53, 32, 32 + LTEXT "Ctrl-Alt-Del キーの組み合わせを押してください", IDC_STATIC, 38, 59, 230, 14 END IDD_LOGON DIALOGEX 0, 0, 275, 147 diff --git a/dll/win32/msgina/lang/no-NO.rc b/dll/win32/msgina/lang/no-NO.rc index b7fb47250b..9952fd2a40 100644 --- a/dll/win32/msgina/lang/no-NO.rc +++ b/dll/win32/msgina/lang/no-NO.rc @@ -10,14 +10,15 @@ BEGIN LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END -IDD_WELCOME DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Velkommen til ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 - LTEXT "Trykk Ctrl-Alt-Del knappene", IDC_STATIC, 38, 60, 230, 14 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 53, 32, 32 + LTEXT "Trykk Ctrl-Alt-Del knappene", IDC_STATIC, 38, 59, 230, 14 END IDD_LOGON DIALOGEX 0, 0, 275, 147 diff --git a/dll/win32/msgina/lang/pl-PL.rc b/dll/win32/msgina/lang/pl-PL.rc index 11e484a9ab..89c2b20911 100644 --- a/dll/win32/msgina/lang/pl-PL.rc +++ b/dll/win32/msgina/lang/pl-PL.rc @@ -20,14 +20,15 @@ BEGIN LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END -IDD_WELCOME DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Witamy w ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 - LTEXT "Proszę wcisnąć kombinację klawiszy Ctrl-Alt-Del", IDC_STATIC, 38, 60, 230, 14 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 53, 32, 32 + LTEXT "Proszę wcisnąć kombinację klawiszy Ctrl-Alt-Del", IDC_STATIC, 38, 59, 230, 14 END IDD_LOGON DIALOGEX 0, 0, 275, 147 diff --git a/dll/win32/msgina/lang/ro-RO.rc b/dll/win32/msgina/lang/ro-RO.rc index a777f4a45c..f6bc934ab4 100644 --- a/dll/win32/msgina/lang/ro-RO.rc +++ b/dll/win32/msgina/lang/ro-RO.rc @@ -19,14 +19,15 @@ BEGIN LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END -IDD_WELCOME DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Bun venit în ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 - LTEXT "Apasați simultan «Ctrl»+«Alt»+«Del»", IDC_STATIC, 38, 60, 230, 14 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 53, 32, 32 + LTEXT "Apasați simultan «Ctrl»+«Alt»+«Del»", IDC_STATIC, 38, 59, 230, 14 END IDD_LOGON DIALOGEX 0, 0, 275, 147 diff --git a/dll/win32/msgina/lang/ru-RU.rc b/dll/win32/msgina/lang/ru-RU.rc index e876310017..82265c179a 100644 --- a/dll/win32/msgina/lang/ru-RU.rc +++ b/dll/win32/msgina/lang/ru-RU.rc @@ -12,14 +12,15 @@ BEGIN LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END -IDD_WELCOME DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Добро пожаловать в ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 - LTEXT "Нажмите клавиши Ctrl-Alt-Del.", IDC_STATIC, 38, 60, 230, 14 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 53, 32, 32 + LTEXT "Нажмите клавиши Ctrl-Alt-Del.", IDC_STATIC, 38, 59, 230, 14 END IDD_LOGON DIALOGEX 0, 0, 275, 147 diff --git a/dll/win32/msgina/lang/sk-SK.rc b/dll/win32/msgina/lang/sk-SK.rc index 331b00c29b..6c28c5927a 100644 --- a/dll/win32/msgina/lang/sk-SK.rc +++ b/dll/win32/msgina/lang/sk-SK.rc @@ -15,14 +15,15 @@ BEGIN LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END -IDD_WELCOME DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Vitajte v systéme ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 - LTEXT "Stlačte kombináciu kláves Ctrl-Alt-Del", IDC_STATIC, 38, 60, 230, 14 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 53, 32, 32 + LTEXT "Stlačte kombináciu kláves Ctrl-Alt-Del", IDC_STATIC, 38, 59, 230, 14 END IDD_LOGON DIALOGEX 0, 0, 275, 147 diff --git a/dll/win32/msgina/lang/sq-AL.rc b/dll/win32/msgina/lang/sq-AL.rc index 7f3d9ff26a..55bcd3048c 100644 --- a/dll/win32/msgina/lang/sq-AL.rc +++ b/dll/win32/msgina/lang/sq-AL.rc @@ -14,14 +14,15 @@ BEGIN LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END -IDD_WELCOME DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Mirë se vini në ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 - LTEXT "Shtyp Ctrl-Alt-Del kombinimin butonave", IDC_STATIC, 38, 60, 230, 14 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 53, 32, 32 + LTEXT "Shtyp Ctrl-Alt-Del kombinimin butonave", IDC_STATIC, 38, 59, 230, 14 END IDD_LOGON DIALOGEX 0, 0, 275, 147 diff --git a/dll/win32/msgina/lang/tr-TR.rc b/dll/win32/msgina/lang/tr-TR.rc index 92218040ff..ededb869b8 100644 --- a/dll/win32/msgina/lang/tr-TR.rc +++ b/dll/win32/msgina/lang/tr-TR.rc @@ -12,14 +12,15 @@ BEGIN LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END -IDD_WELCOME DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ReactOS'a Hoşgeldiniz" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 - LTEXT "Başlamak için Denetim, Seçenek ve Silme düğmelerine birlikte basınız.", IDC_STATIC, 38, 60, 230, 14 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 53, 32, 32 + LTEXT "Başlamak için Denetim, Seçenek ve Silme düğmelerine birlikte basınız.", IDC_STATIC, 38, 59, 230, 14 END IDD_LOGON DIALOGEX 0, 0, 275, 147 diff --git a/dll/win32/msgina/lang/uk-UA.rc b/dll/win32/msgina/lang/uk-UA.rc index 7647b7aad6..1be1116f80 100644 --- a/dll/win32/msgina/lang/uk-UA.rc +++ b/dll/win32/msgina/lang/uk-UA.rc @@ -18,14 +18,15 @@ BEGIN LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END -IDD_WELCOME DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Ласкаво просимо до ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 - LTEXT "Натисніть клавіші Ctrl+Alt+Del", IDC_STATIC, 38, 60, 230, 14 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 53, 32, 32 + LTEXT "Натисніть клавіші Ctrl+Alt+Del", IDC_STATIC, 38, 59, 230, 14 END IDD_LOGON DIALOGEX 0, 0, 275, 147 diff --git a/dll/win32/msgina/lang/zh-CN.rc b/dll/win32/msgina/lang/zh-CN.rc index 22fa0f61f8..0f9770c07d 100644 --- a/dll/win32/msgina/lang/zh-CN.rc +++ b/dll/win32/msgina/lang/zh-CN.rc @@ -13,14 +13,15 @@ BEGIN LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END -IDD_WELCOME DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "欢迎使用 ReactOS" FONT 9, "宋体", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 - LTEXT "请按 Ctrl-Alt-Delete 开始登录。", IDC_STATIC, 38, 60, 230, 14 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 53, 32, 32 + LTEXT "请按 Ctrl-Alt-Delete 开始登录。", IDC_STATIC, 38, 59, 230, 14 END IDD_LOGON DIALOGEX 0, 0, 275, 147 diff --git a/dll/win32/msgina/lang/zh-TW.rc b/dll/win32/msgina/lang/zh-TW.rc index 1198a48e75..849cb4bbf5 100644 --- a/dll/win32/msgina/lang/zh-TW.rc +++ b/dll/win32/msgina/lang/zh-TW.rc @@ -12,14 +12,15 @@ BEGIN LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END -IDD_WELCOME DIALOGEX 0, 0, 275, 80 +IDD_WELCOME DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "歡迎來到 ReactOS" FONT 9, "新細明體", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 - LTEXT "按 Ctrl-Alt-Delete 開始。", IDC_STATIC, 38, 60, 230, 14 + CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 53, 32, 32 + LTEXT "按 Ctrl-Alt-Delete 開始。", IDC_STATIC, 38, 59, 230, 14 END IDD_LOGON DIALOGEX 0, 0, 275, 147

5 years, 10 months

[reactos] 01/03: [MSGINA] Implement rotation bar animation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f9d29319a6e172752e163… commit f9d29319a6e172752e16379f29de619a1d303aa9 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Feb 23 23:34:22 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 24 15:52:49 2019 +0100 [MSGINA] Implement rotation bar animation Based on initial work by Bisoc George. Rotation bar image by Zcooger. CORE-15215 --- dll/win32/msgina/gui.c | 84 ++++++++++++++++++++++++ dll/win32/msgina/lang/bg-BG.rc | 5 +- dll/win32/msgina/lang/cs-CZ.rc | 5 +- dll/win32/msgina/lang/de-DE.rc | 5 +- dll/win32/msgina/lang/en-US.rc | 5 +- dll/win32/msgina/lang/es-ES.rc | 5 +- dll/win32/msgina/lang/fr-FR.rc | 5 +- dll/win32/msgina/lang/he-IL.rc | 5 +- dll/win32/msgina/lang/id-ID.rc | 5 +- dll/win32/msgina/lang/it-IT.rc | 5 +- dll/win32/msgina/lang/ja-JP.rc | 5 +- dll/win32/msgina/lang/no-NO.rc | 5 +- dll/win32/msgina/lang/pl-PL.rc | 5 +- dll/win32/msgina/lang/ro-RO.rc | 5 +- dll/win32/msgina/lang/ru-RU.rc | 5 +- dll/win32/msgina/lang/sk-SK.rc | 5 +- dll/win32/msgina/lang/sq-AL.rc | 5 +- dll/win32/msgina/lang/tr-TR.rc | 5 +- dll/win32/msgina/lang/uk-UA.rc | 5 +- dll/win32/msgina/lang/zh-CN.rc | 5 +- dll/win32/msgina/lang/zh-TW.rc | 5 +- dll/win32/msgina/msgina.rc | 1 + dll/win32/msgina/resource.h | 2 + dll/win32/msgina/resources/line.bmp | Bin 0 -> 6254 bytes dll/win32/msgina/resources/line.svg | 123 ++++++++++++++++++++++++++++++++++++ 25 files changed, 270 insertions(+), 40 deletions(-) diff --git a/dll/win32/msgina/gui.c b/dll/win32/msgina/gui.c index cafced9aa2..bf0a16057e 100644 --- a/dll/win32/msgina/gui.c +++ b/dll/win32/msgina/gui.c @@ -31,6 +31,11 @@ typedef struct _DLG_DATA { PGINA_CONTEXT pgContext; HBITMAP hBitmap; + HBITMAP hBarBitmap; + UINT_PTR TimerID; + DWORD BarCounter; + DWORD BarWidth; + DWORD BarHeight; } DLG_DATA, *PDLG_DATA; static BOOL @@ -111,8 +116,11 @@ StatusDialogProc( IN WPARAM wParam, IN LPARAM lParam) { + PDLG_DATA pDlgData; UNREFERENCED_PARAMETER(wParam); + pDlgData = (PDLG_DATA)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA); + switch (uMsg) { case WM_INITDIALOG: @@ -127,6 +135,82 @@ StatusDialogProc( SetWindowTextW(hwndDlg, msg->pTitle); SetDlgItemTextW(hwndDlg, IDC_STATUS_MESSAGE, msg->pMessage); SetEvent(msg->StartupEvent); + + pDlgData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DLG_DATA)); + SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (LONG_PTR)pDlgData); + + if (pDlgData == NULL) + return FALSE; + + /* Load the bar bitmap */ + pDlgData->hBarBitmap = LoadImageW(hDllInstance, MAKEINTRESOURCEW(IDI_BAR), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + if (pDlgData->hBarBitmap) + { + BITMAP bm; + + GetObject(pDlgData->hBarBitmap, sizeof(BITMAP), &bm); + pDlgData->BarWidth = bm.bmWidth; + pDlgData->BarHeight = bm.bmHeight; + pDlgData->TimerID = SetTimer(hwndDlg, -1, 20, NULL); + } + return TRUE; + } + + case WM_TIMER: + { + if (pDlgData) + { + /* + * Default rotation bar image width is 413 (same as logo) + * We can divide 413 by 7 without remainder + */ + pDlgData->BarCounter = (pDlgData->BarCounter + 7) % pDlgData->BarWidth; + InvalidateRect(hwndDlg, NULL, FALSE); + UpdateWindow(hwndDlg); + } + return TRUE; + } + + case WM_DRAWITEM: + { + LPDRAWITEMSTRUCT lpDis = (LPDRAWITEMSTRUCT)lParam; + + if (lpDis->CtlID != IDC_BAR) + { + return FALSE; + } + + if (pDlgData && pDlgData->hBarBitmap) + { + HDC hdcMem; + HGDIOBJ hOld; + DWORD off = pDlgData->BarCounter; + DWORD iw = pDlgData->BarWidth; + DWORD ih = pDlgData->BarHeight; + + hdcMem = CreateCompatibleDC(lpDis->hDC); + hOld = SelectObject(hdcMem, pDlgData->hBarBitmap); + BitBlt(lpDis->hDC, off, 0, iw - off, ih, hdcMem, 0, 0, SRCCOPY); + BitBlt(lpDis->hDC, 0, 0, off, ih, hdcMem, iw - off, 0, SRCCOPY); + SelectObject(hdcMem, hOld); + DeleteDC(hdcMem); + + return TRUE; + } + return FALSE; + } + + case WM_DESTROY: + { + if (pDlgData) + { + if (pDlgData->hBarBitmap) + { + KillTimer(hwndDlg, pDlgData->TimerID); + DeleteObject(pDlgData->hBarBitmap); + } + HeapFree(GetProcessHeap(), 0, pDlgData); + } return TRUE; } } diff --git a/dll/win32/msgina/lang/bg-BG.rc b/dll/win32/msgina/lang/bg-BG.rc index 97da77a593..e0895a300b 100644 --- a/dll/win32/msgina/lang/bg-BG.rc +++ b/dll/win32/msgina/lang/bg-BG.rc @@ -1,12 +1,13 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Почакайте..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/cs-CZ.rc b/dll/win32/msgina/lang/cs-CZ.rc index e80492613b..76f25dc507 100644 --- a/dll/win32/msgina/lang/cs-CZ.rc +++ b/dll/win32/msgina/lang/cs-CZ.rc @@ -5,13 +5,14 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Prosím čekejte..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/de-DE.rc b/dll/win32/msgina/lang/de-DE.rc index 5308a8e468..cd14ffc66e 100644 --- a/dll/win32/msgina/lang/de-DE.rc +++ b/dll/win32/msgina/lang/de-DE.rc @@ -1,12 +1,13 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Bitte warten..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/en-US.rc b/dll/win32/msgina/lang/en-US.rc index b7c5e92260..ba8979fd70 100644 --- a/dll/win32/msgina/lang/en-US.rc +++ b/dll/win32/msgina/lang/en-US.rc @@ -1,12 +1,13 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Please wait..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/es-ES.rc b/dll/win32/msgina/lang/es-ES.rc index 02c1e2cb4f..f3f1061afe 100644 --- a/dll/win32/msgina/lang/es-ES.rc +++ b/dll/win32/msgina/lang/es-ES.rc @@ -8,13 +8,14 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Espere un momento..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/fr-FR.rc b/dll/win32/msgina/lang/fr-FR.rc index 98c9916875..07eab457a0 100644 --- a/dll/win32/msgina/lang/fr-FR.rc +++ b/dll/win32/msgina/lang/fr-FR.rc @@ -1,12 +1,13 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Veuillez patienter..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/he-IL.rc b/dll/win32/msgina/lang/he-IL.rc index 23c24f9985..dfcadc3b92 100644 --- a/dll/win32/msgina/lang/he-IL.rc +++ b/dll/win32/msgina/lang/he-IL.rc @@ -1,12 +1,13 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "נא להמתין..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/id-ID.rc b/dll/win32/msgina/lang/id-ID.rc index 02660b5dd2..686ac7bb85 100644 --- a/dll/win32/msgina/lang/id-ID.rc +++ b/dll/win32/msgina/lang/id-ID.rc @@ -1,12 +1,13 @@ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Harap menunggu..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/it-IT.rc b/dll/win32/msgina/lang/it-IT.rc index 866f037547..ad93ddef15 100644 --- a/dll/win32/msgina/lang/it-IT.rc +++ b/dll/win32/msgina/lang/it-IT.rc @@ -9,13 +9,14 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Attendere..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/ja-JP.rc b/dll/win32/msgina/lang/ja-JP.rc index 38de8b4abb..df22e8453b 100644 --- a/dll/win32/msgina/lang/ja-JP.rc +++ b/dll/win32/msgina/lang/ja-JP.rc @@ -1,12 +1,13 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "お待ちください..." FONT 9, "MS UI Gothic", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/no-NO.rc b/dll/win32/msgina/lang/no-NO.rc index f3b6bf9670..b7fb47250b 100644 --- a/dll/win32/msgina/lang/no-NO.rc +++ b/dll/win32/msgina/lang/no-NO.rc @@ -1,12 +1,13 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Vent litt..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/pl-PL.rc b/dll/win32/msgina/lang/pl-PL.rc index 93d86eca86..11e484a9ab 100644 --- a/dll/win32/msgina/lang/pl-PL.rc +++ b/dll/win32/msgina/lang/pl-PL.rc @@ -10,13 +10,14 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Proszę czekać..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/ro-RO.rc b/dll/win32/msgina/lang/ro-RO.rc index ff9a0af2d6..a777f4a45c 100644 --- a/dll/win32/msgina/lang/ro-RO.rc +++ b/dll/win32/msgina/lang/ro-RO.rc @@ -9,13 +9,14 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Așteptați…" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/ru-RU.rc b/dll/win32/msgina/lang/ru-RU.rc index 7891fa040f..e876310017 100644 --- a/dll/win32/msgina/lang/ru-RU.rc +++ b/dll/win32/msgina/lang/ru-RU.rc @@ -2,13 +2,14 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Пожалуйста, подождите..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/sk-SK.rc b/dll/win32/msgina/lang/sk-SK.rc index 789443de47..331b00c29b 100644 --- a/dll/win32/msgina/lang/sk-SK.rc +++ b/dll/win32/msgina/lang/sk-SK.rc @@ -5,13 +5,14 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Počkajte, prosím ..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/sq-AL.rc b/dll/win32/msgina/lang/sq-AL.rc index b4474db1b7..7f3d9ff26a 100644 --- a/dll/win32/msgina/lang/sq-AL.rc +++ b/dll/win32/msgina/lang/sq-AL.rc @@ -4,13 +4,14 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Ju Lutem Prisni..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/tr-TR.rc b/dll/win32/msgina/lang/tr-TR.rc index de1b088d46..92218040ff 100644 --- a/dll/win32/msgina/lang/tr-TR.rc +++ b/dll/win32/msgina/lang/tr-TR.rc @@ -2,13 +2,14 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Lütfen Bekleyiniz..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/uk-UA.rc b/dll/win32/msgina/lang/uk-UA.rc index af2cb61762..7647b7aad6 100644 --- a/dll/win32/msgina/lang/uk-UA.rc +++ b/dll/win32/msgina/lang/uk-UA.rc @@ -8,13 +8,14 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Зачекайте..." FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/zh-CN.rc b/dll/win32/msgina/lang/zh-CN.rc index dfc9e1b946..22fa0f61f8 100644 --- a/dll/win32/msgina/lang/zh-CN.rc +++ b/dll/win32/msgina/lang/zh-CN.rc @@ -3,13 +3,14 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "请稍候..." FONT 9, "宋体", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/lang/zh-TW.rc b/dll/win32/msgina/lang/zh-TW.rc index 0ee86535ce..1198a48e75 100644 --- a/dll/win32/msgina/lang/zh-TW.rc +++ b/dll/win32/msgina/lang/zh-TW.rc @@ -2,13 +2,14 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL -IDD_STATUS DIALOGEX 0, 0, 275, 80 +IDD_STATUS DIALOGEX 0, 0, 275, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "請稍候..." FONT 9, "新細明體", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "", IDC_STATUS_MESSAGE, 7, 62, 261, 12, SS_WORDELLIPSIS + CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 80 diff --git a/dll/win32/msgina/msgina.rc b/dll/win32/msgina/msgina.rc index 9d455ab8cf..739b98071d 100644 --- a/dll/win32/msgina/msgina.rc +++ b/dll/win32/msgina/msgina.rc @@ -19,6 +19,7 @@ IDI_LOCKICON ICON "resources/115.ico" /* Bitmaps */ IDI_ROSLOGO BITMAP "resources/reactos.bmp" +IDI_BAR BITMAP "resources/line.bmp" /* UTF-8 */ #pragma code_page(65001) diff --git a/dll/win32/msgina/resource.h b/dll/win32/msgina/resource.h index cdba2c0b66..e23da85878 100644 --- a/dll/win32/msgina/resource.h +++ b/dll/win32/msgina/resource.h @@ -55,9 +55,11 @@ #define IDC_LEGALNOTICE_TEXT 2101 #define IDC_ROSLOGO 1007 +#define IDC_BAR 1008 #define IDI_ROSLOGO 20000 +#define IDI_BAR 20001 #define IDI_NOT_CONNECTED 13 #define IDI_LOGOFF 21 diff --git a/dll/win32/msgina/resources/line.bmp b/dll/win32/msgina/resources/line.bmp new file mode 100644 index 0000000000..08717d3cbe Binary files /dev/null and b/dll/win32/msgina/resources/line.bmp differ diff --git a/dll/win32/msgina/resources/line.svg b/dll/win32/msgina/resources/line.svg new file mode 100644 index 0000000000..82be5cdcde --- /dev/null +++ b/dll/win32/msgina/resources/line.svg @@ -0,0 +1,123 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.1" + id="svg2" + width="413" + height="5" + viewBox="0 0 413 5" + sodipodi:docname="animation_gradient.svg" + inkscape:export-filename="C:\Users\Administrator\Desktop\animation_gradient.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96" + inkscape:version="0.92.3 (2405546, 2018-03-11)"> + <metadata + id="metadata8"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs6"> + <linearGradient + inkscape:collect="always" + id="linearGradient823"> + <stop + style="stop-color:#305067;stop-opacity:1" + offset="0" + id="stop819" /> + <stop + id="stop835" + offset="0.10352668" + style="stop-color:#587787;stop-opacity:1" /> + <stop + id="stop833" + offset="0.2" + style="stop-color:#98a7a8;stop-opacity:1" /> + <stop + id="stop831" + offset="0.30179006" + style="stop-color:#a0b7c7;stop-opacity:1" /> + <stop + id="stop829" + offset="0.40238672" + style="stop-color:#cfd8e0;stop-opacity:1" /> + <stop + id="stop827" + offset="0.5" + style="stop-color:#ffffff;stop-opacity:1" /> + <stop + style="stop-color:#cfd8e0;stop-opacity:1" + offset="0.60000002" + id="stop837" /> + <stop + id="stop839" + offset="0.69999999" + style="stop-color:#a0b7c7;stop-opacity:1" /> + <stop + style="stop-color:#98a7a8;stop-opacity:1" + offset="0.80000001" + id="stop841" /> + <stop + id="stop843" + offset="0.89999998" + style="stop-color:#587787;stop-opacity:1" /> + <stop + style="stop-color:#305067;stop-opacity:1" + offset="1" + id="stop821" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient823" + id="linearGradient825" + x1="0" + y1="5" + x2="413" + y2="5" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(1.5852051e-7,-5)" /> + </defs> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1542" + inkscape:window-height="881" + id="namedview4" + showgrid="false" + inkscape:zoom="2.479154" + inkscape:cx="183.50151" + inkscape:cy="-19.138918" + inkscape:window-x="54" + inkscape:window-y="-4" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" /> + <rect + style="opacity:1;fill:url(#linearGradient825);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" + id="rect817" + width="413" + height="5" + x="0" + y="0" /> +</svg>

5 years, 10 months

[reactos] 01/01: [MMSYS] Disable the 'Low' and 'High' text of the volume trackbar and the 'Place volume icon in the taskbar' checkbox when no sound device is available.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb34029fde3f4eb97ec08… commit fb34029fde3f4eb97ec083489694b102166c90f9 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 24 15:35:36 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 24 15:36:08 2019 +0100 [MMSYS] Disable the 'Low' and 'High' text of the volume trackbar and the 'Place volume icon in the taskbar' checkbox when no sound device is available. --- dll/cpl/mmsys/lang/bg-BG.rc | 4 +-- dll/cpl/mmsys/lang/cs-CZ.rc | 4 +-- dll/cpl/mmsys/lang/de-DE.rc | 4 +-- dll/cpl/mmsys/lang/el-GR.rc | 4 +-- dll/cpl/mmsys/lang/en-US.rc | 4 +-- dll/cpl/mmsys/lang/es-ES.rc | 4 +-- dll/cpl/mmsys/lang/fr-FR.rc | 4 +-- dll/cpl/mmsys/lang/he-IL.rc | 4 +-- dll/cpl/mmsys/lang/id-ID.rc | 4 +-- dll/cpl/mmsys/lang/it-IT.rc | 4 +-- dll/cpl/mmsys/lang/ja-JP.rc | 4 +-- dll/cpl/mmsys/lang/nl-NL.rc | 4 +-- dll/cpl/mmsys/lang/no-NO.rc | 4 +-- dll/cpl/mmsys/lang/pl-PL.rc | 4 +-- dll/cpl/mmsys/lang/pt-BR.rc | 4 +-- dll/cpl/mmsys/lang/ro-RO.rc | 4 +-- dll/cpl/mmsys/lang/ru-RU.rc | 4 +-- dll/cpl/mmsys/lang/sk-SK.rc | 4 +-- dll/cpl/mmsys/lang/sq-AL.rc | 4 +-- dll/cpl/mmsys/lang/tr-TR.rc | 4 +-- dll/cpl/mmsys/lang/uk-UA.rc | 4 +-- dll/cpl/mmsys/lang/zh-CN.rc | 4 +-- dll/cpl/mmsys/lang/zh-TW.rc | 4 +-- dll/cpl/mmsys/resource.h | 66 +++++++++++++++++++++++---------------------- dll/cpl/mmsys/volume.c | 11 +++++--- 25 files changed, 87 insertions(+), 82 deletions(-) diff --git a/dll/cpl/mmsys/lang/bg-BG.rc b/dll/cpl/mmsys/lang/bg-BG.rc index c7017f8bc5..8403619f29 100644 --- a/dll/cpl/mmsys/lang/bg-BG.rc +++ b/dll/cpl/mmsys/lang/bg-BG.rc @@ -10,8 +10,8 @@ BEGIN GROUPBOX "Сила на устройството", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Слабо", -1, 62, 66, 30, 17 - LTEXT "Силно", -1, 195, 66, 30, 17 + LTEXT "Слабо", IDC_VOLUME_LOW, 62, 66, 30, 17 + LTEXT "Силно", IDC_VOLUME_HIGH, 195, 66, 30, 17 AUTOCHECKBOX "За&глушено", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Поставяне на &значе за звука в задачната лента", IDC_ICON_IN_TASKBAR, 50, 92, 180, 10 PUSHBUTTON "Разш&ирени...", IDC_ADVANCED_BTN, 154, 105, 80, 15 diff --git a/dll/cpl/mmsys/lang/cs-CZ.rc b/dll/cpl/mmsys/lang/cs-CZ.rc index 118e05a85e..eaee474fda 100644 --- a/dll/cpl/mmsys/lang/cs-CZ.rc +++ b/dll/cpl/mmsys/lang/cs-CZ.rc @@ -15,8 +15,8 @@ BEGIN GROUPBOX "Hlasitost zařízení", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Nízká", -1, 62, 66, 30, 17 - LTEXT "Vysoká", -1, 195, 66, 30, 17 + LTEXT "Nízká", IDC_VOLUME_LOW, 62, 66, 30, 17 + LTEXT "Vysoká", IDC_VOLUME_HIGH, 195, 66, 30, 17 AUTOCHECKBOX "&Ztlumit", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Umístit &ikonu hlasitosti na panel úloh", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "&Upřesnit...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/de-DE.rc b/dll/cpl/mmsys/lang/de-DE.rc index 50e9f76a34..627a0a8669 100644 --- a/dll/cpl/mmsys/lang/de-DE.rc +++ b/dll/cpl/mmsys/lang/de-DE.rc @@ -10,8 +10,8 @@ BEGIN GROUPBOX "Gerätelautstärke", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Niedrig", -1, 62, 66, 30, 17 - LTEXT "Hoch", -1, 195, 66, 30, 17 + LTEXT "Niedrig", IDC_VOLUME_LOW, 62, 66, 30, 17 + LTEXT "Hoch", IDC_VOLUME_HIGH, 195, 66, 30, 17 AUTOCHECKBOX "Stu&mm schalten", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Lautstärkeregelungs-&Icon in der Taskleiste zeigen", IDC_ICON_IN_TASKBAR, 50, 92, 170, 10 PUSHBUTTON "Er&weitert", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/el-GR.rc b/dll/cpl/mmsys/lang/el-GR.rc index 1daa5ee295..35f18a846c 100644 --- a/dll/cpl/mmsys/lang/el-GR.rc +++ b/dll/cpl/mmsys/lang/el-GR.rc @@ -10,8 +10,8 @@ BEGIN GROUPBOX "Device volume", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Low", -1, 62, 66, 30, 9 - LTEXT "High", -1, 195, 66, 30, 9 + LTEXT "Low", IDC_VOLUME_LOW, 62, 66, 30, 9 + LTEXT "High", IDC_VOLUME_HIGH, 195, 66, 30, 9 AUTOCHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Place volume &icon in the taskbar", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "Ad&vanced...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/en-US.rc b/dll/cpl/mmsys/lang/en-US.rc index a0aa0d70e0..5c002c117a 100644 --- a/dll/cpl/mmsys/lang/en-US.rc +++ b/dll/cpl/mmsys/lang/en-US.rc @@ -10,8 +10,8 @@ BEGIN GROUPBOX "Device volume", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Low", -1, 62, 66, 30, 9 - LTEXT "High", -1, 195, 66, 30, 9 + LTEXT "Low", IDC_VOLUME_LOW, 62, 66, 30, 9 + LTEXT "High", IDC_VOLUME_HIGH, 195, 66, 30, 9 AUTOCHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Place volume &icon in the taskbar", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "Ad&vanced...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/es-ES.rc b/dll/cpl/mmsys/lang/es-ES.rc index 6bc31ec353..9701f22184 100644 --- a/dll/cpl/mmsys/lang/es-ES.rc +++ b/dll/cpl/mmsys/lang/es-ES.rc @@ -10,8 +10,8 @@ BEGIN GROUPBOX "Volumen del dispositivo ", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Bajo", -1, 62, 66, 30, 17 - LTEXT "Alto", -1, 195, 66, 30, 17 + LTEXT "Bajo", IDC_VOLUME_LOW, 62, 66, 30, 17 + LTEXT "Alto", IDC_VOLUME_HIGH, 195, 66, 30, 17 AUTOCHECKBOX "&Silencio", IDC_MUTE_CHECKBOX, 30, 78, 140, 10 AUTOCHECKBOX "Colocar un icono de volumen en la &barra de tareas", IDC_ICON_IN_TASKBAR, 30, 92, 180, 10 PUSHBUTTON "Propiedades avan&zadas...", IDC_ADVANCED_BTN, 140, 105, 88, 15 diff --git a/dll/cpl/mmsys/lang/fr-FR.rc b/dll/cpl/mmsys/lang/fr-FR.rc index 101d756664..0c1d87dcd4 100644 --- a/dll/cpl/mmsys/lang/fr-FR.rc +++ b/dll/cpl/mmsys/lang/fr-FR.rc @@ -10,8 +10,8 @@ BEGIN GROUPBOX "Volume du périphérique", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Faible", -1, 62, 66, 30, 17 - LTEXT "Élevé", -1, 195, 66, 30, 17 + LTEXT "Faible", IDC_VOLUME_LOW, 62, 66, 30, 17 + LTEXT "Élevé", IDC_VOLUME_HIGH, 195, 66, 30, 17 AUTOCHECKBOX "&Muet", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Placer une icône du volume dans la barre de tâches", IDC_ICON_IN_TASKBAR, 50, 92, 175, 10 PUSHBUTTON "A&vancé...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/he-IL.rc b/dll/cpl/mmsys/lang/he-IL.rc index 60415bd885..aa39dc015c 100644 --- a/dll/cpl/mmsys/lang/he-IL.rc +++ b/dll/cpl/mmsys/lang/he-IL.rc @@ -12,8 +12,8 @@ BEGIN GROUPBOX "עוצמת התקן", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "נמוך", -1, 62, 66, 30, 9 - LTEXT "גבוה", -1, 195, 66, 30, 9 + LTEXT "נמוך", IDC_VOLUME_LOW, 62, 66, 30, 9 + LTEXT "גבוה", IDC_VOLUME_HIGH, 195, 66, 30, 9 AUTOCHECKBOX "השתק", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "שים סמל עוצמה בשורת המשימות", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "מתקדם...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/id-ID.rc b/dll/cpl/mmsys/lang/id-ID.rc index d25e780f29..39c0ba6099 100644 --- a/dll/cpl/mmsys/lang/id-ID.rc +++ b/dll/cpl/mmsys/lang/id-ID.rc @@ -10,8 +10,8 @@ BEGIN GROUPBOX "Device volume", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Low", -1, 62, 66, 30, 9 - LTEXT "High", -1, 195, 66, 30, 9 + LTEXT "Low", IDC_VOLUME_LOW, 62, 66, 30, 9 + LTEXT "High", IDC_VOLUME_HIGH, 195, 66, 30, 9 AUTOCHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Place volume &icon in the taskbar", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "Ad&vanced...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/it-IT.rc b/dll/cpl/mmsys/lang/it-IT.rc index e4d7b300ef..beba5fb350 100644 --- a/dll/cpl/mmsys/lang/it-IT.rc +++ b/dll/cpl/mmsys/lang/it-IT.rc @@ -10,8 +10,8 @@ BEGIN GROUPBOX "Volume del dispositivo", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Basso", -1, 62, 66, 30, 17 - LTEXT "Alto", -1, 195, 66, 30, 17 + LTEXT "Basso", IDC_VOLUME_LOW, 62, 66, 30, 17 + LTEXT "Alto", IDC_VOLUME_HIGH, 195, 66, 30, 17 AUTOCHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Mettere l'icona del &volume nella barra dei task", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "&Avanzate...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/ja-JP.rc b/dll/cpl/mmsys/lang/ja-JP.rc index dcd71bb0f9..a3751cf377 100644 --- a/dll/cpl/mmsys/lang/ja-JP.rc +++ b/dll/cpl/mmsys/lang/ja-JP.rc @@ -10,8 +10,8 @@ BEGIN GROUPBOX "デバイスの音量", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "低", -1, 62, 66, 30, 9 - LTEXT "高", -1, 195, 66, 30, 9 + LTEXT "低", IDC_VOLUME_LOW, 62, 66, 30, 9 + LTEXT "高", IDC_VOLUME_HIGH, 195, 66, 30, 9 AUTOCHECKBOX "ミュート(&M)", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "タスクバーに音量アイコンを置く(&I)", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "上級者向け(&V)...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/nl-NL.rc b/dll/cpl/mmsys/lang/nl-NL.rc index 984bd00f91..dff1d14542 100644 --- a/dll/cpl/mmsys/lang/nl-NL.rc +++ b/dll/cpl/mmsys/lang/nl-NL.rc @@ -10,8 +10,8 @@ BEGIN GROUPBOX "Volume", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Laag", -1, 62, 62, 30, 17 - LTEXT "Hoog", -1, 195, 62, 30, 17 + LTEXT "Laag", IDC_VOLUME_LOW, 62, 62, 30, 17 + LTEXT "Hoog", IDC_VOLUME_HIGH, 195, 62, 30, 17 AUTOCHECKBOX "&Dempen", IDC_MUTE_CHECKBOX, 25, 78, 190, 10 AUTOCHECKBOX "P&ictogram voor het volume in het systeemvak plaatsen", IDC_ICON_IN_TASKBAR, 25, 92, 190, 10 PUSHBUTTON "Ge&avanceerd...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/no-NO.rc b/dll/cpl/mmsys/lang/no-NO.rc index adf79f292e..2c380bf07b 100644 --- a/dll/cpl/mmsys/lang/no-NO.rc +++ b/dll/cpl/mmsys/lang/no-NO.rc @@ -10,8 +10,8 @@ BEGIN GROUPBOX "Enhets volum", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Lavt", -1, 62, 66, 30, 17 - LTEXT "Høyt", -1, 195, 66, 30, 17 + LTEXT "Lavt", IDC_VOLUME_LOW, 62, 66, 30, 17 + LTEXT "Høyt", IDC_VOLUME_HIGH, 195, 66, 30, 17 AUTOCHECKBOX "&Demp", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Plasser volum &ikon i oppgavelinjen", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "A&vansert...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/pl-PL.rc b/dll/cpl/mmsys/lang/pl-PL.rc index 1d28cacf29..f90b8c977b 100644 --- a/dll/cpl/mmsys/lang/pl-PL.rc +++ b/dll/cpl/mmsys/lang/pl-PL.rc @@ -23,8 +23,8 @@ BEGIN GROUPBOX "Głośność urządzenia", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Mała", -1, 62, 66, 30, 17 - LTEXT "Duża", -1, 195, 66, 30, 17 + LTEXT "Mała", IDC_VOLUME_LOW, 62, 66, 30, 17 + LTEXT "Duża", IDC_VOLUME_HIGH, 195, 66, 30, 17 AUTOCHECKBOX "&Wycisz", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Umieść &ikonę głośności w zasobniku systemowym", IDC_ICON_IN_TASKBAR, 50, 92, 180, 10 PUSHBUTTON "&Zaawansowane...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/pt-BR.rc b/dll/cpl/mmsys/lang/pt-BR.rc index b315614767..ba60ab0bdf 100644 --- a/dll/cpl/mmsys/lang/pt-BR.rc +++ b/dll/cpl/mmsys/lang/pt-BR.rc @@ -10,8 +10,8 @@ BEGIN GROUPBOX "Device volume", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Low", -1, 62, 66, 30, 9 - LTEXT "High", -1, 195, 66, 30, 9 + LTEXT "Low", IDC_VOLUME_LOW, 62, 66, 30, 9 + LTEXT "High", IDC_VOLUME_HIGH, 195, 66, 30, 9 AUTOCHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Place volume &icon in the taskbar", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "Ad&vanced...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/ro-RO.rc b/dll/cpl/mmsys/lang/ro-RO.rc index aa7ecb0bbb..34f881d6cd 100644 --- a/dll/cpl/mmsys/lang/ro-RO.rc +++ b/dll/cpl/mmsys/lang/ro-RO.rc @@ -15,8 +15,8 @@ BEGIN GROUPBOX "Volum", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Redus", -1, 62, 66, 30, 17 - LTEXT "Ridicat", -1, 195, 66, 30, 17 + LTEXT "Redus", IDC_VOLUME_LOW, 62, 66, 30, 17 + LTEXT "Ridicat", IDC_VOLUME_HIGH, 195, 66, 30, 17 AUTOCHECKBOX "A&muțește tot", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Afișează pictogramă în &zona de notificare", IDC_ICON_IN_TASKBAR, 50, 92, 170, 10 PUSHBUTTON "A&vansate…", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/ru-RU.rc b/dll/cpl/mmsys/lang/ru-RU.rc index cc9c8f1ff4..ec6aee8943 100644 --- a/dll/cpl/mmsys/lang/ru-RU.rc +++ b/dll/cpl/mmsys/lang/ru-RU.rc @@ -10,8 +10,8 @@ BEGIN GROUPBOX "Громкость микшера", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "ниже", -1, 62, 66, 30, 9 - LTEXT "выше", -1, 195, 66, 30, 9 + LTEXT "ниже", IDC_VOLUME_LOW, 62, 66, 30, 9 + LTEXT "выше", IDC_VOLUME_HIGH, 195, 66, 30, 9 AUTOCHECKBOX "В&ыключить звук", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Отображать &значок на панели задач", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "&Дополнительно...", IDC_ADVANCED_BTN, 155, 110, 75, 15 diff --git a/dll/cpl/mmsys/lang/sk-SK.rc b/dll/cpl/mmsys/lang/sk-SK.rc index c5d72f5cb0..9bc914dde8 100644 --- a/dll/cpl/mmsys/lang/sk-SK.rc +++ b/dll/cpl/mmsys/lang/sk-SK.rc @@ -15,8 +15,8 @@ BEGIN GROUPBOX "Hlasitosť zariadenia", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "nízka", -1, 62, 66, 30, 17 - LTEXT "vysoká", -1, 195, 66, 30, 17 + LTEXT "nízka", IDC_VOLUME_LOW, 62, 66, 30, 17 + LTEXT "vysoká", IDC_VOLUME_HIGH, 195, 66, 30, 17 AUTOCHECKBOX "S&tlmiť", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Umiestniť &ikonu hlasitosti na panel úloh", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "&Spresniť...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/sq-AL.rc b/dll/cpl/mmsys/lang/sq-AL.rc index af13ec1c20..6f1d9b079f 100644 --- a/dll/cpl/mmsys/lang/sq-AL.rc +++ b/dll/cpl/mmsys/lang/sq-AL.rc @@ -14,8 +14,8 @@ BEGIN GROUPBOX "Volumi Pjesës", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Poshtë", -1, 62, 66, 30, 9 - LTEXT "Lart", -1, 195, 66, 30, 9 + LTEXT "Poshtë", IDC_VOLUME_LOW, 62, 66, 30, 9 + LTEXT "Lart", IDC_VOLUME_HIGH, 195, 66, 30, 9 AUTOCHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Vendos &ikonen volumit në tabele", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "A&vancuar...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/tr-TR.rc b/dll/cpl/mmsys/lang/tr-TR.rc index 9c2095e5a1..715f2905ad 100644 --- a/dll/cpl/mmsys/lang/tr-TR.rc +++ b/dll/cpl/mmsys/lang/tr-TR.rc @@ -12,8 +12,8 @@ BEGIN GROUPBOX "Aygıt Ses Düzeyi", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "Düşük", -1, 62, 66, 30, 9 - LTEXT "Yüksek", -1, 195, 66, 30, 9 + LTEXT "Düşük", IDC_VOLUME_LOW, 62, 66, 30, 9 + LTEXT "Yüksek", IDC_VOLUME_HIGH, 195, 66, 30, 9 AUTOCHECKBOX "&Sessiz", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "&Görev Çubuğunda Ses Düzeyi Simgesini Yerleştir", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "G&elişmiş...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/uk-UA.rc b/dll/cpl/mmsys/lang/uk-UA.rc index bbb15e8bab..71c739ef66 100644 --- a/dll/cpl/mmsys/lang/uk-UA.rc +++ b/dll/cpl/mmsys/lang/uk-UA.rc @@ -18,8 +18,8 @@ BEGIN GROUPBOX "Гучність мікшера", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "нижче", -1, 62, 66, 30, 17 - LTEXT "вище", -1, 195, 66, 30, 17 + LTEXT "нижче", IDC_VOLUME_LOW, 62, 66, 30, 17 + LTEXT "вище", IDC_VOLUME_HIGH, 195, 66, 30, 17 AUTOCHECKBOX "&Вимкнути звук", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "Пока&зувати значок гучності на панелі завдань", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "&Додатково...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/zh-CN.rc b/dll/cpl/mmsys/lang/zh-CN.rc index 6a89bf8d2d..508bf20d1f 100644 --- a/dll/cpl/mmsys/lang/zh-CN.rc +++ b/dll/cpl/mmsys/lang/zh-CN.rc @@ -18,8 +18,8 @@ BEGIN GROUPBOX "设备音量", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "低", -1, 62, 66, 30, 17 - LTEXT "高", -1, 195, 66, 30, 17 + LTEXT "低", IDC_VOLUME_LOW, 62, 66, 30, 17 + LTEXT "高", IDC_VOLUME_HIGH, 195, 66, 30, 17 AUTOCHECKBOX "静音(&M)", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "将音量图标放入任务栏(&I)", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "高级(&V)...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/lang/zh-TW.rc b/dll/cpl/mmsys/lang/zh-TW.rc index 6f84319978..ae9c5c0e69 100644 --- a/dll/cpl/mmsys/lang/zh-TW.rc +++ b/dll/cpl/mmsys/lang/zh-TW.rc @@ -16,8 +16,8 @@ BEGIN GROUPBOX "裝置音量", -1, 7, 30, 230, 100, WS_GROUP CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE, 17, 45, 32, 32 CONTROL "", IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 20 - LTEXT "低", -1, 62, 66, 30, 17 - LTEXT "高", -1, 195, 66, 30, 17 + LTEXT "低", IDC_VOLUME_LOW, 62, 66, 30, 17 + LTEXT "高", IDC_VOLUME_HIGH, 195, 66, 30, 17 AUTOCHECKBOX "靜音(&M)", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 AUTOCHECKBOX "將音量圖示放入工作列(&I)", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "高階(&V)...", IDC_ADVANCED_BTN, 150, 105, 75, 15 diff --git a/dll/cpl/mmsys/resource.h b/dll/cpl/mmsys/resource.h index d1a85a59b6..bdd843f65c 100644 --- a/dll/cpl/mmsys/resource.h +++ b/dll/cpl/mmsys/resource.h @@ -31,38 +31,40 @@ /* Controls */ #define IDC_VOLUME_TRACKBAR 5000 -#define IDC_MUTE_CHECKBOX 5001 -#define IDC_ICON_IN_TASKBAR 5002 -#define IDC_SOUND_SCHEME 5003 -#define IDC_SCHEME_LIST 5004 -#define IDC_SOUND_LIST 5005 -#define IDC_DEFAULT_DEV_CHECKBOX 5006 -#define IDC_DEVICE_PLAY_LIST 5007 -#define IDC_DEVICE_REC_LIST 5008 -#define IDC_DEVICE_MIDI_LIST 5009 -#define IDC_DEVICE_VOICE_LIST 5010 -#define IDC_DEVICE_VOICE_REC_LIST 5011 -#define IDC_TEXT_SOUND 5012 -#define IDC_PLAY_SOUND 5013 -#define IDC_BROWSE_SOUND 5014 -#define IDC_DEVICE_NAME 5015 -#define IDC_ADVANCED_BTN 5016 -#define IDC_SPEAKER_SET_BTN 5017 -#define IDC_SPEAKER_VOL_BTN 5018 -#define IDC_ADVANCED2_BTN 5019 -#define IDC_VOLUME1_BTN 5020 -#define IDC_ADV2_BTN 5021 -#define IDC_VOLUME2_BTN 5022 -#define IDC_ADV1_BTN 5023 -#define IDC_VOLUME3_BTN 5024 -#define IDC_ADV3_BTN 5025 -#define IDC_VOLUME4_BTN 5026 -#define IDC_ADV4_BTN 5027 -#define IDC_VOLUME5_BTN 5028 -#define IDC_ADV5_BTN 5029 -#define IDC_TEST_HARDWARE 5030 -#define IDC_SAVEAS_BTN 5031 -#define IDC_DELETE_BTN 5032 +#define IDC_VOLUME_LOW 5001 +#define IDC_VOLUME_HIGH 5002 +#define IDC_MUTE_CHECKBOX 5003 +#define IDC_ICON_IN_TASKBAR 5004 +#define IDC_SOUND_SCHEME 5005 +#define IDC_SCHEME_LIST 5006 +#define IDC_SOUND_LIST 5007 +#define IDC_DEFAULT_DEV_CHECKBOX 5008 +#define IDC_DEVICE_PLAY_LIST 5009 +#define IDC_DEVICE_REC_LIST 5010 +#define IDC_DEVICE_MIDI_LIST 5011 +#define IDC_DEVICE_VOICE_LIST 5012 +#define IDC_DEVICE_VOICE_REC_LIST 5013 +#define IDC_TEXT_SOUND 5014 +#define IDC_PLAY_SOUND 5015 +#define IDC_BROWSE_SOUND 5016 +#define IDC_DEVICE_NAME 5017 +#define IDC_ADVANCED_BTN 5018 +#define IDC_SPEAKER_SET_BTN 5019 +#define IDC_SPEAKER_VOL_BTN 5020 +#define IDC_ADVANCED2_BTN 5021 +#define IDC_VOLUME1_BTN 5022 +#define IDC_ADV2_BTN 5023 +#define IDC_VOLUME2_BTN 5024 +#define IDC_ADV1_BTN 5025 +#define IDC_VOLUME3_BTN 5026 +#define IDC_ADV3_BTN 5027 +#define IDC_VOLUME4_BTN 5028 +#define IDC_ADV4_BTN 5029 +#define IDC_VOLUME5_BTN 5030 +#define IDC_ADV5_BTN 5031 +#define IDC_TEST_HARDWARE 5032 +#define IDC_SAVEAS_BTN 5033 +#define IDC_DELETE_BTN 5034 #define IDB_SPEAKIMG 4624 #define IDC_SPEAKIMG 4625 diff --git a/dll/cpl/mmsys/volume.c b/dll/cpl/mmsys/volume.c index 10f61f8222..a64642f862 100644 --- a/dll/cpl/mmsys/volume.c +++ b/dll/cpl/mmsys/volume.c @@ -299,17 +299,16 @@ InitVolumeControls(HWND hwndDlg, PGLOBAL_DATA pGlobalData) MIXERCAPS mxc; TCHAR szNoDevices[256]; - CheckDlgButton(hwndDlg, - IDC_ICON_IN_TASKBAR, - GetSystrayVolumeIconState() ? BST_CHECKED : BST_UNCHECKED); - LoadString(hApplet, IDS_NO_DEVICES, szNoDevices, _countof(szNoDevices)); NumMixers = mixerGetNumDevs(); if (!NumMixers) { EnableWindow(GetDlgItem(hwndDlg, IDC_VOLUME_TRACKBAR), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_VOLUME_LOW), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_VOLUME_HIGH), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_MUTE_CHECKBOX), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_ICON_IN_TASKBAR), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_ADVANCED_BTN), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_SPEAKER_VOL_BTN), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_ADVANCED2_BTN), FALSE); @@ -331,6 +330,10 @@ InitVolumeControls(HWND hwndDlg, PGLOBAL_DATA pGlobalData) return; } + CheckDlgButton(hwndDlg, + IDC_ICON_IN_TASKBAR, + GetSystrayVolumeIconState() ? BST_CHECKED : BST_UNCHECKED); + GetMuteControl(pGlobalData); GetMuteState(pGlobalData); if (pGlobalData->muteVal)

5 years, 10 months

[reactos] 01/01: [WINLOGON] Fix fallback keyboard layout flags

by Raul Tambre

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=44aef85db1d716825527b… commit 44aef85db1d716825527b5abedcc47bf735591ec Author: Raul Tambre <raul(a)tambre.ee> AuthorDate: Sun Feb 24 11:37:42 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 24 15:21:38 2019 +0100 [WINLOGON] Fix fallback keyboard layout flags --- base/system/winlogon/winlogon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/system/winlogon/winlogon.c b/base/system/winlogon/winlogon.c index eeba3a2334..68783c828b 100644 --- a/base/system/winlogon/winlogon.c +++ b/base/system/winlogon/winlogon.c @@ -204,7 +204,7 @@ InitKeyboardLayouts(VOID) if (!bRet) { /* If we failed, load US keyboard layout */ - if (LoadKeyboardLayoutW(L"00000409", 0x04090409)) + if (LoadKeyboardLayoutW(L"00000409", KLF_ACTIVATE | KLF_SUBSTITUTE_OK | KLF_REPLACELANG | KLF_SETFORPROCESS)) bRet = TRUE; }

5 years, 10 months

← Newer
1
2
3
4
5
6
7
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2019