tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-22 21:34:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Unify the terms "Fold/unfold" on menu

Browse Source 
Rename menu item from "collapse" to "fold".

Fix #12035, close #12094
This commit is contained in:
Don Ho 2022-09-04 03:25:02 +02:00
parent ebe7648ee1
commit 15e5da6f7d
7 changed files with 52 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
PowerEditor/installer/nativeLang/english.xml
View File

@ -49,8 +49,8 @@ The comments are here for explanation, it's not necessary to translate them.
<Item subMenuId="view-zoom" name="Zoom"/>
<Item subMenuId="view-moveCloneDocument" name="Move/Clone Current Document"/>
<Item subMenuId="view-tab" name="Tab"/>
<Item subMenuId="view-collapseLevel" name="Collapse Level"/>
<Item subMenuId="view-uncollapseLevel" name="Uncollapse Level"/>
<Item subMenuId="view-collapseLevel" name="Fold Level"/>
<Item subMenuId="view-uncollapseLevel" name="Unfold Level"/>
<Item subMenuId="view-project" name="Project"/>
<Item subMenuId="encoding-characterSets" name="Character Set"/>
<Item subMenuId="encoding-arabic" name="Arabic"/>
@ -267,8 +267,8 @@ The comments are here for explanation, it's not necessary to translate them.
<Item id="44025" name="Show White Space and TAB"/>
<Item id="44026" name="Show End of Line"/>
<Item id="44029" name="Unfold All"/>
<Item id="44030" name="Collapse Current Level"/>
<Item id="44031" name="Uncollapse Current Level"/>
<Item id="44030" name="Fold Current Level"/>
<Item id="44031" name="Unfold Current Level"/>
<Item id="44049" name="Summary..."/>
<Item id="44080" name="Document Map"/>
<Item id="44070" name="Document List"/>
@ -619,22 +619,22 @@ The comments are here for explanation, it's not necessary to translate them.
<Item id="44102" name="View current file in Edge"/>
<Item id="50003" name="Switch to previous document"/>
<Item id="50004" name="Switch to next document"/>
<Item id="44051" name="Collapse Level 1"/>
<Item id="44052" name="Collapse Level 2"/>
<Item id="44053" name="Collapse Level 3"/>
<Item id="44054" name="Collapse Level 4"/>
<Item id="44055" name="Collapse Level 5"/>
<Item id="44056" name="Collapse Level 6"/>
<Item id="44057" name="Collapse Level 7"/>
<Item id="44058" name="Collapse Level 8"/>
<Item id="44061" name="Uncollapse Level 1"/>
<Item id="44062" name="Uncollapse Level 2"/>
<Item id="44063" name="Uncollapse Level 3"/>
<Item id="44064" name="Uncollapse Level 4"/>
<Item id="44065" name="Uncollapse Level 5"/>
<Item id="44066" name="Uncollapse Level 6"/>
<Item id="44067" name="Uncollapse Level 7"/>
<Item id="44068" name="Uncollapse Level 8"/>
<Item id="44051" name="Fold Level 1"/>
<Item id="44052" name="Fold Level 2"/>
<Item id="44053" name="Fold Level 3"/>
<Item id="44054" name="Fold Level 4"/>
<Item id="44055" name="Fold Level 5"/>
<Item id="44056" name="Fold Level 6"/>
<Item id="44057" name="Fold Level 7"/>
<Item id="44058" name="Fold Level 8"/>
<Item id="44061" name="Unfold Level 1"/>
<Item id="44062" name="Unfold Level 2"/>
<Item id="44063" name="Unfold Level 3"/>
<Item id="44064" name="Unfold Level 4"/>
<Item id="44065" name="Unfold Level 5"/>
<Item id="44066" name="Unfold Level 6"/>
<Item id="44067" name="Unfold Level 7"/>
<Item id="44068" name="Unfold Level 8"/>
<Item id="44081" name="Toggle Project Panel 1"/>
<Item id="44082" name="Toggle Project Panel 2"/>
<Item id="44083" name="Toggle Project Panel 3"/>
@ -928,7 +928,7 @@ The comments are here for explanation, it's not necessary to translate them.
</DarkMode>
<MarginsBorderEdge title="Margins/Border/Edge">
<Item id="6201" name="Folder Margin Style"/>
<Item id="6201" name="Fold Margin Style"/>
<Item id="6202" name="Simple"/>
<Item id="6203" name="Arrow"/>
<Item id="6204" name="Circle tree"/>
@ -1376,8 +1376,8 @@ Continue?"/>
<FolderAsWorkspace>
<PanelTitle name="Folder as Workspace"/>
<SelectFolderFromBrowserString name="Select a folder to add in Folder as Workspace panel"/>
<ExpandAllFoldersTip name="Expand all folders"/>
<CollapseAllFoldersTip name="Collapse all folders"/>
<ExpandAllFoldersTip name="Unfold all"/>
<CollapseAllFoldersTip name="Fold all"/>
<LocateCurrentFileTip name="Locate current file"/>
<Menus>
<Item id="3511" name="Remove"/>
@ -1503,8 +1503,8 @@ Find in all files but exclude all folders log or logs recursively:
<find-status-scope-forward value="from caret to end-of-file"/>
<finder-find-in-finder value="Find in these search results..."/>
<finder-close-this value="Close these search results"/>
<finder-collapse-all value="Collapse all"/>
<finder-uncollapse-all value="Uncollapse all"/>
<finder-collapse-all value="Fold all"/>
<finder-uncollapse-all value="Unfold all"/>
<finder-copy value="Copy Selected Line(s)"/>
<finder-copy-verbatim value="Copy"/>
<finder-copy-paths value="Copy Pathname(s)"/>

2
PowerEditor/src/Notepad_plus.cpp
View File

@ -7316,6 +7316,8 @@ static const QuoteParams quotes[] =
{TEXT("Anonymous #193"), QuoteParams::rapid, false, SC_CP_UTF8, L_TEXT, TEXT("Do you know:\nthere are more airplanes in the oceans, than submarines in the sky?\n") },
{TEXT("Anonymous #194"), QuoteParams::rapid, false, SC_CP_UTF8, L_TEXT, TEXT("If you hold a Unix shell up to your ear,\nyou might just be able to hear the C.\n") },
{TEXT("Anonymous #195"), QuoteParams::rapid, false, SC_CP_UTF8, L_TEXT, TEXT("Why do programmers always mix up Halloween and Christmas?\nBecause Oct 31 == Dec 25\n") },
{TEXT("Anonymous #196"), QuoteParams::rapid, false, SC_CP_UTF8, L_TEXT, TEXT("What happened to the function that ran away?\nIt never returned.\n") },
{TEXT("Anonymous #197"), QuoteParams::rapid, false, SC_CP_UTF8, L_TEXT, TEXT("When I am tasked with sorting through a stack of résumés, I throw about half of them in the garbage.\nI do not want unlucky people working in our company.\n") },
{TEXT("xkcd"), QuoteParams::rapid, false, SC_CP_UTF8, L_TEXT, TEXT("Never have I felt so close to another soul\nAnd yet so helplessly alone\nAs when I Google an error\nAnd there's one result\nA thread by someone with the same problem\nAnd no answer\nLast posted to in 2003\n\n\"Who were you, DenverCoder9?\"\n\"What did you see?!\"\n\n(ref: https://xkcd.com/979/)") },
{TEXT("A developer"), QuoteParams::slow, false, SC_CP_UTF8, L_TEXT, TEXT("No hugs & kisses.\nOnly bugs & fixes.") },
{TEXT("Elon Musk"), QuoteParams::rapid, false, SC_CP_UTF8, L_TEXT, TEXT("Don't set your password as your child's name.\nName your child after your password.") },

8
PowerEditor/src/Notepad_plus.rc
View File

@ -712,9 +712,9 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Fold All", IDM_VIEW_FOLDALL
MENUITEM "Unfold All", IDM_VIEW_UNFOLDALL
MENUITEM "Collapse Current Level", IDM_VIEW_FOLD_CURRENT
MENUITEM "Uncollapse Current Level", IDM_VIEW_UNFOLD_CURRENT
POPUP "Collapse Level"
MENUITEM "Fold Current Level", IDM_VIEW_FOLD_CURRENT
MENUITEM "Unfold Current Level", IDM_VIEW_UNFOLD_CURRENT
POPUP "Fold Level"
BEGIN
MENUITEM "1", IDM_VIEW_FOLD_1
MENUITEM "2", IDM_VIEW_FOLD_2
@ -725,7 +725,7 @@ BEGIN
MENUITEM "7", IDM_VIEW_FOLD_7
MENUITEM "8", IDM_VIEW_FOLD_8
END
POPUP "Uncollapse Level"
POPUP "Unfold Level"
BEGIN
MENUITEM "1", IDM_VIEW_UNFOLD_1
MENUITEM "2", IDM_VIEW_UNFOLD_2

32
PowerEditor/src/Parameters.cpp
View File

@ -290,23 +290,23 @@ static const WinMenuKeyDefinition winKeyDefs[] =
{ VK_0, IDM_VIEW_UNFOLDALL, false, true, true, nullptr },
{ VK_F, IDM_VIEW_FOLD_CURRENT, true, true, false, nullptr },
{ VK_F, IDM_VIEW_UNFOLD_CURRENT, true, true, true, nullptr },
{ VK_1, IDM_VIEW_FOLD_1, false, true, false, TEXT("Collapse Level 1") },
{ VK_2, IDM_VIEW_FOLD_2, false, true, false, TEXT("Collapse Level 2") },
{ VK_3, IDM_VIEW_FOLD_3, false, true, false, TEXT("Collapse Level 3") },
{ VK_4, IDM_VIEW_FOLD_4, false, true, false, TEXT("Collapse Level 4") },
{ VK_5, IDM_VIEW_FOLD_5, false, true, false, TEXT("Collapse Level 5") },
{ VK_6, IDM_VIEW_FOLD_6, false, true, false, TEXT("Collapse Level 6") },
{ VK_7, IDM_VIEW_FOLD_7, false, true, false, TEXT("Collapse Level 7") },
{ VK_8, IDM_VIEW_FOLD_8, false, true, false, TEXT("Collapse Level 8") },
{ VK_1, IDM_VIEW_FOLD_1, false, true, false, TEXT("Fold Level 1") },
{ VK_2, IDM_VIEW_FOLD_2, false, true, false, TEXT("Fold Level 2") },
{ VK_3, IDM_VIEW_FOLD_3, false, true, false, TEXT("Fold Level 3") },
{ VK_4, IDM_VIEW_FOLD_4, false, true, false, TEXT("Fold Level 4") },
{ VK_5, IDM_VIEW_FOLD_5, false, true, false, TEXT("Fold Level 5") },
{ VK_6, IDM_VIEW_FOLD_6, false, true, false, TEXT("Fold Level 6") },
{ VK_7, IDM_VIEW_FOLD_7, false, true, false, TEXT("Fold Level 7") },
{ VK_8, IDM_VIEW_FOLD_8, false, true, false, TEXT("Fold Level 8") },
{ VK_1, IDM_VIEW_UNFOLD_1, false, true, true, TEXT("Uncollapse Level 1") },
{ VK_2, IDM_VIEW_UNFOLD_2, false, true, true, TEXT("Uncollapse Level 2") },
{ VK_3, IDM_VIEW_UNFOLD_3, false, true, true, TEXT("Uncollapse Level 3") },
{ VK_4, IDM_VIEW_UNFOLD_4, false, true, true, TEXT("Uncollapse Level 4") },
{ VK_5, IDM_VIEW_UNFOLD_5, false, true, true, TEXT("Uncollapse Level 5") },
{ VK_6, IDM_VIEW_UNFOLD_6, false, true, true, TEXT("Uncollapse Level 6") },
{ VK_7, IDM_VIEW_UNFOLD_7, false, true, true, TEXT("Uncollapse Level 7") },
{ VK_8, IDM_VIEW_UNFOLD_8, false, true, true, TEXT("Uncollapse Level 8") },
{ VK_1, IDM_VIEW_UNFOLD_1, false, true, true, TEXT("Unfold Level 1") },
{ VK_2, IDM_VIEW_UNFOLD_2, false, true, true, TEXT("Unfold Level 2") },
{ VK_3, IDM_VIEW_UNFOLD_3, false, true, true, TEXT("Unfold Level 3") },
{ VK_4, IDM_VIEW_UNFOLD_4, false, true, true, TEXT("Unfold Level 4") },
{ VK_5, IDM_VIEW_UNFOLD_5, false, true, true, TEXT("Unfold Level 5") },
{ VK_6, IDM_VIEW_UNFOLD_6, false, true, true, TEXT("Unfold Level 6") },
{ VK_7, IDM_VIEW_UNFOLD_7, false, true, true, TEXT("Unfold Level 7") },
{ VK_8, IDM_VIEW_UNFOLD_8, false, true, true, TEXT("Unfold Level 8") },
{ VK_NULL, IDM_VIEW_SUMMARY, false, false, false, nullptr },
{ VK_NULL, IDM_VIEW_PROJECT_PANEL_1, false, false, false, TEXT("Toggle Project Panel 1") },
{ VK_NULL, IDM_VIEW_PROJECT_PANEL_2, false, false, false, TEXT("Toggle Project Panel 2") },

4
PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp
View File

@ -4922,8 +4922,8 @@ intptr_t CALLBACK Finder::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam
generic_string findInFinder = pNativeSpeaker->getLocalizedStrFromID("finder-find-in-finder", TEXT("Find in these search results..."));
generic_string closeThis = pNativeSpeaker->getLocalizedStrFromID("finder-close-this", TEXT("Close these search results"));
generic_string collapseAll = pNativeSpeaker->getLocalizedStrFromID("finder-collapse-all", TEXT("Collapse all"));
generic_string uncollapseAll = pNativeSpeaker->getLocalizedStrFromID("finder-uncollapse-all", TEXT("Uncollapse all"));
generic_string collapseAll = pNativeSpeaker->getLocalizedStrFromID("finder-collapse-all", TEXT("Fold all"));
generic_string uncollapseAll = pNativeSpeaker->getLocalizedStrFromID("finder-uncollapse-all", TEXT("Unfold all"));
generic_string copyLines = pNativeSpeaker->getLocalizedStrFromID("finder-copy", TEXT("Copy Selected Line(s)"));
generic_string copyVerbatim = pNativeSpeaker->getLocalizedStrFromID("finder-copy-verbatim", TEXT("Copy"));
copyVerbatim += TEXT("\tCtrl+C");

4
PowerEditor/src/WinControls/FileBrowser/fileBrowser.h
View File

@ -176,8 +176,8 @@ protected:
std::vector<SortingData4lParam*> sortingDataArray;
generic_string _expandAllFolders = TEXT("Expand all folders");
generic_string _collapseAllFolders = TEXT("Collapse all folders");
generic_string _expandAllFolders = TEXT("Unfold all");
generic_string _collapseAllFolders = TEXT("Fold all");
generic_string _locateCurrentFile = TEXT("Locate current file");
void initPopupMenus();

2
PowerEditor/src/WinControls/Preference/preference.rc
View File

@ -136,7 +136,7 @@ IDD_PREFERENCE_SUB_MARGING_BORDER_EDGE DIALOGEX 0, 0, 455, 185
STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
GROUPBOX "Folder Margin Style",IDC_FMS_GB_STATIC,22,21,83,89,BS_CENTER
GROUPBOX "Fold Margin Style",IDC_FMS_GB_STATIC,22,21,83,89,BS_CENTER
CONTROL "Simple",IDC_RADIO_SIMPLE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,31,34,59,10
CONTROL "Arrow",IDC_RADIO_ARROW,"Button",BS_AUTORADIOBUTTON,31,48,60,10
CONTROL "Circle tree",IDC_RADIO_CIRCLE,"Button",BS_AUTORADIOBUTTON,31,63,62,10