Kaydet (Commit) 13ef923c authored tarafından Maxim Monastirsky's avatar Maxim Monastirsky Kaydeden (comit) Adolfo Jayme Barrientos

Fix popup menu IDs after .ui conversion

(cherry picked from commit 9fbdb3d3)

Conflicts:
	cui/source/customize/cfg.cxx

Change-Id: I8955bee3ac2bb7a757c1f70dd46141833a068517
Reviewed-on: https://gerrit.libreoffice.org/19739Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarAdolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: 's avatarAdolfo Jayme Barrientos <fitojb@ubuntu.com>
üst 47e8bcd7
......@@ -2298,9 +2298,9 @@ void SvxMenuConfigPage::UpdateButtonStates()
m_pMoveUpButton->Enable( false );
m_pMoveDownButton->Enable( false );
pPopup->EnableItem( ID_BEGIN_GROUP, true );
pPopup->EnableItem( ID_RENAME, false );
pPopup->EnableItem( ID_DELETE, false );
pPopup->EnableItem( "addseparator", true );
pPopup->EnableItem( "modrename", false );
pPopup->EnableItem( "moddelete", false );
m_pDescriptionField->SetText("");
......@@ -2318,17 +2318,17 @@ void SvxMenuConfigPage::UpdateButtonStates()
if ( pEntryData->IsSeparator() )
{
pPopup->EnableItem( ID_DELETE, true );
pPopup->EnableItem( ID_BEGIN_GROUP, false );
pPopup->EnableItem( ID_RENAME, false );
pPopup->EnableItem( "moddelete", true );
pPopup->EnableItem( "addseparator", false );
pPopup->EnableItem( "modrename", false );
m_pDescriptionField->SetText("");
}
else
{
pPopup->EnableItem( ID_BEGIN_GROUP, true );
pPopup->EnableItem( ID_DELETE, true );
pPopup->EnableItem( ID_RENAME, true );
pPopup->EnableItem( "addseparator", true );
pPopup->EnableItem( "moddelete", true );
pPopup->EnableItem( "modrename", true );
m_pDescriptionField->SetText(pEntryData->GetHelpText());
}
......@@ -2409,9 +2409,9 @@ IMPL_LINK( SvxMenuConfigPage, SelectMenu, ListBox *, pBox )
PopupMenu* pPopup = m_pModifyTopLevelButton->GetPopupMenu();
if ( pMenuData )
{
pPopup->EnableItem( ID_DELETE, pMenuData->IsDeletable() );
pPopup->EnableItem( ID_RENAME, pMenuData->IsRenamable() );
pPopup->EnableItem( ID_MOVE, pMenuData->IsMovable() );
pPopup->EnableItem( "delete", pMenuData->IsDeletable() );
pPopup->EnableItem( "rename", pMenuData->IsRenamable() );
pPopup->EnableItem( "move", pMenuData->IsMovable() );
SvxEntries* pEntries = pMenuData->GetEntries();
SvxEntries::const_iterator iter = pEntries->begin();
......
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