cui/source/tabpages/tpbitmap.cxx | 4 cui/source/tabpages/tpcolor.cxx | 2 cui/source/tabpages/tpgradnt.cxx | 4 cui/source/tabpages/tphatch.cxx | 3 cui/source/tabpages/tppattern.cxx | 4 cui/uiconfig/ui/bitmaptabpage.ui | 157 +++++++++++++------------ cui/uiconfig/ui/gradientpage.ui | 221 +++++++++++++++++++++--------------- cui/uiconfig/ui/hatchpage.ui | 1 cui/uiconfig/ui/patterntabpage.ui | 146 ++++++++++++----------- include/sfx2/dialoghelper.hxx | 2 sfx2/source/dialog/dialoghelper.cxx | 6 11 files changed, 310 insertions(+), 240 deletions(-)
New commits: commit def1e51dc36e2042a50bea48e7fa15db9560d09b Author: Gülşah Köse <gulsah.k...@collabora.com> AuthorDate: Fri Nov 1 00:11:49 2019 +0300 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Fri Nov 1 10:52:58 2019 +0100 tdf#126128 Reduce page properties dialog's height. Change-Id: I421be7684668c4cab2ddda5f67adcfccaf34729d Reviewed-on: https://gerrit.libreoffice.org/81865 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Andras Timar <andras.ti...@collabora.com> diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 7dd325d9a37f..be451dfdcac0 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -119,8 +119,10 @@ SvxBitmapTabPage::SvxBitmapTabPage(TabPageParent pParent, const SfxItemSet& rInA m_xBtnImport->hide(); // Calculate size of display boxes + Size aBitmapLBSize = getPagePropertiesOptimalSize(this); + m_xBitmapLB->set_size_request(aBitmapLBSize.Width(), aBitmapLBSize.Height()); + Size aSize = getDrawPreviewOptimalSize(this); - m_xBitmapLB->set_size_request(aSize.Width(), aSize.Height()); m_xCtlBitmapPreview->set_size_request(aSize.Width(), aSize.Height()); SfxItemPool* pPool = m_rXFSet.GetPool(); diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index c7b79ed69bc2..4606d8a705a7 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -97,7 +97,7 @@ SvxColorTabPage::SvxColorTabPage(TabPageParent pParent, const SfxItemSet& rInAtt , m_xValSetColorListWin(new weld::CustomWeld(*m_xBuilder, "colorset", *m_xValSetColorList)) , m_xValSetRecentListWin(new weld::CustomWeld(*m_xBuilder, "recentcolorset", *m_xValSetRecentList)) { - Size aSize = LogicToPixel(Size(100 , 80), MapMode(MapUnit::MapAppFont)); + Size aSize = LogicToPixel(Size(100 , 70), MapMode(MapUnit::MapAppFont)); m_xValSetColorList->set_size_request(aSize.Width(), aSize.Height()); aSize = LogicToPixel(Size(34 , 25), MapMode(MapUnit::MapAppFont)); m_aCtlPreviewOld.set_size_request(aSize.Width(), aSize.Height()); diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 520606d276d9..95391a27f16c 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -77,8 +77,10 @@ SvxGradientTabPage::SvxGradientTabPage(TabPageParent pParent, const SfxItemSet& , m_xCtlPreview(new weld::CustomWeld(*m_xBuilder, "previewctl", m_aCtlPreview)) , m_xGradientLBWin(new weld::CustomWeld(*m_xBuilder, "gradientpresetlist", *m_xGradientLB)) { - Size aSize = getDrawPreviewOptimalSize(this); + Size aSize = getPagePropertiesOptimalSize(this); m_xGradientLB->set_size_request(aSize.Width(), aSize.Height()); + + aSize = getDrawPreviewOptimalSize(this); m_xCtlPreview->set_size_request(aSize.Width(), aSize.Height()); // this page needs ExchangeSupport SetExchangeSupport(); diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 74c25cbefa3a..7dee5b3749a8 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -69,8 +69,9 @@ SvxHatchTabPage::SvxHatchTabPage(TabPageParent pParent, const SfxItemSet& rInAtt , m_xHatchLBWin(new weld::CustomWeld(*m_xBuilder, "hatchpresetlist", *m_xHatchLB)) , m_xCtlPreview(new weld::CustomWeld(*m_xBuilder, "previewctl", m_aCtlPreview)) { - Size aSize = getDrawPreviewOptimalSize(this); + Size aSize = getPagePropertiesOptimalSize(this); m_xHatchLBWin->set_size_request(aSize.Width(), aSize.Height()); + aSize = getDrawPreviewOptimalSize(this); m_xCtlPreview->set_size_request(aSize.Width(), aSize.Height()); // this page needs ExchangeSupport diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx index 56ada28c2681..69c526e9b310 100644 --- a/cui/source/tabpages/tppattern.cxx +++ b/cui/source/tabpages/tppattern.cxx @@ -101,8 +101,10 @@ SvxPatternTabPage::SvxPatternTabPage(TabPageParent pParent, const SfxItemSet& rI , m_xPatternLBWin(new weld::CustomWeld(*m_xBuilder, "patternpresetlist", *m_xPatternLB)) { // size of the bitmap display - Size aSize = getDrawPreviewOptimalSize(this); + Size aSize = getPagePropertiesOptimalSize(this); m_xPatternLB->set_size_request(aSize.Width(), aSize.Height()); + + aSize = getDrawPreviewOptimalSize(this); m_xCtlPreview->set_size_request(aSize.Width(), aSize.Height()); m_xBitmapCtl.reset(new SvxBitmapCtl); diff --git a/cui/uiconfig/ui/bitmaptabpage.ui b/cui/uiconfig/ui/bitmaptabpage.ui index 6be64b47549d..7ca2868f0bc7 100644 --- a/cui/uiconfig/ui/bitmaptabpage.ui +++ b/cui/uiconfig/ui/bitmaptabpage.ui @@ -36,6 +36,7 @@ <object class="GtkScrolledWindow" id="bitmapwin"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="valign">start</property> <property name="vexpand">True</property> <property name="hscrollbar_policy">never</property> <property name="vscrollbar_policy">never</property> @@ -332,6 +333,78 @@ <property name="position">2</property> </packing> </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="bitmaptabpage|label2">Options</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frame3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">start</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkBox" id="box4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">4</property> + <child> + <object class="GtkScrolledWindow"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hscrollbar_policy">never</property> + <property name="vscrollbar_policy">never</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkViewport"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkDrawingArea" id="CTL_BITMAP_PREVIEW"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="CTL_BITMAP_PREVIEW-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="bitmaptabpage|CTL_BITMAP_PREVIEW-atkobject">Example</property> + </object> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> <child> <object class="GtkBox" id="posoffbox"> <property name="visible">True</property> @@ -431,7 +504,7 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> <child> @@ -482,6 +555,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> + <property name="text" translatable="yes" context="bitmaptabpage|tileoffmtr">0</property> <property name="adjustment">adjustment1</property> </object> <packing> @@ -501,78 +575,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="bitmaptabpage|label2">Options</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkFrame" id="frame3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="valign">start</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkAlignment" id="alignment8"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> - <child> - <object class="GtkBox" id="box4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkScrolledWindow"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkViewport"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkDrawingArea" id="CTL_BITMAP_PREVIEW"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="CTL_BITMAP_PREVIEW-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="bitmaptabpage|CTL_BITMAP_PREVIEW-atkobject">Example</property> - </object> - </child> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="position">2</property> </packing> </child> </object> @@ -600,14 +603,14 @@ </object> <object class="GtkSizeGroup"> <widgets> - <widget name="label10"/> - <widget name="label11"/> + <widget name="label5"/> + <widget name="label6"/> </widgets> </object> <object class="GtkSizeGroup"> <widgets> - <widget name="label5"/> - <widget name="label6"/> + <widget name="label10"/> + <widget name="label11"/> </widgets> </object> </interface> diff --git a/cui/uiconfig/ui/gradientpage.ui b/cui/uiconfig/ui/gradientpage.ui index ba34727e60bc..0fc16e1c23ec 100644 --- a/cui/uiconfig/ui/gradientpage.ui +++ b/cui/uiconfig/ui/gradientpage.ui @@ -79,6 +79,7 @@ <object class="GtkScrolledWindow" id="gradientpresetlistwin"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="valign">start</property> <property name="vexpand">True</property> <property name="hscrollbar_policy">never</property> <property name="vscrollbar_policy">never</property> @@ -92,6 +93,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property> + <property name="valign">start</property> <property name="vexpand">True</property> </object> </child> @@ -437,90 +439,6 @@ </packing> </child> <child> - <object class="GtkSpinButton" id="colortomtr"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">percentadjustment2</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">7</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="colortolb"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">7</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="colortoft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="gradientpage|colortoft">_To Color:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">colortolb</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">6</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="colorfromlb"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="colorfrommtr"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">percentadjustment1</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="colorfromft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="gradientpage|colorfromft">_From Color:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">colorfromlb</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - <property name="width">2</property> - </packing> - </child> - <child> <object class="GtkScale" id="angleslider"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -577,7 +495,6 @@ <property name="can_focus">False</property> <property name="label" translatable="yes" context="gradientpage|a11y_percentage_from">From color percentage</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">colorfrommtr</property> </object> <packing> <property name="expand">False</property> @@ -591,7 +508,6 @@ <property name="can_focus">False</property> <property name="label" translatable="yes" context="gradientpage|a11y_percentage_to">To color percentage</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">colortomtr</property> </object> <packing> <property name="expand">False</property> @@ -677,6 +593,139 @@ <property name="position">0</property> </packing> </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">82</property> + <property name="orientation">vertical</property> + <property name="spacing">4</property> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">2</property> + <property name="column_spacing">4</property> + <child> + <object class="GtkLabel" id="colorfromft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="gradientpage|colorfromft">_From Color:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">colorfromlb</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="colorfromlb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="colorfrommtr"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="text" translatable="yes" context="gradientpage|colorfrommtr">0</property> + <property name="placeholder_text" translatable="yes" context="gradientpage|colorfrommtr-from">From color</property> + <property name="adjustment">percentadjustment1</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">2</property> + <property name="column_spacing">8</property> + <child> + <object class="GtkLabel" id="colortoft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="gradientpage|colortoft">_To Color:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">colortolb</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="colortolb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="colortomtr"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="text" translatable="yes" context="gradientpage|colortomtr">5</property> + <property name="placeholder_text" translatable="yes" context="gradientpage|colorfrommtr-to">To color</property> + <property name="adjustment">percentadjustment2</property> + <property name="value">5</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> </child> </object> diff --git a/cui/uiconfig/ui/hatchpage.ui b/cui/uiconfig/ui/hatchpage.ui index b683522f5c55..03652ff73bf7 100644 --- a/cui/uiconfig/ui/hatchpage.ui +++ b/cui/uiconfig/ui/hatchpage.ui @@ -45,6 +45,7 @@ <object class="GtkScrolledWindow" id="hatchpresetlistwin"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="valign">start</property> <property name="vexpand">True</property> <property name="hscrollbar_policy">never</property> <property name="vscrollbar_policy">never</property> diff --git a/cui/uiconfig/ui/patterntabpage.ui b/cui/uiconfig/ui/patterntabpage.ui index 836e9a5ee05f..bbab6ffb1cd8 100644 --- a/cui/uiconfig/ui/patterntabpage.ui +++ b/cui/uiconfig/ui/patterntabpage.ui @@ -31,6 +31,7 @@ <object class="GtkScrolledWindow" id="patternpresetlistwin"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="valign">start</property> <property name="vexpand">True</property> <property name="hscrollbar_policy">never</property> <property name="vscrollbar_policy">never</property> @@ -179,9 +180,9 @@ <object class="GtkDrawingArea" id="CTL_PIXEL"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="events">GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property> <property name="halign">start</property> <property name="valign">start</property> - <property name="events">GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property> <child internal-child="accessible"> <object class="AtkObject" id="CTL_PIXEL-atkobject"> <property name="AtkObject::accessible-name" translatable="yes" context="patterntabpage|CTL_PIXEL-atkobject">Pattern Editor</property> @@ -205,10 +206,82 @@ <property name="position">0</property> </packing> </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="patterntabpage|label1">Options</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frame2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">start</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkBox" id="box1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkScrolledWindow"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hscrollbar_policy">never</property> + <property name="vscrollbar_policy">never</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkViewport"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkDrawingArea" id="CTL_PREVIEW"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="CTL_PREVIEW-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="patterntabpage|CTL_PREVIEW-atkobject">Example</property> + </object> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> <child> <object class="GtkBox" id="box8"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_top">2</property> <property name="orientation">vertical</property> <property name="spacing">3</property> <child> @@ -298,77 +371,6 @@ </object> </child> <child type="label"> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="patterntabpage|label1">Options</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkFrame" id="frame2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="valign">start</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkAlignment" id="alignment2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> - <child> - <object class="GtkBox" id="box1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkScrolledWindow"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkViewport"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkDrawingArea" id="CTL_PREVIEW"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="CTL_PREVIEW-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="patterntabpage|CTL_PREVIEW-atkobject">Example</property> - </object> - </child> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - </object> - </child> - </object> - </child> - <child type="label"> <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/include/sfx2/dialoghelper.hxx b/include/sfx2/dialoghelper.hxx index b0d9ae5b5cfe..2a582b4f90f8 100644 --- a/include/sfx2/dialoghelper.hxx +++ b/include/sfx2/dialoghelper.hxx @@ -33,6 +33,8 @@ Size SFX2_DLLPUBLIC getPreviewStripSize(const OutputDevice& rReference); Size SFX2_DLLPUBLIC getPreviewOptionsSize(const vcl::Window *pReference); +Size SFX2_DLLPUBLIC getPagePropertiesOptimalSize(const vcl::Window *pReference); + OUString SFX2_DLLPUBLIC getWidestTime(const LocaleDataWrapper& rWrapper); OUString SFX2_DLLPUBLIC formatTime(const DateTime& rDateTime, const LocaleDataWrapper& rWrapper); diff --git a/sfx2/source/dialog/dialoghelper.cxx b/sfx2/source/dialog/dialoghelper.cxx index a0d9fa36ccd9..56d55690035f 100644 --- a/sfx2/source/dialog/dialoghelper.cxx +++ b/sfx2/source/dialog/dialoghelper.cxx @@ -34,6 +34,12 @@ Size getPreviewOptionsSize(const vcl::Window *pReference) return pReference->LogicToPixel(Size(70 , 27), MapMode(MapUnit::MapAppFont)); } +Size getPagePropertiesOptimalSize(const vcl::Window *pReference) +{ + return pReference->LogicToPixel(Size(88, 120), MapMode(MapUnit::MapAppFont)); +} + + OUString getWidestTime(const LocaleDataWrapper& rWrapper) { Date aDate(22, 12, 2000); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits