Ros-diffs January 2024

ros-diffs@reactos.org

17 participants
181 discussions

[reactos] 03/04: [REGEDIT] Update Russian (ru-RU) translation
by Stanislav Motylkov 25 Jan '24

25 Jan '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c9985e48d378a0ce52ed1… commit c9985e48d378a0ce52ed18a8ec2600fad1ad9668 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Jan 26 01:08:43 2024 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri Jan 26 01:08:43 2024 +0300 [REGEDIT] Update Russian (ru-RU) translation --- base/applications/regedit/lang/ru-RU.rc | 138 ++++++++++++++++---------------- 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/base/applications/regedit/lang/ru-RU.rc b/base/applications/regedit/lang/ru-RU.rc index 4c0cfb75775..87875a88a27 100644 --- a/base/applications/regedit/lang/ru-RU.rc +++ b/base/applications/regedit/lang/ru-RU.rc @@ -280,10 +280,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | CAPTION "Ресурсы" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Канал DMA:", IDC_STATIC, 10, 5, 20, 8 + LTEXT "Канал DMA:", IDC_STATIC, 10, 5, 40, 8 CONTROL "", IDC_DMA_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 15, 261, 31 - LTEXT "Прерывание:", IDC_STATIC, 10, 48, 35, 8 + LTEXT "Прерывание:", IDC_STATIC, 10, 48, 44, 8 CONTROL "", IDC_IRQ_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 58, 261, 31 LTEXT "Память:", IDC_STATIC, 10, 91, 32, 8 @@ -296,7 +296,7 @@ BEGIN CONTROL "", IDC_DEVICE_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 188, 261, 31 GROUPBOX "Назначение", IDC_STATIC, 10, 219, 125, 39 - LTEXT "Не определено", IDC_UNDETERMINED, 18, 230, 46, 8, WS_DISABLED + LTEXT "Не определено", IDC_UNDETERMINED, 18, 230, 52, 8, WS_DISABLED LTEXT "Общий ресурс", IDC_SHARED, 18, 240, 48, 8, WS_DISABLED LTEXT "Для устройства", IDC_DEVICE_EXCLUSIVE, 72, 230, 58, 8, WS_DISABLED LTEXT "Для драйвера", IDC_DRIVER_EXCLUSIVE, 72, 240, 54, 8, WS_DISABLED @@ -314,100 +314,100 @@ END IDD_EDIT_REQUIREMENTS_LIST DIALOGEX 32, 24, 220, 135 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Requirements List" +CAPTION "Список необходимых ресурсов" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_REQUIREMENTS_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 200, 66 - RTEXT "Interface Type:", IDC_STATIC, 10, 80, 62, 8 + RTEXT "Тип интерфейса:", IDC_STATIC, 10, 80, 62, 8 LTEXT "", IDC_REQINTERFACETYPE, 77, 80, 76, 8 - RTEXT "Bus Number:", IDC_STATIC, 10, 90, 62, 8 + RTEXT "Номер шины:", IDC_STATIC, 10, 90, 62, 8 LTEXT "", IDC_REQBUSNUMBER, 77, 90, 76, 8 - RTEXT "Slot Type:", IDC_STATIC, 10, 100, 62, 8 + RTEXT "Номер гнезда:", IDC_STATIC, 10, 100, 62, 8 LTEXT "", IDC_REQSLOTNUMBER, 77, 100, 76, 8 DEFPUSHBUTTON "OK", IDOK, 62, 115, 50, 14 - PUSHBUTTON "Show...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED + PUSHBUTTON "Показать...", IDC_SHOW_REQUIREMENT, 118, 115, 50, 14, WS_DISABLED END IDD_EDIT_REQUIREMENTS_PORT DIALOGEX 32, 24, 158, 135 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Port" +CAPTION "Порт" FONT 8, "MS Shell Dlg" BEGIN - RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8 + RTEXT "Тип:", IDC_STATIC, 10, 10, 61, 8 LTEXT "", IDC_REQ_PORT_TYPE, 77, 10, 76, 8 - RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8 + RTEXT "Длина:", IDC_STATIC, 10, 20, 61, 8 LTEXT "", IDC_REQ_PORT_LENGTH, 77, 20, 76, 8 - RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8 + RTEXT "Выравнивание:", IDC_STATIC, 10, 30, 61, 8 LTEXT "", IDC_REQ_PORT_ALIGN, 77, 30, 76, 8 - RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8 + RTEXT "Мин. адрес:", IDC_STATIC, 10, 40, 61, 8 LTEXT "", IDC_REQ_PORT_MIN, 77, 40, 76, 8 - RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8 + RTEXT "Макс. адрес:", IDC_STATIC, 10, 50, 61, 8 LTEXT "", IDC_REQ_PORT_MAX, 77, 50, 76, 8 - RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8 + RTEXT "Назначение:", IDC_STATIC, 10, 60, 61, 8 LTEXT "", IDC_REQ_PORT_SHARE, 77, 60, 76, 8 - GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39 - LTEXT "Alternative", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED - LTEXT "Preferred", IDC_REQ_PORT_PREFERRED, 34, 96, 37, 8, WS_DISABLED + GROUPBOX "Параметры", IDC_STATIC, 10, 72, 83, 39 + LTEXT "Дополнительный", IDC_REQ_PORT_ALTERNATIVE, 34, 86, 59, 8, WS_DISABLED + LTEXT "Основной", IDC_REQ_PORT_PREFERRED, 34, 96, 59, 8, WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14 END IDD_EDIT_REQUIREMENTS_MEMORY DIALOGEX 32, 24, 158, 135 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Memory" +CAPTION "Память" FONT 8, "MS Shell Dlg" BEGIN - RTEXT "Access:", IDC_STATIC, 10, 10, 61, 8 + RTEXT "Доступ:", IDC_STATIC, 10, 10, 61, 8 LTEXT "", IDC_REQ_MEMORY_ACCESS, 77, 10, 76, 8 - RTEXT "Length:", IDC_STATIC, 10, 20, 61, 8 + RTEXT "Длина:", IDC_STATIC, 10, 20, 61, 8 LTEXT "", IDC_REQ_MEMORY_LENGTH, 77, 20, 76, 8 - RTEXT "Alignment:", IDC_STATIC, 10, 30, 61, 8 + RTEXT "Выравнивание:", IDC_STATIC, 10, 30, 61, 8 LTEXT "", IDC_REQ_MEMORY_ALIGN, 77, 30, 76, 8 - RTEXT "Minimum Address:", IDC_STATIC, 10, 40, 61, 8 + RTEXT "Мин. адрес:", IDC_STATIC, 10, 40, 61, 8 LTEXT "", IDC_REQ_MEMORY_MIN, 77, 40, 76, 8 - RTEXT "Maximum Address:", IDC_STATIC, 10, 50, 61, 8 + RTEXT "Макс. адрес:", IDC_STATIC, 10, 50, 61, 8 LTEXT "", IDC_REQ_MEMORY_MAX, 77, 50, 76, 8 - RTEXT "Share Disposition:", IDC_STATIC, 10, 60, 61, 8 + RTEXT "Назначение:", IDC_STATIC, 10, 60, 61, 8 LTEXT "", IDC_REQ_MEMORY_SHARE, 77, 60, 76, 8 - GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39 - LTEXT "Alternative", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED - LTEXT "Preferred", IDC_REQ_MEMORY_PREFERRED, 34, 96, 37, 8, WS_DISABLED + GROUPBOX "Параметры", IDC_STATIC, 10, 72, 83, 39 + LTEXT "Дополнительный", IDC_REQ_MEMORY_ALTERNATIVE, 34, 86, 59, 8, WS_DISABLED + LTEXT "Основной", IDC_REQ_MEMORY_PREFERRED, 34, 96, 59, 8, WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14 END IDD_EDIT_REQUIREMENTS_INT DIALOGEX 32, 24, 158, 135 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Interrupt" +CAPTION "Прерывание" FONT 8, "MS Shell Dlg" BEGIN - RTEXT "Type:", IDC_STATIC, 10, 10, 61, 8 + RTEXT "Тип:", IDC_STATIC, 10, 10, 61, 8 LTEXT "", IDC_REQ_INT_TYPE, 77, 10, 76, 8 - RTEXT "Minimum Vector:", IDC_STATIC, 10, 20, 61, 8 + RTEXT "Мин. вектор:", IDC_STATIC, 10, 20, 61, 8 LTEXT "", IDC_REQ_INT_MIN, 77, 20, 76, 8 - RTEXT "Maximum Vector:", IDC_STATIC, 10, 30, 61, 8 + RTEXT "Макс. вектор:", IDC_STATIC, 10, 30, 61, 8 LTEXT "", IDC_REQ_INT_MAX, 77, 30, 76, 8 - RTEXT "Share Disposition:", IDC_STATIC, 10, 40, 61, 8 + RTEXT "Назначение:", IDC_STATIC, 10, 40, 61, 8 LTEXT "", IDC_REQ_INT_SHARE, 77, 40, 76, 8 - GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39 - LTEXT "Alternative", IDC_REQ_INT_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED - LTEXT "Preferred", IDC_REQ_INT_PREFERRED, 34, 96, 37, 8, WS_DISABLED + GROUPBOX "Параметры", IDC_STATIC, 10, 72, 83, 39 + LTEXT "Дополнительный", IDC_REQ_INT_ALTERNATIVE, 34, 86, 59, 8, WS_DISABLED + LTEXT "Основной", IDC_REQ_INT_PREFERRED, 34, 96, 59, 8, WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14 END IDD_EDIT_REQUIREMENTS_DMA DIALOGEX 32, 24, 158, 135 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "DMA" +CAPTION "Канал DMA" FONT 8, "MS Shell Dlg" BEGIN - RTEXT "Minimum Channel:", IDC_STATIC, 10, 10, 61, 8 + RTEXT "Мин. канал:", IDC_STATIC, 10, 10, 61, 8 LTEXT "", IDC_REQ_DMA_MIN, 77, 10, 76, 8 - RTEXT "Maximum Channel:", IDC_STATIC, 10, 20, 61, 8 + RTEXT "Макс. канал:", IDC_STATIC, 10, 20, 61, 8 LTEXT "", IDC_REQ_DMA_MAX, 77, 20, 76, 8 - RTEXT "Share Disposition:", IDC_STATIC, 10, 30, 61, 8 + RTEXT "Назначение:", IDC_STATIC, 10, 30, 61, 8 LTEXT "", IDC_REQ_DMA_SHARE, 77, 30, 76, 8 - GROUPBOX "Options", IDC_STATIC, 10, 72, 83, 39 - LTEXT "Alternative", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 37, 8, WS_DISABLED - LTEXT "Preferred", IDC_REQ_DMA_PREFERRED, 34, 96, 37, 8, WS_DISABLED + GROUPBOX "Параметры", IDC_STATIC, 10, 72, 83, 39 + LTEXT "Дополнительный", IDC_REQ_DMA_ALTERNATIVE, 34, 86, 59, 8, WS_DISABLED + LTEXT "Основной", IDC_REQ_DMA_PREFERRED, 34, 96, 59, 8, WS_DISABLED DEFPUSHBUTTON "OK", IDOK, 58, 117, 40, 14 END @@ -619,39 +619,39 @@ END STRINGTABLE BEGIN - IDS_FIELD_KEY_NAME "Key Name:" - IDS_FIELD_CLASS_NAME "Class Name:" - IDS_NO_CLASS_NAME "<NO CLASS>" - IDS_NULL_TIMESTAMP "<NULL>" - IDS_FIELD_NAME " Name:" - IDS_FIELD_TYPE " Type:" - IDS_FIELD_DATA " Data:" - IDS_FIELD_LASTWRITE "Last Write Time:" - IDS_UNKNOWN "<UNKNOWN>" - IDS_VALUE_INDEX "Value %d" + IDS_FIELD_KEY_NAME "Раздел:" + IDS_FIELD_CLASS_NAME "Название класса:" + IDS_NO_CLASS_NAME "<Класс отсутствует>" + IDS_NULL_TIMESTAMP "<НЕТ>" + IDS_FIELD_NAME " Название:" + IDS_FIELD_TYPE " Тип:" + IDS_FIELD_DATA " Значение:" + IDS_FIELD_LASTWRITE "Последнее время записи:" + IDS_UNKNOWN "<НЕИЗВЕСТНО>" + IDS_VALUE_INDEX "Значение %d" END STRINGTABLE BEGIN - IDS_REQALTERNATIVELIST "Alternative List" - IDS_REQRESOURCELIST "Resource List" - IDS_REQDESCRIPTOR "Descriptor" - IDS_REQDEVICETYPE "Device Type" - IDS_TYPE_PORT "Port" - IDS_TYPE_INTERRUPT "Interrupt" - IDS_TYPE_MEMORY "Memory" - IDS_TYPE_DMA "DMA" - IDS_SHARE_DEVICE_EXCLUSIVE "Device Exclusive" - IDS_SHARE_DRIVER_EXCLUSIVE "Driver Exclusive" - IDS_SHARE_SHARED "Shared" - IDS_SHARE_UNDETERMINED "Undetermined" + IDS_REQALTERNATIVELIST "Дополнительный список" + IDS_REQRESOURCELIST "Список ресурсов" + IDS_REQDESCRIPTOR "Дескриптор" + IDS_REQDEVICETYPE "Тип устройства" + IDS_TYPE_PORT "Порт" + IDS_TYPE_INTERRUPT "Прерывание" + IDS_TYPE_MEMORY "Память" + IDS_TYPE_DMA "Канал DMA" + IDS_SHARE_DEVICE_EXCLUSIVE "Для устройства" + IDS_SHARE_DRIVER_EXCLUSIVE "Для драйвера" + IDS_SHARE_SHARED "Общий ресурс" + IDS_SHARE_UNDETERMINED "Не определено" END /*****************************************************************/ /* Dialogs */ -IDD_EXPORTRANGE DIALOGEX 50, 50, 268, 98 +IDD_EXPORTRANGE DIALOGEX 50, 50, 370, 50 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN @@ -666,13 +666,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Загрузить куст" FONT 8, "Ms Shell Dlg" BEGIN - LTEXT "&Значение:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT - EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 + LTEXT "&Значение:", IDC_STATIC, 4, 4, 33, 8, SS_LEFT + EDITTEXT IDC_EDIT_KEY, 42, 2, 148, 13 DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 PUSHBUTTON "Отмена", IDCANCEL, 89, 17, 50, 14 END -IDD_ADDFAVORITES DIALOGEX 0, 0, 187, 95 +IDD_ADDFAVORITES DIALOGEX 0, 0, 186, 46 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Добавить в избранное" FONT 8, "MS Shell Dlg"

1 0

[reactos] 02/04: [FORMAT] Fix translation headers (+ miscellaneous fixes)
by Stanislav Motylkov 25 Jan '24

25 Jan '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=889cfee653fabf8aef1ab… commit 889cfee653fabf8aef1ab27f279d66ec9f54f889 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Jan 26 00:02:38 2024 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri Jan 26 00:02:38 2024 +0300 [FORMAT] Fix translation headers (+ miscellaneous fixes) --- base/system/format/lang/bg-BG.rc | 12 ++++++++++-- base/system/format/lang/cs-CZ.rc | 8 +++++--- base/system/format/lang/de-DE.rc | 11 +++++++++++ base/system/format/lang/el-GR.rc | 7 ++++++- base/system/format/lang/en-US.rc | 7 +++++++ base/system/format/lang/es-ES.rc | 7 ++++++- base/system/format/lang/fr-FR.rc | 7 ++++++- base/system/format/lang/hu-HU.rc | 8 +++++++- base/system/format/lang/id-ID.rc | 8 ++++++++ base/system/format/lang/it-IT.rc | 7 +++++++ base/system/format/lang/ja-JP.rc | 7 +++++++ base/system/format/lang/lt-LT.rc | 8 +++++++- base/system/format/lang/no-NO.rc | 9 ++++++++- base/system/format/lang/pl-PL.rc | 9 +++++---- base/system/format/lang/ro-RO.rc | 2 +- base/system/format/lang/ru-RU.rc | 10 ++++++++-- base/system/format/lang/sk-SK.rc | 8 +++++--- base/system/format/lang/sq-AL.rc | 9 ++++++--- base/system/format/lang/tr-TR.rc | 9 ++++++++- base/system/format/lang/uk-UA.rc | 9 ++++----- base/system/format/lang/zh-CN.rc | 8 +++++++- base/system/format/lang/zh-TW.rc | 9 +++++++-- 22 files changed, 146 insertions(+), 33 deletions(-) diff --git a/base/system/format/lang/bg-BG.rc b/base/system/format/lang/bg-BG.rc index eeabc866595..75fe6e4d804 100644 --- a/base/system/format/lang/bg-BG.rc +++ b/base/system/format/lang/bg-BG.rc @@ -1,11 +1,19 @@ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Bulgarian resource file + * TRANSLATORS: Copyright 2007-2012 S. Stanev (CCTAHEB) <sstpr(a)narod.ru> + * Copyright 2023 Nikolay Dimitrov <nikolay.dimitrov(a)extremesoft.eu> + */ + LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN STRING_HELP "Употреба: %s устройство: [-FS:файлова_система] [-V:етикет] [-Q] [-A:размер] [-C]\n\n\ - [drive:] Указва устройството за оразмеряване.\n\ + [устройство:] Указва устройството за оразмеряване.\n\ -FS:файлова_система Указва вида на файловата система (%s).\n\ - -V:етикет Указва етикет за тома.\n\ + -V:етикет Указва етикет за тома.\n\ -Q Извършва бързо оразмеряване (форматиране).\n\ -A:размер Потиска подразбрания размер на чепката. Подразбраните настройки\n\ са силно препоръчителни за обща употреба.\n\ diff --git a/base/system/format/lang/cs-CZ.rc b/base/system/format/lang/cs-CZ.rc index fb52fa3cd7f..329893e7c1d 100644 --- a/base/system/format/lang/cs-CZ.rc +++ b/base/system/format/lang/cs-CZ.rc @@ -1,6 +1,8 @@ -/* FILE: base/system/format/lang/cs-CZ.rc - * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) - * UPDATED: 2008-04-21 +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Czech resource file + * TRANSLATOR: Copyright 2008 Radek Liška (Black_Fox) <radekliska(a)gmail.com> */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT diff --git a/base/system/format/lang/de-DE.rc b/base/system/format/lang/de-DE.rc index 22e102984ba..3242887f855 100644 --- a/base/system/format/lang/de-DE.rc +++ b/base/system/format/lang/de-DE.rc @@ -1,3 +1,14 @@ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: German resource file + * TRANSLATORS: Copyright 2005 Kevin Schnabel (FooDerGrosse) <kevin_schnabel(a)gmx.de> + * Copyright 2008 Fabian Maurer <dark_shadow(a)gmx.at> + * Copyright 2008 Matthias Kupfer <mkupfer(a)reactos.org> + * Copyright 2010 Sven Knurr (tux.) <forenkrams(a)tuxproject.de> + * Copyright 2014 Zehnvor <sixlivezehn(a)googlemail.com> + */ + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE diff --git a/base/system/format/lang/el-GR.rc b/base/system/format/lang/el-GR.rc index dd143638e53..f25a676d79f 100644 --- a/base/system/format/lang/el-GR.rc +++ b/base/system/format/lang/el-GR.rc @@ -1,4 +1,9 @@ -/* Ελληνική μετάφραση - Απόστολος Αλεξιάδης */ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Greek resource file + * TRANSLATOR: Copyright 2008 Apostolos Alexiadis <djapal(a)gmail.com> + */ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT diff --git a/base/system/format/lang/en-US.rc b/base/system/format/lang/en-US.rc index 4356abca1be..2990400cd74 100644 --- a/base/system/format/lang/en-US.rc +++ b/base/system/format/lang/en-US.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: English (United States) resource file + * TRANSLATOR: Copyright 2005 Magnus Olsen <magnus(a)greatlord.com> + */ + LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE diff --git a/base/system/format/lang/es-ES.rc b/base/system/format/lang/es-ES.rc index e82a4a84c0c..7930c1794b3 100644 --- a/base/system/format/lang/es-ES.rc +++ b/base/system/format/lang/es-ES.rc @@ -1,4 +1,9 @@ -/* Spanish translation by Javier Remacha 2007-12-19 */ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Spanish resource file + * TRANSLATOR: Copyright 2007 Javier Remacha <remialdo(a)gmail.com> + */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL diff --git a/base/system/format/lang/fr-FR.rc b/base/system/format/lang/fr-FR.rc index 74447b46072..70385a8bb97 100644 --- a/base/system/format/lang/fr-FR.rc +++ b/base/system/format/lang/fr-FR.rc @@ -1,4 +1,9 @@ -/* Translation made by Jerome Signouret, 2005. */ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: French resource file + * TRANSLATOR: Copyright 2005 Jerome Signouret <ggcom(a)tele2.fr> + */ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL diff --git a/base/system/format/lang/hu-HU.rc b/base/system/format/lang/hu-HU.rc index 4cf8f2bb988..9105327e755 100644 --- a/base/system/format/lang/hu-HU.rc +++ b/base/system/format/lang/hu-HU.rc @@ -1,4 +1,10 @@ -/* Hungarian translation by Peter Nagy <nagylakas(a)gmail.com> */ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Hungarian resource file + * TRANSLATORS: Copyright 2005 Peter Nagy <nagylakas(a)gmail.com> + * Copyright 2022 Tibor Lajos Füzi <tibor.fuzi(a)gmail.com> + */ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT diff --git a/base/system/format/lang/id-ID.rc b/base/system/format/lang/id-ID.rc index bddde264e7e..8369ece9de6 100644 --- a/base/system/format/lang/id-ID.rc +++ b/base/system/format/lang/id-ID.rc @@ -1,3 +1,11 @@ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Indonesian resource file + * TRANSLATORS: Copyright 2007 Zaenal Mutaqin <ade999(a)gmail.com> + * Copyright 2019 Mas Ahmad Muhammad <m.charly81(a)gmail.com> + */ + LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT STRINGTABLE diff --git a/base/system/format/lang/it-IT.rc b/base/system/format/lang/it-IT.rc index 34918cb5b9f..0add43bd09a 100644 --- a/base/system/format/lang/it-IT.rc +++ b/base/system/format/lang/it-IT.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Italian resource file + * TRANSLATOR: Copyright 2007 Paolo Devoti (devpao) <devotip(a)tiscali.it> + */ + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE diff --git a/base/system/format/lang/ja-JP.rc b/base/system/format/lang/ja-JP.rc index 6b4c6954446..f0203afbcbb 100644 --- a/base/system/format/lang/ja-JP.rc +++ b/base/system/format/lang/ja-JP.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Japanese resource file + * TRANSLATOR: Copyright 2005 tsk <tsk_n(a)mail.goo.ne.jp> + */ + LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STRINGTABLE diff --git a/base/system/format/lang/lt-LT.rc b/base/system/format/lang/lt-LT.rc index 13b9e4d80f2..30819ecb5a3 100644 --- a/base/system/format/lang/lt-LT.rc +++ b/base/system/format/lang/lt-LT.rc @@ -1,4 +1,10 @@ -/* Translation by Vytis 'CMan' Girdžijauskas cman(a)cman.us */ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Lithuanian resource file + * TRANSLATORS: Copyright 2008 Vytis Girdžijauskas <cman(a)cman.us> + * Copyright 2011 Edijs Kolesnikovics <terminedijs(a)yahoo.com> + */ LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT diff --git a/base/system/format/lang/no-NO.rc b/base/system/format/lang/no-NO.rc index e7020f1fc28..d3e5b10f4f6 100644 --- a/base/system/format/lang/no-NO.rc +++ b/base/system/format/lang/no-NO.rc @@ -1,9 +1,16 @@ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Norwegian resource file + * TRANSLATOR: Copyright 2006 Lars Martin Hambro (LMH1) <lars_martin4(a)hotmail.com> + */ + LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN STRING_HELP "bruk: %s stasjon: [-FS:fil-system] [-V:merke] [-Q] [-A:størrelse] [-C]\n\n\ - [stasjon:] Spesifisere stasjon til formater.\n\ + [stasjon:] Spesifisere stasjon til formater.\n\ -FS:file-system Spesifisere typen av fil system (%s).\n\ -V:merke Spesifisere volum merke.\n\ -Q Fullføre en rask formatering.\n\ diff --git a/base/system/format/lang/pl-PL.rc b/base/system/format/lang/pl-PL.rc index d8abe78f03f..aa4a70720cf 100644 --- a/base/system/format/lang/pl-PL.rc +++ b/base/system/format/lang/pl-PL.rc @@ -1,8 +1,9 @@ /* - * Translated by xrogers - * xxrogers(a)users.sourceforge.net - * https://sourceforge.net/projects/reactospl - * UTF-8 conversion by Caemyr (May, 2011) + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Polish resource file + * TRANSLATORS: Copyright 2007 Lech Groblewicz <xxrogers(a)users.sourceforge.net> + * Copyright 2007 Janusz Tomczak <januszt29(a)interia.pl> */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT diff --git a/base/system/format/lang/ro-RO.rc b/base/system/format/lang/ro-RO.rc index 61a55fd22f7..3a4103eaf0d 100644 --- a/base/system/format/lang/ro-RO.rc +++ b/base/system/format/lang/ro-RO.rc @@ -1,5 +1,5 @@ /* - * PROJECT: ReactOS Format + * PROJECT: Disk Format Utility * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Romanian resource file * TRANSLATORS: Copyright 2018 Ștefan Fulea <stefan.fulea(a)mail.com> diff --git a/base/system/format/lang/ru-RU.rc b/base/system/format/lang/ru-RU.rc index 64d541da008..fcedd2654b6 100644 --- a/base/system/format/lang/ru-RU.rc +++ b/base/system/format/lang/ru-RU.rc @@ -1,11 +1,17 @@ -/* Russian translation by Dmitry Chapyshev, 2007-06-10 */ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Russian resource file + * TRANSLATORS: Copyright 2007 Dmitry Chapyshev <lentind(a)yandex.ru> + * Copyright 2014 Kudratov Olimjon <olim98(a)bk.ru> + */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN STRING_HELP "Использование: %s том: [-FS:система] [-V:метка] [-Q] [-A:размер] [-C]\n\n\ - том: Указывает букву диска (с последующим двоеточием),\n\ + [том:] Указывает букву диска (с последующим двоеточием),\n\ точку подключения или имя тома.\n\ -FS:система Указывает тип файловой системы (%s).\n\ -V:метка Метка тома.\n\ diff --git a/base/system/format/lang/sk-SK.rc b/base/system/format/lang/sk-SK.rc index 8ea2aafdfb9..7411a75db96 100644 --- a/base/system/format/lang/sk-SK.rc +++ b/base/system/format/lang/sk-SK.rc @@ -1,6 +1,8 @@ -/* TRANSLATOR : Mário Kačmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) - * DATE OF TR.: 15-02-2008 - * LAST CHANGE: 10-08-2010 +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Slovak resource file + * TRANSLATOR: Copyright 2008-2010 Mário Kačmár <kario(a)szm.sk> */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT diff --git a/base/system/format/lang/sq-AL.rc b/base/system/format/lang/sq-AL.rc index 871913260f9..a8a93e55a02 100644 --- a/base/system/format/lang/sq-AL.rc +++ b/base/system/format/lang/sq-AL.rc @@ -1,6 +1,9 @@ -/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) - * DATE OF TR: 29-11-2013 -*/ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Albanian resource file + * TRANSLATOR: Copyright 2013 Ardit Dani (Ard1t) <ardit.dani(a)gmail.com> + */ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL diff --git a/base/system/format/lang/tr-TR.rc b/base/system/format/lang/tr-TR.rc index 2581ee7c885..9504a3dd5d7 100644 --- a/base/system/format/lang/tr-TR.rc +++ b/base/system/format/lang/tr-TR.rc @@ -1,4 +1,11 @@ -/* TRANSLATOR: 2015 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net), 2018 Ercan Ersoy (ercanersoy) (ercanersoy [at] ercanersoy [dot] net) */ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Turkish resource file + * TRANSLATORS: Copyright 2015 Erdem Ersoy (eersoy93) <erdemersoy(a)erdemersoy.net> + * Copyright 2018 Ercan Ersoy <ercanersoy(a)ercanersoy.net> + * Copyright 2021 Süleyman Poyraz <zaryob.dev(a)gmail.com> + */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT diff --git a/base/system/format/lang/uk-UA.rc b/base/system/format/lang/uk-UA.rc index 7604cee65ce..f6ccf704148 100644 --- a/base/system/format/lang/uk-UA.rc +++ b/base/system/format/lang/uk-UA.rc @@ -1,9 +1,8 @@ /* - * PROJECT: ReactOS CMD Format - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/system/format/lang/uk-UA.rc - * PURPOSE: Ukraianian Language File for Format command - * TRANSLATOR: Rostislav Zabolotny + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Ukrainian resource file + * TRANSLATOR: Copyright 2007 Rostislav Zabolotny <rstzab(a)yandex.ru> */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT diff --git a/base/system/format/lang/zh-CN.rc b/base/system/format/lang/zh-CN.rc index e8307c11776..1f5bba51926 100644 --- a/base/system/format/lang/zh-CN.rc +++ b/base/system/format/lang/zh-CN.rc @@ -1,4 +1,10 @@ -/* Simplified Chinese translation by Song Fuchang (0xfc) <sfc_0(a)yahoo.com.cn> 2011 */ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Chinese (Simplified) resource file + * TRANSLATORS: Copyright 2011 Song Fuchang (0xfc) <sfc_0(a)yahoo.com.cn> + * Copyright 2022 Wu Haotian <rigoligo03(a)gmail.com> + */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED diff --git a/base/system/format/lang/zh-TW.rc b/base/system/format/lang/zh-TW.rc index 61349085870..c9de9f4827c 100644 --- a/base/system/format/lang/zh-TW.rc +++ b/base/system/format/lang/zh-TW.rc @@ -1,5 +1,10 @@ -/* Traditional Chinese translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) */ -/* Translation improved by Chan Chilung 2020 - 2021 (eason066(a)gmail.com) */ +/* + * PROJECT: Disk Format Utility + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Chinese (Traditional) resource file + * TRANSLATORS: Copyright 2016 Henry Tang Ih <henrytang2(a)hotmail.com> + * Copyright 2020-2021 Chan Chilung <eason066(a)gmail.com> + */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL

1 0

[reactos] 01/04: [INF] Shortcuts: Remove remaining trailing dots. Addendum to 92a36b36131.
by Stanislav Motylkov 25 Jan '24

25 Jan '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e480a7d17c9cc5ebcdc71… commit e480a7d17c9cc5ebcdc717e4b7888a768deccb4c Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Jan 25 21:58:40 2024 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Jan 25 21:58:40 2024 +0300 [INF] Shortcuts: Remove remaining trailing dots. Addendum to 92a36b36131. --- media/inf/shortcuts.inf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/media/inf/shortcuts.inf b/media/inf/shortcuts.inf index 3e6307c2204..efde782435d 100644 --- a/media/inf/shortcuts.inf +++ b/media/inf/shortcuts.inf @@ -467,7 +467,7 @@ README_DESC=Documento Léame de ReactOS CMD_TITLE=Consola CMD_DESC=Abre una consola de comandos EXPLORER_TITLE=Explorador de ReactOS -EXPLORER_DESC=Ejecuta una nueva ventana del explorador de archivos. +EXPLORER_DESC=Ejecuta una nueva ventana del explorador de archivos RAPPS_TITLE=Administrador de aplicaciones de ReactOS RAPPS_TITLE_SHORT=Administrador de aplicaciones RAPPS_DESC=Descarga e instala varias aplicaciones @@ -890,7 +890,7 @@ KBSWITCH_DESC=Cambia il layout di tastiera REGEDIT_TITLE=Editor del registro REGEDIT_DESC=Lancia l'editor del registro DXDIAG_TITLE=ReactX Diagnostica -DXDIAG_DESC=Esegui il programma di diagnostica ReactX- +DXDIAG_DESC=Esegui il programma di diagnostica ReactX MAGNIFY_TITLE=Lente d'ingrandimento MAGNIFY_DESC=Ingrandisce parti dello schermo OSK_TITLE=Tastiera su schermo @@ -1327,7 +1327,7 @@ CLIPBRD_DESC=Inspector de Clipboard KBSWITCH_TITLE=Comutator aranjamente de tastatură KBSWITCH_DESC=Program pentru comutarea aranjamentelor de tastatură REGEDIT_TITLE=Editor de registru -REGEDIT_DESC=Program pentru editarea registrului de sistem. +REGEDIT_DESC=Program pentru editarea registrului de sistem TASKMGR_TITLE=Manager de activități TASKMGR_DESC=Program de gestiune a activităților DXDIAG_TITLE=Diagnosticare ReactX @@ -1645,7 +1645,7 @@ WORDPAD_DESC=Hasi testu dokumentu editorea MSPAINT_TITLE=Paint MSPAINT_DESC=Hasi irudiaren editore funtsezkoa CHARMAP_TITLE=Karaktere-mapa -CHARMAP_DESC=Karaktere-mapa hasi. +CHARMAP_DESC=Karaktere-mapa hasi CLIPBRD_TITLE=Arbel-ikustailea CLIPBRD_DESC=Controla lo que copias y pegas en el visor del portapapeles de ReactOS KBSWITCH_TITLE=Teklatuen diztribuzio aukerak @@ -1655,7 +1655,7 @@ REGEDIT_DESC=Ejecuta la utilidad de configuración del Registro del sistema oper TASKMGR_TITLE=Ataza-kudeatzaile TASKMGR_DESC=Administre y gestione las tareas y procesos en funcionamiento DXDIAG_TITLE=ReactX analisia -DXDIAG_DESC=Hasi ReactX analisia. +DXDIAG_DESC=Hasi ReactX analisia MAGNIFY_TITLE=Lupa MAGNIFY_DESC=Zabaldu pantailaren atalak eta hobetu irisgarritasuna OSK_TITLE=Pantailako teklatua

1 0

[reactos] 01/01: [SDK] cicuif.h: Add CUIFMenuItemSeparator (#6411)
by Katayama Hirofumi MZ 25 Jan '24

25 Jan '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b0ee735c739764cd7f52… commit 6b0ee735c739764cd7f523bbc723a7d57e0998bb Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jan 25 12:35:04 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 25 12:35:04 2024 +0900 [SDK] cicuif.h: Add CUIFMenuItemSeparator (#6411) Supporting Language Bar... JIRA issue: CORE-19363 - Add CUIFMenuItemSeparator class. - Implement CUIFMenu::InsertSeparator method. --- sdk/include/reactos/cicero/cicarray.h | 9 +++++ sdk/include/reactos/cicero/cicuif.h | 70 +++++++++++++++++++++++++++++++---- 2 files changed, 72 insertions(+), 7 deletions(-) diff --git a/sdk/include/reactos/cicero/cicarray.h b/sdk/include/reactos/cicero/cicarray.h index 880188b5186..1d2142f1c59 100644 --- a/sdk/include/reactos/cicero/cicarray.h +++ b/sdk/include/reactos/cicero/cicarray.h @@ -57,6 +57,15 @@ public: using CicArrayBase::Insert; using CicArrayBase::Remove; + BOOL Add(const T_ITEM& item) + { + T_ITEM *pItem = Append(1); + if (!pItem) + return FALSE; + CopyMemory(pItem, &item, sizeof(T_ITEM)); + return TRUE; + } + ssize_t Find(const T_ITEM& item) const { for (size_t iItem = 0; iItem < m_cItems; ++iItem) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index c1e2f337027..b4715f93263 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -34,6 +34,7 @@ class CUIFTheme; class CUIFWndFrame; class CUIFGripper; class CUIFMenuItem; + class CUIFMenuItemSeparator; class CUIFObjectArray; class CUIFColorTable; class CUIFColorTableSys; @@ -806,13 +807,25 @@ public: STDMETHOD_(void, OnTimer)() override; STDMETHOD_(void, InitMenuExtent)(); - STDMETHOD_(void, OnPaintO10)(HDC hDC); STDMETHOD_(void, OnPaintDef)(HDC hDC); + STDMETHOD_(void, OnPaintO10)(HDC hDC); STDMETHOD_(void, OnUnknownMethod)() { } // FIXME: method name }; ///////////////////////////////////////////////////////////////////////////// +class CUIFMenuItemSeparator : public CUIFMenuItem +{ +public: + CUIFMenuItemSeparator(CUIFMenu *pMenu); + + STDMETHOD_(void, InitMenuExtent)() override; + STDMETHOD_(void, OnPaintDef)(HDC hDC) override; + STDMETHOD_(void, OnPaintO10)(HDC hDC) override; +}; + +///////////////////////////////////////////////////////////////////////////// + // m_style flags for CUIFButton enum { @@ -5733,20 +5746,27 @@ CUIFMenu::InitShow(CUIFWindow *pWindow, LPCRECT prc, BOOL bFlag, BOOL bDoAnimati inline BOOL CUIFMenu::InsertItem(CUIFMenuItem *pItem) { - CUIFMenuItem **ppAdded = m_MenuItems.Append(1); - if (!ppAdded) + if (!m_MenuItems.Add(pItem)) return FALSE; - *ppAdded = pItem; pItem->SetFont(m_hFont); return TRUE; } -/// @unimplemented inline BOOL CUIFMenu::InsertSeparator() { - //FIXME - return FALSE; + CUIFMenuItemSeparator *pSep = new(cicNoThrow) CUIFMenuItemSeparator(this); + if (!pSep) + return FALSE; + + if (!m_MenuItems.Add(pSep)) + { + delete pSep; + return FALSE; + } + + pSep->Initialize(); + return TRUE; } inline STDMETHODIMP_(void) @@ -6370,3 +6390,39 @@ inline void CUIFMenuItem::ShowSubPopup() ::ClientToScreen(*m_pWindow, (LPPOINT)&rc.right); m_pSubMenu->ShowSubPopup(m_pMenu, &rc, FALSE); } + +///////////////////////////////////////////////////////////////////////////// + +inline +CUIFMenuItemSeparator::CUIFMenuItemSeparator(CUIFMenu *pMenu) : CUIFMenuItem(pMenu, TRUE) +{ + m_nMenuItemID = -1; +} + +inline STDMETHODIMP_(void) +CUIFMenuItemSeparator::InitMenuExtent() +{ + m_MenuLeftExtent.cx = 0; + m_MenuLeftExtent.cy = 6; +} + +inline STDMETHODIMP_(void) +CUIFMenuItemSeparator::OnPaintDef(HDC hDC) +{ + if (!m_pScheme) + return; + + RECT rc; + rc.left = m_rc.left + 2; + rc.top = m_rc.top + (m_rc.bottom - m_rc.top - 2) / 2; + rc.right = m_rc.right - 2; + rc.bottom = rc.top + 2; + m_pScheme->DrawMenuSeparator(hDC, &rc); +} + +/// @unimplemented +inline STDMETHODIMP_(void) +CUIFMenuItemSeparator::OnPaintO10(HDC hDC) +{ + //FIXME +}

1 0

[reactos] 01/01: [SDK] cicuif.h: Fix CUIFMenuItem::OnPaintO10 (#6410)
by Katayama Hirofumi MZ 25 Jan '24

25 Jan '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a88c85259bd17df0fb0d0… commit a88c85259bd17df0fb0d0a417694a612313613c7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jan 25 12:09:56 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 25 12:09:56 2024 +0900 [SDK] cicuif.h: Fix CUIFMenuItem::OnPaintO10 (#6410) Supporting Language Bar... JIRA issue: CORE-19363 Implement CUIFMenuItem::OnPaintO10 method. --- sdk/include/reactos/cicero/cicuif.h | 71 +++++++++++++++++++++++++++++++++++-- 1 file changed, 69 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index 2a6601701c8..c1e2f337027 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -6210,11 +6210,78 @@ CUIFMenuItem::OnPaint(HDC hDC) OnPaintDef(hDC); } -/// unimplemented inline STDMETHODIMP_(void) CUIFMenuItem::OnPaintO10(HDC hDC) { - //FIXME + if (!m_pScheme) + return; + + HGDIOBJ hFontOld = ::SelectObject(hDC, m_hFont); + + SIZE textSize; + ::GetTextExtentPoint32W(hDC, m_pszMenuItemLeft, m_cchMenuItemLeft, &textSize); + + LONG cySpace = m_rc.bottom - m_rc.top - textSize.cy; + LONG xCheck = m_rc.left, yCheck = m_rc.top + cySpace / 2; + LONG cxyMargin = (m_pMenu->m_bHasMargin ? m_pMenu->m_cxyMargin : 0); + + LONG xBitmap = m_rc.left + cxyMargin, yBitmap = m_rc.top; + LONG xText = m_rc.left + m_pMenu->m_cxyMargin + cxyMargin + 8; + LONG yText = m_rc.top + cySpace / 2; + LONG xArrow = m_rc.left - textSize.cy + m_rc.right - 2; + LONG xRightText = m_rc.right - m_pMenu->m_cxMenuExtent - 8; + + RECT rc; + GetRect(&rc); + + if (m_bMenuItemDisabled || m_pMenu->m_pSelectedItem != this) + { + rc.right = m_pMenu->m_cxyMargin + rc.left + 2; + if (m_pMenu->m_bHasMargin) + rc.right += m_pMenu->m_cxyMargin; + + ::FillRect(hDC, &rc, m_pScheme->GetBrush(9)); + } + else + { + m_pScheme->DrawCtrlBkgd(hDC, &rc, 0, UIF_DRAW_PRESSED); + m_pScheme->DrawCtrlEdge(hDC, &rc, 0, UIF_DRAW_PRESSED); + } + + ::SetBkMode(hDC, TRANSPARENT); + + if (m_bMenuItemGrayed) + { + ::SetTextColor(hDC, m_pScheme->GetColor(11)); + ::ExtTextOutW(hDC, xText, yText, ETO_CLIPPED, &m_rc, m_pszMenuItemLeft, + m_cchMenuItemLeft, NULL); + } + else if (m_bMenuItemDisabled || m_pMenu->m_pSelectedItem != this) + { + ::SetTextColor(hDC, m_pScheme->GetColor(10)); + ::ExtTextOutW(hDC, xText, yText, ETO_CLIPPED, &m_rc, m_pszMenuItemLeft, + m_cchMenuItemLeft, NULL); + } + else + { + ::SetTextColor(hDC, m_pScheme->GetColor(5)); + ::ExtTextOutW(hDC, xText, yText, ETO_CLIPPED, &m_rc, m_pszMenuItemLeft, + m_cchMenuItemLeft, NULL); + } + + DrawUnderline(hDC, xText, yText, m_pScheme->GetBrush(5)); + + if (m_pszMenuItemRight) + { + ::ExtTextOutW(hDC, xRightText, yText, ETO_CLIPPED, &m_rc, m_pszMenuItemRight, + m_cchMenuItemRight, NULL); + } + + DrawCheck(hDC, xCheck, yCheck); + DrawBitmapProc(hDC, xBitmap, yBitmap); + DrawArrow(hDC, xArrow, yText); + + ::SelectObject(hDC, hFontOld); } inline STDMETHODIMP_(void)

1 0

[reactos] 01/01: [SDK] cicuif.h: Fix CUIFMenuItem::OnPaintDef (#6409)
by Katayama Hirofumi MZ 25 Jan '24

25 Jan '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6634f66e0e4b173454974… commit 6634f66e0e4b173454974a2b46455150e8447fe1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jan 25 12:09:02 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 25 12:09:02 2024 +0900 [SDK] cicuif.h: Fix CUIFMenuItem::OnPaintDef (#6409) Supporting Language Bar... JIRA issue: CORE-19363 Implement CUIFMenuItem::OnPaintDef method. --- sdk/include/reactos/cicero/cicuif.h | 62 +++++++++++++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index d3f440a3fa7..2a6601701c8 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -6217,11 +6217,69 @@ CUIFMenuItem::OnPaintO10(HDC hDC) //FIXME } -/// unimplemented inline STDMETHODIMP_(void) CUIFMenuItem::OnPaintDef(HDC hDC) { - //FIXME + HGDIOBJ hFontOld = ::SelectObject(hDC, m_hFont); + + SIZE textSize; + ::GetTextExtentPoint32W(hDC, m_pszMenuItemLeft, m_cchMenuItemLeft, &textSize); + + LONG cxyMargin = (m_pMenu->m_bHasMargin ? m_pMenu->m_cxyMargin : 0); + + LONG cySpace = m_rc.bottom - m_rc.top - textSize.cy; + LONG xCheck = m_rc.left, yCheck = m_rc.top + cySpace / 2; + LONG xBitmap = m_rc.left + cxyMargin, yBitmap = m_rc.top; + LONG xText = m_rc.left + cxyMargin + m_pMenu->m_cxyMargin + 2; + LONG yText = m_rc.top + cySpace / 2; + + LONG xArrow = m_rc.right + m_rc.left - 10; + + ::SetBkMode(hDC, TRANSPARENT); + + if (m_bMenuItemGrayed) + { + UINT uOptions = ETO_CLIPPED; + if (m_bMenuItemDisabled || m_pMenu->m_pSelectedItem != this) + { + ::SetTextColor(hDC, ::GetSysColor(COLOR_BTNHIGHLIGHT)); + ::ExtTextOutW(hDC, xText + 1, yText + 1, ETO_CLIPPED, &m_rc, m_pszMenuItemLeft, + m_cchMenuItemLeft, NULL); + DrawCheck(hDC, xCheck + 1, yCheck + 1); + DrawBitmapProc(hDC, xBitmap + 1, yBitmap + 1); + DrawArrow(hDC, xArrow + 1, yText + 1); + } + else + { + ::SetBkColor(hDC, ::GetSysColor(COLOR_HIGHLIGHT)); + uOptions = ETO_CLIPPED | ETO_OPAQUE; + } + ::SetTextColor(hDC, ::GetSysColor(COLOR_BTNSHADOW)); + ::ExtTextOutW(hDC, xText, yText, uOptions, &m_rc, m_pszMenuItemLeft, + m_cchMenuItemLeft, NULL); + DrawUnderline(hDC, xText, yText, (HBRUSH)UlongToHandle(COLOR_BTNSHADOW + 1)); + } + else if (m_bMenuItemDisabled || m_pMenu->m_pSelectedItem != this) + { + ::SetTextColor(hDC, ::GetSysColor(COLOR_MENUTEXT)); + ::ExtTextOutW(hDC, xText, yText, ETO_CLIPPED, &m_rc, m_pszMenuItemLeft, + m_cchMenuItemLeft, NULL); + DrawUnderline(hDC, xText, yText, (HBRUSH)UlongToHandle(COLOR_MENUTEXT + 1)); + } + else + { + ::SetTextColor(hDC, ::GetSysColor(COLOR_HIGHLIGHTTEXT)); + ::SetBkColor(hDC, ::GetSysColor(COLOR_HIGHLIGHT)); + ::ExtTextOutW(hDC, xText, yText, ETO_CLIPPED | ETO_OPAQUE, &m_rc, + m_pszMenuItemLeft, m_cchMenuItemLeft, NULL); + DrawUnderline(hDC, xText, yText, (HBRUSH)UlongToHandle(COLOR_HIGHLIGHTTEXT + 1)); + } + + DrawCheck(hDC, xCheck, yCheck); + DrawBitmapProc(hDC, xBitmap, yBitmap); + DrawArrow(hDC, xArrow, yText); + + ::SelectObject(hDC, hFontOld); } inline STDMETHODIMP_(void)

1 0

[reactos] 01/01: [NTOS:KE/x86/arm] Use a better boot process affinity value (#6399)
by Oleg Dubinskiy 24 Jan '24

24 Jan '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5abf0c76b7251b1b03d8e… commit 5abf0c76b7251b1b03d8e326bd95951566e1bae7 Author: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> AuthorDate: Wed Jan 24 17:52:56 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 24 17:52:56 2024 +0100 [NTOS:KE/x86/arm] Use a better boot process affinity value (#6399) Use a value that is independent of the CPU bitness. Addendum to commit 96d5b6281 --- ntoskrnl/ke/arm/kiinit.c | 2 +- ntoskrnl/ke/i386/kiinit.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/ke/arm/kiinit.c b/ntoskrnl/ke/arm/kiinit.c index 86db2d9377f..34413f17a57 100644 --- a/ntoskrnl/ke/arm/kiinit.c +++ b/ntoskrnl/ke/arm/kiinit.c @@ -101,7 +101,7 @@ KiInitializeKernel(IN PKPROCESS InitProcess, PageDirectory[1] = 0; KeInitializeProcess(InitProcess, 0, - 0xFFFFFFFF, + MAXULONG_PTR, PageDirectory, FALSE); InitProcess->QuantumReset = MAXCHAR; diff --git a/ntoskrnl/ke/i386/kiinit.c b/ntoskrnl/ke/i386/kiinit.c index 2620885156a..e3ec9ed94bf 100644 --- a/ntoskrnl/ke/i386/kiinit.c +++ b/ntoskrnl/ke/i386/kiinit.c @@ -527,7 +527,7 @@ KiInitializeKernel(IN PKPROCESS InitProcess, PageDirectory[1] = 0; KeInitializeProcess(InitProcess, 0, - 0xFFFFFFFF, + MAXULONG_PTR, PageDirectory, FALSE); InitProcess->QuantumReset = MAXCHAR;

1 0

[reactos] 01/01: [SDK] cicuif.h: Fix CUIFMenuItem::DrawUnderline (#6406)
by Katayama Hirofumi MZ 24 Jan '24

24 Jan '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=927b183aa97fb040717ae… commit 927b183aa97fb040717ae4c9b76cd3e7364549bd Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 24 19:13:24 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 24 19:13:24 2024 +0900 [SDK] cicuif.h: Fix CUIFMenuItem::DrawUnderline (#6406) Supporting Language Bar... JIRA issue: CORE-19363 Implement CUIFMenuItem::DrawUnderline method. --- sdk/include/reactos/cicero/cicuif.h | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index 77e84fff690..d3f440a3fa7 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -762,9 +762,9 @@ class CUIFMenuItem : public CUIFObject protected: UINT m_nMenuItemID; LPWSTR m_pszMenuItemLeft; - INT m_cchMenuItemLeft; + UINT m_cchMenuItemLeft; LPWSTR m_pszMenuItemRight; - INT m_cchMenuItemRight; + UINT m_cchMenuItemRight; UINT m_nMenuItemVKey; UINT m_ichMenuItemPrefix; HBITMAP m_hbmColor; @@ -782,7 +782,7 @@ protected: void DrawArrow(HDC hDC, INT x, INT y); void DrawBitmapProc(HDC hDC, INT xLeft, INT yTop); void DrawCheck(HDC hDC, INT xLeft, INT yTop); - void DrawUnderline(HDC hDC, INT cxMargin, INT cyMargin, HBRUSH hbr); + void DrawUnderline(HDC hDC, INT xText, INT yText, HBRUSH hbr); public: CUIFMenuItem(CUIFMenu *pMenu, BOOL bDisabled); @@ -6153,11 +6153,24 @@ inline void CUIFMenuItem::DrawCheck(HDC hDC, INT xLeft, INT yTop) ::SelectObject(hDC, hFontOld); } -/// @unimplemented inline void -CUIFMenuItem::DrawUnderline(HDC hDC, INT cxMargin, INT cyMargin, HBRUSH hbr) +CUIFMenuItem::DrawUnderline(HDC hDC, INT xText, INT yText, HBRUSH hbr) { - //FIXME + if (m_ichMenuItemPrefix > m_cchMenuItemLeft) + return; + + SIZE PrePrefixSize, PostPrefixSize; + ::GetTextExtentPoint32W(hDC, m_pszMenuItemLeft, m_ichMenuItemPrefix, &PrePrefixSize); + ::GetTextExtentPoint32W(hDC, m_pszMenuItemLeft, m_ichMenuItemPrefix + 1, &PostPrefixSize); + + BOOL bHeadPrefix = (m_ichMenuItemPrefix == 0); + + RECT rc; + rc.left = xText + PrePrefixSize.cx + !bHeadPrefix; + rc.right = xText + PostPrefixSize.cx; + rc.top = (yText + PostPrefixSize.cy) - 1; + rc.bottom = yText + PostPrefixSize.cy; + ::FillRect(hDC, &rc, hbr); } inline STDMETHODIMP_(void)

1 0

[reactos] 01/01: [SDK] cicuif.h: Fix CUIFMenu::OnKeyDown (#6408)
by Katayama Hirofumi MZ 24 Jan '24

24 Jan '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ac5de4102cef3c7acb35… commit 3ac5de4102cef3c7acb3579049115aae43ddd7a2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 24 17:52:36 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 24 17:52:36 2024 +0900 [SDK] cicuif.h: Fix CUIFMenu::OnKeyDown (#6408) Supporting Language Bar... JIRA issue: CORE-19363 Implement CUIFMenu::OnKeyDown method. --- sdk/include/reactos/cicero/cicuif.h | 78 ++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index f6fcf6a9f0c..77e84fff690 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -5771,11 +5771,85 @@ CUIFMenu::ModalMouseNotify(UINT uMsg, LONG x, LONG y) CancelMenu(); } -/// @unimplemented inline STDMETHODIMP_(void) CUIFMenu::OnKeyDown(HWND hWnd, WPARAM wParam, LPARAM lParam) { - //FIXME + CUIFMenuItem *pTargetItem; + + BYTE vKey = (BYTE)wParam; + + switch (vKey) + { + case VK_ESCAPE: + CancelMenu(); + return; + + case VK_LEFT: + if (!m_pVisibleSubMenu) + return; + + CancelMenu(); + return; + + case VK_RIGHT: + if (m_pSelectedItem && m_pSelectedItem->m_pSubMenu) + { + m_pSelectedItem->ShowSubPopup(); + CUIFMenu *pSubMenu = m_pSelectedItem->m_pSubMenu; + pTargetItem = pSubMenu->GetNextItem(NULL); + pSubMenu->SetSelectedItem(pTargetItem); + } + return; + + case VK_UP: + pTargetItem = GetPrevItem(m_pSelectedItem); + SetSelectedItem(pTargetItem); + return; + + case VK_DOWN: + pTargetItem = GetNextItem(m_pSelectedItem); + SetSelectedItem(pTargetItem); + return; + + case VK_RETURN: + break; + + default: + { + if (!(('A' <= vKey && vKey <= 'Z') || ('0' <= vKey && vKey <= '9'))) + return; + + size_t iItem; + for (iItem = 0; iItem < m_MenuItems.size(); ++iItem) + { + CUIFMenuItem *pItem = m_MenuItems[iItem]; + if (pItem->m_nMenuItemVKey == vKey) + { + SetSelectedItem(pItem); + break; + } + } + + if (iItem == m_MenuItems.size()) + return; + } + } + + if (m_pSelectedItem && !m_pSelectedItem->m_bMenuItemGrayed) + { + CUIFMenu *pSubMenu = m_pSelectedItem->m_pSubMenu; + if (pSubMenu) + { + m_pSelectedItem->ShowSubPopup(); + pTargetItem = pSubMenu->GetNextItem(NULL); + pSubMenu->SetSelectedItem(pTargetItem); + } + else + { + SetSelectedId(m_pSelectedItem->m_nMenuItemID); + ::PostMessage(m_hWnd, WM_NULL, 0, 0); + } + } } inline void CUIFMenu::PostKey(BOOL bUp, WPARAM wParam, LPARAM lParam)

1 0

[reactos] 01/01: [SDK] cicuif.h: Fix CUIFMenuItem::InitMenuExtent (#6407)
by Katayama Hirofumi MZ 24 Jan '24

24 Jan '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76c898ca8e6072931c5ae… commit 76c898ca8e6072931c5aeb824279d51d3604051a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 24 17:51:59 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 24 17:51:59 2024 +0900 [SDK] cicuif.h: Fix CUIFMenuItem::InitMenuExtent (#6407) Supporting Language Bar... JIRA issue: CORE-19363 Implement CUIFMenuItem::InitMenuExtent method. --- sdk/include/reactos/cicero/cicuif.h | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index 7ae16842900..f6fcf6a9f0c 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -5979,11 +5979,44 @@ inline BOOL CUIFMenuItem::Init(UINT nMenuItemID, LPCWSTR pszText) return TRUE; } -/// @unimplemented inline STDMETHODIMP_(void) CUIFMenuItem::InitMenuExtent() { - //FIXME + if (!m_pszMenuItemLeft) + { + if (m_hbmColor) + { + BITMAP bm; + ::GetObject(m_hbmColor, sizeof(bm), &bm); + m_MenuLeftExtent.cx = bm.bmWidth + 2; + m_MenuLeftExtent.cy = bm.bmHeight + 4; + } + else + { + m_MenuLeftExtent.cx = m_MenuLeftExtent.cy = 0; + } + return; + } + + HDC hDC = ::GetDC(*m_pWindow); + + HGDIOBJ hFontOld = ::SelectObject(hDC, m_hFont); + ::GetTextExtentPoint32W(hDC, m_pszMenuItemLeft, m_cchMenuItemLeft, &m_MenuLeftExtent); + m_MenuLeftExtent.cx += 16; + m_MenuLeftExtent.cy += 8; + if (m_pszMenuItemRight) + { + ::GetTextExtentPoint32W(hDC, m_pszMenuItemRight, m_cchMenuItemRight, &m_MenuRightExtent); + m_MenuRightExtent.cy += 8; + } + ::SelectObject(hDC, hFontOld); + + if (m_pSubMenu) + m_MenuLeftExtent.cx += m_MenuLeftExtent.cy + 2; + if (m_pMenu->m_style & UIF_MENU_USE_OFF10) + m_MenuLeftExtent.cx += 24; + + ::ReleaseDC(*m_pWindow, hDC); } inline BOOL CUIFMenuItem::IsCheck()

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2024