reportdesign/source/ui/dlg/dlgpage.cxx | 41 +- reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui | 23 - reportdesign/uiconfig/dbreport/ui/chardialog.ui | 365 +----------------- reportdesign/uiconfig/dbreport/ui/pagedialog.ui | 142 +------ 4 files changed, 78 insertions(+), 493 deletions(-)
New commits: commit 21faff90e7ad62c90eb2ea6e5d07ac336d850b63 Author: Heiko Tietze <tietze.he...@gmail.com> AuthorDate: Wed Aug 6 13:58:40 2025 +0200 Commit: Heiko Tietze <heiko.tie...@documentfoundation.org> CommitDate: Wed Aug 6 15:36:40 2025 +0200 Related tdf#167446 - UI-less tab style (reportdesign) Change-Id: Ifa65abc73ae2acf13fc70cb97cd1dd5be6603c5a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189003 Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org> Tested-by: Jenkins diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx index 451e47d88f1f..1eed5c7a0ee5 100644 --- a/reportdesign/source/ui/dlg/dlgpage.cxx +++ b/reportdesign/source/ui/dlg/dlgpage.cxx @@ -24,6 +24,8 @@ #include <svl/cjkoptions.hxx> #include <osl/diagnose.h> +#include <vcl/tabs.hrc> + namespace rptui { /************************************************************************* @@ -40,27 +42,42 @@ ORptPageDialog::ORptPageDialog(weld::Window* pParent, const SfxItemSet* pAttr, c if (rDialog == "BackgroundDialog") { - AddTabPage(u"background"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), nullptr ); + AddTabPage(u"background"_ustr, TabResId(RID_TAB_BACKGROUND.aLabel), + pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BKG), + RID_L + RID_TAB_BACKGROUND.sIconName); } else if (rDialog == "PageDialog") { - AddTabPage(u"page"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), nullptr ); - AddTabPage(u"background"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), nullptr ); + AddTabPage(u"page"_ustr, TabResId(RID_TAB_PAGE.aLabel), + pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PAGE), RID_L + RID_TAB_PAGE.sIconName); + AddTabPage(u"background"_ustr, TabResId(RID_TAB_BACKGROUND.aLabel), + pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BKG), + RID_L + RID_TAB_BACKGROUND.sIconName); } else if (rDialog == "CharDialog") { - AddTabPage(u"font"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), nullptr ); - AddTabPage(u"fonteffects"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), nullptr ); - AddTabPage(u"position"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), nullptr ); - AddTabPage(u"asianlayout"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), nullptr ); - AddTabPage(u"background"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BKG ), nullptr ); - AddTabPage(u"alignment"_ustr, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), nullptr ); + AddTabPage(u"font"_ustr, TabResId(RID_TAB_FONT.aLabel), + pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_NAME), + RID_L + RID_TAB_FONT.sIconName); + AddTabPage(u"fonteffects"_ustr, TabResId(RID_TAB_FONTEFFECTS.aLabel), + pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_EFFECTS), + RID_L + RID_TAB_FONTEFFECTS.sIconName); + AddTabPage(u"position"_ustr, TabResId(RID_TAB_POSITION.aLabel), + pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_POSITION), + RID_L + RID_TAB_POSITION.sIconName); + if (SvtCJKOptions::IsDoubleLinesEnabled()) + AddTabPage(u"asianlayout"_ustr, TabResId(RID_TAB_ASIANLAYOUT.aLabel), + pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_TWOLINES), + RID_L + RID_TAB_ASIANLAYOUT.sIconName); + AddTabPage(u"background"_ustr, TabResId(RID_TAB_BACKGROUND.aLabel), + pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BKG), + RID_L + RID_TAB_BACKGROUND.sIconName); + AddTabPage(u"alignment"_ustr, TabResId(RID_TAB_ALIGNMENT.aLabel), + pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGNMENT), + RID_L + RID_TAB_ALIGNMENT.sIconName); } else OSL_FAIL("Unknown page id"); - - if ( !SvtCJKOptions::IsDoubleLinesEnabled() ) - RemoveTabPage(u"asianlayout"_ustr); } void ORptPageDialog::PageCreated(const OUString& rId, SfxTabPage &rPage) diff --git a/reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui b/reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui index 56035a897a06..eb03d922e422 100644 --- a/reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui +++ b/reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui @@ -92,29 +92,10 @@ <property name="can-focus">False</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="background"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="backgrounddialog|background">Background</property> - <property name="xalign">0.5</property> - </object> - <packing> - <property name="tab-fill">False</property> - </packing> - </child> + <property name="group-name">icons</property> </object> <packing> <property name="expand">False</property> diff --git a/reportdesign/uiconfig/dbreport/ui/chardialog.ui b/reportdesign/uiconfig/dbreport/ui/chardialog.ui index 4a5d252c6cf9..4b605df0d36f 100644 --- a/reportdesign/uiconfig/dbreport/ui/chardialog.ui +++ b/reportdesign/uiconfig/dbreport/ui/chardialog.ui @@ -1,33 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> +<!-- Generated with glade 3.40.0 --> <interface domain="rpt"> <requires lib="gtk+" version="3.20"/> <object class="GtkDialog" id="CharDialog"> - <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="chardialog|CharDialog">Character Settings</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> @@ -40,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> @@ -56,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> @@ -70,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> @@ -85,335 +82,19 @@ <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="scrollable">True</property> <property name="tab-pos">left</property> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - </object> - </child> - <child type="tab"> - <object class="GtkBox" id="font"> - <property name="can-focus">False</property> - <property name="spacing">3</property> - <child> - <object class="GtkImage" id="imFont"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">cmd/lc_fontdialog.png</property> - <accessibility> - <relation type="labelled-by" target="lbFont"/> - </accessibility> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lbFont"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="chardialog|font">Font</property> - <property name="mnemonic-widget">font</property> - <accessibility> - <relation type="label-for" target="imFont"/> - </accessibility> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkBox"> - <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="GtkBox" id="fonteffects"> - <property name="can-focus">False</property> - <property name="spacing">3</property> - <child> - <object class="GtkImage" id="imFonteffects"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">cmd/lc_color.png</property> - <accessibility> - <relation type="labelled-by" target="lbFonteffects"/> - </accessibility> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lbFonteffects"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="chardialog|fonteffects">Font Effects</property> - <property name="mnemonic-widget">fonteffects</property> - <accessibility> - <relation type="label-for" target="imFonteffects"/> - </accessibility> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - <property name="tab-fill">False</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkBox"> - <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="GtkBox" id="position"> - <property name="can-focus">False</property> - <property name="spacing">3</property> - <child> - <object class="GtkImage" id="imPosition"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">cmd/lc_fontwork.png</property> - <accessibility> - <relation type="labelled-by" target="lbPosition"/> - </accessibility> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lbPosition"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="chardialog|position">Position</property> - <property name="mnemonic-widget">position</property> - <accessibility> - <relation type="label-for" target="imPosition"/> - </accessibility> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">2</property> - <property name="tab-fill">False</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkBox"> - <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="GtkBox" id="asianlayout"> - <property name="can-focus">False</property> - <property name="spacing">3</property> - <child> - <object class="GtkImage" id="imAsianlayout"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">cmd/lc_textdirectiontoptobottom.png</property> - <accessibility> - <relation type="labelled-by" target="lbAsianlayout"/> - </accessibility> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lbAsianlayout"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="chardialog|asianlayout">Asian Layout</property> - <property name="mnemonic-widget">asianlayout</property> - <accessibility> - <relation type="label-for" target="imAsianlayout"/> - </accessibility> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">3</property> - <property name="tab-fill">False</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">4</property> - </packing> - </child> - <child type="tab"> - <object class="GtkBox" id="background"> - <property name="can-focus">False</property> - <property name="spacing">3</property> - <child> - <object class="GtkImage" id="imBackground"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">cmd/lc_backcolor.png</property> - <accessibility> - <relation type="labelled-by" target="lbBackground"/> - </accessibility> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lbBackground"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="chardialog|background">Background</property> - <property name="mnemonic-widget">background</property> - <accessibility> - <relation type="label-for" target="imBackground"/> - </accessibility> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">4</property> - <property name="tab-fill">False</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">5</property> - </packing> - </child> - <child type="tab"> - <object class="GtkBox" id="alignment"> - <property name="can-focus">False</property> - <property name="spacing">3</property> - <child> - <object class="GtkImage" id="imAlignment"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">cmd/lc_alignblock.png</property> - <accessibility> - <relation type="labelled-by" target="lbAlignment"/> - </accessibility> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lbAlignment"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="chardialog|alignment">Alignment</property> - <property name="mnemonic-widget">alignment</property> - <accessibility> - <relation type="label-for" target="imAlignment"/> - </accessibility> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">5</property> - <property name="tab-fill">False</property> - </packing> - </child> + <property name="scrollable">True</property> + <property name="group-name">icons</property> </object> <packing> <property name="expand">False</property> diff --git a/reportdesign/uiconfig/dbreport/ui/pagedialog.ui b/reportdesign/uiconfig/dbreport/ui/pagedialog.ui index b84fe3ad0e0b..a49385fd1d2a 100644 --- a/reportdesign/uiconfig/dbreport/ui/pagedialog.ui +++ b/reportdesign/uiconfig/dbreport/ui/pagedialog.ui @@ -1,33 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> +<!-- Generated with glade 3.40.0 --> <interface domain="rpt"> <requires lib="gtk+" version="3.20"/> <object class="GtkDialog" id="PageDialog"> - <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="pagedialog|PageDialog">Page Setup</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> @@ -40,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> @@ -56,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> @@ -70,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> @@ -85,111 +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">False</property> + <property name="can-focus">False</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="page"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="pagedialog|page">Page</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="background"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="pagedialog|background">Background</property> - <property name="xalign">0.5</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>