cui/source/dialogs/cuigaldlg.cxx | 13 cui/source/tabpages/autocdlg.cxx | 23 - cui/source/tabpages/bbdlg.cxx | 14 cui/source/tabpages/labdlg.cxx | 21 - cui/source/tabpages/tabarea.cxx | 19 - cui/source/tabpages/tabline.cxx | 19 - cui/source/tabpages/textanim.cxx | 11 cui/source/tabpages/transfrm.cxx | 24 - cui/uiconfig/ui/areadialog.ui | 189 +---------- cui/uiconfig/ui/autocorrectdialog.ui | 393 +----------------------- cui/uiconfig/ui/borderareatransparencydialog.ui | 70 ---- cui/uiconfig/ui/borderbackgrounddialog.ui | 46 -- cui/uiconfig/ui/calloutdialog.ui | 185 +---------- cui/uiconfig/ui/gallerythemedialog.ui | 137 +------- cui/uiconfig/ui/linedialog.ui | 237 +------------- cui/uiconfig/ui/positionsizedialog.ui | 94 ----- cui/uiconfig/ui/textdialog.ui | 70 ---- include/vcl/tabs.hrc | 15 18 files changed, 237 insertions(+), 1343 deletions(-)
New commits: commit 6ddabcd616769bf78fc18a0c5b9a1a99bd867463 Author: Heiko Tietze <[email protected]> AuthorDate: Fri Aug 8 15:13:57 2025 +0200 Commit: Heiko Tietze <[email protected]> CommitDate: Mon Aug 11 10:58:52 2025 +0200 Resolves tdf#167869 - Apply VT style to n<4 dialogs in cui Change-Id: I815c6b134be04c25e862640f02cb18241d550916 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189193 Tested-by: Jenkins Reviewed-by: Heiko Tietze <[email protected]> diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 026abd399608..57fa59221398 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -55,6 +55,8 @@ #include <osl/diagnose.h> #include <o3tl/string_view.hxx> +#include <vcl/tabs.hrc> + using namespace ::ucbhelper; using namespace ::cppu; using namespace ::com::sun::star::lang; @@ -479,10 +481,13 @@ GalleryThemeProperties::GalleryThemeProperties(weld::Widget* pParent, u"GalleryThemeDialog"_ustr, pItemSet) , pData(_pData) { - AddTabPage(u"general"_ustr, TPGalleryThemeGeneral::Create, nullptr); - AddTabPage(u"files"_ustr, TPGalleryThemeProperties::Create, nullptr); - if (pData->pTheme->IsReadOnly()) - RemoveTabPage(u"files"_ustr); + AddTabPage(u"general"_ustr, TabResId(RID_TAB_ORGANIZER.aLabel), TPGalleryThemeGeneral::Create, + RID_L + RID_TAB_ORGANIZER.sIconName); + if (!pData->pTheme->IsReadOnly()) + { + AddTabPage(u"files"_ustr, TabResId(RID_TAB_FILES.aLabel), + TPGalleryThemeProperties::Create, RID_L + RID_TAB_FILES.sIconName); + } OUString aText = m_xDialog->get_title().replaceFirst( "%1", pData->pTheme->GetName() ); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 31e77373a644..c5c271fdec0e 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -52,6 +52,8 @@ #include <dialmgr.hxx> #include <svx/svxids.hrc> +#include <vcl/tabs.hrc> + static LanguageType eLastDialogLanguage = LANGUAGE_SYSTEM; using namespace ::com::sun::star; @@ -75,10 +77,20 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(weld::Window* pParent, const SfxItemSet* _pSet ) bOpenSmartTagOptions = true; } - AddTabPage(u"options"_ustr, OfaAutocorrOptionsPage::Create, nullptr); - AddTabPage(u"applypage"_ustr, OfaSwAutoFmtOptionsPage::Create, nullptr); - AddTabPage(u"wordcompletion"_ustr, OfaAutoCompleteTabPage::Create, nullptr); - AddTabPage(u"smarttags"_ustr, OfaSmartTagOptionsTabPage::Create, nullptr); + AddTabPage(u"replace"_ustr, TabResId(RID_TAB_OFA_REPLACE.aLabel), OfaAutocorrReplacePage::Create, + RID_L + RID_TAB_OFA_REPLACE.sIconName); + AddTabPage(u"exceptions"_ustr, TabResId(RID_TAB_OFA_EXCEPTIONS.aLabel), OfaAutocorrExceptPage::Create, + RID_L + RID_TAB_OFA_EXCEPTIONS.sIconName); + AddTabPage(u"options"_ustr, TabResId(RID_TAB_OFA_APPLY.aLabel), OfaAutocorrOptionsPage::Create, + RID_L + RID_TAB_OFA_APPLY.sIconName); + AddTabPage(u"applypage"_ustr, TabResId(RID_TAB_OFA_OPTIONS.aLabel), + OfaSwAutoFmtOptionsPage::Create, RID_L + RID_TAB_OFA_OPTIONS.sIconName); + AddTabPage(u"localized"_ustr, TabResId(RID_TAB_OFA_LOCALIZED.aLabel), OfaQuoteTabPage::Create, + RID_L + RID_TAB_OFA_LOCALIZED.sIconName); + AddTabPage(u"wordcompletion"_ustr, TabResId(RID_TAB_OFA_WORDCOMPL.aLabel), + OfaAutoCompleteTabPage::Create, RID_L + RID_TAB_OFA_WORDCOMPL.sIconName); + AddTabPage(u"smarttags"_ustr, TabResId(RID_TAB_OFA_SMARTTAG.aLabel), + OfaSmartTagOptionsTabPage::Create, RID_L + RID_TAB_OFA_SMARTTAG.sIconName); if (!bShowSWOptions) { @@ -97,9 +109,6 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(weld::Window* pParent, const SfxItemSet* _pSet ) RemoveTabPage(u"options"_ustr); } - AddTabPage(u"replace"_ustr, OfaAutocorrReplacePage::Create, nullptr); - AddTabPage(u"exceptions"_ustr, OfaAutocorrExceptPage::Create, nullptr); - AddTabPage(u"localized"_ustr, OfaQuoteTabPage::Create, nullptr); // initialize languages //! LANGUAGE_NONE is displayed as '[All]' and the LanguageType diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx index f2d6a567feb2..141effe9c4ac 100644 --- a/cui/source/tabpages/bbdlg.cxx +++ b/cui/source/tabpages/bbdlg.cxx @@ -24,6 +24,8 @@ #include <svl/intitem.hxx> #include <cuitabarea.hxx> +#include <vcl/tabs.hrc> + SvxBorderBackgroundDlg::SvxBorderBackgroundDlg(weld::Window *pParent, const SfxItemSet& rCoreSet, bool bEnableSelector, @@ -38,16 +40,20 @@ SvxBorderBackgroundDlg::SvxBorderBackgroundDlg(weld::Window *pParent, &rCoreSet) , mbEnableBackgroundSelector(bEnableSelector) { - AddTabPage(u"borders"_ustr, SvxBorderTabPage::Create, nullptr ); + AddTabPage(u"borders"_ustr, TabResId(RID_TAB_BORDER.aLabel), SvxBorderTabPage::Create, + RID_L + RID_TAB_BORDER.sIconName); if (bEnableDrawingLayerFillStyles) { // Here we want full DrawingLayer FillStyle access, so add Area and Transparency TabPages - AddTabPage(u"area"_ustr, SvxAreaTabPage::Create, nullptr); - AddTabPage(u"transparence"_ustr, SvxTransparenceTabPage::Create, nullptr); + AddTabPage(u"area"_ustr, TabResId(RID_TAB_AREA.aLabel), SvxAreaTabPage::Create, + RID_L + RID_TAB_AREA.sIconName); + AddTabPage(u"transparence"_ustr, TabResId(RID_TAB_TRANSPARENCE.aLabel), + SvxTransparenceTabPage::Create, RID_L + RID_TAB_TRANSPARENCE.sIconName); } else { - AddTabPage(u"background"_ustr, SvxBkgTabPage::Create, nullptr ); + AddTabPage(u"background"_ustr, TabResId(RID_TAB_BACKGROUND.aLabel), SvxBkgTabPage::Create, + RID_L + RID_TAB_BACKGROUND.sIconName); } } diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index 2540c5335282..0c851972a099 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -31,6 +31,8 @@ #include <transfrm.hxx> #include <bitmaps.hlst> +#include <vcl/tabs.hrc> + // define ---------------------------------------------------------------- #define EXT_OPTIMAL 0 @@ -458,20 +460,25 @@ SvxCaptionTabDialog::SvxCaptionTabDialog(weld::Window* pParent, const SdrView* p assert(pView); // No valid View transferred! //different positioning page in Writer - if (nAnchorCtrls & (SvxAnchorIds::Paragraph | SvxAnchorIds::Character | SvxAnchorIds::Page | SvxAnchorIds::Fly)) + if (nAnchorCtrls + & (SvxAnchorIds::Paragraph | SvxAnchorIds::Character | SvxAnchorIds::Page + | SvxAnchorIds::Fly)) { - AddTabPage(u"RID_SVXPAGE_SWPOSSIZE"_ustr, SvxSwPosSizeTabPage::Create, - SvxSwPosSizeTabPage::GetRanges ); + AddTabPage(u"RID_SVXPAGE_SWPOSSIZE"_ustr, TabResId(RID_TAB_POSSIZE.aLabel), + SvxSwPosSizeTabPage::Create, SvxSwPosSizeTabPage::GetRanges, + RID_L + RID_TAB_POSSIZE.sIconName); RemoveTabPage(u"RID_SVXPAGE_POSITION_SIZE"_ustr); } else { - AddTabPage(u"RID_SVXPAGE_POSITION_SIZE"_ustr, SvxPositionSizeTabPage::Create, - SvxPositionSizeTabPage::GetRanges ); + AddTabPage(u"RID_SVXPAGE_POSITION_SIZE"_ustr, TabResId(RID_TAB_POSSIZE.aLabel), + SvxPositionSizeTabPage::Create, SvxPositionSizeTabPage::GetRanges, + RID_L + RID_TAB_POSSIZE.sIconName); RemoveTabPage(u"RID_SVXPAGE_SWPOSSIZE"_ustr); } - AddTabPage(u"RID_SVXPAGE_CAPTION"_ustr, SvxCaptionTabPage::Create, - SvxCaptionTabPage::GetRanges ); + AddTabPage(u"RID_SVXPAGE_CAPTION"_ustr, TabResId(RID_TAB_CALLOUT.aLabel), + SvxCaptionTabPage::Create, SvxCaptionTabPage::GetRanges, + RID_L + RID_TAB_CALLOUT.sIconName); } void SvxCaptionTabDialog::PageCreated(const OUString& rId, SfxTabPage &rPage) diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx index 6a42f8328b72..67fb1d00e42d 100644 --- a/cui/source/tabpages/tabarea.cxx +++ b/cui/source/tabpages/tabarea.cxx @@ -26,6 +26,8 @@ #include <svx/drawitem.hxx> #include <cuitabarea.hxx> +#include <vcl/tabs.hrc> + SvxAreaTabDialog::SvxAreaTabDialog ( weld::Window* pParent, @@ -49,20 +51,19 @@ SvxAreaTabDialog::SvxAreaTabDialog mnColorListState(ChangeType::NONE) { if (bSlideBackground) - AddTabPage(u"RID_SVXPAGE_AREA"_ustr, SvxAreaTabPage::CreateWithSlideBackground, nullptr); + AddTabPage(u"RID_SVXPAGE_AREA"_ustr, TabResId(RID_TAB_AREA.aLabel), + SvxAreaTabPage::CreateWithSlideBackground, RID_L + RID_TAB_AREA.sIconName); else - AddTabPage(u"RID_SVXPAGE_AREA"_ustr, SvxAreaTabPage::Create, nullptr); + AddTabPage(u"RID_SVXPAGE_AREA"_ustr, TabResId(RID_TAB_AREA.aLabel), SvxAreaTabPage::Create, + RID_L + RID_TAB_AREA.sIconName); if (bShadow) { - AddTabPage(u"RID_SVXPAGE_SHADOW"_ustr, SvxShadowTabPage::Create, nullptr); + AddTabPage(u"RID_SVXPAGE_SHADOW"_ustr, TabResId(RID_TAB_SHADOW.aLabel), + SvxShadowTabPage::Create, RID_L + RID_TAB_SHADOW.sIconName); } - else - { - RemoveTabPage( u"RID_SVXPAGE_SHADOW"_ustr ); - } - - AddTabPage( u"RID_SVXPAGE_TRANSPARENCE"_ustr, SvxTransparenceTabPage::Create, nullptr); + AddTabPage(u"RID_SVXPAGE_TRANSPARENCE"_ustr, TabResId(RID_TAB_TRANSPARENCE.aLabel), + SvxTransparenceTabPage::Create, RID_L + RID_TAB_TRANSPARENCE.sIconName); weld::Button& rBtnCancel = GetCancelButton(); rBtnCancel.connect_clicked(LINK(this, SvxAreaTabDialog, CancelHdlImpl)); diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index 3facbce8b91d..a262b04db69b 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -26,6 +26,8 @@ #include <svx/xtable.hxx> #include <svx/drawitem.hxx> +#include <vcl/tabs.hrc> + SvxLineTabDialog::SvxLineTabDialog(weld::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pSdrObj, bool bHasObj) : SfxTabDialogController(pParent, u"cui/ui/linedialog.ui"_ustr, u"LineDialog"_ustr, pAttr) @@ -65,14 +67,15 @@ SvxLineTabDialog::SvxLineTabDialog(weld::Window* pParent, const SfxItemSet* pAtt } - AddTabPage(u"RID_SVXPAGE_LINE"_ustr, SvxLineTabPage::Create, nullptr); - if( bLineOnly ) - AddTabPage(u"RID_SVXPAGE_SHADOW"_ustr, SvxShadowTabPage::Create, nullptr); - else - RemoveTabPage( u"RID_SVXPAGE_SHADOW"_ustr ); - - AddTabPage(u"RID_SVXPAGE_LINE_DEF"_ustr, SvxLineDefTabPage::Create, nullptr); - AddTabPage(u"RID_SVXPAGE_LINEEND_DEF"_ustr, SvxLineEndDefTabPage::Create, nullptr); + AddTabPage(u"RID_SVXPAGE_LINE"_ustr, TabResId(RID_TAB_LINE.aLabel), + SvxLineTabPage::Create, RID_L + RID_TAB_LINE.sIconName); + if (bLineOnly) + AddTabPage(u"RID_SVXPAGE_SHADOW"_ustr, TabResId(RID_TAB_SHADOW.aLabel), + SvxShadowTabPage::Create, RID_L + RID_TAB_SHADOW.sIconName); + AddTabPage(u"RID_SVXPAGE_LINE_DEF"_ustr, TabResId(RID_TAB_LINESTYLE.aLabel), + SvxLineDefTabPage::Create, RID_L + RID_TAB_LINESTYLE.sIconName); + AddTabPage(u"RID_SVXPAGE_LINEEND_DEF"_ustr, TabResId(RID_TAB_ARROWSTYLE.aLabel), + SvxLineEndDefTabPage::Create, RID_L + RID_TAB_ARROWSTYLE.sIconName); weld::Button& rBtnCancel = GetCancelButton(); rBtnCancel.connect_clicked(LINK(this, SvxLineTabDialog, CancelHdlImpl)); diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index 986d3da4c425..191d00cd6e50 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -29,6 +29,8 @@ #include <svx/sdtayitm.hxx> #include <svtools/unitconv.hxx> +#include <vcl/tabs.hrc> + const WhichRangesContainer SvxTextAnimationPage::pRanges( svl::Items<SDRATTR_TEXT_ANIKIND, SDRATTR_TEXT_ANIAMOUNT>); @@ -42,9 +44,12 @@ SvxTextTabDialog::SvxTextTabDialog(weld::Window* pParent, const SfxItemSet* pAtt : SfxTabDialogController(pParent, u"cui/ui/textdialog.ui"_ustr, u"TextDialog"_ustr, pAttr) , pView(pSdrView) { - AddTabPage(u"RID_SVXPAGE_TEXTATTR"_ustr, SvxTextAttrPage::Create, nullptr); - AddTabPage(u"RID_SVXPAGE_TEXTANIMATION"_ustr, SvxTextAnimationPage::Create, nullptr); - AddTabPage(u"RID_SVXPAGE_TEXTCOLUMNS"_ustr, SvxTextColumnsPage::Create, nullptr); + AddTabPage(u"RID_SVXPAGE_TEXTATTR"_ustr, TabResId(RID_TAB_TEXT.aLabel), + SvxTextAttrPage::Create, RID_L + RID_TAB_TEXT.sIconName); + AddTabPage(u"RID_SVXPAGE_TEXTANIMATION"_ustr, TabResId(RID_TAB_TEXTANIMATION.aLabel), + SvxTextAnimationPage::Create, RID_L + RID_TAB_TEXTANIMATION.sIconName); + AddTabPage(u"RID_SVXPAGE_TEXTCOLUMNS"_ustr, TabResId(RID_TAB_COLUMNS.aLabel), + SvxTextColumnsPage::Create, RID_L + RID_TAB_COLUMNS.sIconName); } /************************************************************************* diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 0a1c566102b3..53ed676de924 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -41,6 +41,7 @@ #include <vcl/fieldvalues.hxx> #include <bitmaps.hlst> +#include <vcl/tabs.hrc> // static ---------------------------------------------------------------- @@ -78,22 +79,27 @@ SvxTransformTabDialog::SvxTransformTabDialog(weld::Window* pParent, const SfxIte DBG_ASSERT(pView, "no valid view (!)"); //different positioning page in Writer - if(nAnchorCtrls & (SvxAnchorIds::Paragraph | SvxAnchorIds::Character | SvxAnchorIds::Page | SvxAnchorIds::Fly)) + if (nAnchorCtrls + & (SvxAnchorIds::Paragraph | SvxAnchorIds::Character | SvxAnchorIds::Page + | SvxAnchorIds::Fly)) { - AddTabPage(u"RID_SVXPAGE_SWPOSSIZE"_ustr, SvxSwPosSizeTabPage::Create, SvxSwPosSizeTabPage::GetRanges); - RemoveTabPage(u"RID_SVXPAGE_POSITION_SIZE"_ustr); + AddTabPage(u"RID_SVXPAGE_SWPOSSIZE"_ustr, TabResId(RID_TAB_POSSIZE.aLabel), + SvxSwPosSizeTabPage::Create, SvxSwPosSizeTabPage::GetRanges, + RID_L + RID_TAB_POSSIZE.sIconName); } else { - AddTabPage(u"RID_SVXPAGE_POSITION_SIZE"_ustr, SvxPositionSizeTabPage::Create, SvxPositionSizeTabPage::GetRanges); - RemoveTabPage(u"RID_SVXPAGE_SWPOSSIZE"_ustr); + AddTabPage(u"RID_SVXPAGE_POSITION_SIZE"_ustr, TabResId(RID_TAB_POSSIZE.aLabel), + SvxPositionSizeTabPage::Create, SvxPositionSizeTabPage::GetRanges, + RID_L + RID_TAB_POSSIZE.sIconName); } - - AddTabPage(u"RID_SVXPAGE_ANGLE"_ustr, SvxAngleTabPage::Create, SvxAngleTabPage::GetRanges); - AddTabPage(u"RID_SVXPAGE_SLANT"_ustr, SvxSlantTabPage::Create, SvxSlantTabPage::GetRanges); + AddTabPage(u"RID_SVXPAGE_ANGLE"_ustr, TabResId(RID_TAB_ROTATION.aLabel), + SvxAngleTabPage::Create, SvxAngleTabPage::GetRanges, + RID_L + RID_TAB_ROTATION.sIconName); + AddTabPage(u"RID_SVXPAGE_SLANT"_ustr, TabResId(RID_TAB_SLANT.aLabel), SvxSlantTabPage::Create, + SvxSlantTabPage::GetRanges, RID_L + RID_TAB_SLANT.sIconName); } - void SvxTransformTabDialog::PageCreated(const OUString& rId, SfxTabPage &rPage) { if (rId == "RID_SVXPAGE_POSITION_SIZE") diff --git a/cui/uiconfig/ui/areadialog.ui b/cui/uiconfig/ui/areadialog.ui index ec9b33759b70..b1be82ab9c4c 100644 --- a/cui/uiconfig/ui/areadialog.ui +++ b/cui/uiconfig/ui/areadialog.ui @@ -1,30 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.36.0 --> +<!-- Generated with glade 3.40.0 --> <interface domain="cui"> <requires lib="gtk+" version="3.20"/> <object class="GtkDialog" id="AreaDialog"> - <property name="can_focus">False</property> - <property name="border_width">6</property> + <property name="can-focus">False</property> + <property name="border-width">6</property> <property name="title" translatable="yes" context="areadialog|AreaDialog">Area</property> <property name="modal">True</property> - <property name="default_width">0</property> - <property name="default_height">0</property> - <property name="type_hint">dialog</property> + <property name="default-width">0</property> + <property name="default-height">0</property> + <property name="type-hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> - <property name="can_focus">False</property> - <property name="layout_style">end</property> + <property name="can-focus">False</property> + <property name="layout-style">end</property> <child> <object class="GtkButton" id="reset"> <property name="label" translatable="yes" context="stock">_Reset</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -37,10 +37,10 @@ <object class="GtkButton" id="ok"> <property name="label" translatable="yes" context="stock">_OK</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="has-default">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -53,8 +53,8 @@ <object class="GtkButton" id="cancel"> <property name="label" translatable="yes" context="stock">_Cancel</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -67,8 +67,8 @@ <object class="GtkButton" id="help"> <property name="label" translatable="yes" context="stock">_Help</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -82,158 +82,20 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> + <property name="pack-type">end</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkNotebook" id="tabcontrol"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="tab-pos">left</property> <property name="scrollable">True</property> - <property name="enable_popup">True</property> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - </child> - <child type="tab"> - <object class="GtkLabel" id="RID_SVXPAGE_AREA"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="areadialog|RID_SVXPAGE_AREA">Area</property> - </object> - <packing> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="RID_SVXPAGE_SHADOW"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="areadialog|RID_SVXPAGE_SHADOW">Shadow</property> - </object> - <packing> - <property name="position">1</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">2</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="RID_SVXPAGE_TRANSPARENCE"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="areadialog|RID_SVXPAGE_TRANSPARENCE">Transparency</property> - </object> - <packing> - <property name="position">2</property> - <property name="tab_fill">False</property> - </packing> - </child> + <property name="enable-popup">True</property> + <property name="group-name">icons</property> </object> <packing> <property name="expand">False</property> @@ -249,9 +111,6 @@ <action-widget response="-6">cancel</action-widget> <action-widget response="-11">help</action-widget> </action-widgets> - <child type="titlebar"> - <placeholder/> - </child> <child internal-child="accessible"> <object class="AtkObject" id="AreaDialog-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="areadialog|extended_tip|AreaDialog">Sets the fill properties of the selected drawing object.</property> diff --git a/cui/uiconfig/ui/autocorrectdialog.ui b/cui/uiconfig/ui/autocorrectdialog.ui index 80b354c973e0..8ac2c5f9cf82 100644 --- a/cui/uiconfig/ui/autocorrectdialog.ui +++ b/cui/uiconfig/ui/autocorrectdialog.ui @@ -1,30 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.36.0 --> +<!-- Generated with glade 3.40.0 --> <interface domain="cui"> <requires lib="gtk+" version="3.20"/> <object class="GtkDialog" id="AutoCorrectDialog"> - <property name="can_focus">False</property> - <property name="border_width">6</property> + <property name="can-focus">False</property> + <property name="border-width">6</property> <property name="title" translatable="yes" context="autocorrectdialog|AutoCorrectDialog">AutoCorrect</property> <property name="modal">True</property> - <property name="default_width">0</property> - <property name="default_height">0</property> - <property name="type_hint">dialog</property> + <property name="default-width">0</property> + <property name="default-height">0</property> + <property name="type-hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> - <property name="can_focus">False</property> - <property name="layout_style">end</property> + <property name="can-focus">False</property> + <property name="layout-style">end</property> <child> <object class="GtkButton" id="reset"> <property name="label" translatable="yes" context="stock">_Reset</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="reset-atkobject"> @@ -42,10 +42,10 @@ <object class="GtkButton" id="ok"> <property name="label" translatable="yes" context="stock">_OK</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="has-default">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="ok-atkobject"> @@ -63,8 +63,8 @@ <object class="GtkButton" id="cancel"> <property name="label" translatable="yes" context="stock">_Cancel</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="cancel-atkobject"> @@ -82,8 +82,8 @@ <object class="GtkButton" id="help"> <property name="label" translatable="yes" context="stock">_Help</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -97,29 +97,29 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> + <property name="pack-type">end</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkBox" id="box1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkBox" id="langbox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="autocorrectdialog|label1">Replacements and exceptions for language:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">lang</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">lang</property> <property name="xalign">0</property> </object> <packing> @@ -131,7 +131,7 @@ <child> <object class="GtkComboBoxText" id="lang"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child internal-child="accessible"> <object class="AtkObject" id="lang-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="autocorrectdialog|extended_tip|lang">Select the language for which you want to create or edit the replacement rules.</property> @@ -154,342 +154,12 @@ <child> <object class="GtkNotebook" id="tabcontrol"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="enable_popup">True</property> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - </child> - <child type="tab"> - <object class="GtkLabel" id="replace"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="autocorrectdialog|replace">Replace</property> - </object> - <packing> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="exceptions"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="autocorrectdialog|exceptions">Exceptions</property> - </object> - <packing> - <property name="position">1</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">2</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="options"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="autocorrectdialog|options">Options</property> - </object> - <packing> - <property name="position">2</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">3</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="applypage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="autocorrectdialog|apply">Options</property> - </object> - <packing> - <property name="position">3</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">4</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="localized"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="autocorrectdialog|localized">Localized Options</property> - </object> - <packing> - <property name="position">4</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">5</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="wordcompletion"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="autocorrectdialog|wordcompletion">Word Completion</property> - </object> - <packing> - <property name="position">5</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">6</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="smarttags"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="autocorrectdialog|smarttags">Smart Tags</property> - </object> - <packing> - <property name="position">6</property> - <property name="tab_fill">False</property> - </packing> - </child> + <property name="tab-pos">left</property> + <property name="enable-popup">True</property> + <property name="group-name">icons</property> </object> <packing> <property name="expand">False</property> @@ -512,8 +182,5 @@ <action-widget response="-6">cancel</action-widget> <action-widget response="-11">help</action-widget> </action-widgets> - <child type="titlebar"> - <placeholder/> - </child> </object> </interface> diff --git a/cui/uiconfig/ui/borderareatransparencydialog.ui b/cui/uiconfig/ui/borderareatransparencydialog.ui index 03d493c8631c..941c5849d2f6 100644 --- a/cui/uiconfig/ui/borderareatransparencydialog.ui +++ b/cui/uiconfig/ui/borderareatransparencydialog.ui @@ -91,76 +91,10 @@ <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="tab-pos">left</property> <property name="scrollable">True</property> <property name="enable-popup">True</property> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <placeholder/> - </child> - </object> - </child> - <child type="tab"> - <object class="GtkLabel" id="borders"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="borderareatransparencydialog|borders">Borders</property> - </object> - <packing> - <property name="tab-fill">False</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="area"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="borderareatransparencydialog|area">Area</property> - </object> - <packing> - <property name="position">1</property> - <property name="tab-fill">False</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">2</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="transparence"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="borderareatransparencydialog|transparence">Transparency</property> - </object> - <packing> - <property name="position">2</property> - <property name="tab-fill">False</property> - </packing> - </child> + <property name="group-name">icons</property> </object> <packing> <property name="expand">False</property> diff --git a/cui/uiconfig/ui/borderbackgrounddialog.ui b/cui/uiconfig/ui/borderbackgrounddialog.ui index ec761999f19b..b6147db30515 100644 --- a/cui/uiconfig/ui/borderbackgrounddialog.ui +++ b/cui/uiconfig/ui/borderbackgrounddialog.ui @@ -91,52 +91,10 @@ <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="tab-pos">left</property> <property name="scrollable">True</property> <property name="enable-popup">True</property> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <placeholder/> - </child> - </object> - </child> - <child type="tab"> - <object class="GtkLabel" id="borders"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="borderbackgrounddialog|borders">Borders</property> - </object> - <packing> - <property name="tab-fill">False</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="background"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="borderbackgrounddialog|background">Background</property> - </object> - <packing> - <property name="position">1</property> - <property name="tab-fill">False</property> - </packing> - </child> + <property name="group-name">icons</property> </object> <packing> <property name="expand">False</property> diff --git a/cui/uiconfig/ui/calloutdialog.ui b/cui/uiconfig/ui/calloutdialog.ui index fff41067a554..45f28ccaf438 100644 --- a/cui/uiconfig/ui/calloutdialog.ui +++ b/cui/uiconfig/ui/calloutdialog.ui @@ -1,31 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> +<!-- Generated with glade 3.40.0 --> <interface domain="cui"> <requires lib="gtk+" version="3.20"/> <object class="GtkDialog" id="CalloutDialog"> - <property name="can_focus">False</property> - <property name="border_width">6</property> + <property name="can-focus">False</property> + <property name="border-width">6</property> <property name="title" translatable="yes" context="calloutdialog|CalloutDialog">Position and Size</property> <property name="resizable">False</property> - <property name="type_hint">dialog</property> - <child> - <placeholder/> - </child> + <property name="type-hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> - <property name="can_focus">False</property> - <property name="layout_style">end</property> + <property name="can-focus">False</property> + <property name="layout-style">end</property> <child> <object class="GtkButton" id="reset"> <property name="label" translatable="yes" context="stock">_Reset</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -38,10 +35,10 @@ <object class="GtkButton" id="ok"> <property name="label" translatable="yes" context="stock">_OK</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="has-default">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -54,8 +51,8 @@ <object class="GtkButton" id="cancel"> <property name="label" translatable="yes" context="stock">_Cancel</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -68,8 +65,8 @@ <object class="GtkButton" id="help"> <property name="label" translatable="yes" context="stock">_Help</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -83,158 +80,20 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> + <property name="pack-type">end</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkNotebook" id="tabcontrol"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="tab-pos">left</property> <property name="scrollable">True</property> - <property name="enable_popup">True</property> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - </child> - <child type="tab"> - <object class="GtkLabel" id="RID_SVXPAGE_POSITION_SIZE"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="calloutdialog|RID_SVXPAGE_POSITION_SIZE">Position and Size</property> - </object> - <packing> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="RID_SVXPAGE_SWPOSSIZE"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="calloutdialog|RID_SVXPAGE_SWPOSSIZE">Position and Size</property> - </object> - <packing> - <property name="position">1</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">2</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="RID_SVXPAGE_CAPTION"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="calloutdialog|RID_SVXPAGE_CAPTION">Callout</property> - </object> - <packing> - <property name="position">2</property> - <property name="tab_fill">False</property> - </packing> - </child> + <property name="enable-popup">True</property> + <property name="group-name">icons</property> </object> <packing> <property name="expand">False</property> diff --git a/cui/uiconfig/ui/gallerythemedialog.ui b/cui/uiconfig/ui/gallerythemedialog.ui index 2c8bd4be3a66..305172322b69 100644 --- a/cui/uiconfig/ui/gallerythemedialog.ui +++ b/cui/uiconfig/ui/gallerythemedialog.ui @@ -1,32 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> +<!-- Generated with glade 3.40.0 --> <interface domain="cui"> <requires lib="gtk+" version="3.20"/> <object class="GtkDialog" id="GalleryThemeDialog"> - <property name="can_focus">False</property> - <property name="border_width">6</property> + <property name="can-focus">False</property> + <property name="border-width">6</property> <property name="title" translatable="yes" context="gallerythemedialog|GalleryThemeDialog" comments="%1 will be replaced by a gallery theme name">Properties of %1</property> <property name="resizable">False</property> <property name="modal">True</property> - <property name="type_hint">dialog</property> - <child> - <placeholder/> - </child> + <property name="type-hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> - <property name="can_focus">False</property> - <property name="layout_style">end</property> + <property name="can-focus">False</property> + <property name="layout-style">end</property> <child> <object class="GtkButton" id="reset"> <property name="label" translatable="yes" context="stock">_Reset</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -39,10 +36,10 @@ <object class="GtkButton" id="ok"> <property name="label" translatable="yes" context="stock">_OK</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="has-default">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -55,8 +52,8 @@ <object class="GtkButton" id="cancel"> <property name="label" translatable="yes" context="stock">_Cancel</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -69,8 +66,8 @@ <object class="GtkButton" id="help"> <property name="label" translatable="yes" context="stock">_Help</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -84,110 +81,20 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> + <property name="pack-type">end</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkNotebook" id="tabcontrol"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="tab-pos">left</property> <property name="scrollable">True</property> - <property name="enable_popup">True</property> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - </child> - <child type="tab"> - <object class="GtkLabel" id="general"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="gallerythemedialog|general">General</property> - </object> - <packing> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="files"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="gallerythemedialog|files">Files</property> - </object> - <packing> - <property name="position">1</property> - <property name="tab_fill">False</property> - </packing> - </child> + <property name="enable-popup">True</property> + <property name="group-name">icons</property> </object> <packing> <property name="expand">False</property> diff --git a/cui/uiconfig/ui/linedialog.ui b/cui/uiconfig/ui/linedialog.ui index cb4648e8c236..49edeb2712fa 100644 --- a/cui/uiconfig/ui/linedialog.ui +++ b/cui/uiconfig/ui/linedialog.ui @@ -1,34 +1,31 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> +<!-- Generated with glade 3.40.0 --> <interface domain="cui"> <requires lib="gtk+" version="3.20"/> <object class="GtkDialog" id="LineDialog"> - <property name="can_focus">False</property> - <property name="border_width">6</property> + <property name="can-focus">False</property> + <property name="border-width">6</property> <property name="title" translatable="yes" context="linedialog|LineDialog">Line</property> <property name="resizable">False</property> <property name="modal">True</property> - <property name="default_width">0</property> - <property name="default_height">0</property> - <property name="type_hint">dialog</property> - <child> - <placeholder/> - </child> + <property name="default-width">0</property> + <property name="default-height">0</property> + <property name="type-hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> - <property name="can_focus">False</property> - <property name="layout_style">end</property> + <property name="can-focus">False</property> + <property name="layout-style">end</property> <child> <object class="GtkButton" id="reset"> <property name="label" translatable="yes" context="stock">_Reset</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -41,10 +38,10 @@ <object class="GtkButton" id="ok"> <property name="label" translatable="yes" context="stock">_OK</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="has-default">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -57,8 +54,8 @@ <object class="GtkButton" id="cancel"> <property name="label" translatable="yes" context="stock">_Cancel</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -71,8 +68,8 @@ <object class="GtkButton" id="help"> <property name="label" translatable="yes" context="stock">_Help</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -86,206 +83,20 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> + <property name="pack-type">end</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkNotebook" id="tabcontrol"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="tab-pos">left</property> <property name="scrollable">True</property> - <property name="enable_popup">True</property> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - </child> - <child type="tab"> - <object class="GtkLabel" id="RID_SVXPAGE_LINE"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="linedialog|RID_SVXPAGE_LINE">Line</property> - </object> - <packing> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="RID_SVXPAGE_SHADOW"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="linedialog|RID_SVXPAGE_SHADOW">Shadow</property> - </object> - <packing> - <property name="position">1</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">2</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="RID_SVXPAGE_LINE_DEF"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="linedialog|RID_SVXPAGE_LINE_DEF">Line Styles</property> - </object> - <packing> - <property name="position">2</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">3</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="RID_SVXPAGE_LINEEND_DEF"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="linedialog|RID_SVXPAGE_LINEEND_DEF">Arrow Styles</property> - </object> - <packing> - <property name="position">3</property> - <property name="tab_fill">False</property> - </packing> - </child> + <property name="enable-popup">True</property> + <property name="group-name">icons</property> </object> <packing> <property name="expand">False</property> diff --git a/cui/uiconfig/ui/positionsizedialog.ui b/cui/uiconfig/ui/positionsizedialog.ui index d687eced33b2..a58abe38e4db 100644 --- a/cui/uiconfig/ui/positionsizedialog.ui +++ b/cui/uiconfig/ui/positionsizedialog.ui @@ -93,100 +93,10 @@ <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="tab-pos">left</property> <property name="scrollable">True</property> <property name="enable-popup">True</property> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <placeholder/> - </child> - </object> - </child> - <child type="tab"> - <object class="GtkLabel" id="RID_SVXPAGE_POSITION_SIZE"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="positionsizedialog|RID_SVXPAGE_POSITION_SIZE">Position and Size</property> - </object> - <packing> - <property name="tab-fill">False</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="RID_SVXPAGE_SWPOSSIZE"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="positionsizedialog|RID_SVXPAGE_SWPOSSIZE">Position and Size</property> - </object> - <packing> - <property name="position">1</property> - <property name="tab-fill">False</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">2</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="RID_SVXPAGE_ANGLE"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="positionsizedialog|RID_SVXPAGE_ANGLE">Rotation</property> - </object> - <packing> - <property name="position">2</property> - <property name="tab-fill">False</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">3</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="RID_SVXPAGE_SLANT"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="positionsizedialog|RID_SVXPAGE_SLANT">Slant & Corner Radius</property> - </object> - <packing> - <property name="position">3</property> - <property name="tab-fill">False</property> - </packing> - </child> + <property name="group-name">icons</property> </object> <packing> <property name="expand">False</property> diff --git a/cui/uiconfig/ui/textdialog.ui b/cui/uiconfig/ui/textdialog.ui index f5d28ea45480..a93dd6929f07 100644 --- a/cui/uiconfig/ui/textdialog.ui +++ b/cui/uiconfig/ui/textdialog.ui @@ -93,76 +93,10 @@ <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="tab-pos">left</property> <property name="scrollable">True</property> <property name="enable-popup">True</property> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <placeholder/> - </child> - </object> - </child> - <child type="tab"> - <object class="GtkLabel" id="RID_SVXPAGE_TEXTATTR"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="textdialog|RID_SVXPAGE_TEXTATTR">Text</property> - </object> - <packing> - <property name="tab-fill">False</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="RID_SVXPAGE_TEXTANIMATION"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="textdialog|RID_SVXPAGE_TEXTANIMATION">Text Animation</property> - </object> - <packing> - <property name="position">1</property> - <property name="tab-fill">False</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">2</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="RID_SVXPAGE_TEXTCOLUMNS"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="textdialog|RID_SVXPAGE_TEXTCOLUMNS">Text Columns</property> - </object> - <packing> - <property name="position">2</property> - <property name="tab-fill">False</property> - </packing> - </child> + <property name="group-name">icons</property> </object> <packing> <property name="expand">False</property> diff --git a/include/vcl/tabs.hrc b/include/vcl/tabs.hrc index 4b8c3f754cda..610597e2f8ca 100644 --- a/include/vcl/tabs.hrc +++ b/include/vcl/tabs.hrc @@ -31,6 +31,8 @@ inline constexpr OUString RID_L = u"cmd/32/"_ustr; inline constexpr TabData RID_TAB_BORDER{ NC_("RID_TAB_BORDER", "Border"), u"borderdialog.png"_ustr }; inline constexpr TabData RID_TAB_LINE{ NC_("RID_TAB_LINE", "Line"), u"formatline.png"_ustr }; +inline constexpr TabData RID_TAB_LINESTYLE{ NC_("RID_TAB_LINE", "Line Style"), u"linestyle.png"_ustr }; +inline constexpr TabData RID_TAB_ARROWSTYLE{ NC_("RID_TAB_ARROWSTYLE", "Arrow Style"), u"lineendstyle.png"_ustr }; inline constexpr TabData RID_TAB_AREA{ NC_("RID_TAB_AREA", "Area"), u"backgroundcolor.png"_ustr }; inline constexpr TabData RID_TAB_TRANSPARENCE{ NC_("RID_TAB_TRANSPARENCE", "Transparency"), u"graftransparence.png"_ustr }; inline constexpr TabData RID_TAB_FONT{ NC_("RID_TAB_FONT", "Font"), u"fontdialog.png"_ustr }; @@ -44,6 +46,7 @@ inline constexpr TabData RID_TAB_NUMBERS{ NC_("RID_TAB_NUMBERS", "Numbers"), u"n inline constexpr TabData RID_TAB_INDENTS{ NC_("RID_TAB_INDENTS", "Indents & Spacing"), u"paraspaceincrease.png"_ustr }; inline constexpr TabData RID_TAB_TABS{ NC_("RID_TAB_TABS", "Tabs"), u"hangingindent.png"_ustr }; inline constexpr TabData RID_TAB_ORGANIZER{ NC_("RID_TAB_ORGANIZER", "General"), u"browseview.png"_ustr }; +inline constexpr TabData RID_TAB_FILES{ NC_("RID_TAB_FILES", "Files"), u"open.png"_ustr }; inline constexpr TabData RID_TAB_BACKGROUND{ NC_("RID_TAB_BACKGROUND", "Background"), u"backgroundcolor.png"_ustr }; inline constexpr TabData RID_TAB_TEXTFLOW{ NC_("RID_TAB_TEXTFLOW", "Text Flow"), u"hyphenate.png"_ustr }; inline constexpr TabData RID_TAB_ASIANLAYOUT{ NC_("RID_TAB_ASIANLAYOUT", "Asian Layout"), u"textdirectiontoptobottom.png"_ustr }; @@ -119,10 +122,12 @@ inline constexpr TabData RID_TAB_FOOTER_FIRST{ NC_("RID_TAB_FOOTER_FIRST", "Foot inline constexpr TabData RID_TAB_FOOTER_LEFT{ NC_("RID_TAB_FOOTER_LEFT", "Footer (left)"), u"insertfooter.png"_ustr }; inline constexpr TabData RID_TAB_FOOTER_RIGHT{ NC_("RID_TAB_FOOTER_RIGHT", "Footer (right)"), u"insertfooter.png"_ustr }; // picture/frame formatting -inline constexpr TabData RID_TAB_POSSIZE{ NC_("RID_TAB_POSSIZE", "Position and Size"), u"transformdialog.png"_ustr }; +inline constexpr TabData RID_TAB_POSSIZE{ NC_("RID_TAB_POSSIZE", "Position and Size"), u"attributepagesize.png"_ustr }; inline constexpr TabData RID_TAB_HYPERLINK{ NC_("RID_TAB_HYPERLINK", "Hyperlink"), u"inserthyperlink.png"_ustr }; inline constexpr TabData RID_TAB_CROP{ NC_("RID_TAB_CROP", "Crop"), u"crop.png"_ustr }; inline constexpr TabData RID_TAB_ROTATION{ NC_("RID_TAB_ROTATION", "Rotation"), u"toggleobjectrotatemode.png"_ustr }; +inline constexpr TabData RID_TAB_CALLOUT{ NC_("RID_TAB_CALLOUT", "Callout"), u"calloutshapes.png"_ustr }; +inline constexpr TabData RID_TAB_SLANT{ NC_("RID_TAB_SLANT", "Slant & Corner Radius"), u"crookslant.png"_ustr }; // chart inline constexpr TabData RID_TAB_CHART_OPTIONS{ NC_("RID_TAB_CHART_OPTIONS", "Options"), u"diagramtype.png"_ustr }; inline constexpr TabData RID_TAB_CHART_ERROR_X{ NC_("RID_TAB_CHART_ERROR_X", "X Error Bars"), u"arrowshapes.png"_ustr }; @@ -149,6 +154,14 @@ inline constexpr TabData RID_TAB_EVENTS{ NC_("RID_TAB_EVENTS", "Events"), u"clos inline constexpr TabData RID_TAB_ENVELOPE{ NC_("RID_TAB_ENVELOPE", "Envelope"), u"insertenvelope.png"_ustr }; inline constexpr TabData RID_TAB_ENV_FORMAT{ NC_("RID_TAB_ENV_FORMAT", "Format"), u"distributeverttop.png"_ustr }; inline constexpr TabData RID_TAB_PRINTER{ NC_("RID_TAB_PRINTER", "Printer"), u"printlayout.png"_ustr }; +// autocorrect +inline constexpr TabData RID_TAB_OFA_REPLACE{ NC_("RID_TAB_OFA_REPLACE", "Replace"), u"reload.png"_ustr }; +inline constexpr TabData RID_TAB_OFA_EXCEPTIONS{ NC_("RID_TAB_OFA_EXCEPTIONS", "Exceptions"), u"cancel.png"_ustr }; +inline constexpr TabData RID_TAB_OFA_APPLY{ NC_("RID_TAB_OFA_APPLY", "Options"), u"patternfield.png"_ustr }; +inline constexpr TabData RID_TAB_OFA_OPTIONS{ NC_("RID_TAB_OFA_OPTIONS", "Options"), u"patternfield.png"_ustr }; +inline constexpr TabData RID_TAB_OFA_LOCALIZED{ NC_("RID_TAB_OFA_LOCALIZED", "Localized Options"), u"charmapcontrol.png"_ustr }; +inline constexpr TabData RID_TAB_OFA_WORDCOMPL{ NC_("RID_TAB_OFA_WORDCOMPL", "Word Completion"), u"autocorrectdlg.png"_ustr }; +inline constexpr TabData RID_TAB_OFA_SMARTTAG{ NC_("RID_TAB_OFA_SMARTTAG", "Smart Tags"), u"autopilotmenu.png"_ustr }; static OUString TabResId(TranslateId aId) {
