cui/source/tabpages/tpbitmap.cxx | 5
cui/source/tabpages/tpgradnt.cxx | 4
cui/source/tabpages/tphatch.cxx | 4
cui/source/tabpages/tppattern.cxx | 4
cui/uiconfig/ui/bitmaptabpage.ui | 157 +++++++++++++------------
cui/uiconfig/ui/gradientpage.ui | 221 +++++++++++++++++++++---------------
cui/uiconfig/ui/hatchpage.ui | 3
cui/uiconfig/ui/patterntabpage.ui | 147 +++++++++++------------
include/sfx2/dialoghelper.hxx | 2
sfx2/source/dialog/dialoghelper.cxx | 5
10 files changed, 307 insertions(+), 245 deletions(-)
New commits:
commit 80109586e6cb6d3e2e0a53a9079c3125ec9b8368
Author: Gülşah Köse <gulsah.k...@collabora.com>
AuthorDate: Fri Nov 1 20:33:09 2019 +0300
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri Nov 1 22:59:52 2019 +0100
tdf#126128 Reduce page properties dialog's height.
Change-Id: Ie35c9cb4c9b134a94f3a125dd800936b7160950c
Reviewed-on: https://gerrit.libreoffice.org/81910
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 7d1f17be236b..946da898ad08 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -119,8 +119,11 @@ SvxBitmapTabPage::SvxBitmapTabPage(weld::Container* pPage,
weld::DialogControlle
m_xBtnImport->hide();
// Calculate size of display boxes
+
+ Size aBitmapLBSize =
getPagePropertiesOptimalSize(m_xBitmapLB->GetDrawingArea()->get_ref_device());
+ m_xBitmapLB->set_size_request(aBitmapLBSize.Width(),
aBitmapLBSize.Height());
+
Size aSize =
getDrawPreviewOptimalSize(m_aCtlBitmapPreview.GetDrawingArea()->get_ref_device());
- 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/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index f8affa0f044e..ac7832e2b4d2 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -68,8 +68,10 @@ SvxGradientTabPage::SvxGradientTabPage(weld::Container*
pPage, weld::DialogContr
, m_xCtlPreview(new weld::CustomWeld(*m_xBuilder, "previewctl",
m_aCtlPreview))
, m_xGradientLBWin(new weld::CustomWeld(*m_xBuilder, "gradientpresetlist",
*m_xGradientLB))
{
- Size aSize =
getDrawPreviewOptimalSize(m_aCtlPreview.GetDrawingArea()->get_ref_device());
+ Size aSize =
getPagePropertiesOptimalSize(m_xGradientLB->GetDrawingArea()->get_ref_device());
m_xGradientLB->set_size_request(aSize.Width(), aSize.Height());
+
+ aSize =
getDrawPreviewOptimalSize(m_aCtlPreview.GetDrawingArea()->get_ref_device());
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 aeb5d9c85fcb..76de2709df89 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -63,8 +63,10 @@ SvxHatchTabPage::SvxHatchTabPage(weld::Container* pPage,
weld::DialogController*
, m_xHatchLBWin(new weld::CustomWeld(*m_xBuilder, "hatchpresetlist",
*m_xHatchLB))
, m_xCtlPreview(new weld::CustomWeld(*m_xBuilder, "previewctl",
m_aCtlPreview))
{
- Size aSize =
getDrawPreviewOptimalSize(m_aCtlPreview.GetDrawingArea()->get_ref_device());
+ Size aSize =
getPagePropertiesOptimalSize(m_xHatchLB->GetDrawingArea()->get_ref_device());
m_xHatchLBWin->set_size_request(aSize.Width(), aSize.Height());
+
+ aSize =
getDrawPreviewOptimalSize(m_aCtlPreview.GetDrawingArea()->get_ref_device());
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 713a7c3a6628..aa3b561a2c7d 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -87,8 +87,10 @@ SvxPatternTabPage::SvxPatternTabPage(weld::Container* pPage,
weld::DialogControl
, m_xPatternLBWin(new weld::CustomWeld(*m_xBuilder, "patternpresetlist",
*m_xPatternLB))
{
// size of the bitmap display
- Size aSize =
getDrawPreviewOptimalSize(m_aCtlPreview.GetDrawingArea()->get_ref_device());
+ Size aSize =
getPagePropertiesOptimalSize(m_xPatternLB->GetDrawingArea()->get_ref_device());
m_xPatternLB->set_size_request(aSize.Width(), aSize.Height());
+
+ aSize =
getDrawPreviewOptimalSize(m_aCtlPreview.GetDrawingArea()->get_ref_device());
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 dae24f1ea007..52503da401fc 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 11970d4856c8..f07f89486549 100644
--- a/cui/uiconfig/ui/gradientpage.ui
+++ b/cui/uiconfig/ui/gradientpage.ui
@@ -78,6 +78,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>
@@ -436,92 +437,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>
- <property name="label" translatable="no"></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>
- <property name="label" translatable="no"></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>
@@ -578,7 +493,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>
@@ -592,7 +506,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>
@@ -678,6 +591,138 @@
<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">6</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">6</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">0</property>
+ <property name="placeholder_text"
translatable="yes" context="gradientpage|colortomtr-to">To color</property>
+ <property
name="adjustment">percentadjustment2</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 0195a5c1e8c9..2111ac913ea4 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>
@@ -292,7 +293,6 @@
<property name="valign">center</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
- <property name="label" translatable="no"></property>
<child>
<placeholder/>
</child>
@@ -331,7 +331,6 @@
<property name="valign">center</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
- <property name="label" translatable="no"></property>
<child>
<placeholder/>
</child>
diff --git a/cui/uiconfig/ui/patterntabpage.ui
b/cui/uiconfig/ui/patterntabpage.ui
index 0c054341703f..8662d05c6356 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,6 +206,77 @@
<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>
@@ -233,7 +305,6 @@
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
- <property name="label" translatable="no"></property>
<child>
<placeholder/>
</child>
@@ -279,7 +350,6 @@
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
- <property name="label" translatable="no"></property>
<child>
<placeholder/>
</child>
@@ -302,77 +372,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 c18545a75c49..2ccc9284c332 100644
--- a/include/sfx2/dialoghelper.hxx
+++ b/include/sfx2/dialoghelper.hxx
@@ -32,6 +32,8 @@ Size SFX2_DLLPUBLIC getPreviewStripSize(const OutputDevice&
rReference);
Size SFX2_DLLPUBLIC getPreviewOptionsSize(const OutputDevice& rReference);
+Size SFX2_DLLPUBLIC getPagePropertiesOptimalSize(const OutputDevice&
rReference);
+
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 4c7d63e23e0e..4a810a386f1c 100644
--- a/sfx2/source/dialog/dialoghelper.cxx
+++ b/sfx2/source/dialog/dialoghelper.cxx
@@ -35,6 +35,11 @@ Size getPreviewOptionsSize(const OutputDevice& rReference)
return rReference.LogicToPixel(Size(70 , 27),
MapMode(MapUnit::MapAppFont));
}
+Size getPagePropertiesOptimalSize(const OutputDevice& rReference)
+{
+ return rReference.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
