From e970395c692a5c315914ddf5b43cf01e590345ff Mon Sep 17 00:00:00 2001 From: Muhammet Kara Date: Mon, 11 Sep 2017 15:42:30 +0300 Subject: tdf#112241: Improve column width behaviour in Customize dialog Also: * Remove unnecessary frame "contents" * Remove unnecessary alignment * Remove extra column from the left grid (grid4) * Move all into a new grid for better sizing Change-Id: I4d805a800ca6e487bf788cd9401e5f77303ddd1d Reviewed-on: https://gerrit.libreoffice.org/42186 Tested-by: Jenkins Reviewed-by: Heiko Tietze --- cui/source/customize/cfg.cxx | 7 +- cui/source/inc/cfg.hxx | 1 - cui/uiconfig/ui/menuassignpage.ui | 965 ++++++++++++++++++-------------------- 3 files changed, 450 insertions(+), 523 deletions(-) (limited to 'cui') diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 0afb97ec10ec..fa415d43f6f7 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1158,7 +1158,6 @@ SvxConfigPage::SvxConfigPage(vcl::Window *pParent, const SfxItemSet& rSet) get(m_pTopLevelListBox, "toplevellist"); get(m_pPlusBtn, "plusbtn"); get(m_pMinusBtn, "minusbtn"); - get(m_pContents, "contents"); get(m_pMoveUpButton, "up"); get(m_pMoveDownButton, "down"); get(m_pSaveInListBox, "savein"); @@ -1173,7 +1172,10 @@ SvxConfigPage::SvxConfigPage(vcl::Window *pParent, const SfxItemSet& rSet) m_pEntries->set_height_request(aSize.Height()); m_pEntries->set_width_request(aSize.Width()); m_pFunctions->set_height_request(aSize.Height()); - m_pFunctions->set_width_request(aSize.Width()); + //TODO: Add SvxMenuEntriesListBox into the glade catalog, and use it on the + // .ui file to get rid of the extra VCLContainer, and all these manual + // sizing and widget creation tricks. + m_pFunctions->set_width_request(aSize.Width() * 1.4); // Make the middle buttons bigger m_pAddCommandButton->set_height_request( m_pAddCommandButton->GetOptimalSize().Height() * 1.5 ); @@ -1203,7 +1205,6 @@ void SvxConfigPage::dispose() m_pMinusBtn.clear(); m_pSearchEdit.clear(); m_pCommandCategoryListBox.clear(); - m_pContents.clear(); m_pEntries.clear(); m_pFunctions.clear(); m_pAddCommandButton.clear(); diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 3185750ffd7a..9e6de15e9e91 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -399,7 +399,6 @@ protected: // Used to add and remove toolbars/menus VclPtr m_pPlusBtn; VclPtr m_pMinusBtn; - VclPtr m_pContents; VclPtr m_pEntries; VclPtr m_pContentsListBox; diff --git a/cui/uiconfig/ui/menuassignpage.ui b/cui/uiconfig/ui/menuassignpage.ui index 4dc7ad6ae5e2..9b1da649f7d6 100644 --- a/cui/uiconfig/ui/menuassignpage.ui +++ b/cui/uiconfig/ui/menuassignpage.ui @@ -32,571 +32,499 @@ vertical 6 - + True False True True - 0 - none + 6 + 6 - + True False + start + center + 5 + _Search + True + searchEntry + + + 0 + 0 + + + + + True + False + start + center + 5 + Categor_y + True + commandcategorylist + + + 0 + 1 + + + + + True + False + start + start + _Function + True + functions:border + + + 0 + 2 + + + + + True + False + start + start + Description + + + 0 + 3 + + + + + True + True + 5 + Type to search + + + 1 + 0 + + + + + True + True + 5 + True + + + 1 + 1 + + + + + True + True True True - 6 - 12 + + + + + + 1 + 2 + + + + + True + True + in + + + True + True + Local help is not installed. + False + False + False + + + + + 1 + 3 + + + + + True + False + center + 6 - + True False - True - True - 12 + 5 - + True - False + True + True + center + start + 5 True True - 6 - 12 - - - True - False - center - 6 - - - True - True - True - image1 - - - 0 - 0 - - - - - True - True - True - image2 - - - 0 - 1 - - - - - 2 - 1 - 2 - - - - - True - False - True - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 2 - - - - - True - False - 5 - 5 - 5 - 5 - True - start - - - _Insert - True - True - True - 5 - 5 - 5 - 5 - True - - - True - True - 0 - - - - - _Modify - True - True - True - 5 - 5 - 5 - 5 - True - - - True - True - 1 - - - - - Rese_t - True - True - True - 5 - 5 - 5 - 5 - True - - - True - True - 2 - - - - - 1 - 3 - - - - - True - False - 5 - True - - - True - False - 5 - True - - - 0 - 0 - - - - - _Function - True - True - True - True - right - - - 1 - 0 - - - - - 1 - 0 - - - - - True - False - 5 - - - True - False - True - - - 0 - 0 - - - - - _+ - True - True - True - 5 - 5 - True - True - True - - - 1 - 0 - - - - - _- - True - True - True - True - True - - - 2 - 0 - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - + image3 + True - 1 + 0 0 - + True False + _Add + True + add + + + + + + 0 + 1 + + + + + 0 + 0 + + + + + True + False + 5 + + + True + True + True + center + end + 5 True True - 6 - 12 - - - True - False - start - Description - 0 - - - 0 - 3 - - - - - True - False - start - _Function - True - functions:border - 0 - - - - - - 0 - 2 - - - - - True - False - center - 6 - - - True - False - 5 - - - True - True - True - center - start - 5 - True - True - image3 - True - - - 0 - 0 - - - - - True - False - _Add - True - add - - - - - - 0 - 1 - - - - - 0 - 0 - - - - - True - False - 5 - - - True - True - True - center - end - 5 - True - True - image4 - True - - - 0 - 0 - - - - - True - False - Remo_ve - True - remove - - - - - - 0 - 1 - - - - - 0 - 1 - - - - - 2 - 2 - 2 - - - - - True - False - True - True - - - - - - 1 - 2 - - - - - True - True - in - - - True - True - Local help is not installed. - False - False - False - - - - - 1 - 3 - - - - - True - False - center - 5 - _Search - True - searchEntry - 0 - - - - - - 0 - 0 - - - - - True - True - 5 - Type to search - - - 1 - 0 - - - - - True - False - center - 5 - Categor_y - True - commandcategorylist - 0 - - - - - - 0 - 1 - - - - - True - False - 5 - True - - - 1 - 1 - - - - - - - - + image4 + True 0 0 + + + True + False + Remo_ve + True + remove + + + + + + 0 + 1 + + + + + 0 + 1 + + + + + 2 + 1 + 2 + + + + + True + False + 5 + True + + + True + True + 5 + True + + + 0 + 0 + + + + + _Function + True + True + True + True + right + + 1 + 0 + + + 3 + 0 + - - + + + True + False + 5 + 5 + + + True + True + True + + + 0 + 0 + + + + + _+ + True + True + True + True + True + True + + + 1 + 0 + + + + + _- + True + True + True + True + True + + + 2 + 0 + + + + + 3 + 1 + + + + + True + True + True + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + 2 + + + + + True + False + 5 + 5 + 5 + 5 + True + start + + + _Insert + True + True + True + 5 + 5 + 5 + 5 + True + + + True + True + 0 + + + + + _Modify + True + True + True + 5 + 5 + 5 + 5 + True + + + True + True + 1 + + + + + Rese_t + True + True + True + 5 + 5 + 5 + 5 + True + + + True + True + 2 + + + + + 3 + 3 + + + + + True False - Label + center + 6 + + + True + True + True + image1 + + + 0 + 0 + + + + + True + True + True + image2 + + + 0 + 1 + + + + 4 + 1 + 2 + + + + + + + + + + + + + False True - 1 + 0 - + - - + + + + + @@ -655,5 +583,4 @@ - -- cgit v1.2.3