Skip to content

C
core
Kaydet (Commit) 9fbdb3d3 authored tarafından Maxim Monastirsky's avatar Maxim Monastirsky
Dosyalara gözat
Seçenekler

Fix popup menu IDs after .ui conversion 

Change-Id: I8955bee3ac2bb7a757c1f70dd46141833a068517
üst c7e36de2
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
cui/source/customize/cfg.cxx
Dosyayı görüntüle @ 9fbdb3d3
...@@ -2282,9 +2282,9 @@ void SvxMenuConfigPage::UpdateButtonStates() ...@@ -2282,9 +2282,9 @@ void SvxMenuConfigPage::UpdateButtonStates()
m_pMoveUpButton->Enable( false ); m_pMoveUpButton->Enable( false );
m_pMoveDownButton->Enable( false ); m_pMoveDownButton->Enable( false );
pPopup->EnableItem( ID_BEGIN_GROUP ); pPopup->EnableItem( "addseparator" );
pPopup->EnableItem( ID_RENAME, false ); pPopup->EnableItem( "modrename", false );
pPopup->EnableItem( ID_DELETE, false ); pPopup->EnableItem( "moddelete", false );
m_pDescriptionField->SetText(""); m_pDescriptionField->SetText("");
...@@ -2302,17 +2302,17 @@ void SvxMenuConfigPage::UpdateButtonStates() ...@@ -2302,17 +2302,17 @@ void SvxMenuConfigPage::UpdateButtonStates()
if ( pEntryData->IsSeparator() ) if ( pEntryData->IsSeparator() )
{ {
pPopup->EnableItem( ID_DELETE ); pPopup->EnableItem( "moddelete" );
pPopup->EnableItem( ID_BEGIN_GROUP, false ); pPopup->EnableItem( "addseparator", false );
pPopup->EnableItem( ID_RENAME, false ); pPopup->EnableItem( "modrename", false );
m_pDescriptionField->SetText(""); m_pDescriptionField->SetText("");
} }
else else
{ {
pPopup->EnableItem( ID_BEGIN_GROUP ); pPopup->EnableItem( "addseparator" );
pPopup->EnableItem( ID_DELETE ); pPopup->EnableItem( "moddelete" );
pPopup->EnableItem( ID_RENAME ); pPopup->EnableItem( "modrename" );
m_pDescriptionField->SetText(pEntryData->GetHelpText()); m_pDescriptionField->SetText(pEntryData->GetHelpText());
} }
...@@ -2391,9 +2391,9 @@ IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, SelectMenu, ListBox&, void ) ...@@ -2391,9 +2391,9 @@ IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, SelectMenu, ListBox&, void )
PopupMenu* pPopup = m_pModifyTopLevelButton->GetPopupMenu(); PopupMenu* pPopup = m_pModifyTopLevelButton->GetPopupMenu();
if ( pMenuData ) if ( pMenuData )
{ {
pPopup->EnableItem( ID_DELETE, pMenuData->IsDeletable() ); pPopup->EnableItem( "delete", pMenuData->IsDeletable() );
pPopup->EnableItem( ID_RENAME, pMenuData->IsRenamable() ); pPopup->EnableItem( "rename", pMenuData->IsRenamable() );
pPopup->EnableItem( ID_MOVE, pMenuData->IsMovable() ); pPopup->EnableItem( "move", pMenuData->IsMovable() );
SvxEntries* pEntries = pMenuData->GetEntries(); SvxEntries* pEntries = pMenuData->GetEntries();
SvxEntries::const_iterator iter = pEntries->begin(); 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