Kaydet (Commit) 50f548d5 authored tarafından Caolán McNamara's avatar Caolán McNamara

convert starmath context menu to .ui

Change-Id: I0ab984aac0103a0d2bbb3c7a7c0bbd797eba7454
üst 2ce4fa15
......@@ -30,6 +30,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/smath,\
$(eval $(call gb_UIConfig_add_uifiles,modules/smath,\
starmath/uiconfig/smath/ui/alignmentdialog \
starmath/uiconfig/smath/ui/catalogdialog \
starmath/uiconfig/smath/ui/commandmenu \
starmath/uiconfig/smath/ui/dockingelements \
starmath/uiconfig/smath/ui/fontdialog \
starmath/uiconfig/smath/ui/fontsizedialog \
......
This diff is collapsed.
......@@ -86,7 +86,6 @@
#define RID_MATH_TOOLBOX (RID_APP_START + 50)
#define RID_UNDOFORMATNAME (RID_APP_START + 504)
#define RID_COMMANDMENU (RID_APP_START + 701)
#define RID_FONTREGULAR (RID_APP_START + 804)
#define RID_FONTITALIC (RID_APP_START + 805)
#define RID_FONTBOLD (RID_APP_START + 806)
......@@ -462,18 +461,6 @@
#define RID_NOTEXISTS (RID_APP_START + 1618)
#define RID_FORALL (RID_APP_START + 1612)
// new menue resource ID's
#define RID_UNBINOPS_MENU (RID_APP_START + 2164)
#define RID_RELATIONS_MENU (RID_APP_START + 2165)
#define RID_SETOPERATIONS_MENU (RID_APP_START + 2166)
#define RID_FUNCTIONS_MENU (RID_APP_START + 2167)
#define RID_OPERATORS_MENU (RID_APP_START + 2168)
#define RID_ATTRIBUTES_MENU (RID_APP_START + 2169)
#define RID_BRACKETS_MENU (RID_APP_START + 2170)
#define RID_FORMAT_MENU (RID_APP_START + 2171)
#define RID_MISC_MENU (RID_APP_START + 2172)
#define RID_FUNCTIONSOTHER1_MENU (RID_APP_START + 2173)
#define RID_UI_SYMBOL_NAMES (RID_APP_START + 3102)
#define RID_EXPORT_SYMBOL_NAMES (RID_APP_START + 3103)
#define RID_UI_SYMBOLSET_NAMES (RID_APP_START + 3105)
......
This diff is collapsed.
......@@ -341,7 +341,9 @@ void SmEditWindow::Command(const CommandEvent& rCEvt)
GetParent()->ToTop();
Point aPoint = rCEvt.GetMousePosPixel();
VclPtr<PopupMenu> xPopupMenu = VclPtr<PopupMenu>::Create(SmResId(RID_COMMANDMENU));
VclBuilder aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "modules/smath/ui/commandmenu.ui", "");
VclPtr<PopupMenu> xPopupMenu(aBuilder.get_menu("menu"));
// added for replaceability of context menus
VclPtr<Menu> pMenu;
......@@ -362,7 +364,6 @@ void SmEditWindow::Command(const CommandEvent& rCEvt)
xPopupMenu->SetSelectHdl(LINK(this, SmEditWindow, MenuSelectHdl));
xPopupMenu->Execute( this, aPoint );
xPopupMenu.disposeAndClear();
bForwardEvt = false;
}
else if (rCEvt.GetCommand() == CommandEventId::Wheel)
......@@ -396,14 +397,13 @@ bool SmEditWindow::HandleWheelCommands( const CommandEvent &rCEvt )
return bCommandHandled;
}
IMPL_LINK( SmEditWindow, MenuSelectHdl, Menu *, pMenu, bool )
{
SmViewShell *pViewSh = rCmdBox.GetView();
if (pViewSh)
pViewSh->GetViewFrame()->GetDispatcher()->ExecuteList(
SID_INSERTCOMMAND, SfxCallMode::RECORD,
{ new SfxInt16Item(SID_INSERTCOMMAND, pMenu->GetCurItemId()) });
SID_INSERTCOMMANDTEXT, SfxCallMode::RECORD,
{ new SfxStringItem(SID_INSERTCOMMANDTEXT, OUString::fromUtf8(pMenu->GetCurItemIdent())) });
return false;
}
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment