[Libreoffice-commits] .: 3 commits - cui/source cui/uiconfig cui/UI_cui.mk sw/uiconfig
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Oct 26 12:41:34 PDT 2012
cui/UI_cui.mk | 1
cui/source/dialogs/insdlg.cxx | 188 ++++--------
cui/source/dialogs/svuidlg.hrc | 23 -
cui/source/dialogs/svuidlg.src | 187 ------------
cui/source/inc/insdlg.hxx | 64 +---
cui/uiconfig/ui/insertfloatingframe.ui | 505 +++++++++++++++++++++++++++++++++
sw/uiconfig/swriter/ui/insertbreak.ui | 2
7 files changed, 605 insertions(+), 365 deletions(-)
New commits:
commit e0e79e9026dff2a1db0816a79e7f76966183938a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Oct 26 20:39:13 2012 +0100
missing a default button for insert break
Change-Id: I417a6d46dc72ee251b43e00836363b6ae07c2b4c
diff --git a/sw/uiconfig/swriter/ui/insertbreak.ui b/sw/uiconfig/swriter/ui/insertbreak.ui
index 99a290d..48c19de 100644
--- a/sw/uiconfig/swriter/ui/insertbreak.ui
+++ b/sw/uiconfig/swriter/ui/insertbreak.ui
@@ -39,6 +39,8 @@
<property name="use_action_appearance">False</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="use_action_appearance">False</property>
<property name="use_stock">True</property>
commit 9921cf3bdf9b6b287d1aac8179e1647dd2b3be07
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Oct 26 20:13:16 2012 +0100
connect adjustments to spinbuttons
Change-Id: Ia840ae93a0582e96df8faa2507835dc4fbb7141d
diff --git a/cui/uiconfig/ui/insertfloatingframe.ui b/cui/uiconfig/ui/insertfloatingframe.ui
index a406207..d147cc1 100644
--- a/cui/uiconfig/ui/insertfloatingframe.ui
+++ b/cui/uiconfig/ui/insertfloatingframe.ui
@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">99</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkDialog" id="InsertFloatingFrameDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -85,10 +90,12 @@
<child>
<object class="GtkButton" id="buttonbrowse">
<property name="label" translatable="yes">Browse...</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">end</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -128,9 +135,11 @@
<child>
<object class="GtkRadioButton" id="scrollbaron">
<property name="label" translatable="yes">On</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -145,9 +154,11 @@
<child>
<object class="GtkRadioButton" id="scrollbaroff">
<property name="label" translatable="yes">Off</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">scrollbarauto</property>
@@ -161,9 +172,11 @@
<child>
<object class="GtkRadioButton" id="scrollbarauto">
<property name="label" translatable="yes">Automatic</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">scrollbaron</property>
@@ -214,9 +227,11 @@
<child>
<object class="GtkRadioButton" id="borderon">
<property name="label" translatable="yes">On</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -231,9 +246,11 @@
<child>
<object class="GtkRadioButton" id="borderoff">
<property name="label" translatable="yes">Off</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">borderon</property>
@@ -318,6 +335,7 @@
<property name="margin_right">12</property>
<property name="invisible_char">•</property>
<property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment1</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -333,6 +351,7 @@
<property name="margin_right">12</property>
<property name="invisible_char">•</property>
<property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment1</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -344,9 +363,11 @@
<child>
<object class="GtkCheckButton" id="defaultwidth">
<property name="label" translatable="yes">Default</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -360,9 +381,11 @@
<child>
<object class="GtkCheckButton" id="defaultheight">
<property name="label" translatable="yes">Default</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -416,11 +439,13 @@
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
+ <property name="use_action_appearance">False</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="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -432,9 +457,11 @@
<child>
<object class="GtkButton" id="cancel">
<property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -446,9 +473,11 @@
<child>
<object class="GtkButton" id="help">
<property name="label">gtk-help</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -473,14 +502,4 @@
<action-widget response="0">help</action-widget>
</action-widgets>
</object>
- <object class="GtkAdjustment" id="heightadjustment">
- <property name="upper">99</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="widthadjustment">
- <property name="upper">99</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
</interface>
commit 468cb30c109dc086e4dc319ab7013f14c559ddc2
Author: Jack Leigh <leighman at gmx.se>
Date: Fri Oct 26 18:25:26 2012 +0100
migrate Insert Floating Frame dialog to .ui file
Change-Id: I732bd280295097fe098d3175127eb4d8a026dc32
diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk
index c1b2a3e..57a1f8d 100644
--- a/cui/UI_cui.mk
+++ b/cui/UI_cui.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_UI_add_uifiles,cui,\
cui/uiconfig/ui/charnamepage \
cui/uiconfig/ui/effectspage \
cui/uiconfig/ui/hyphenate \
+ cui/uiconfig/ui/insertfloatingframe \
cui/uiconfig/ui/insertoleobject \
cui/uiconfig/ui/insertplugin \
cui/uiconfig/ui/positionpage \
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 9c42a48..83cd8d0 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -509,97 +509,49 @@ short SvInsertPlugInDialog::Execute()
SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent,
const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage )
- : InsertObjectDialog_Impl( pParent, CUI_RES( MD_INSERT_OBJECT_IFRAME ), xStorage )
- , aFTName ( this, CUI_RES( FT_FRAMENAME ) )
- , aEDName ( this, CUI_RES( ED_FRAMENAME ) )
- , aFTURL ( this, CUI_RES( FT_URL ) )
- , aEDURL ( this, CUI_RES( ED_URL ) )
- , aBTOpen ( this, CUI_RES(BT_FILEOPEN ) )
-
- , aFLScrolling ( this, CUI_RES( GB_SCROLLING ) )
- , aRBScrollingOn ( this, CUI_RES( RB_SCROLLINGON ) )
- , aRBScrollingOff ( this, CUI_RES( RB_SCROLLINGOFF ) )
- , aRBScrollingAuto ( this, CUI_RES( RB_SCROLLINGAUTO ) )
- , aFLSepLeft( this, CUI_RES( FL_SEP_LEFT ) )
- , aFLFrameBorder( this, CUI_RES( GB_BORDER ) )
- , aRBFrameBorderOn ( this, CUI_RES( RB_FRMBORDER_ON ) )
- , aRBFrameBorderOff ( this, CUI_RES( RB_FRMBORDER_OFF ) )
- , aFLSepRight( this, CUI_RES( FL_SEP_RIGHT ) )
- , aFLMargin( this, CUI_RES( GB_MARGIN ) )
- , aFTMarginWidth ( this, CUI_RES( FT_MARGINWIDTH ) )
- , aNMMarginWidth ( this, CUI_RES( NM_MARGINWIDTH ) )
- , aCBMarginWidthDefault( this, CUI_RES( CB_MARGINWIDTHDEFAULT ) )
- , aFTMarginHeight ( this, CUI_RES( FT_MARGINHEIGHT ) )
- , aNMMarginHeight ( this, CUI_RES( NM_MARGINHEIGHT ) )
- , aCBMarginHeightDefault( this, CUI_RES( CB_MARGINHEIGHTDEFAULT ) )
- , aOKButton1( this, CUI_RES( 1 ) )
- , aCancelButton1( this, CUI_RES( 1 ) )
- , aHelpButton1( this, CUI_RES( 1 ) )
+ : InsertObjectDialog_Impl( pParent, "InsertFloatingFrameDialog", "cui/ui/insertfloatingframe.ui",
+ xStorage )
{
- FreeResource();
-
- aFLSepLeft.SetStyle(aFLSepLeft.GetStyle()|WB_VERT);
- aFLSepRight.SetStyle(aFLSepRight.GetStyle()|WB_VERT);
-
- Link aLink( STATIC_LINK( this, SfxInsertFloatingFrameDialog, CheckHdl ) );
- aCBMarginWidthDefault.SetClickHdl( aLink );
- aCBMarginHeightDefault.SetClickHdl( aLink );
-
- aCBMarginWidthDefault.Check();
- aCBMarginHeightDefault.Check();
- aRBScrollingAuto.Check();
- aRBFrameBorderOn.Check();
-
- aBTOpen.SetClickHdl( STATIC_LINK( this, SfxInsertFloatingFrameDialog, OpenHdl ) );
+ Init();
}
-SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent, const uno::Reference < embed::XEmbeddedObject >& xObj )
- : InsertObjectDialog_Impl( pParent, CUI_RES( MD_INSERT_OBJECT_IFRAME ), uno::Reference < embed::XStorage >() )
- , aFTName ( this, CUI_RES( FT_FRAMENAME ) )
- , aEDName ( this, CUI_RES( ED_FRAMENAME ) )
- , aFTURL ( this, CUI_RES( FT_URL ) )
- , aEDURL ( this, CUI_RES( ED_URL ) )
- , aBTOpen ( this, CUI_RES(BT_FILEOPEN ) )
-
- , aFLScrolling ( this, CUI_RES( GB_SCROLLING ) )
- , aRBScrollingOn ( this, CUI_RES( RB_SCROLLINGON ) )
- , aRBScrollingOff ( this, CUI_RES( RB_SCROLLINGOFF ) )
- , aRBScrollingAuto ( this, CUI_RES( RB_SCROLLINGAUTO ) )
-
- , aFLSepLeft( this, CUI_RES( FL_SEP_LEFT ) )
- , aFLFrameBorder( this, CUI_RES( GB_BORDER ) )
- , aRBFrameBorderOn ( this, CUI_RES( RB_FRMBORDER_ON ) )
- , aRBFrameBorderOff ( this, CUI_RES( RB_FRMBORDER_OFF ) )
-
- , aFLSepRight( this, CUI_RES( FL_SEP_RIGHT ) )
- , aFLMargin( this, CUI_RES( GB_MARGIN ) )
- , aFTMarginWidth ( this, CUI_RES( FT_MARGINWIDTH ) )
- , aNMMarginWidth ( this, CUI_RES( NM_MARGINWIDTH ) )
- , aCBMarginWidthDefault( this, CUI_RES( CB_MARGINWIDTHDEFAULT ) )
- , aFTMarginHeight ( this, CUI_RES( FT_MARGINHEIGHT ) )
- , aNMMarginHeight ( this, CUI_RES( NM_MARGINHEIGHT ) )
- , aCBMarginHeightDefault( this, CUI_RES( CB_MARGINHEIGHTDEFAULT ) )
- , aOKButton1( this, CUI_RES( 1 ) )
- , aCancelButton1( this, CUI_RES( 1 ) )
- , aHelpButton1( this, CUI_RES( 1 ) )
+SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent,
+ const uno::Reference < embed::XEmbeddedObject >& xObj )
+ : InsertObjectDialog_Impl( pParent, "InsertFloatingFrameDialog", "cui/ui/insertfloatingframe.ui",
+ uno::Reference < embed::XStorage >() )
{
- FreeResource();
-
m_xObj = xObj;
- aFLSepLeft.SetStyle(aFLSepLeft.GetStyle()|WB_VERT);
- aFLSepRight.SetStyle(aFLSepRight.GetStyle()|WB_VERT);
+ Init();
+}
+
+void SfxInsertFloatingFrameDialog::Init()
+{
+ get(m_pEDName, "edname");
+ get(m_pEDURL, "edurl");
+ get(m_pBTOpen, "buttonbrowse");
+ get(m_pRBScrollingOn, "scrollbaron");
+ get(m_pRBScrollingOff, "scrollbaroff");
+ get(m_pRBScrollingAuto, "scrollbarauto");
+ get(m_pRBFrameBorderOn, "borderon");
+ get(m_pRBFrameBorderOff, "borderoff");
+ get(m_pFTMarginWidth, "widthlabel");
+ get(m_pNMMarginWidth, "width");
+ get(m_pCBMarginWidthDefault, "defaultwidth");
+ get(m_pFTMarginHeight, "heightlabel");
+ get(m_pNMMarginHeight, "height");
+ get(m_pCBMarginHeightDefault, "defaultheight");
Link aLink( STATIC_LINK( this, SfxInsertFloatingFrameDialog, CheckHdl ) );
- aCBMarginWidthDefault.SetClickHdl( aLink );
- aCBMarginHeightDefault.SetClickHdl( aLink );
+ m_pCBMarginWidthDefault->SetClickHdl( aLink );
+ m_pCBMarginHeightDefault->SetClickHdl( aLink );
- aCBMarginWidthDefault.Check();
- aCBMarginHeightDefault.Check();
- aRBScrollingAuto.Check();
- aRBFrameBorderOn.Check();
+ m_pCBMarginWidthDefault->Check();
+ m_pCBMarginHeightDefault->Check();
+ m_pRBScrollingAuto->Check();
+ m_pRBFrameBorderOn->Check();
- aBTOpen.SetClickHdl( STATIC_LINK( this, SfxInsertFloatingFrameDialog, OpenHdl ) );
+ m_pBTOpen->SetClickHdl( STATIC_LINK( this, SfxInsertFloatingFrameDialog, OpenHdl ) );
}
short SfxInsertFloatingFrameDialog::Execute()
@@ -617,10 +569,10 @@ short SfxInsertFloatingFrameDialog::Execute()
::rtl::OUString aStr;
uno::Any aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameURL") ) );
if ( aAny >>= aStr )
- aEDURL.SetText( aStr );
+ m_pEDURL->SetText( aStr );
aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameName") ) );
if ( aAny >>= aStr )
- aEDName.SetText( aStr );
+ m_pEDName->SetText( aStr );
sal_Int32 nSize = SIZE_NOT_SET;
aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginWidth") ) );
@@ -628,26 +580,26 @@ short SfxInsertFloatingFrameDialog::Execute()
if ( nSize == SIZE_NOT_SET )
{
- aCBMarginWidthDefault.Check( sal_True );
- aNMMarginWidth.SetText( String::CreateFromInt32( DEFAULT_MARGIN_WIDTH ) );
- aFTMarginWidth.Enable( sal_False );
- aNMMarginWidth.Enable( sal_False );
+ m_pCBMarginWidthDefault->Check( sal_True );
+ m_pNMMarginWidth->SetText( String::CreateFromInt32( DEFAULT_MARGIN_WIDTH ) );
+ m_pFTMarginWidth->Enable( sal_False );
+ m_pNMMarginWidth->Enable( sal_False );
}
else
- aNMMarginWidth.SetText( String::CreateFromInt32( nSize ) );
+ m_pNMMarginWidth->SetText( String::CreateFromInt32( nSize ) );
aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginHeight") ) );
aAny >>= nSize;
if ( nSize == SIZE_NOT_SET )
{
- aCBMarginHeightDefault.Check( sal_True );
- aNMMarginHeight.SetText( String::CreateFromInt32( DEFAULT_MARGIN_HEIGHT ) );
- aFTMarginHeight.Enable( sal_False );
- aNMMarginHeight.Enable( sal_False );
+ m_pCBMarginHeightDefault->Check( sal_True );
+ m_pNMMarginHeight->SetText( String::CreateFromInt32( DEFAULT_MARGIN_HEIGHT ) );
+ m_pFTMarginHeight->Enable( sal_False );
+ m_pNMMarginHeight->Enable( sal_False );
}
else
- aNMMarginHeight.SetText( String::CreateFromInt32( nSize ) );
+ m_pNMMarginHeight->SetText( String::CreateFromInt32( nSize ) );
sal_Bool bScrollOn = sal_False;
sal_Bool bScrollOff = sal_False;
@@ -666,9 +618,9 @@ short SfxInsertFloatingFrameDialog::Execute()
else
bScrollAuto = sal_True;
- aRBScrollingOn.Check( bScrollOn );
- aRBScrollingOff.Check( bScrollOff );
- aRBScrollingAuto.Check( bScrollAuto );
+ m_pRBScrollingOn->Check( bScrollOn );
+ m_pRBScrollingOff->Check( bScrollOff );
+ m_pRBScrollingAuto->Check( bScrollAuto );
bSet = sal_False;
aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoBorder") ) );
@@ -677,8 +629,8 @@ short SfxInsertFloatingFrameDialog::Execute()
{
aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsBorder") ) );
aAny >>= bSet;
- aRBFrameBorderOn.Check( bSet );
- aRBFrameBorderOff.Check( !bSet );
+ m_pRBFrameBorderOn->Check( bSet );
+ m_pRBFrameBorderOff->Check( !bSet );
}
SetUpdateMode( sal_True );
@@ -698,12 +650,12 @@ short SfxInsertFloatingFrameDialog::Execute()
if ( bOK && ( nRet = Dialog::Execute() ) == RET_OK )
{
::rtl::OUString aURL;
- if ( aEDURL.GetText().Len() )
+ if ( m_pEDURL->GetText().Len() )
{
// URL can be a valid and absolute URL or a system file name
INetURLObject aObj;
aObj.SetSmartProtocol( INET_PROT_FILE );
- if ( aObj.SetSmartURL( aEDURL.GetText() ) )
+ if ( aObj.SetSmartURL( m_pEDURL->GetText() ) )
aURL = aObj.GetMainURL( INetURLObject::NO_DECODE );
}
@@ -726,26 +678,26 @@ short SfxInsertFloatingFrameDialog::Execute()
if ( bIPActive )
m_xObj->changeState( embed::EmbedStates::RUNNING );
- ::rtl::OUString aName = aEDName.GetText();
+ ::rtl::OUString aName = m_pEDName->GetText();
ScrollingMode eScroll = ScrollingNo;
- if ( aRBScrollingOn.IsChecked() )
+ if ( m_pRBScrollingOn->IsChecked() )
eScroll = ScrollingYes;
- if ( aRBScrollingOff.IsChecked() )
+ if ( m_pRBScrollingOff->IsChecked() )
eScroll = ScrollingNo;
- if ( aRBScrollingAuto.IsChecked() )
+ if ( m_pRBScrollingAuto->IsChecked() )
eScroll = ScrollingAuto;
- sal_Bool bHasBorder = aRBFrameBorderOn.IsChecked();
+ sal_Bool bHasBorder = m_pRBFrameBorderOn->IsChecked();
long lMarginWidth;
- if ( !aCBMarginWidthDefault.IsChecked() )
- lMarginWidth = (long) aNMMarginWidth.GetText().ToInt32();
+ if ( !m_pCBMarginWidthDefault->IsChecked() )
+ lMarginWidth = (long) m_pNMMarginWidth->GetText().ToInt32();
else
lMarginWidth = SIZE_NOT_SET;
long lMarginHeight;
- if ( !aCBMarginHeightDefault.IsChecked() )
- lMarginHeight = (long) aNMMarginHeight.GetText().ToInt32();
+ if ( !m_pCBMarginHeightDefault->IsChecked() )
+ lMarginHeight = (long) m_pNMMarginHeight->GetText().ToInt32();
else
lMarginHeight = SIZE_NOT_SET;
@@ -785,20 +737,20 @@ short SfxInsertFloatingFrameDialog::Execute()
IMPL_STATIC_LINK( SfxInsertFloatingFrameDialog, CheckHdl, CheckBox*, pCB )
{
- if ( pCB == &pThis->aCBMarginWidthDefault )
+ if ( pCB == pThis->m_pCBMarginWidthDefault )
{
if ( pCB->IsChecked() )
- pThis->aNMMarginWidth.SetText( String::CreateFromInt32( DEFAULT_MARGIN_WIDTH ) );
- pThis->aFTMarginWidth.Enable( !pCB->IsChecked() );
- pThis->aNMMarginWidth.Enable( !pCB->IsChecked() );
+ pThis->m_pNMMarginWidth->SetText( String::CreateFromInt32( DEFAULT_MARGIN_WIDTH ) );
+ pThis->m_pFTMarginWidth->Enable( !pCB->IsChecked() );
+ pThis->m_pNMMarginWidth->Enable( !pCB->IsChecked() );
}
- if ( pCB == &pThis->aCBMarginHeightDefault )
+ if ( pCB == pThis->m_pCBMarginHeightDefault )
{
if ( pCB->IsChecked() )
- pThis->aNMMarginHeight.SetText( String::CreateFromInt32( DEFAULT_MARGIN_HEIGHT ) );
- pThis->aFTMarginHeight.Enable( !pCB->IsChecked() );
- pThis->aNMMarginHeight.Enable( !pCB->IsChecked() );
+ pThis->m_pNMMarginHeight->SetText( String::CreateFromInt32( DEFAULT_MARGIN_HEIGHT ) );
+ pThis->m_pFTMarginHeight->Enable( !pCB->IsChecked() );
+ pThis->m_pNMMarginHeight->Enable( !pCB->IsChecked() );
}
return 0L;
@@ -820,7 +772,7 @@ IMPL_STATIC_LINK( SfxInsertFloatingFrameDialog, OpenHdl, PushButton*, EMPTYARG )
// show the dialog
if ( aFileDlg.Execute() == ERRCODE_NONE )
- pThis->aEDURL.SetText(
+ pThis->m_pEDURL->SetText(
INetURLObject( aFileDlg.GetPath() ).GetMainURL( INetURLObject::DECODE_WITH_CHARSET ) );
Application::SetDefDialogParent( pOldParent );
diff --git a/cui/source/dialogs/svuidlg.hrc b/cui/source/dialogs/svuidlg.hrc
index e2d69f4..d473d6f 100644
--- a/cui/source/dialogs/svuidlg.hrc
+++ b/cui/source/dialogs/svuidlg.hrc
@@ -84,26 +84,3 @@
#define GB_APPLET_OPTIONS 21
#define MD_INSERT_OBJECT_IFRAME 32011
-#define FT_FRAMENAME 3
-#define ED_FRAMENAME 4
-#define FT_URL 5
-#define ED_URL 6
-#define BT_FILEOPEN 7
-#define NM_MARGINHEIGHT 8
-#define FT_MARGINHEIGHT 9
-#define NM_MARGINWIDTH 10
-#define FT_MARGINWIDTH 11
-#define GB_MARGIN 12
-#define RB_SCROLLINGON 13
-#define RB_SCROLLINGOFF 14
-#define RB_SCROLLINGAUTO 15
-#define GB_SCROLLING 16
-#define GB_BORDER 17
-#define RB_FRMBORDER_ON 18
-#define RB_FRMBORDER_INHERIT 19
-#define RB_FRMBORDER_OFF 20
-#define CB_MARGINWIDTHDEFAULT 21
-#define CB_MARGINHEIGHTDEFAULT 22
-#define FL_SEP_LEFT 46
-#define FL_SEP_RIGHT 47
-
diff --git a/cui/source/dialogs/svuidlg.src b/cui/source/dialogs/svuidlg.src
index 7c5bce2..d8cd5ea 100644
--- a/cui/source/dialogs/svuidlg.src
+++ b/cui/source/dialogs/svuidlg.src
@@ -393,193 +393,6 @@ Control TB_LINKS
ClipChildren = TRUE ;
};
-ModalDialog MD_INSERT_OBJECT_IFRAME
-{
- HelpID = "cui:ModalDialog:MD_INSERT_OBJECT_IFRAME";
- Size = MAP_APPFONT ( 302 , 98 ) ;
- Hide = TRUE ;
- Moveable = TRUE ;
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Text [ en-US ] = "Floating Frame Properties" ;
- OKButton 1
- {
- Pos = MAP_APPFONT ( 246 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- DefButton = TRUE ;
- };
- CancelButton 1
- {
- Pos = MAP_APPFONT ( 246 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- };
- HelpButton 1
- {
- Pos = MAP_APPFONT ( 246 , 43 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- };
- FixedText FT_FRAMENAME
- {
- Pos = MAP_APPFONT ( 6 , 7 ) ;
- Size = MAP_APPFONT ( 36 , 10 ) ;
- Text [ en-US ] = "~Name" ;
- };
- Edit ED_FRAMENAME
- {
- HelpID = "cui:Edit:MD_INSERT_OBJECT_IFRAME:ED_FRAMENAME";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 45 , 6 ) ;
- Size = MAP_APPFONT ( 178 , 12 ) ;
- TabStop = TRUE ;
- };
- FixedText FT_URL
- {
- Pos = MAP_APPFONT ( 6 , 25 ) ;
- Size = MAP_APPFONT ( 36 , 10 ) ;
- Text [ en-US ] = "~Contents" ;
- };
- Edit ED_URL
- {
- HelpID = "cui:Edit:MD_INSERT_OBJECT_IFRAME:ED_URL";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 45 , 24 ) ;
- Size = MAP_APPFONT ( 178 , 12 ) ;
- TabStop = TRUE ;
- };
- PushButton BT_FILEOPEN
- {
- HelpID = "cui:PushButton:MD_INSERT_OBJECT_IFRAME:BT_FILEOPEN";
- Pos = MAP_APPFONT ( 226 , 24 ) ;
- Size = MAP_APPFONT ( 14 , 14 ) ;
- Text = "~..." ;
- TabStop = TRUE ;
- };
- RadioButton RB_SCROLLINGON
- {
- HelpID = "cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGON";
- TabStop = TRUE ;
- Pos = MAP_APPFONT ( 12 , 53 ) ;
- Size = MAP_APPFONT ( 54 , 10 ) ;
- Text [ en-US ] = "~On" ;
- };
- RadioButton RB_SCROLLINGOFF
- {
- HelpID = "cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGOFF";
- TabStop = TRUE ;
- Pos = MAP_APPFONT ( 12 , 66 ) ;
- Size = MAP_APPFONT ( 54 , 10 ) ;
- Text [ en-US ] = "O~ff" ;
- };
- RadioButton RB_SCROLLINGAUTO
- {
- HelpID = "cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGAUTO";
- TabStop = TRUE ;
- Pos = MAP_APPFONT ( 12 , 79 ) ;
- Size = MAP_APPFONT ( 54 , 10 ) ;
- Text [ en-US ] = "Au~tomatic" ;
- };
- FixedLine GB_SCROLLING
- {
- Pos = MAP_APPFONT ( 6 , 42 ) ;
- Size = MAP_APPFONT ( 63 , 8 ) ;
- Text [ en-US ] = "Scroll bar" ;
- };
- RadioButton RB_FRMBORDER_ON
- {
- HelpID = "cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_ON";
- TabStop = TRUE ;
- Pos = MAP_APPFONT ( 81 , 53 ) ;
- Size = MAP_APPFONT ( 42 , 10 ) ;
- Text [ en-US ] = "On" ;
- };
- RadioButton RB_FRMBORDER_OFF
- {
- HelpID = "cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_OFF";
- TabStop = TRUE ;
- Pos = MAP_APPFONT ( 81 , 66 ) ;
- Size = MAP_APPFONT ( 42 , 10 ) ;
- Text [ en-US ] = "Off" ;
- };
- FixedLine FL_SEP_LEFT
- {
- Pos = MAP_APPFONT ( 70 , 51 ) ;
- Size = MAP_APPFONT ( 4 , 38 ) ;
- };
- FixedLine GB_BORDER
- {
- Pos = MAP_APPFONT ( 75 , 42 ) ;
- Size = MAP_APPFONT ( 49 , 8 ) ;
- Text [ en-US ] = "Border" ;
- };
- FixedText FT_MARGINWIDTH
- {
- Pos = MAP_APPFONT ( 136 , 56 ) ;
- Size = MAP_APPFONT ( 28 , 10 ) ;
- Text [ en-US ] = "~Width" ;
- };
- NumericField NM_MARGINWIDTH
- {
- HelpID = "cui:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINWIDTH";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 167 , 54 ) ;
- Size = MAP_APPFONT ( 20 , 12 ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 0 ;
- Maximum = 99 ;
- Last = 10 ;
- SpinSize = 1 ;
- };
- CheckBox CB_MARGINWIDTHDEFAULT
- {
- HelpID = "cui:CheckBox:MD_INSERT_OBJECT_IFRAME:CB_MARGINWIDTHDEFAULT";
- TabStop = TRUE ;
- Pos = MAP_APPFONT ( 190 , 56 ) ;
- Size = MAP_APPFONT ( 50 , 10 ) ;
- Text [ en-US ] = "~Default" ;
- };
- FixedText FT_MARGINHEIGHT
- {
- Pos = MAP_APPFONT ( 136 , 74 ) ;
- Size = MAP_APPFONT ( 28 , 10 ) ;
- Text [ en-US ] = "H~eight" ;
- };
- NumericField NM_MARGINHEIGHT
- {
- HelpID = "cui:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINHEIGHT";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 167 , 72 ) ;
- Size = MAP_APPFONT ( 20 , 12 ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 0 ;
- Maximum = 99 ;
- Last = 10 ;
- SpinSize = 1 ;
- };
- CheckBox CB_MARGINHEIGHTDEFAULT
- {
- HelpID = "cui:CheckBox:MD_INSERT_OBJECT_IFRAME:CB_MARGINHEIGHTDEFAULT";
- TabStop = TRUE ;
- Pos = MAP_APPFONT ( 190 , 74 ) ;
- Size = MAP_APPFONT ( 50 , 10 ) ;
- Text [ en-US ] = "Defa~ult" ;
- };
- FixedLine FL_SEP_RIGHT
- {
- Pos = MAP_APPFONT ( 125 , 51 ) ;
- Size = MAP_APPFONT ( 4 , 38 ) ;
- };
- FixedLine GB_MARGIN
- {
- Pos = MAP_APPFONT ( 130 , 42 ) ;
- Size = MAP_APPFONT ( 110 , 8 ) ;
- Text [ en-US ] = "Spacing to contents" ;
- };
-};
-
String MD_INSERT_OBJECT_IFRAME
{
Text [ en-US ] = "Select File for Floating Frame" ;
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index c4486c9..1f9daae 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -116,45 +116,35 @@ public:
class SfxInsertFloatingFrameDialog : public InsertObjectDialog_Impl
{
private:
- FixedText aFTName;
- Edit aEDName;
- FixedText aFTURL;
- Edit aEDURL;
- PushButton aBTOpen;
-
- FixedLine aFLScrolling;
- RadioButton aRBScrollingOn;
- RadioButton aRBScrollingOff;
- RadioButton aRBScrollingAuto;
-
-
- FixedLine aFLSepLeft;
- FixedLine aFLFrameBorder;
- RadioButton aRBFrameBorderOn;
- RadioButton aRBFrameBorderOff;
-
- FixedLine aFLSepRight;
- FixedLine aFLMargin;
- FixedText aFTMarginWidth;
- NumericField aNMMarginWidth;
- CheckBox aCBMarginWidthDefault;
- FixedText aFTMarginHeight;
- NumericField aNMMarginHeight;
- CheckBox aCBMarginHeightDefault;
-
- OKButton aOKButton1;
- CancelButton aCancelButton1;
- HelpButton aHelpButton1;
-
- DECL_STATIC_LINK( SfxInsertFloatingFrameDialog, OpenHdl, PushButton* );
- DECL_STATIC_LINK( SfxInsertFloatingFrameDialog, CheckHdl, CheckBox* );
+ Edit* m_pEDName;
+ Edit* m_pEDURL;
+ PushButton* m_pBTOpen;
+
+ RadioButton* m_pRBScrollingOn;
+ RadioButton* m_pRBScrollingOff;
+ RadioButton* m_pRBScrollingAuto;
+
+ RadioButton* m_pRBFrameBorderOn;
+ RadioButton* m_pRBFrameBorderOff;
+
+ FixedText* m_pFTMarginWidth;
+ NumericField* m_pNMMarginWidth;
+ CheckBox* m_pCBMarginWidthDefault;
+ FixedText* m_pFTMarginHeight;
+ NumericField* m_pNMMarginHeight;
+ CheckBox* m_pCBMarginHeightDefault;
+
+ DECL_STATIC_LINK(SfxInsertFloatingFrameDialog, OpenHdl, PushButton* );
+ DECL_STATIC_LINK(SfxInsertFloatingFrameDialog, CheckHdl, CheckBox* );
+
+ void Init();
public:
- SfxInsertFloatingFrameDialog( Window *pParent,
- const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage );
- SfxInsertFloatingFrameDialog( Window* pParent,
- const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj );
- virtual short Execute();
+ SfxInsertFloatingFrameDialog(Window *pParent,
+ const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage );
+ SfxInsertFloatingFrameDialog( Window* pParent,
+ const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj );
+ virtual short Execute();
};
#endif // _SVX_INSDLG_HXX
diff --git a/cui/uiconfig/ui/insertfloatingframe.ui b/cui/uiconfig/ui/insertfloatingframe.ui
new file mode 100644
index 0000000..a406207
--- /dev/null
+++ b/cui/uiconfig/ui/insertfloatingframe.ui
@@ -0,0 +1,486 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="InsertFloatingFrameDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Floating Frame Properties</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="orientation">vertical</property>
+ <property name="spacing">2</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="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkEntry" id="edname">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="edurl">
+ <property name="width_request">400</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="margin_right">12</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_right">12</property>
+ <property name="label" translatable="yes">Name</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_right">12</property>
+ <property name="label" translatable="yes">Contents</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="buttonbrowse">
+ <property name="label" translatable="yes">Browse...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="halign">end</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="orientation">vertical</property>
+ <child>
+ <object class="GtkRadioButton" id="scrollbaron">
+ <property name="label" translatable="yes">On</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">scrollbaroff</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="scrollbaroff">
+ <property name="label" translatable="yes">Off</property>
+ <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="group">scrollbarauto</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="scrollbarauto">
+ <property name="label" translatable="yes">Automatic</property>
+ <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="group">scrollbaron</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</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">Scroll bar</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="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="GtkRadioButton" id="borderon">
+ <property name="label" translatable="yes">On</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">borderoff</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="borderoff">
+ <property name="label" translatable="yes">Off</property>
+ <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="group">borderon</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </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">Border</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</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="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="widthlabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_right">12</property>
+ <property name="label" translatable="yes">Width</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="heightlabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_right">12</property>
+ <property name="label" translatable="yes">Height</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="width">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="margin_right">12</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="height">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="margin_right">12</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="defaultwidth">
+ <property name="label" translatable="yes">Default</property>
+ <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>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="defaultheight">
+ <property name="label" translatable="yes">Default</property>
+ <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>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Spacing to contents</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">12</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-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="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">ok</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ <action-widget response="0">help</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkAdjustment" id="heightadjustment">
+ <property name="upper">99</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="widthadjustment">
+ <property name="upper">99</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list