diff options
-rw-r--r-- | cui/source/customize/cfg.cxx | 121 | ||||
-rw-r--r-- | cui/source/customize/cfg.hrc | 5 | ||||
-rw-r--r-- | cui/source/customize/cfg.src | 29 | ||||
-rw-r--r-- | cui/source/inc/cfg.hxx | 6 | ||||
-rw-r--r-- | cui/uiconfig/ui/menuassignpage.ui | 84 |
5 files changed, 163 insertions, 82 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index eb49a59b911a..715c29f9a3cc 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1746,6 +1746,10 @@ SvxConfigPage::SvxConfigPage(vcl::Window *pParent, const SfxItemSet& rSet) get(m_pTopLevelListBox, "toplevellist"); get(m_pNewTopLevelButton, "toplevelbutton"); get(m_pModifyTopLevelButton, "menuedit"); + get(m_pToolbarStyleLabel, "toolbarstyleft"); + get(m_pIconsOnlyRB, "iconsrb"); + get(m_pTextOnlyRB, "textrb"); + get(m_pIconsAndTextRB, "iconsandtextrb"); get(m_pContents, "contents"); get(m_pContentsLabel, "contentslabel"); get(m_pAddCommandsButton, "add"); @@ -1769,6 +1773,14 @@ SvxConfigPage::SvxConfigPage(vcl::Window *pParent, const SfxItemSet& rSet) // This button is applicable only for the toolbar config tab m_pResetTopLevelButton->Enable( false ); m_pResetTopLevelButton->Hide(); + //These radio buttons are applicable only for the toolbar config tab + m_pIconsOnlyRB->Enable( false ); + m_pTextOnlyRB->Enable( false ); + m_pIconsAndTextRB->Enable( false ); + m_pIconsOnlyRB->Hide(); + m_pTextOnlyRB->Hide(); + m_pIconsAndTextRB->Hide(); + m_pToolbarStyleLabel->Hide(); } SvxConfigPage::~SvxConfigPage() @@ -1783,6 +1795,10 @@ void SvxConfigPage::dispose() m_pTopLevelListBox.clear(); m_pNewTopLevelButton.clear(); m_pModifyTopLevelButton.clear(); + m_pToolbarStyleLabel.clear(); + m_pIconsOnlyRB.clear(); + m_pTextOnlyRB.clear(); + m_pIconsAndTextRB.clear(); m_pContents.clear(); m_pContentsLabel.clear(); m_pEntries.clear(); @@ -3121,12 +3137,27 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(vcl::Window *pParent, const SfxItemSe // The reset button will be used in the toolbar config tab m_pResetTopLevelButton->Show(); + // These radio buttons will be used in the toolbar config tab + m_pIconsOnlyRB->Enable(); + m_pTextOnlyRB->Enable(); + m_pIconsAndTextRB->Enable(); + m_pIconsOnlyRB->Show(); + m_pTextOnlyRB->Show(); + m_pIconsAndTextRB->Show(); + m_pToolbarStyleLabel->Show(); m_pTopLevelListBox->SetSelectHdl( LINK( this, SvxToolbarConfigPage, SelectToolbar ) ); m_pContentsListBox->SetSelectHdl( LINK( this, SvxToolbarConfigPage, SelectToolbarEntry ) ); + m_pIconsOnlyRB->SetClickHdl ( + LINK( this, SvxToolbarConfigPage, StyleChangeHdl ) ); + m_pTextOnlyRB->SetClickHdl ( + LINK( this, SvxToolbarConfigPage, StyleChangeHdl ) ); + m_pIconsAndTextRB->SetClickHdl ( + LINK( this, SvxToolbarConfigPage, StyleChangeHdl ) ); + m_pNewTopLevelButton->SetClickHdl ( LINK( this, SvxToolbarConfigPage, NewToolbarHdl ) ); @@ -3336,33 +3367,6 @@ IMPL_LINK_TYPED( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton, } break; } - case ID_ICONS_ONLY: - { - pToolbar->SetStyle( 0 ); - pSaveInData->SetSystemStyle( m_xFrame, pToolbar->GetCommand(), 0 ); - - m_pTopLevelListBox->GetSelectHdl().Call( *m_pTopLevelListBox ); - - break; - } - case ID_TEXT_ONLY: - { - pToolbar->SetStyle( 1 ); - pSaveInData->SetSystemStyle( m_xFrame, pToolbar->GetCommand(), 1 ); - - m_pTopLevelListBox->GetSelectHdl().Call( *m_pTopLevelListBox ); - - break; - } - case ID_ICONS_AND_TEXT: - { - pToolbar->SetStyle( 2 ); - pSaveInData->SetSystemStyle( m_xFrame, pToolbar->GetCommand(), 2 ); - - m_pTopLevelListBox->GetSelectHdl().Call( *m_pTopLevelListBox ); - - break; - } } } @@ -3467,18 +3471,6 @@ IMPL_LINK_TYPED( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton, vo } break; } - case ID_ICON_ONLY: - { - break; - } - case ID_TEXT_ONLY: - { - break; - } - case ID_ICON_AND_TEXT: - { - break; - } case ID_CHANGE_SYMBOL: { SvTreeListEntry* pActEntry = m_pContentsListBox->GetCurEntry(); @@ -4471,9 +4463,6 @@ void SvxToolbarConfigPage::UpdateButtonStates() PopupMenu* pPopup = m_pModifyCommandButton->GetPopupMenu(); pPopup->EnableItem( ID_RENAME, false ); pPopup->EnableItem( ID_DEFAULT_COMMAND, false ); - pPopup->EnableItem( ID_ICON_ONLY, false ); - pPopup->EnableItem( ID_ICON_AND_TEXT, false ); - pPopup->EnableItem( ID_TEXT_ONLY, false ); pPopup->EnableItem( ID_CHANGE_SYMBOL, false ); pPopup->EnableItem( ID_RESET_SYMBOL, false ); @@ -4496,9 +4485,6 @@ void SvxToolbarConfigPage::UpdateButtonStates() else { pPopup->EnableItem( ID_RENAME ); - pPopup->EnableItem( ID_ICON_ONLY ); - pPopup->EnableItem( ID_ICON_AND_TEXT ); - pPopup->EnableItem( ID_TEXT_ONLY ); pPopup->EnableItem( ID_CHANGE_SYMBOL ); m_pDeleteCommandButton->Enable(); @@ -4541,6 +4527,9 @@ IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, SelectToolbar, ListBox&, void ) m_pAddSeparatorButton->Enable( false ); m_pDeleteCommandButton->Enable( false ); m_pResetTopLevelButton->Enable( false ); + m_pIconsOnlyRB->Enable( false ); + m_pTextOnlyRB->Enable( false ); + m_pIconsAndTextRB->Enable( false ); return; } @@ -4550,6 +4539,10 @@ IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, SelectToolbar, ListBox&, void ) m_pAddCommandsButton->Enable(); m_pResetTopLevelButton->Enable( !pToolbar->IsRenamable() ); + m_pIconsOnlyRB->Enable(); + m_pTextOnlyRB->Enable(); + m_pIconsAndTextRB->Enable(); + PopupMenu* pPopup = m_pModifyTopLevelButton->GetPopupMenu(); pPopup->EnableItem( ID_DELETE, pToolbar->IsDeletable() ); @@ -4559,17 +4552,17 @@ IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, SelectToolbar, ListBox&, void ) { case 0: { - pPopup->CheckItem( ID_ICONS_ONLY ); + m_pIconsOnlyRB->Check(); break; } case 1: { - pPopup->CheckItem( ID_TEXT_ONLY ); + m_pTextOnlyRB->Check(); break; } case 2: { - pPopup->CheckItem( ID_ICONS_AND_TEXT ); + m_pIconsAndTextRB->Check(); break; } } @@ -4601,6 +4594,38 @@ IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, SelectToolbar, ListBox&, void ) UpdateButtonStates(); } +IMPL_LINK_TYPED( SvxToolbarConfigPage, StyleChangeHdl, Button*, pButton, void ) +{ + sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectEntryPos(); + + SvxConfigEntry* pToolbar = + static_cast<SvxConfigEntry*>(m_pTopLevelListBox->GetEntryData( nSelectionPos )); + + ToolbarSaveInData* pSaveInData = static_cast<ToolbarSaveInData*>( GetSaveInData() ); + + if (pButton == m_pIconsOnlyRB) + { + pToolbar->SetStyle( 0 ); + pSaveInData->SetSystemStyle( m_xFrame, pToolbar->GetCommand(), 0 ); + + m_pTopLevelListBox->GetSelectHdl().Call( *m_pTopLevelListBox ); + } + else if (pButton == m_pTextOnlyRB) + { + pToolbar->SetStyle( 1 ); + pSaveInData->SetSystemStyle( m_xFrame, pToolbar->GetCommand(), 1 ); + + m_pTopLevelListBox->GetSelectHdl().Call( *m_pTopLevelListBox ); + } + else if (pButton == m_pIconsAndTextRB) + { + pToolbar->SetStyle( 2 ); + pSaveInData->SetSystemStyle( m_xFrame, pToolbar->GetCommand(), 2 ); + + m_pTopLevelListBox->GetSelectHdl().Call( *m_pTopLevelListBox ); + } +} + IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, NewToolbarHdl, Button *, void ) { OUString prefix = CUI_RES( RID_SVXSTR_NEW_TOOLBAR ); diff --git a/cui/source/customize/cfg.hrc b/cui/source/customize/cfg.hrc index 486206f9b9ea..5f7a37413a89 100644 --- a/cui/source/customize/cfg.hrc +++ b/cui/source/customize/cfg.hrc @@ -24,11 +24,6 @@ #define ID_DELETE (44 + CFG_OFFSET) // There is a gap here -#define ID_ICONS_ONLY (48 + CFG_OFFSET) -#define ID_ICONS_AND_TEXT (49 + CFG_OFFSET) -#define ID_ICON_ONLY (50 + CFG_OFFSET) -#define ID_ICON_AND_TEXT (51 + CFG_OFFSET) -#define ID_TEXT_ONLY (52 + CFG_OFFSET) #define ID_CHANGE_SYMBOL (53 + CFG_OFFSET) #define ID_RESET_SYMBOL (54 + CFG_OFFSET) #define ID_DEFAULT_COMMAND (55 + CFG_OFFSET) diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src index d09241dd31e9..48f60dadd8c1 100644 --- a/cui/source/customize/cfg.src +++ b/cui/source/customize/cfg.src @@ -40,31 +40,6 @@ Menu MODIFY_TOOLBAR Identifier = ID_DELETE ; TEXT_DELETE_NODOTS }; - MenuItem - { - Separator = TRUE ; - }; - MenuItem - { - Identifier = ID_ICONS_ONLY ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - Text [ en-US ] = "Icons Only" ; - }; - MenuItem - { - Identifier = ID_TEXT_ONLY ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - Text [ en-US ] = "Text only" ; - }; - MenuItem - { - Identifier = ID_ICONS_AND_TEXT ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - Text [ en-US ] = "Icons & Text" ; - }; }; }; @@ -88,10 +63,6 @@ Menu MODIFY_TOOLBAR_CONTENT }; MenuItem { - Separator = TRUE ; - }; - MenuItem - { Identifier = ID_CHANGE_SYMBOL ; Text [ en-US ] = "Change Icon..." ; }; diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index d52947b461a2..c91fa99c4e97 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -367,6 +367,11 @@ protected: VclPtr<PushButton> m_pNewTopLevelButton; VclPtr<MenuButton> m_pModifyTopLevelButton; + VclPtr<FixedText> m_pToolbarStyleLabel; + VclPtr<RadioButton> m_pIconsOnlyRB; + VclPtr<RadioButton> m_pTextOnlyRB; + VclPtr<RadioButton> m_pIconsAndTextRB; + // the contents section where the contents of the selected // menu or toolbar are displayed VclPtr<VclFrame> m_pContents; @@ -570,6 +575,7 @@ private: DECL_LINK_TYPED( SelectToolbarEntry, SvTreeListBox*, void ); DECL_LINK_TYPED( ToolbarSelectHdl, MenuButton *, void ); DECL_LINK_TYPED( EntrySelectHdl, MenuButton *, void ); + DECL_LINK_TYPED( StyleChangeHdl, Button *, void ); DECL_LINK_TYPED( NewToolbarHdl, Button *, void ); DECL_LINK_TYPED( AddCommandsHdl, Button *, void ); DECL_LINK_TYPED( AddSeparatorHdl, Button *, void ); diff --git a/cui/uiconfig/ui/menuassignpage.ui b/cui/uiconfig/ui/menuassignpage.ui index 03f46d50f5df..193153d54629 100644 --- a/cui/uiconfig/ui/menuassignpage.ui +++ b/cui/uiconfig/ui/menuassignpage.ui @@ -61,12 +61,96 @@ <object class="GtkComboBoxText" id="toplevellist"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_right">36</property> + <property name="hexpand">True</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> </packing> </child> + <child> + <object class="GtkLabel" id="toolbarstyleft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">6</property> + <property name="margin_bottom">6</property> + <property name="label" translatable="yes">Style</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">toplevellist</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_right">36</property> + <property name="margin_top">6</property> + <property name="margin_bottom">6</property> + <property name="hexpand">True</property> + <child> + <object class="GtkRadioButton" id="iconsandtextrb"> + <property name="label" translatable="yes">Icons & Text</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">center</property> + <property name="margin_left">12</property> + <property name="margin_right">12</property> + <property name="use_underline">True</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <property name="group">iconsrb</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="iconsrb"> + <property name="label" translatable="yes">Icons</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="textrb"> + <property name="label" translatable="yes">Text</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">end</property> + <property name="use_underline">True</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <property name="group">iconsrb</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> </object> <packing> <property name="left_attach">0</property> |