Clarified DecorateItemsWithHotkeys.

Author: MKadaner

far/changelog

@@ -1,3 +1,10 @@
+--------------------------------------------------------------------------------
+MZK 2026-08-15 12:52:07-04:00 - build 6728
+
+1. Clarified `DecorateItemsWithHotkeys`.
+
+2. Refactoring.
+
 --------------------------------------------------------------------------------
 drkns 2026-08-11 21:39:09+01:00 - build 6727
 

far/codepage_selection.cpp

@@ -434,7 +434,7 @@ void codepages::SetFavorite(bool State)
 			DeleteFavorite(codePage);
 
 		// Создаём новый элемент меню
-		menu_item_ex newItem{ CodePagesMenu->current().GetName() };
+		menu_item_ex newItem{ CodePagesMenu->current().get_name() };
 		newItem.SimpleUserData = codePage;
 		// Сохраняем позицию курсора
 		size_t position = CodePagesMenu->GetSelectPos();
@@ -614,7 +614,7 @@ void codepages::EditCodePageName()
 	const auto Position = CodePagesMenu->GetSelectPos();
 	if (IsPositionStandard(Position))
 		return;
-	string_view CodePageName = CodePagesMenu->at(Position).GetName();
+	string_view CodePageName = CodePagesMenu->at(Position).get_name();
 	const auto BoxPosition = CodePageName.find(BoxSymbols[BS_V1]);
 	if (BoxPosition == string_view::npos)
 		return;

far/config.cpp

@@ -1167,17 +1167,17 @@ void Options::SetFilePanelModes()
 
 		const auto MenuCount = ViewSettings.size();
 		// +1 for separator
-		std::vector<menu_item> ModeListMenu(MenuCount > predefined_panel_modes_count? MenuCount + 1: MenuCount);
+		std::vector<menu_item_data> ModeListMenu(MenuCount > predefined_panel_modes_count? MenuCount + 1: MenuCount);
 
 		for (const auto i: std::views::iota(0uz, ViewSettings.size()))
 		{
-			ModeListMenu[RealModeToDisplay(i)].SetName(ViewSettings[i].Name);
+			ModeListMenu[RealModeToDisplay(i)].Name = ViewSettings[i].Name;
 		}
 
 		for (const auto i: std::views::iota(0uz, predefined_panel_modes_count))
 		{
-			if (ModeListMenu[i].GetName().empty())
-				ModeListMenu[i].SetName(msg(PredefinedNames[i]));
+			if (ModeListMenu[i].Name.empty())
+				ModeListMenu[i].Name = msg(PredefinedNames[i]);
 		}
 
 		if (MenuCount > predefined_panel_modes_count)
@@ -1190,7 +1190,7 @@ void Options::SetFilePanelModes()
 		bool AddNewMode = false;
 		bool DeleteMode = false;
 
-		ModeListMenu[CurMode].SetSelect(true);
+		ModeListMenu[CurMode].set_select(true);
 		{
 			const auto ModeList = VMenu2::create(msg(lng::MEditPanelModes), ModeListMenu, ScrY - 4);
 			ModeList->SetPosition({ -1, -1, 0, 0 });
@@ -1310,7 +1310,7 @@ void Options::SetFilePanelModes()
 
 		auto ModeDlg = MakeDialogItems<MD_COUNT>(
 		{
-			{ DI_DOUBLEBOX, {{3,  1 }, {72, 17}}, DIF_NONE, AddNewMode ? L""sv : ModeListMenu[CurMode].GetName(), },
+			{ DI_DOUBLEBOX, {{3,  1 }, {72, 17}}, DIF_NONE, AddNewMode ? L""sv : ModeListMenu[CurMode].Name, },
 			{ DI_TEXT,      {{5,  2 }, {0,  2 }}, DIF_NONE, msg(lng::MEditPanelModeName), },
 			{ DI_EDIT,      {{5,  3 }, {70, 3 }}, DIF_FOCUS, },
 			{ DI_TEXT,      {{5,  4 }, {0,  4 }}, DIF_NONE, msg(lng::MEditPanelModeTypes), },
@@ -3055,46 +3055,46 @@ enum enumOptionsMenu
 	MENU_OPTIONS_SAVESETUP
 };
 
-static void SetLeftRightMenuChecks(menu_item* pMenu, bool bLeft)
+static void SetLeftRightMenuChecks(menu_item_data* pMenu, bool bLeft)
 {
 	const auto pPanel = bLeft? Global->CtrlObject->Cp()->LeftPanel() : Global->CtrlObject->Cp()->RightPanel();
 
 	switch (pPanel->GetType())
 	{
 	case panel_type::FILE_PANEL:
-		pMenu[RealModeToDisplay(pPanel->GetViewMode())].SetCheck();
+		pMenu[RealModeToDisplay(pPanel->GetViewMode())].set_check(true);
 		break;
 
 	case panel_type::INFO_PANEL:
-		pMenu[MENU_PANEL_INFOPANEL].SetCheck();
+		pMenu[MENU_PANEL_INFOPANEL].set_check(true);
 		break;
 
 	case panel_type::TREE_PANEL:
-		pMenu[MENU_PANEL_TREEPANEL].SetCheck();
+		pMenu[MENU_PANEL_TREEPANEL].set_check(true);
 		break;
 
 	case panel_type::QVIEW_PANEL:
-		pMenu[MENU_PANEL_QUICKVIEW].SetCheck();
+		pMenu[MENU_PANEL_QUICKVIEW].set_check(true);
 		break;
 	}
 
-	pPanel->GetShowShortNamesMode()? pMenu[MENU_PANEL_LONGNAMES].ClearCheck() : pMenu[MENU_PANEL_LONGNAMES].SetCheck();
+	pMenu[MENU_PANEL_LONGNAMES].set_check(!pPanel->GetShowShortNamesMode());
 }
 
 void Options::ShellOptions(bool LastCommand, const MOUSE_EVENT_RECORD *MouseEvent)
 {
-	const auto ApplyViewModesNames = [this](menu_item* Menu)
+	const auto ApplyViewModesNames = [this](menu_item_data* Menu)
 	{
 		for (const auto i: std::views::iota(0uz, predefined_panel_modes_count))
 		{
 			if (!ViewSettings[i].Name.empty())
-				Menu[RealModeToDisplay(i)].SetName(ViewSettings[i].Name);
+				Menu[RealModeToDisplay(i)].Name = ViewSettings[i].Name;
 		}
 	};
 
 	const auto no_tree = Tree.TurnOffCompletely? LIF_HIDDEN : LIF_NONE;
 
-	menu_item LeftMenu[]
+	menu_item_data LeftMenu[]
 	{
 		{ msg(lng::MMenuBriefView), LIF_SELECTED, KEY_CTRL1 },
 		{ msg(lng::MMenuMediumView), 0, KEY_CTRL2 },
@@ -3120,7 +3120,7 @@ void Options::ShellOptions(bool LastCommand, const MOUSE_EVENT_RECORD *MouseEven
 	ApplyViewModesNames(LeftMenu);
 	VMenu::DecorateItemsWithHotkeys(LeftMenu);
 
-	menu_item FilesMenu[]
+	menu_item_data FilesMenu[]
 	{
 		{ msg(lng::MMenuView), LIF_SELECTED, KEY_F3 },
 		{ msg(lng::MMenuEdit), 0, KEY_F4 },
@@ -3146,7 +3146,7 @@ void Options::ShellOptions(bool LastCommand, const MOUSE_EVENT_RECORD *MouseEven
 	};
 	VMenu::DecorateItemsWithHotkeys(FilesMenu);
 
-	menu_item CmdMenu[]
+	menu_item_data CmdMenu[]
 	{
 		{ msg(lng::MMenuFindFile), LIF_SELECTED, KEY_ALTF7 },
 		{ msg(lng::MMenuHistory), 0, KEY_ALTF8 },
@@ -3171,7 +3171,7 @@ void Options::ShellOptions(bool LastCommand, const MOUSE_EVENT_RECORD *MouseEven
 	};
 	VMenu::DecorateItemsWithHotkeys(CmdMenu);
 
-	menu_item OptionsMenu[]
+	menu_item_data OptionsMenu[]
 	{
 		{ msg(lng::MMenuSystemSettings), LIF_SELECTED },
 		{ msg(lng::MMenuPanelSettings), 0 },
@@ -3203,7 +3203,7 @@ void Options::ShellOptions(bool LastCommand, const MOUSE_EVENT_RECORD *MouseEven
 	};
 	VMenu::DecorateItemsWithHotkeys(OptionsMenu);
 
-	menu_item RightMenu[]
+	menu_item_data RightMenu[]
 	{
 		{ msg(lng::MMenuBriefView), LIF_SELECTED, KEY_CTRL1 },
 		{ msg(lng::MMenuMediumView), 0, KEY_CTRL2 },
@@ -3262,8 +3262,8 @@ void Options::ShellOptions(bool LastCommand, const MOUSE_EVENT_RECORD *MouseEven
 
 			MainMenu[0].Selected = false;
 			MainMenu[HItemToShow].Selected = true;
-			MainMenu[HItemToShow].SubMenu[0].SetSelect(false);
-			MainMenu[HItemToShow].SubMenu[LastVItem].SetSelect(true);
+			MainMenu[HItemToShow].SubMenu[0].set_select(false);
+			MainMenu[HItemToShow].SubMenu[LastVItem].set_select(true);
 			Global->WindowManager->CallbackWindow([&HOptMenu](){HOptMenu->ProcessKey(Manager::Key(KEY_DOWN));});
 		}
 		else

far/dialog.cpp

@@ -214,7 +214,7 @@ static size_t ConvertItemEx2(const DialogItemEx& ItemEx, FarGetDialogItem *Item,
 			size+=ListBoxSize*sizeof(FarListItem);
 			for (const auto i: std::views::iota(0uz, ListBoxSize))
 			{
-				size += (ListBox->at(i).GetName().size() + 1) * sizeof(wchar_t);
+				size += (ListBox->at(i).get_name().size() + 1) * sizeof(wchar_t);
 			}
 		}
 	}
@@ -246,7 +246,7 @@ static size_t ConvertItemEx2(const DialogItemEx& ItemEx, FarGetDialogItem *Item,
 						auto& item = ListBox->at(ii);
 						listItems[ii].Flags = item.Flags;
 						listItems[ii].Text = text;
-						text += item.GetName().copy(text, item.GetName().npos);
+						text += item.get_name().copy(text, item.get_name().npos);
 						*text++ = {};
 						listItems[ii].UserData = item.SimpleUserData;
 						listItems[ii].Reserved = 0;
@@ -3894,11 +3894,11 @@ int Dialog::SelectFromComboBox(DialogItemEx& CurItem, DlgEdit& EditLine)
 
 		if (CurItem.Flags & DIF_LISTNOAMPERSAND)
 		{
-			strStr = remove_highlight(ItemPtr.GetName());
+			strStr = remove_highlight(ItemPtr.get_name());
 			EditLine.SetString(strStr);
 		}
 		else
-			EditLine.SetString(ItemPtr.GetName());
+			EditLine.SetString(ItemPtr.get_name());
 
 		EditLine.SetLeftPos(0);
 		Redraw();
@@ -4903,7 +4903,7 @@ intptr_t Dialog::SendMessage(intptr_t Msg,intptr_t Param1,void* Param2)
 								auto& Item = ListItems->Item;
 								Item = {};
 								Item.Flags=ListMenuItem.Flags;
-								Item.Text=ListMenuItem.GetName().c_str();
+								Item.Text=ListMenuItem.get_name().c_str();
 								Item.UserData = ListMenuItem.SimpleUserData;
 								Item.Reserved = 0;
 
@@ -5050,9 +5050,9 @@ intptr_t Dialog::SendMessage(intptr_t Msg,intptr_t Param1,void* Param2)
 							const auto& ListMenuItem = ListBox->at(ListBox->GetSelectPos());
 							const auto Edit = static_cast<DlgEdit*>(CurItem.ObjPtr);
 							if (CurItem.Flags & DIF_LISTNOAMPERSAND)
-								Edit->SetHiString(ListMenuItem.GetName());
+								Edit->SetHiString(ListMenuItem.get_name());
 							else
-								Edit->SetString(ListMenuItem.GetName());
+								Edit->SetString(ListMenuItem.get_name());
 							Edit->RemoveSelection();
 						}
 					}
@@ -5529,8 +5529,8 @@ intptr_t Dialog::SendMessage(intptr_t Msg,intptr_t Param1,void* Param2)
 						if (CurItem.ListPtr->GetShowItemCount())
 						{
 							const auto& ListMenuItem = CurItem.ListPtr->current();
-							Ptr = ListMenuItem.GetName().data();
-							Len = ListMenuItem.GetName().size();
+							Ptr = ListMenuItem.get_name().data();
+							Len = ListMenuItem.get_name().size();
 						}
 						InitItemData();
 						break;
@@ -5579,7 +5579,7 @@ intptr_t Dialog::SendMessage(intptr_t Msg,intptr_t Param1,void* Param2)
 					Len=0;
 					if (CurItem.ListPtr->GetShowItemCount())
 					{
-						Len = CurItem.ListPtr->current().GetName().size();
+						Len = CurItem.ListPtr->current().get_name().size();
 					}
 					break;
 

far/diskmenu.cpp

@@ -218,7 +218,7 @@ static void AddPluginItems(VMenu2 &ChDisk, int Pos, int DiskCount, bool SetSelec
 		if (Pos > DiskCount && !SetSelected && DiskCount + static_cast<int>(index) + 1 == Pos)
 		{
 			SetSelected = true;
-			MenuItem.SetSelect(true);
+			MenuItem.set_select(true);
 		}
 
 		ChDisk.AddItem(MenuItem);
@@ -714,7 +714,7 @@ static int ChangeDiskMenu(panel_ptr Owner, int Pos, bool FirstCall)
 				{
 					const auto DiskNumber = os::fs::drive::get_number(i.RootDirectory[L"\\\\?\\"sv.size()]);
 
-					ChDiskItem.SetSelect(static_cast<int>(DiskNumber) == Pos);
+					ChDiskItem.set_select(static_cast<int>(DiskNumber) == Pos);
 
 					if (!SetSelected)
 						SetSelected = (static_cast<int>(DiskNumber) == Pos);
@@ -724,7 +724,7 @@ static int ChangeDiskMenu(panel_ptr Owner, int Pos, bool FirstCall)
 			{
 				if (Pos < static_cast<int>(Items.size()))
 				{
-					ChDiskItem.SetSelect(MenuLine == Pos);
+					ChDiskItem.set_select(MenuLine == Pos);
 
 					if (!SetSelected)
 						SetSelected = (MenuLine == Pos);
@@ -762,7 +762,7 @@ static int ChangeDiskMenu(panel_ptr Owner, int Pos, bool FirstCall)
 			inplace::escape_ampersands(ItemName);
 			ItemName.insert(0, 1, L'&');
 
-			ChDiskItem.SetName(std::move(ItemName));
+			ChDiskItem.set_name(std::move(ItemName));
 			ChDiskItem.ComplexUserData = item;
 			ChDisk->AddItem(ChDiskItem);
 
@@ -927,7 +927,7 @@ static int ChangeDiskMenu(panel_ptr Owner, int Pos, bool FirstCall)
 				{
 					[&](plugin_item const& item)
 					{
-						if (Global->CtrlObject->Plugins->SetHotKeyDialog(item.pPlugin, item.Uuid, hotkey_type::drive_menu, trim(string_view{ ChDisk->at(SelPos).GetName() }.substr(3))))
+						if (Global->CtrlObject->Plugins->SetHotKeyDialog(item.pPlugin, item.Uuid, hotkey_type::drive_menu, trim(string_view{ ChDisk->at(SelPos).get_name() }.substr(3))))
 							RetCode = SelPos;
 					},
 					[](disk_item const& item)

far/editcontrol.cpp

@@ -444,7 +444,7 @@ int EditControl::AutoCompleteProc(bool Manual,bool DelBlock,Manager::Key& BackKe
 			{
 				for (const auto i: std::views::iota(0uz, pList->size()))
 				{
-					const auto& Text = pList->at(i).GetName();
+					const auto& Text = pList->at(i).get_name();
 
 					if (!starts_with_icase(Text, Str))
 						continue;
@@ -486,7 +486,7 @@ int EditControl::AutoCompleteProc(bool Manual,bool DelBlock,Manager::Key& BackKe
 		{
 			int SelStart = GetLength();
 
-			const auto& FirstItem = ComplMenu->at(0).GetName();
+			const auto& FirstItem = ComplMenu->at(0).get_name();
 			const auto Data = ComplMenu->GetComplexUserDataPtr<cmp_user_data>(0);
 
 			// magic
@@ -516,7 +516,7 @@ int EditControl::AutoCompleteProc(bool Manual,bool DelBlock,Manager::Key& BackKe
 			}
 		};
 
-		if(ComplMenu->size() > 1 || (ComplMenu->size() == 1 && !equal_icase(CurrentInput, ComplMenu->at(0).GetName())))
+		if(ComplMenu->size() > 1 || (ComplMenu->size() == 1 && !equal_icase(CurrentInput, ComplMenu->at(0).get_name())))
 		{
 			ComplMenu->SetMenuFlags(VMENU_WRAPMODE | VMENU_SHOWAMPERSAND);
 			if(!DelBlock && Global->Opt->AutoComplete.AppendCompletion && (!m_Flags.Check(FEDITLINE_PERSISTENTBLOCKS) || Global->Opt->AutoComplete.ShowList))
@@ -555,7 +555,7 @@ int EditControl::AutoCompleteProc(bool Manual,bool DelBlock,Manager::Key& BackKe
 						{
 							PrevPos=CurPos;
 							IsChanged = false;
-							SetString(CurPos? ComplMenu->at(CurPos).GetName() : CurrentInput);
+							SetString(CurPos? ComplMenu->at(CurPos).get_name() : CurrentInput);
 							Show();
 						}
 
@@ -604,7 +604,7 @@ int EditControl::AutoCompleteProc(bool Manual,bool DelBlock,Manager::Key& BackKe
 
 								Complete(*ComplMenu, CurrentInput);
 
-								if (ComplMenu->size() > 1 || (ComplMenu->size() == 1 && !equal_icase(CurrentInput, ComplMenu->at(0).GetName())))
+								if (ComplMenu->size() > 1 || (ComplMenu->size() == 1 && !equal_icase(CurrentInput, ComplMenu->at(0).get_name())))
 								{
 									if(none_of(MenuKey, KEY_BS, KEY_DEL, KEY_NUMDEL) && Global->Opt->AutoComplete.AppendCompletion)
 									{
@@ -757,7 +757,7 @@ int EditControl::AutoCompleteProc(bool Manual,bool DelBlock,Manager::Key& BackKe
 				{
 					if(Global->Opt->AutoComplete.ModalList)
 					{
-						SetString(ComplMenu->at(ExitCode).GetName());
+						SetString(ComplMenu->at(ExitCode).get_name());
 						Show();
 					}
 					else