Ros-diffs

ros-diffs@reactos.org

12 participants
81034 discussions

[reactos] 01/01: [ACPPAGE] Add Japanese (ja-JP) translation

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ef754b121a613fd2a90e3… commit ef754b121a613fd2a90e307f2dac011a82e2a401 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 19 20:29:56 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 19 20:29:56 2023 +0900 [ACPPAGE] Add Japanese (ja-JP) translation CORE-18706 --- dll/shellext/acppage/ACPPage.rc | 3 +++ dll/shellext/acppage/lang/ja-JP.rc | 42 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/dll/shellext/acppage/ACPPage.rc b/dll/shellext/acppage/ACPPage.rc index e031abe7fb2..ca472c50f13 100644 --- a/dll/shellext/acppage/ACPPage.rc +++ b/dll/shellext/acppage/ACPPage.rc @@ -52,6 +52,9 @@ IDR_ACPPAGE REGISTRY "res/acppage.rgs" #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_NL_NL #include "lang/nl-NL.rc" #endif diff --git a/dll/shellext/acppage/lang/ja-JP.rc b/dll/shellext/acppage/lang/ja-JP.rc new file mode 100644 index 00000000000..e5e3e2d7d69 --- /dev/null +++ b/dll/shellext/acppage/lang/ja-JP.rc @@ -0,0 +1,42 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_ACPPAGESHEET DIALOGEX 0, 0, 224, 226 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "互換性" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + LTEXT "もしReactOSでプログラムを実行中に問題があれば、そのアプリに報告すべきOSを選択して下さい。\n注意: これは試験的な機能です。", IDC_EXPLANATION, 7, 7, 210, 31 + GROUPBOX "互換性モード", IDC_COMPATGROUP, 7, 41, 210, 49 + CHECKBOX "このプログラムを次の設定の互換性モードで実行:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + GROUPBOX "画面設定", -1, 7, 99, 210, 61, BS_GROUPBOX + CHECKBOX "256色で実行", IDC_CHKRUNIN256COLORS, 18, 114, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "画面を解像度 640x480 にする", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "視覚的テーマを無効化", IDC_CHKDISABLEVISUALTHEMES, 18, 144, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + PUSHBUTTON "互換性モードを編集(&D)...", IDC_EDITCOMPATIBILITYMODES, 117, 167, 100, 15 + LTEXT "",IDC_ENABLED_LAYERS,7,185,210,21 + CONTROL "<A>プログラム互換性</A>の詳細を知る", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY +END + +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "互換性モードの編集" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + LISTBOX IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LISTBOX IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT | WS_VSCROLL + PUSHBUTTON ">",IDC_ADD,144,42,18,14,WS_DISABLED + PUSHBUTTON "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED + PUSHBUTTON "<",IDC_REMOVE,144,60,18,14,WS_DISABLED + PUSHBUTTON "&OK",IDOK,174,114,60,14 + PUSHBUTTON "キャンセル(&C)",IDCANCEL,240,114,60,14 + LTEXT "利用可能なモード",-1,6,6,52,8 + LTEXT "選択中のモード",-1,168,6,51,8 +END + +STRINGTABLE +BEGIN + IDS_COMPAT_TITLE "互換性" + IDS_FAILED_NETWORK "このプログラムはネットワークドライブにあるので互換性モードは設定できません。" + IDS_FAILED_PROTECTED "このプログラムは ReactOS の一部なので互換性モードは設定できません。" +END

1 year, 1 month

[reactos] 01/01: [DESKMON] Add Japanese (ja-JP) translation

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=69d7adbebc91948e333ce… commit 69d7adbebc91948e333ce8d0e63008a3e0757c86 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 19 20:17:25 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 19 20:17:25 2023 +0900 [DESKMON] Add Japanese (ja-JP) translation CORE-18706 --- dll/shellext/deskmon/deskmon.rc | 3 +++ dll/shellext/deskmon/lang/ja-JP.rc | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/dll/shellext/deskmon/deskmon.rc b/dll/shellext/deskmon/deskmon.rc index 5cfc8a699ad..6e18edfa6f4 100644 --- a/dll/shellext/deskmon/deskmon.rc +++ b/dll/shellext/deskmon/deskmon.rc @@ -52,6 +52,9 @@ IDC_MONITORICO ICON "resources/monitor.ico" #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_NB_NO #include "lang/no-NO.rc" #endif diff --git a/dll/shellext/deskmon/lang/ja-JP.rc b/dll/shellext/deskmon/lang/ja-JP.rc new file mode 100644 index 00000000000..680dbe0504c --- /dev/null +++ b/dll/shellext/deskmon/lang/ja-JP.rc @@ -0,0 +1,23 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_MONITOR DIALOGEX 0, 0, 252, 226 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "モニター" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "モニターの種類", -1, 7, 3, 237, 52 + ICON IDC_MONITORICO, IDC_MONITORICO, 13, 11, 21, 20, SS_ICON + LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX + LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL + PUSHBUTTON "プロパティ(&P)", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED + GROUPBOX "モニター設定", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 + LTEXT "画面のリフレッシュレート(&S9:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 + COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT + AUTOCHECKBOX "このモニターが表示できないモードを隠す(&H)", IDC_PRUNINGCHECK, 13, 106, 225, 10 +END + +STRINGTABLE +BEGIN + IDS_USEDEFFRQUENCY "ハードウェアの既定の設定を使う" + IDS_FREQFMT "%u ヘルツ" +END

1 year, 1 month

[reactos] 01/01: [NETPLWIZ] Add Japanese (ja-JP) translation

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da18e2893b068018770a7… commit da18e2893b068018770a7f670a5f4aedcc150067 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 19 20:12:17 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 19 20:12:17 2023 +0900 [NETPLWIZ] Add Japanese (ja-JP) translation CORE-18706 --- dll/shellext/netplwiz/lang/ja-JP.rc | 21 +++++++++++++++++++++ dll/shellext/netplwiz/netplwiz.rc | 3 +++ 2 files changed, 24 insertions(+) diff --git a/dll/shellext/netplwiz/lang/ja-JP.rc b/dll/shellext/netplwiz/lang/ja-JP.rc new file mode 100644 index 00000000000..71913bb9a04 --- /dev/null +++ b/dll/shellext/netplwiz/lang/ja-JP.rc @@ -0,0 +1,21 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_DISCONNECTDRIVES DIALOGEX 0, 0, 300, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ネットワークドライブの接続を切る" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "接続を切りたいネットワークドライブを選択して OK をクリックして下さい。", -1, 7, 7, 286, 8 + LTEXT "ネットワークドライブ (&N):", -1, 7, 23, 286, 8 + CONTROL "", IDC_CONNECTEDDRIVELIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_SINGLESEL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 7, 31, 286, 140 + PUSHBUTTON "OK", ID_OK, 189, 179, 50, 14 + PUSHBUTTON "キャンセル", IDCANCEL, 243, 179, 50, 14 +END + +STRINGTABLE +BEGIN + IDS_DIALOG_CAPTION "ネットワークドライブの接続を切る" + IDS_DRIVE_LETTER "ドライブ文字" + IDS_NETWORK_PATH "ネットワークパス" + IDS_NO_DRIVES "接続を切るネットワークドライブがありません。" +END diff --git a/dll/shellext/netplwiz/netplwiz.rc b/dll/shellext/netplwiz/netplwiz.rc index 3d843f11bf3..378a3e838ed 100644 --- a/dll/shellext/netplwiz/netplwiz.rc +++ b/dll/shellext/netplwiz/netplwiz.rc @@ -33,6 +33,9 @@ IDI_DISCONNECT_NET_DRIVES ICON "res/4400.ico" #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif

1 year, 1 month

[reactos] 01/01: [STOBJECT] Add Japanese (ja-JP) translation

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c9295fbeebd1a848f75f4… commit c9295fbeebd1a848f75f416ad6b54fcb93032462 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 19 20:06:50 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 19 20:06:50 2023 +0900 [STOBJECT] Add Japanese (ja-JP) translation CORE-18706 --- dll/shellext/stobject/lang/ja-JP.rc | 51 +++++++++++++++++++++++++++++++++++++ dll/shellext/stobject/stobject.rc | 3 +++ 2 files changed, 54 insertions(+) diff --git a/dll/shellext/stobject/lang/ja-JP.rc b/dll/shellext/stobject/lang/ja-JP.rc new file mode 100644 index 00000000000..c775f35b425 --- /dev/null +++ b/dll/shellext/stobject/lang/ja-JP.rc @@ -0,0 +1,51 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_POWER_METER DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "電源メーター" +FONT 9, "MS UI Gothic" +BEGIN + CONTROL "電源の状態", 1001, "Button", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 9, 20, 234, 189 + CONTROL "常にタスクバーにアイコンを表示する(&A)", 1002, "Button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 6, 6, 120, 10 + CONTROL "各バッテリーの詳細を表示する(&B)", 1003, "Button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 135, 6, 120, 8 + CONTROL "", 1000, "Static", SS_LEFT | WS_CHILD | WS_GROUP, 11, 29, 229, 178 +END + +STRINGTABLE +BEGIN + //Power related strings + IDS_PWR_PROPERTIES "電源のプロパティを調整(&A)" + IDS_PWR_METER "電源メーターを開く(&O)" + IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" + IDS_PWR_PERCENT_REMAINING "残り %u%%" + IDS_PWR_CHARGING "充電中 (%u%%)" + IDS_PWR_UNKNOWN_REMAINING "不明" + IDS_PWR_AC "交流電源" + IDS_PWR_HOURS_REMAINING "残り %1!u!:%2!02u! 時間 (%3!u!%%)" + IDS_PWR_MINUTES_REMAINING "残り %1!u! 分 (%2!u!%%)" + + //Hotplug related strings + IDS_HOTPLUG_REMOVE_1 "安全なハードウェアの取り外し" + IDS_HOTPLUG_REMOVE_2 "安全にハードウェアを取り除く(&S)" + IDS_HOTPLUG_REMOVE_3 "安全に %s を取り外す" + IDS_HOTPLUG_RUN "shell32.dll,Control_RunDLL hotplug.dll" + IDS_HOTPLUG_COMMA ", " + IDS_HOTPLUG_DRIVE " - ドライブ(%s)" + IDS_HOTPLUG_DRIVES " - ドライブ(%s)" + IDS_HOTPLUG_A "A:" + IDS_HOTPLUG_REQUIRES "このハードウェアは ""安全な取り外し"" が必要です" + IDS_HOTPLUG_CLICK "ハードウェアを取り除く前に、取り除くハードウェアを選択して、このアイコンをクリックして下さい。" + + //Volume related strings + IDS_VOL_VOLUME "音量" + IDS_VOL_ADJUST "音声プロパティを調整(&A)" + IDS_VOL_OPEN "音量調整を開く(&O)" + IDS_VOL_RUN "SNDVOL32.EXE" + IDS_VOL_MUTED "音量 (ミュート中)" + + //Keyboard-Mouse related strings + IDS_KEYS_STICKY "スティッキーキー" + IDS_KEYS_MOUSE "マウスキー" + IDS_KEYS_FILTER "フィルタキー" +END diff --git a/dll/shellext/stobject/stobject.rc b/dll/shellext/stobject/stobject.rc index bf310d7b95d..26610fe8b2d 100644 --- a/dll/shellext/stobject/stobject.rc +++ b/dll/shellext/stobject/stobject.rc @@ -71,6 +71,9 @@ IDR_SYSTRAY REGISTRY "resources/rgs/systray.rgs" #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif

1 year, 1 month

[reactos] 01/01: [CMAKE] Remove "/Gy" option from ML

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e3f204e2282f25d9556d9… commit e3f204e2282f25d9556d9d83f43f31b6578eaa84 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Nov 11 21:38:59 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Nov 19 09:19:33 2023 +0200 [CMAKE] Remove "/Gy" option from ML Reason: VS solution builds pass the compiler options to the assembler. These are usually ignored and result in a warning only, but ML of the latest VS supports /Gy (function level linking), but that requires all functions to be declared with "PROC" and otherwise results in an error. --- sdk/cmake/msvc.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index dd3df55021d..8357316a112 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -22,8 +22,9 @@ endif() # helper macros. Note also that GCC builds use string pooling by default. add_compile_options(/GF) -# Enable function level linking and comdat folding -add_compile_options(/Gy) +# Enable function level linking and comdat folding (only C/C++, not ASM!) +add_compile_options($<$<COMPILE_LANGUAGE:CXX>:/Gy>) +add_compile_options($<$<COMPILE_LANGUAGE:C>:/Gy>) add_link_options(/OPT:REF /OPT:ICF) if(ARCH STREQUAL "i386")

1 year, 1 month

[reactos] 01/01: [MSPAINT] Introduce partial image history (#5994)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=72081168fb0f8e279ba24… commit 72081168fb0f8e279ba24eaab601fee4525a71d7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 19 12:59:39 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 19 12:59:39 2023 +0900 [MSPAINT] Introduce partial image history (#5994) - Add IMAGE_PART structure and use as history items. - Overload ImageModel::PushImageForUndo(const RECT& rcPartial). - Add ToolsModel::GetToolSize. - Implement partial image history on TwoPointDrawTool. CORE-19094 --- base/applications/mspaint/history.cpp | 71 +++++++++++++++++++++++++------- base/applications/mspaint/history.h | 15 ++++++- base/applications/mspaint/mouse.cpp | 7 +++- base/applications/mspaint/toolsmodel.cpp | 41 ++++++++++++++++++ base/applications/mspaint/toolsmodel.h | 2 + 5 files changed, 118 insertions(+), 18 deletions(-) diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index c0f347d0aa9..2f7480b5f45 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -12,6 +12,14 @@ ImageModel imageModel; /* FUNCTIONS ********************************************************/ +void IMAGE_PART::clear() +{ + ::DeleteObject(m_hbmImage); + m_hbmImage = NULL; + m_rcPart.SetRectEmpty(); + m_bPartial = FALSE; +} + void ImageModel::NotifyImageChanged() { if (canvasWindow.IsWindow()) @@ -30,7 +38,7 @@ ImageModel::ImageModel() , m_undoSteps(0) , m_redoSteps(0) { - ZeroMemory(m_hBms, sizeof(m_hBms)); + ZeroMemory(m_historyItems, sizeof(m_historyItems)); m_hbmMaster = CreateColorDIB(1, 1, RGB(255, 255, 255)); m_hbmOld = ::SelectObject(m_hDrawingDC, m_hbmMaster); @@ -46,6 +54,23 @@ ImageModel::~ImageModel() ClearHistory(); } +void ImageModel::SwapPart() +{ + IMAGE_PART& part = m_historyItems[m_currInd]; + if (!part.m_bPartial) + { + Swap(m_hbmMaster, part.m_hbmImage); + return; + } + + HBITMAP hbmMaster = LockBitmap(); + HBITMAP hbmPart = getSubImage(hbmMaster, part.m_rcPart); + putSubImage(hbmMaster, part.m_rcPart, part.m_hbmImage); + ::DeleteObject(part.m_hbmImage); + part.m_hbmImage = hbmPart; + UnlockBitmap(hbmMaster); +} + void ImageModel::Undo(BOOL bClearRedo) { ATLTRACE("%s: %d\n", __FUNCTION__, m_undoSteps); @@ -55,11 +80,8 @@ void ImageModel::Undo(BOOL bClearRedo) selectionModel.HideSelection(); m_currInd = (m_currInd + HISTORYSIZE - 1) % HISTORYSIZE; // Go previous - ATLASSERT(m_hbmMaster != NULL); - ATLASSERT(m_hBms[m_currInd] != NULL); - - Swap(m_hbmMaster, m_hBms[m_currInd]); + SwapPart(); ::SelectObject(m_hDrawingDC, m_hbmMaster); // Re-select m_undoSteps--; @@ -80,9 +102,7 @@ void ImageModel::Redo() selectionModel.HideSelection(); ATLASSERT(m_hbmMaster != NULL); - ATLASSERT(m_hBms[m_currInd] != NULL); - - Swap(m_hbmMaster, m_hBms[m_currInd]); + SwapPart(); m_currInd = (m_currInd + 1) % HISTORYSIZE; // Go next ::SelectObject(m_hDrawingDC, m_hbmMaster); // Re-select @@ -97,11 +117,7 @@ void ImageModel::ClearHistory() { for (int i = 0; i < HISTORYSIZE; ++i) { - if (m_hBms[i]) - { - ::DeleteObject(m_hBms[i]); - m_hBms[i] = NULL; - } + m_historyItems[i].clear(); } m_undoSteps = 0; @@ -130,12 +146,35 @@ void ImageModel::PushImageForUndo(HBITMAP hbm) return; } - ::DeleteObject(m_hBms[m_currInd]); - m_hBms[m_currInd] = m_hbmMaster; + IMAGE_PART& part = m_historyItems[m_currInd]; + part.clear(); + part.m_hbmImage = m_hbmMaster; m_hbmMaster = hbm; - m_currInd = (m_currInd + 1) % HISTORYSIZE; // Go next ::SelectObject(m_hDrawingDC, m_hbmMaster); // Re-select + PushDone(); +} + +void ImageModel::PushImageForUndo(const RECT& rcPartial) +{ + ATLTRACE("%s: %d\n", __FUNCTION__, m_currInd); + + IMAGE_PART& part = m_historyItems[m_currInd]; + part.clear(); + part.m_bPartial = TRUE; + part.m_rcPart = rcPartial; + + HBITMAP hbmMaster = LockBitmap(); + part.m_hbmImage = getSubImage(hbmMaster, rcPartial); + UnlockBitmap(hbmMaster); + + PushDone(); +} + +void ImageModel::PushDone() +{ + m_currInd = (m_currInd + 1) % HISTORYSIZE; // Go next + if (m_undoSteps < HISTORYSIZE - 1) m_undoSteps++; m_redoSteps = 0; diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index e827a430b35..87c98515136 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -10,6 +10,15 @@ /* HISTORYSIZE = number of possible undo-steps + 1 */ #define HISTORYSIZE 11 +struct IMAGE_PART +{ + CRect m_rcPart; + HBITMAP m_hbmImage; + BOOL m_bPartial; + + void clear(); +}; + class ImageModel { public: @@ -21,6 +30,7 @@ public: BOOL CanRedo() const { return m_redoSteps > 0; } void PushImageForUndo(); void PushImageForUndo(HBITMAP hbm); + void PushImageForUndo(const RECT& rcPartial); void Undo(BOOL bClearRedo = FALSE); void Redo(void); void ClearHistory(void); @@ -49,6 +59,9 @@ protected: int m_currInd; // The current index in m_hBms int m_undoSteps; // The undo-able count int m_redoSteps; // The redo-able count - HBITMAP m_hBms[HISTORYSIZE]; // A rotation buffer of HBITMAPs + IMAGE_PART m_historyItems[HISTORYSIZE]; // A ring buffer of IMAGE_PARTs HGDIOBJ m_hbmOld; + + void SwapPart(); + void PushDone(); }; diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index d650259f6cb..2aa17872c81 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -291,7 +291,12 @@ struct TwoPointDrawTool : ToolBase BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { - imageModel.PushImageForUndo(); + CRect rcPartial(g_ptStart, g_ptEnd); + rcPartial.NormalizeRect(); + SIZE size = toolsModel.GetToolSize(); + rcPartial.InflateRect((size.cx + 1) / 2, (size.cy + 1) / 2); + imageModel.PushImageForUndo(rcPartial); + OnDrawOverlayOnImage(m_hdc); m_bDrawing = FALSE; imageModel.NotifyImageChanged(); diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index 42ee980c2b3..c19a1152c24 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -202,6 +202,47 @@ void ToolsModel::SetRubberRadius(int nRubberRadius) NotifyToolSettingsChanged(); } +SIZE ToolsModel::GetToolSize() const +{ + SIZE size; + switch (m_activeTool) + { + case TOOL_FREESEL: + case TOOL_RECTSEL: + case TOOL_COLOR: + case TOOL_ZOOM: + case TOOL_TEXT: + case TOOL_FILL: + size.cx = size.cy = 1; + break; + case TOOL_LINE: + case TOOL_BEZIER: + case TOOL_RECT: + case TOOL_RRECT: + case TOOL_SHAPE: + case TOOL_ELLIPSE: + size.cx = size.cy = GetLineWidth(); + break; + case TOOL_AIRBRUSH: + size.cx = size.cy = GetAirBrushRadius() * 2; + break; + case TOOL_RUBBER: + size.cx = size.cy = GetRubberRadius() * 2; + break; + case TOOL_BRUSH: + size.cx = size.cy = GetBrushWidth(); + break; + case TOOL_PEN: + size.cx = size.cy = GetPenWidth(); + break; + } + if (size.cx < 1) + size.cx = 1; + if (size.cy < 1) + size.cy = 1; + return size; +} + BOOL ToolsModel::IsBackgroundTransparent() const { return m_transpBg; diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index a5737010d9b..1bc5ee256c0 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -124,6 +124,8 @@ public: void SetRubberRadius(int nRubberRadius); void MakeRubberThickerOrThinner(BOOL bThinner); + SIZE GetToolSize() const; + BOOL IsBackgroundTransparent() const; void SetBackgroundTransparent(BOOL bTransparent);

1 year, 1 month

[reactos] 01/01: [ACCESS] Improve IDC_RESET_COMBO selection (#5893)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=416d63026eaba0aa8e2fe… commit 416d63026eaba0aa8e2fe05c028fc0b1b4e2b0ab Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 19 10:33:18 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 19 10:33:18 2023 +0900 [ACCESS] Improve IDC_RESET_COMBO selection (#5893) Based on KRosUser's access.patch. CORE-19303 --- dll/cpl/access/general.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dll/cpl/access/general.c b/dll/cpl/access/general.c index 414b93016a5..8069fd0e965 100644 --- a/dll/cpl/access/general.c +++ b/dll/cpl/access/general.c @@ -12,6 +12,7 @@ #define BAUDTICKS 6 static UINT nBaudArray[BAUDTICKS] = {300, 1200, 2400, 4800, 9600, 19200}; +#define FIVE_MINS_IN_MS (5 * 60 * 1000) INT_PTR CALLBACK SerialKeysDlgProc(HWND hwndDlg, @@ -177,6 +178,7 @@ GeneralPageProc(HWND hwndDlg, { PGLOBAL_DATA pGlobalData; LPPSHNOTIFY lppsn; + INT iCurSel; pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); @@ -194,8 +196,9 @@ GeneralPageProc(HWND hwndDlg, IDC_RESET_BOX, pGlobalData->accessTimeout.dwFlags & ATF_TIMEOUTON ? BST_CHECKED : BST_UNCHECKED); FillResetComboBox(GetDlgItem(hwndDlg, IDC_RESET_COMBO)); - SendDlgItemMessage(hwndDlg, IDC_RESET_COMBO, CB_SETCURSEL, - (pGlobalData->accessTimeout.iTimeOutMSec / 300000) - 1, 0); + pGlobalData->accessTimeout.iTimeOutMSec = max(FIVE_MINS_IN_MS, pGlobalData->accessTimeout.iTimeOutMSec); + iCurSel = (pGlobalData->accessTimeout.iTimeOutMSec / FIVE_MINS_IN_MS) - 1; + SendDlgItemMessage(hwndDlg, IDC_RESET_COMBO, CB_SETCURSEL, iCurSel, 0); EnableWindow(GetDlgItem(hwndDlg, IDC_RESET_COMBO), pGlobalData->accessTimeout.dwFlags & ATF_TIMEOUTON ? TRUE : FALSE); @@ -233,7 +236,7 @@ GeneralPageProc(HWND hwndDlg, { INT nSel; nSel = SendDlgItemMessage(hwndDlg, IDC_RESET_COMBO, CB_GETCURSEL, 0, 0); - pGlobalData->accessTimeout.iTimeOutMSec = (ULONG)((nSel + 1) * 300000); + pGlobalData->accessTimeout.iTimeOutMSec = (DWORD)((nSel + 1) * FIVE_MINS_IN_MS); PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } break;

1 year, 1 month

[reactos] 01/01: [WININET] Update Romanian (ro-RO) translation (#5992)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0a7a2824cfafe877e151b… commit 0a7a2824cfafe877e151be8bfac8a3eff44c2295 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sat Nov 18 23:41:25 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 18 22:41:25 2023 +0100 [WININET] Update Romanian (ro-RO) translation (#5992) --- dll/win32/wininet/lang/wininet_Ro.rc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dll/win32/wininet/lang/wininet_Ro.rc b/dll/win32/wininet/lang/wininet_Ro.rc index aa7973d8690..5532f394704 100644 --- a/dll/win32/wininet/lang/wininet_Ro.rc +++ b/dll/win32/wininet/lang/wininet_Ro.rc @@ -29,17 +29,17 @@ STRINGTABLE IDS_CERT_DATE_INVALID "Data din certificat nu este validă." IDS_CERT_CN_INVALID "Numele din certificat nu corespunde cu cel al sitului." IDS_CERT_ERRORS "Există cel puțin o problemă nespecificată de securitate cu acest certificat." - IDS_CERT_SUBJECT "Subject" - IDS_CERT_ISSUER "Issuer" - IDS_CERT_EFFECTIVE "Effective Date" - IDS_CERT_EXPIRATION "Expiration Date" - IDS_CERT_PROTOCOL "Security Protocol" - IDS_CERT_SIGNATURE "Signature Type" - IDS_CERT_ENCRYPTION "Encryption Type" - IDS_CERT_PRIVACY "Privacy Strength" - IDS_CERT_HIGH "High" - IDS_CERT_LOW "Low" - IDS_CERT_BITS "bits" + IDS_CERT_SUBJECT "Subiect" + IDS_CERT_ISSUER "Emitent" + IDS_CERT_EFFECTIVE "Data efectivă" + IDS_CERT_EXPIRATION "Data expirării" + IDS_CERT_PROTOCOL "Protocolul de securitate" + IDS_CERT_SIGNATURE "Tipul semnăturii" + IDS_CERT_ENCRYPTION "Tipul de criptare" + IDS_CERT_PRIVACY "Puterea de confidențialitate" + IDS_CERT_HIGH "Înaltă" + IDS_CERT_LOW "Joasă" + IDS_CERT_BITS "octeți" } IDD_PROXYDLG DIALOGEX 36, 24, 220, 146 @@ -76,7 +76,7 @@ FONT 8, "MS Shell Dlg" LTEXT "", IDC_REALM, 60, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 60, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 60, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Păstreată această parolă (nerecomandat)", IDC_SAVEPASSWORD, + CHECKBOX "Sal&vează această parolă (nerecomandat)", IDC_SAVEPASSWORD, 60, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "Con&firmă", IDOK, 90, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "A&nulează", IDCANCEL, 154, 126, 56, 14, WS_GROUP | WS_TABSTOP

1 year, 1 month

[reactos] 01/01: [VGAFONTEDIT] Update Romanian (ro-RO) translation (#5991)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a6a617f96cf5ff7d9648e… commit a6a617f96cf5ff7d9648ee20cb0e94967708ff93 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sat Nov 18 23:40:18 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 18 22:40:18 2023 +0100 [VGAFONTEDIT] Update Romanian (ro-RO) translation (#5991) --- .../rosapps/applications/devutils/vgafontedit/lang/ro-RO.rc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/rosapps/applications/devutils/vgafontedit/lang/ro-RO.rc b/modules/rosapps/applications/devutils/vgafontedit/lang/ro-RO.rc index f221c59383f..8c18c22973f 100644 --- a/modules/rosapps/applications/devutils/vgafontedit/lang/ro-RO.rc +++ b/modules/rosapps/applications/devutils/vgafontedit/lang/ro-RO.rc @@ -2,8 +2,8 @@ * PROJECT: ReactOS VGA Font Editor * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Romanian resource file - * COPYRIGHT: Copyright 2008 Colin Finck (colin(a)reactos.org) - * TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot com) + * TRANSLATORS: Copyright 2008 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2023 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -40,8 +40,8 @@ BEGIN MENUITEM "&Deschidere…\tCtrl+O", ID_FILE_OPEN MENUITEM "În&chide", ID_FILE_CLOSE MENUITEM SEPARATOR - MENUITEM "Pă&strează\tCtrl+S", ID_FILE_SAVE - MENUITEM "&Păstrare în…", ID_FILE_SAVE_AS + MENUITEM "Sal&vează\tCtrl+S", ID_FILE_SAVE + MENUITEM "Salvea&ză ca…", ID_FILE_SAVE_AS MENUITEM SEPARATOR MENUITEM "I&eșire\tAlt+F4", ID_FILE_EXIT END @@ -80,13 +80,13 @@ BEGIN IDS_UNSUPPORTEDFORMAT, "Format de fișier incompatibil!" IDS_UNSUPPORTEDPSF, "Format incompatibil de font PSF! Posibilitățile editorului se limitează la fonturile 8x8 fără moduri speciale." IDS_DOCNAME, "Font %1!u!" - IDS_SAVEPROMPT, "Modificările în fișierul „%1” încă nu au fost păstrate.\n\nDoriți păstrarea lor?" + IDS_SAVEPROMPT, "Modificările în fișierul „%1” încă nu au fost salvate.\n\nDoriți salvarea lor?" IDS_APPTITLE, "Editor de font VGA ReactOS" IDS_CLOSEEDIT, "Închideți mai întâi toate ferestrele de editare!" IDS_TOOLTIP_NEW, "Nou" IDS_TOOLTIP_OPEN, "Deschide" - IDS_TOOLTIP_SAVE, "Păstrează" + IDS_TOOLTIP_SAVE, "Salvează" IDS_TOOLTIP_EDIT_GLYPH, "Editează glifă" IDS_TOOLTIP_COPY, "Copiază" IDS_TOOLTIP_PASTE, "Lipește"

1 year, 1 month

[reactos] 01/01: [MPR] Update Romanian (ro-RO) translation (#5990)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a9445f5ff6043aa28b017… commit a9445f5ff6043aa28b017200dbe3449e55126643 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sat Nov 18 23:39:02 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 18 22:39:02 2023 +0100 [MPR] Update Romanian (ro-RO) translation (#5990) --- dll/win32/mpr/lang/mpr_Ro.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/mpr/lang/mpr_Ro.rc b/dll/win32/mpr/lang/mpr_Ro.rc index 1a3acf6c523..e28d71f3263 100644 --- a/dll/win32/mpr/lang/mpr_Ro.rc +++ b/dll/win32/mpr/lang/mpr_Ro.rc @@ -41,7 +41,7 @@ FONT 8, "MS Shell Dlg" LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Păstrează această parolă (nerecomandat)", IDC_SAVEPASSWORD, + CHECKBOX "Sal&vează această parolă (nerecomandat)", IDC_SAVEPASSWORD, 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "Con&firmă", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "A&nulează", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP

1 year, 1 month

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