[Libreoffice-commits] core.git: 3 commits - cui/source cui/uiconfig include/svx sd/uiconfig svx/source
Caolán McNamara
caolanm at redhat.com
Sat Aug 17 07:22:01 PDT 2013
cui/source/tabpages/textattr.cxx | 4 --
cui/uiconfig/ui/textattrtabpage.ui | 35 ++++++++++++-----------
include/svx/dlgctrl.hxx | 2 +
sd/uiconfig/simpress/ui/optimpressgeneralpage.ui | 4 +-
svx/source/dialog/dlgctrl.cxx | 9 +++++
5 files changed, 33 insertions(+), 21 deletions(-)
New commits:
commit b0f3c279bcff2ebacf8b0f736f749f403019d0a7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Aug 17 15:18:02 2013 +0100
vertically column two to match column one
Change-Id: I2def55821347622252c22ae61c75239af5d27e6a
diff --git a/cui/uiconfig/ui/textattrtabpage.ui b/cui/uiconfig/ui/textattrtabpage.ui
index db4f261c..da272cf 100644
--- a/cui/uiconfig/ui/textattrtabpage.ui
+++ b/cui/uiconfig/ui/textattrtabpage.ui
@@ -350,21 +350,24 @@
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="vexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkBox" id="box3">
<property name="visible">True</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="svxlo-SvxRectCtl" id="CTL_POSITION">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="vexpand">True</property>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
commit 4eb5b7f65c78327b2fafbadbcbfc88e21c6a8d7e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Aug 17 15:11:04 2013 +0100
add SvxRectCtl::SetControlSettings and restore original settings
Change-Id: Ie307b3acb3e87bd87ec578e042b1cea29ab4839d
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 0060110..51a5620 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -75,7 +75,7 @@ SvxTextAttrPage::SvxTextAttrPage( Window* pWindow, const SfxItemSet& rInAttrs )
get(m_pMtrFldBottom,"MTR_FLD_BOTTOM");
get(m_pFlPosition,"FL_POSITION");
get(m_pCtlPosition,"CTL_POSITION");
-// RP_MM, 240, 100 ),
+ m_pCtlPosition->SetControlSettings(RP_MM, 240, 100),
get(m_pTsbFullWidth,"TSB_FULL_WIDTH");
@@ -92,8 +92,6 @@ SvxTextAttrPage::SvxTextAttrPage( Window* pWindow, const SfxItemSet& rInAttrs )
m_pTsbContour->SetClickHdl( aLink );
m_pTsbFullWidth->SetClickHdl(LINK( this, SvxTextAttrPage, ClickFullWidthHdl_Impl ) );
-
-// aCtlPosition.SetAccessibleRelationMemberOf( &aFlPosition );
}
/*************************************************************************
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index 8bc5142..5c62e18 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -102,6 +102,8 @@ public:
sal_uInt16 nBorder = 200, sal_uInt16 nCircle = 80, CTL_STYLE eStyle = CS_RECT );
SvxRectCtl( Window* pParent, RECT_POINT eRpt = RP_MM,
sal_uInt16 nBorder = 200, sal_uInt16 nCircle = 80, CTL_STYLE eStyle = CS_RECT );
+ void SetControlSettings(RECT_POINT eRpt = RP_MM, sal_uInt16 nBorder = 200,
+ sal_uInt16 nCircle = 80, CTL_STYLE eStyle = CS_RECT);
virtual ~SvxRectCtl();
virtual void Paint( const Rectangle& rRect );
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 5d59296..af07280 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -96,6 +96,15 @@ SvxRectCtl::SvxRectCtl(Window* pParent, RECT_POINT eRpt,
Resize_Impl();
}
+void SvxRectCtl::SetControlSettings(RECT_POINT eRpt, sal_uInt16 nBorder, sal_uInt16 nCircle, CTL_STYLE eStyle)
+{
+ nBorderWidth = nBorder;
+ nRadius = nCircle;
+ eDefRP = eRpt;
+ eCS = eStyle;
+ Resize_Impl();
+}
+
Size SvxRectCtl::GetOptimalSize() const
{
return LogicToPixel(Size(39, 39), MAP_APPFONT);
commit 435238f3928125f8ab115fa2d7a98ec5e03fe5c0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Aug 17 15:01:24 2013 +0100
0,00[c|m] => 0.00[c|m]
Change-Id: I34b03a7decb459c6014f25e2e38b5c32c58da68f
diff --git a/cui/uiconfig/ui/textattrtabpage.ui b/cui/uiconfig/ui/textattrtabpage.ui
index dea4308..db4f261c 100644
--- a/cui/uiconfig/ui/textattrtabpage.ui
+++ b/cui/uiconfig/ui/textattrtabpage.ui
@@ -13,7 +13,7 @@
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
@@ -34,12 +34,6 @@
<property name="column_spacing">12</property>
<property name="column_homogeneous">True</property>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<object class="GtkCheckButton" id="TSB_AUTOGROW_WIDTH">
<property name="label" translatable="yes">Fit wi_dth to text</property>
<property name="visible">True</property>
@@ -147,6 +141,12 @@
<property name="height">1</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
</object>
@@ -201,7 +201,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">_Left</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">MTR_FLD_LEFT:0,00cm</property>
+ <property name="mnemonic_widget">MTR_FLD_LEFT:0.00cm</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -217,7 +217,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">_Right</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">MTR_FLD_RIGHT:0,00cm</property>
+ <property name="mnemonic_widget">MTR_FLD_RIGHT:0.00cm</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -233,7 +233,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">_Top</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">MTR_FLD_TOP:0,00cm</property>
+ <property name="mnemonic_widget">MTR_FLD_TOP:0.00cm</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -249,7 +249,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">_Bottom</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">MTR_FLD_BOTTOM:0,00cm</property>
+ <property name="mnemonic_widget">MTR_FLD_BOTTOM:0.00cm</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -259,7 +259,7 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="MTR_FLD_LEFT:0,00cm">
+ <object class="GtkSpinButton" id="MTR_FLD_LEFT:0.00cm">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="invisible_char">•</property>
@@ -274,7 +274,7 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="MTR_FLD_RIGHT:0,00cm">
+ <object class="GtkSpinButton" id="MTR_FLD_RIGHT:0.00cm">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="invisible_char">•</property>
@@ -289,7 +289,7 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="MTR_FLD_TOP:0,00cm">
+ <object class="GtkSpinButton" id="MTR_FLD_TOP:0.00cm">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="invisible_char">•</property>
@@ -304,7 +304,7 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="MTR_FLD_BOTTOM:0,00cm">
+ <object class="GtkSpinButton" id="MTR_FLD_BOTTOM:0.00cm">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="invisible_char">•</property>
diff --git a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
index 71ca5d9..ba8da2e 100644
--- a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
+++ b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
@@ -298,7 +298,7 @@
<property name="label" translatable="yes">Ta_b stops</property>
<property name="use_underline">True</property>
<property name="justify">fill</property>
- <property name="mnemonic_widget">metricFields:0,00mm</property>
+ <property name="mnemonic_widget">metricFields:0.00mm</property>
<property name="track_visited_links">False</property>
</object>
<packing>
@@ -309,7 +309,7 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="metricFields:0,00mm">
+ <object class="GtkSpinButton" id="metricFields:0.00mm">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
More information about the Libreoffice-commits
mailing list