sw/source/ui/table/tabledlg.cxx | 228 ++++++++++++------------------
sw/source/uibase/inc/prcntfld.hxx | 1
sw/source/uibase/table/tablepg.hxx | 39 ++---
sw/uiconfig/swriter/ui/tablecolumnpage.ui | 91 ++++++++---
4 files changed, 178 insertions(+), 181 deletions(-)
New commits:
commit d86549db56b25c2b201285cb67521cccc11b8bae
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Jun 11 21:18:57 2018 +0100
weld SwTableColumnPage
Change-Id: I2e92de5899bdee7c5a8a7c29c3a0f407cbb5a1d3
Reviewed-on: https://gerrit.libreoffice.org/55645
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 9f9c703d7e60..ee4fb784772f 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -131,7 +131,7 @@ void SwFormatTablePage::Init()
m_xRightBtn->connect_toggled( aLk2 );
m_xCenterBtn->connect_toggled( aLk2 );
- Link<weld::MetricSpinButton&,void> aLk = LINK( this, SwFormatTablePage,
UpDownHdl );
+ Link<weld::MetricSpinButton&,void> aLk = LINK(this, SwFormatTablePage,
ValueChangedHdl);
m_xTopMF->connect_value_changed(aLk);
m_xBottomMF->connect_value_changed(aLk);
m_xRightMF->connect_value_changed(aLk);
@@ -256,9 +256,9 @@ void SwFormatTablePage::RightModify()
}
}
-IMPL_LINK( SwFormatTablePage, UpDownHdl, weld::MetricSpinButton&, rEdit, void )
+IMPL_LINK( SwFormatTablePage, ValueChangedHdl, weld::MetricSpinButton&, rEdit,
void )
{
- if( m_xRightMF->get() == &rEdit)
+ if (m_xRightMF->get() == &rEdit)
RightModify();
ModifyHdl(rEdit);
}
@@ -697,9 +697,8 @@ DeactivateRC SwFormatTablePage::DeactivatePage( SfxItemSet*
_pSet )
}
//Description: Page column configuration
-SwTableColumnPage::SwTableColumnPage(vcl::Window* pParent, const SfxItemSet&
rSet)
- : SfxTabPage(pParent, "TableColumnPage",
- "modules/swriter/ui/tablecolumnpage.ui", &rSet)
+SwTableColumnPage::SwTableColumnPage(TabPageParent pParent, const SfxItemSet&
rSet)
+ : SfxTabPage(pParent, "modules/swriter/ui/tablecolumnpage.ui",
"TableColumnPage", &rSet)
, pTableData(nullptr)
, nTableWidth(0)
, nMinWidth(MINLAY)
@@ -708,28 +707,25 @@ SwTableColumnPage::SwTableColumnPage(vcl::Window*
pParent, const SfxItemSet& rSe
, bModified(false)
, bModifyTable(false)
, bPercentMode(false)
+ , m_aFieldArr { m_xBuilder->weld_metric_spin_button("width1", FUNIT_CM),
+ m_xBuilder->weld_metric_spin_button("width2", FUNIT_CM),
+ m_xBuilder->weld_metric_spin_button("width3", FUNIT_CM),
+ m_xBuilder->weld_metric_spin_button("width4", FUNIT_CM),
+ m_xBuilder->weld_metric_spin_button("width5", FUNIT_CM),
+ m_xBuilder->weld_metric_spin_button("width6", FUNIT_CM) }
+ , m_aTextArr { std::unique_ptr<weld::Label>(m_xBuilder->weld_label("1")),
+ std::unique_ptr<weld::Label>(m_xBuilder->weld_label("2")),
+ std::unique_ptr<weld::Label>(m_xBuilder->weld_label("3")),
+ std::unique_ptr<weld::Label>(m_xBuilder->weld_label("4")),
+ std::unique_ptr<weld::Label>(m_xBuilder->weld_label("5")),
+ std::unique_ptr<weld::Label>(m_xBuilder->weld_label("6")) }
+ , m_xModifyTableCB(m_xBuilder->weld_check_button("adaptwidth"))
+ , m_xProportionalCB(m_xBuilder->weld_check_button("adaptcolumns"))
+ , m_xSpaceFT(m_xBuilder->weld_label("spaceft"))
+ , m_xSpaceED(m_xBuilder->weld_metric_spin_button("space", FUNIT_CM))
+ , m_xUpBtn(m_xBuilder->weld_button("next"))
+ , m_xDownBtn(m_xBuilder->weld_button("back"))
{
- get(m_pModifyTableCB, "adaptwidth");
- get(m_pProportionalCB, "adaptcolumns");
- get(m_pSpaceFT, "spaceft");
- get(m_pSpaceED, "space-nospin");
- get(m_pUpBtn, "next");
- get(m_pDownBtn, "back");
-
- m_aFieldArr[0].set(get<MetricField>("width1"));
- m_aFieldArr[1].set(get<MetricField>("width2"));
- m_aFieldArr[2].set(get<MetricField>("width3"));
- m_aFieldArr[3].set(get<MetricField>("width4"));
- m_aFieldArr[4].set(get<MetricField>("width5"));
- m_aFieldArr[5].set(get<MetricField>("width6"));
-
- m_pTextArr[0] = get<FixedText>("1");
- m_pTextArr[1] = get<FixedText>("2");
- m_pTextArr[2] = get<FixedText>("3");
- m_pTextArr[3] = get<FixedText>("4");
- m_pTextArr[4] = get<FixedText>("5");
- m_pTextArr[5] = get<FixedText>("6");
-
SetExchangeSupport();
const SfxPoolItem* pItem;
@@ -739,26 +735,11 @@ SwTableColumnPage::SwTableColumnPage(vcl::Window*
pParent, const SfxItemSet& rSe
SwTableColumnPage::~SwTableColumnPage()
{
- disposeOnce();
-}
-
-void SwTableColumnPage::dispose()
-{
- m_pModifyTableCB.clear();
- m_pProportionalCB.clear();
- m_pSpaceFT.clear();
- m_pSpaceED.clear();
- m_pUpBtn.clear();
- m_pDownBtn.clear();
- for (auto& p : m_pTextArr)
- p.clear();
- SfxTabPage::dispose();
}
-VclPtr<SfxTabPage> SwTableColumnPage::Create( TabPageParent pParent,
- const SfxItemSet* rAttrSet)
+VclPtr<SfxTabPage> SwTableColumnPage::Create(TabPageParent pParent, const
SfxItemSet* rAttrSet)
{
- return VclPtr<SwTableColumnPage>::Create( pParent.pParent, *rAttrSet );
+ return VclPtr<SwTableColumnPage>::Create(pParent, *rAttrSet);
}
void SwTableColumnPage::Reset( const SfxItemSet* )
@@ -786,19 +767,19 @@ void SwTableColumnPage::Reset( const SfxItemSet* )
{
m_aFieldArr[i].SetPrcntValue( m_aFieldArr[i].NormalizePercent(
GetVisibleWidth(i) ),
FUNIT_TWIP );
- m_aFieldArr[i].SetMin( nMinTwips , FUNIT_TWIP );
- m_aFieldArr[i].SetMax( nMaxTwips , FUNIT_TWIP );
- m_aFieldArr[i].Enable();
- m_pTextArr[i]->Enable();
+ m_aFieldArr[i].set_min(nMinTwips, FUNIT_TWIP);
+ m_aFieldArr[i].set_max(nMaxTwips, FUNIT_TWIP);
+ m_aFieldArr[i].set_sensitive(true);
+ m_aTextArr[i]->set_sensitive(true);
}
if( nNoOfVisibleCols > MET_FIELDS )
- m_pUpBtn->Enable();
+ m_xUpBtn->set_sensitive(true);
for( sal_uInt16 i = nNoOfVisibleCols; i < MET_FIELDS; ++i )
{
- m_aFieldArr[i].SetText( OUString() );
- m_pTextArr[i]->Disable();
+ m_aFieldArr[i].set_text(OUString());
+ m_aTextArr[i]->set_sensitive(false);
}
}
ActivatePage(rSet);
@@ -808,32 +789,28 @@ void SwTableColumnPage::Reset( const SfxItemSet* )
void SwTableColumnPage::Init(bool bWeb)
{
FieldUnit aMetric = ::GetDfltMetric(bWeb);
- Link<SpinField&,void> aLkUp = LINK( this, SwTableColumnPage, UpHdl );
- Link<SpinField&,void> aLkDown = LINK( this, SwTableColumnPage, DownHdl );
- Link<Control&,void> aLkLF = LINK( this, SwTableColumnPage, LoseFocusHdl );
- for( sal_uInt16 i = 0; i < MET_FIELDS; i++ )
+ Link<weld::MetricSpinButton&,void> aLk = LINK(this, SwTableColumnPage,
ValueChangedHdl);
+ for (sal_uInt16 i = 0; i < MET_FIELDS; ++i)
{
aValueTable[i] = i;
m_aFieldArr[i].SetMetric(aMetric);
- m_aFieldArr[i].SetUpHdl( aLkUp );
- m_aFieldArr[i].SetDownHdl( aLkDown );
- m_aFieldArr[i].SetLoseFocusHdl( aLkLF );
+ m_aFieldArr[i].connect_value_changed(aLk);
}
- SetMetric(*m_pSpaceED, aMetric);
+ SetFieldUnit(*m_xSpaceED, aMetric);
- Link<Button*,void> aLk = LINK( this, SwTableColumnPage, AutoClickHdl );
- m_pUpBtn->SetClickHdl( aLk );
- m_pDownBtn->SetClickHdl( aLk );
+ Link<weld::Button&,void> aClickLk = LINK(this, SwTableColumnPage,
AutoClickHdl);
+ m_xUpBtn->connect_clicked(aClickLk);
+ m_xDownBtn->connect_clicked(aClickLk);
- aLk = LINK( this, SwTableColumnPage, ModeHdl );
- m_pModifyTableCB->SetClickHdl( aLk );
- m_pProportionalCB->SetClickHdl( aLk );
+ Link<weld::ToggleButton&,void> aToggleLk = LINK(this, SwTableColumnPage,
ModeHdl);
+ m_xModifyTableCB->connect_toggled(aToggleLk);
+ m_xProportionalCB->connect_toggled(aToggleLk);
}
-IMPL_LINK( SwTableColumnPage, AutoClickHdl, Button*, pControl, void )
+IMPL_LINK(SwTableColumnPage, AutoClickHdl, weld::Button&, rControl, void)
{
//move display window
- if(pControl == m_pDownBtn.get())
+ if (&rControl == m_xDownBtn.get())
{
if(aValueTable[0] > 0)
{
@@ -841,7 +818,7 @@ IMPL_LINK( SwTableColumnPage, AutoClickHdl, Button*,
pControl, void )
rn -= 1;
}
}
- if (pControl == m_pUpBtn.get())
+ if (&rControl == m_xUpBtn.get())
{
if( aValueTable[ MET_FIELDS -1 ] < nNoOfVisibleCols -1 )
{
@@ -854,88 +831,72 @@ IMPL_LINK( SwTableColumnPage, AutoClickHdl, Button*,
pControl, void )
OUString sEntry('~');
OUString sIndex = OUString::number( aValueTable[i] + 1 );
sEntry += sIndex;
- m_pTextArr[i]->SetText( sEntry );
+ m_aTextArr[i]->set_label(sEntry);
}
- m_pDownBtn->Enable(aValueTable[0] > 0);
- m_pUpBtn->Enable(aValueTable[ MET_FIELDS -1 ] < nNoOfVisibleCols -1 );
+ m_xDownBtn->set_sensitive(aValueTable[0] > 0);
+ m_xUpBtn->set_sensitive(aValueTable[ MET_FIELDS -1 ] < nNoOfVisibleCols -1
);
UpdateCols(0);
}
-IMPL_LINK( SwTableColumnPage, UpHdl, SpinField&, rEdit, void )
+IMPL_LINK(SwTableColumnPage, ValueChangedHdl, weld::MetricSpinButton&, rEdit,
void)
{
bModified = true;
- ModifyHdl( static_cast<MetricField*>(&rEdit) );
+ ModifyHdl(&rEdit);
}
-IMPL_LINK( SwTableColumnPage, DownHdl, SpinField&, rEdit, void )
+IMPL_LINK(SwTableColumnPage, ModeHdl, weld::ToggleButton&, rBox, void)
{
- bModified = true;
- ModifyHdl( static_cast<MetricField*>(&rEdit) );
-}
-
-IMPL_LINK( SwTableColumnPage, LoseFocusHdl, Control&, rControl, void )
-{
- MetricField* pEdit = static_cast<MetricField*>(&rControl);
- if (pEdit->IsModified())
+ const bool bCheck = rBox.get_active();
+ if (&rBox == m_xProportionalCB.get())
{
- bModified = true;
- ModifyHdl( pEdit );
+ if (bCheck)
+ m_xModifyTableCB->set_active(true);
+ m_xModifyTableCB->set_sensitive(!bCheck && bModifyTable);
}
}
-IMPL_LINK( SwTableColumnPage, ModeHdl, Button*, pBox, void )
+bool SwTableColumnPage::FillItemSet( SfxItemSet* )
{
- bool bCheck = static_cast<CheckBox*>(pBox)->IsChecked();
- if (pBox == m_pProportionalCB)
+ for (SwPercentField & i : m_aFieldArr)
{
- if(bCheck)
- m_pModifyTableCB->Check();
- m_pModifyTableCB->Enable(!bCheck && bModifyTable);
- }
-}
-
-bool SwTableColumnPage::FillItemSet( SfxItemSet* )
-{
- for(PercentField & i : m_aFieldArr)
- {
- if (i.HasFocus())
+ if (i.has_focus())
{
- LoseFocusHdl(*i.get());
+ ModifyHdl(i.get());
break;
}
}
- if(bModified)
+ if (bModified)
{
pTableData->SetColsChanged();
}
return bModified;
}
-void SwTableColumnPage::ModifyHdl( MetricField const * pField )
+void SwTableColumnPage::ModifyHdl(const weld::MetricSpinButton* pField)
{
- PercentField *pEdit = nullptr;
- sal_uInt16 i;
+ SwPercentField *pEdit = nullptr;
+ sal_uInt16 i;
- for( i = 0; i < MET_FIELDS; i++)
+ for( i = 0; i < MET_FIELDS; i++)
+ {
+ if (pField == m_aFieldArr[i].get())
{
- if (pField == m_aFieldArr[i].get())
- {
- pEdit = &m_aFieldArr[i];
- break;
- }
+ pEdit = &m_aFieldArr[i];
+ break;
}
+ }
- if (MET_FIELDS <= i || !pEdit)
- {
- OSL_ENSURE(false, "cannot happen.");
- return;
- }
+ if (MET_FIELDS <= i || !pEdit)
+ {
+ OSL_ENSURE(false, "cannot happen.");
+ return;
+ }
- SetVisibleWidth(aValueTable[i], static_cast< SwTwips
>(pEdit->DenormalizePercent(pEdit->GetValue( FUNIT_TWIP ))) );
+ SetVisibleWidth(aValueTable[i],
pEdit->DenormalizePercent(pEdit->get_value(FUNIT_TWIP)));
- UpdateCols( aValueTable[i] );
+ UpdateCols( aValueTable[i] );
}
void SwTableColumnPage::UpdateCols( sal_uInt16 nCurrentPos )
@@ -948,8 +909,8 @@ void SwTableColumnPage::UpdateCols( sal_uInt16 nCurrentPos )
}
SwTwips nDiff = nSum - nTableWidth;
- bool bModifyTableChecked = m_pModifyTableCB->IsChecked();
- bool bProp = m_pProportionalCB->IsChecked();
+ bool bModifyTableChecked = m_xModifyTableCB->get_active();
+ bool bProp = m_xProportionalCB->get_active();
if (!bModifyTableChecked && !bProp)
{
@@ -1041,17 +1002,16 @@ void SwTableColumnPage::UpdateCols( sal_uInt16
nCurrentPos )
}
if(!bPercentMode)
- m_pSpaceED->SetValue(m_pSpaceED->Normalize( pTableData->GetSpace() -
nTableWidth) , FUNIT_TWIP);
+ m_xSpaceED->set_value(m_xSpaceED->normalize(pTableData->GetSpace() -
nTableWidth), FUNIT_TWIP);
for( sal_uInt16 i = 0; ( i < nNoOfVisibleCols ) && ( i < MET_FIELDS ); i++)
{
m_aFieldArr[i].SetPrcntValue(m_aFieldArr[i].NormalizePercent(
GetVisibleWidth(aValueTable[i]) ), FUNIT_TWIP);
- m_aFieldArr[i].ClearModifyFlag();
}
}
-void SwTableColumnPage::ActivatePage( const SfxItemSet& )
+void SwTableColumnPage::ActivatePage( const SfxItemSet& )
{
bPercentMode = pTableData->GetWidthPercent() != 0;
for( sal_uInt16 i = 0; (i < MET_FIELDS) && (i < nNoOfVisibleCols); i++ )
@@ -1070,27 +1030,27 @@ void SwTableColumnPage::ActivatePage( const
SfxItemSet& )
UpdateCols(0);
}
bModifyTable = true;
- if(pTableData->GetWidthPercent() ||
+ if (pTableData->GetWidthPercent() ||
text::HoriOrientation::FULL == nTableAlign ||
pTableData->IsLineSelected() )
bModifyTable = false;
- if(bPercentMode)
+ if (bPercentMode)
{
- m_pModifyTableCB->Check(false);
- m_pProportionalCB->Check(false);
+ m_xModifyTableCB->set_active(false);
+ m_xProportionalCB->set_active(false);
}
- else if( !bModifyTable )
+ else if (!bModifyTable)
{
- m_pProportionalCB->Check(false);
- m_pModifyTableCB->Check(false);
+ m_xProportionalCB->set_active(false);
+ m_xModifyTableCB->set_active(false);
}
- m_pSpaceFT->Enable(!bPercentMode);
- m_pSpaceED->Enable(!bPercentMode);
- m_pModifyTableCB->Enable( !bPercentMode && bModifyTable );
- m_pProportionalCB->Enable(!bPercentMode && bModifyTable );
+ m_xSpaceFT->set_sensitive(!bPercentMode);
+ m_xSpaceED->set_sensitive(!bPercentMode);
+ m_xModifyTableCB->set_sensitive( !bPercentMode && bModifyTable );
+ m_xProportionalCB->set_sensitive(!bPercentMode && bModifyTable );
- m_pSpaceED->SetValue(m_pSpaceED->Normalize(
- pTableData->GetSpace() - nTableWidth) , FUNIT_TWIP);
+ m_xSpaceED->set_value(m_xSpaceED->normalize(
+ pTableData->GetSpace() - nTableWidth), FUNIT_TWIP);
}
diff --git a/sw/source/uibase/inc/prcntfld.hxx
b/sw/source/uibase/inc/prcntfld.hxx
index 4e3e0c3f8a2e..21f9978338e8 100644
--- a/sw/source/uibase/inc/prcntfld.hxx
+++ b/sw/source/uibase/inc/prcntfld.hxx
@@ -124,6 +124,7 @@ public:
bool has_focus() const { return m_pField->has_focus(); }
void save_value() { m_pField->save_value(); }
bool get_value_changed_from_saved() const { return
m_pField->get_value_changed_from_saved(); }
+ void set_text(const OUString& rStr) { m_pField->set_text(rStr); }
void SetMetricFieldMin(int nNewMin) { m_pField->set_min(nNewMin,
FUNIT_NONE); }
void SetMetricFieldMax(int nNewMax) { m_pField->set_max(nNewMax,
FUNIT_NONE); }
diff --git a/sw/source/uibase/table/tablepg.hxx
b/sw/source/uibase/table/tablepg.hxx
index 3883de6cd2b6..dc4e4abda802 100644
--- a/sw/source/uibase/table/tablepg.hxx
+++ b/sw/source/uibase/table/tablepg.hxx
@@ -75,7 +75,7 @@ class SwFormatTablePage : public SfxTabPage
DECL_LINK(AutoClickHdl, weld::ToggleButton&, void);
DECL_LINK(RelWidthClickHdl, weld::ToggleButton&, void);
void RightModify();
- DECL_LINK(UpDownHdl, weld::MetricSpinButton&, void);
+ DECL_LINK(ValueChangedHdl, weld::MetricSpinButton&, void);
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
@@ -96,33 +96,31 @@ public:
class SwTableColumnPage : public SfxTabPage
{
- VclPtr<CheckBox> m_pModifyTableCB;
- VclPtr<CheckBox> m_pProportionalCB;
- VclPtr<FixedText> m_pSpaceFT;
- VclPtr<MetricField> m_pSpaceED;
- VclPtr<PushButton> m_pUpBtn;
- VclPtr<PushButton> m_pDownBtn;
-
SwTableRep* pTableData;
- PercentField m_aFieldArr[MET_FIELDS];
- VclPtr<FixedText> m_pTextArr[MET_FIELDS];
SwTwips nTableWidth;
SwTwips nMinWidth;
- sal_uInt16 nNoOfCols;
- sal_uInt16 nNoOfVisibleCols;
+ sal_uInt16 nNoOfCols;
+ sal_uInt16 nNoOfVisibleCols;
// Remember the width, when switching to autoalign
- sal_uInt16 aValueTable[MET_FIELDS];// primary assignment of the
MetricFields
+ sal_uInt16 aValueTable[MET_FIELDS];// primary assignment of the
MetricFields
bool bModified:1;
bool bModifyTable:1;
bool bPercentMode:1;
+ SwPercentField m_aFieldArr[MET_FIELDS];
+ std::unique_ptr<weld::Label> m_aTextArr[MET_FIELDS];
+ std::unique_ptr<weld::CheckButton> m_xModifyTableCB;
+ std::unique_ptr<weld::CheckButton> m_xProportionalCB;
+ std::unique_ptr<weld::Label> m_xSpaceFT;
+ std::unique_ptr<weld::MetricSpinButton> m_xSpaceED;
+ std::unique_ptr<weld::Button> m_xUpBtn;
+ std::unique_ptr<weld::Button> m_xDownBtn;
+
void Init(bool bWeb);
- DECL_LINK( AutoClickHdl, Button *, void );
- void ModifyHdl( MetricField const * pEdit );
- DECL_LINK( UpHdl, SpinField&, void );
- DECL_LINK( DownHdl, SpinField&, void );
- DECL_LINK( LoseFocusHdl, Control&, void );
- DECL_LINK( ModeHdl, Button *, void );
+ DECL_LINK(AutoClickHdl, weld::Button&, void);
+ void ModifyHdl(const weld::MetricSpinButton* pEdit);
+ DECL_LINK(ValueChangedHdl, weld::MetricSpinButton&, void);
+ DECL_LINK(ModeHdl, weld::ToggleButton&, void);
void UpdateCols( sal_uInt16 nCurrentPos );
SwTwips GetVisibleWidth(sal_uInt16 nPos);
void SetVisibleWidth(sal_uInt16 nPos, SwTwips nNewWidth);
@@ -131,9 +129,8 @@ class SwTableColumnPage : public SfxTabPage
using TabPage::DeactivatePage;
public:
- SwTableColumnPage( vcl::Window* pParent, const SfxItemSet& rSet );
+ SwTableColumnPage(TabPageParent pParent, const SfxItemSet& rSet);
virtual ~SwTableColumnPage() override;
- virtual void dispose() override;
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const
SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
diff --git a/sw/uiconfig/swriter/ui/tablecolumnpage.ui
b/sw/uiconfig/swriter/ui/tablecolumnpage.ui
index 28bd74d9a406..5efafa5cce5e 100644
--- a/sw/uiconfig/swriter/ui/tablecolumnpage.ui
+++ b/sw/uiconfig/swriter/ui/tablecolumnpage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="sw">
<requires lib="gtk+" version="3.18"/>
<object class="GtkAdjustment" id="adjustment1">
@@ -13,6 +13,36 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkAdjustment" id="adjustment3">
+ <property name="lower">0.01</property>
+ <property name="upper">56</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment4">
+ <property name="lower">0.01</property>
+ <property name="upper">56</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment5">
+ <property name="lower">0.01</property>
+ <property name="upper">56</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment6">
+ <property name="lower">0.01</property>
+ <property name="upper">56</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment7">
+ <property name="lower">0.01</property>
+ <property name="upper">56</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkImage" id="image7">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -72,7 +102,7 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes"
context="tablecolumnpage|spaceft">Remaining space:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">space-nospin:0.00cm</property>
+ <property name="mnemonic_widget">space</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -80,9 +110,10 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="space-nospin:0.00cm">
+ <object class="GtkSpinButton" id="space">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="activates_default">True</property>
<property name="adjustment">adjustment1</property>
<property name="digits">2</property>
</object>
@@ -119,16 +150,17 @@
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
- <object class="GtkSpinButton" id="width2:0.0cm">
+ <object class="GtkSpinButton" id="width2">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="halign">center</property>
<property name="hexpand">True</property>
- <property name="adjustment">adjustment2</property>
+ <property name="activates_default">True</property>
+ <property name="adjustment">adjustment3</property>
<property name="digits">2</property>
<child internal-child="accessible">
- <object class="AtkObject" id="width2:0.0cm-atkobject">
+ <object class="AtkObject" id="width2-atkobject">
<property name="AtkObject::accessible-name"
translatable="yes" context="tablecolumnpage|width2-atkobject">Column 2
Width</property>
</object>
</child>
@@ -139,16 +171,17 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="width3:0.00cm">
+ <object class="GtkSpinButton" id="width3">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="halign">center</property>
<property name="hexpand">True</property>
- <property name="adjustment">adjustment2</property>
+ <property name="activates_default">True</property>
+ <property name="adjustment">adjustment4</property>
<property name="digits">2</property>
<child internal-child="accessible">
- <object class="AtkObject" id="width3:0.00cm-atkobject">
+ <object class="AtkObject" id="width3-atkobject">
<property name="AtkObject::accessible-name"
translatable="yes" context="tablecolumnpage|width3-atkobject">Column 3
Width</property>
</object>
</child>
@@ -159,16 +192,17 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="width4:0.00cm">
+ <object class="GtkSpinButton" id="width4">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="halign">center</property>
<property name="hexpand">True</property>
- <property name="adjustment">adjustment2</property>
+ <property name="activates_default">True</property>
+ <property name="adjustment">adjustment5</property>
<property name="digits">2</property>
<child internal-child="accessible">
- <object class="AtkObject" id="width4:0.00cm-atkobject">
+ <object class="AtkObject" id="width4-atkobject">
<property name="AtkObject::accessible-name"
translatable="yes" context="tablecolumnpage|width4-atkobject">Column 4
Width</property>
</object>
</child>
@@ -179,16 +213,17 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="width5:0.00cm">
+ <object class="GtkSpinButton" id="width5">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="halign">center</property>
<property name="hexpand">True</property>
- <property name="adjustment">adjustment2</property>
+ <property name="activates_default">True</property>
+ <property name="adjustment">adjustment6</property>
<property name="digits">2</property>
<child internal-child="accessible">
- <object class="AtkObject" id="width5:0.00cm-atkobject">
+ <object class="AtkObject" id="width5-atkobject">
<property name="AtkObject::accessible-name"
translatable="yes" context="tablecolumnpage|width5-atkobject">Column 5
Width</property>
</object>
</child>
@@ -199,16 +234,17 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="width6:0.00cm">
+ <object class="GtkSpinButton" id="width6">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="halign">center</property>
<property name="hexpand">True</property>
- <property name="adjustment">adjustment2</property>
+ <property name="activates_default">True</property>
+ <property name="adjustment">adjustment7</property>
<property name="digits">2</property>
<child internal-child="accessible">
- <object class="AtkObject" id="width6:0.00cm-atkobject">
+ <object class="AtkObject" id="width6-atkobject">
<property name="AtkObject::accessible-name"
translatable="yes" context="tablecolumnpage|width6-atkobject">Column 6
Width</property>
</object>
</child>
@@ -226,7 +262,7 @@
<property name="can_focus">False</property>
<property name="label">_6</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">width6:0.00cm</property>
+ <property name="mnemonic_widget">width6</property>
</object>
<packing>
<property name="left_attach">6</property>
@@ -240,7 +276,7 @@
<property name="can_focus">False</property>
<property name="label">_1</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">width1:0.00cm</property>
+ <property name="mnemonic_widget">width1</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -254,7 +290,7 @@
<property name="can_focus">False</property>
<property name="label">_2</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">width2:0.0cm</property>
+ <property name="mnemonic_widget">width2</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -268,7 +304,7 @@
<property name="can_focus">False</property>
<property name="label">_3</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">width3:0.00cm</property>
+ <property name="mnemonic_widget">width3</property>
</object>
<packing>
<property name="left_attach">3</property>
@@ -282,7 +318,7 @@
<property name="can_focus">False</property>
<property name="label">_5</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">width5:0.00cm</property>
+ <property name="mnemonic_widget">width5</property>
</object>
<packing>
<property name="left_attach">5</property>
@@ -296,7 +332,7 @@
<property name="can_focus">False</property>
<property name="label">_4</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">width4:0.00cm</property>
+ <property name="mnemonic_widget">width4</property>
</object>
<packing>
<property name="left_attach">4</property>
@@ -304,16 +340,17 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="width1:0.00cm">
+ <object class="GtkSpinButton" id="width1">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="halign">center</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
<property name="adjustment">adjustment2</property>
<property name="digits">2</property>
<child internal-child="accessible">
- <object class="AtkObject" id="width1:0.00cm-atkobject">
+ <object class="AtkObject" id="width1-atkobject">
<property name="AtkObject::accessible-name"
translatable="yes" context="tablecolumnpage|width1-atkobject">Column 1
Width</property>
</object>
</child>
@@ -332,6 +369,7 @@
<property name="receives_default">True</property>
<property name="halign">start</property>
<property name="image">image7</property>
+ <property name="always_show_image">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -346,6 +384,7 @@
<property name="receives_default">True</property>
<property name="halign">end</property>
<property name="image">image8</property>
+ <property name="always_show_image">True</property>
</object>
<packing>
<property name="left_attach">7</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
