Skip to content

C
core
Kaydet (Commit) f3226c4c authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

weld SwTextFlowPage 

Change-Id: I9f182874551e7c1e32b2a00e72f7c3a8f1356fc3
Reviewed-on: https://gerrit.libreoffice.org/55461Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 9ac659ec
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 92 deletions
include/vcl/weld.hxx
Dosyayı görüntüle @ f3226c4c
......@@ -405,10 +405,6 @@ public:
return TRISTATE_FALSE;
}
void save_state() { m_eSavedValue = get_state(); }
TriState get_saved_state() const { return m_eSavedValue; }
void set_state(TriState eState)
{
switch (eState)
......@@ -427,6 +423,8 @@ public:
}
}
void save_state() { m_eSavedValue = get_state(); }
TriState get_saved_state() const { return m_eSavedValue; }
bool get_state_changed_from_saved() const { return m_eSavedValue != get_state(); }
virtual void connect_toggled(const Link<ToggleButton&, void>& rLink) { m_aToggleHdl = rLink; }
......
sw/source/ui/table/tabledlg.cxx
Dosyayı görüntüle @ f3226c4c
This diff is collapsed.
sw/source/uibase/table/tablepg.hxx
Dosyayı görüntüle @ f3226c4c
......@@ -145,46 +145,39 @@ public:
class SwTextFlowPage : public SfxTabPage
{
VclPtr<CheckBox> m_pPgBrkCB;
VclPtr<RadioButton> m_pPgBrkRB;
VclPtr<RadioButton> m_pColBrkRB;
VclPtr<RadioButton> m_pPgBrkBeforeRB;
VclPtr<RadioButton> m_pPgBrkAfterRB;
VclPtr<CheckBox> m_pPageCollCB;
VclPtr<ListBox> m_pPageCollLB;
VclPtr<CheckBox> m_pPageNoCB;
VclPtr<NumericField> m_pPageNoNF;
VclPtr<CheckBox> m_pSplitCB;
VclPtr<TriStateBox> m_pSplitRowCB;
VclPtr<CheckBox> m_pKeepCB;
VclPtr<CheckBox> m_pHeadLineCB;
VclPtr<NumericField> m_pRepeatHeaderNF;
VclPtr<VclContainer> m_pRepeatHeaderCombo;
VclPtr<ListBox> m_pTextDirectionLB;
VclPtr<ListBox> m_pVertOrientLB;
SwWrtShell* pShell;
bool bPageBreak;
bool bHtmlMode;
DECL_LINK(PageBreakHdl_Impl, Button*, void);
DECL_LINK(ApplyCollClickHdl_Impl, Button*, void);
DECL_LINK( PageBreakPosHdl_Impl, Button*, void );
DECL_LINK( PageBreakTypeHdl_Impl, Button*, void );
DECL_LINK(PageNoClickHdl_Impl, Button*, void);
DECL_LINK( SplitHdl_Impl, Button*, void );
DECL_STATIC_LINK( SwTextFlowPage, SplitRowHdl_Impl, Button*, void );
DECL_LINK( HeadLineCBClickHdl, Button*, void );
std::unique_ptr<weld::CheckButton> m_xPgBrkCB;
std::unique_ptr<weld::RadioButton> m_xPgBrkRB;
std::unique_ptr<weld::RadioButton> m_xColBrkRB;
std::unique_ptr<weld::RadioButton> m_xPgBrkBeforeRB;
std::unique_ptr<weld::RadioButton> m_xPgBrkAfterRB;
std::unique_ptr<weld::CheckButton> m_xPageCollCB;
std::unique_ptr<weld::ComboBoxText> m_xPageCollLB;
std::unique_ptr<weld::CheckButton> m_xPageNoCB;
std::unique_ptr<weld::SpinButton> m_xPageNoNF;
std::unique_ptr<weld::CheckButton> m_xSplitCB;
std::unique_ptr<weld::CheckButton> m_xSplitRowCB;
std::unique_ptr<weld::CheckButton> m_xKeepCB;
std::unique_ptr<weld::CheckButton> m_xHeadLineCB;
std::unique_ptr<weld::Widget> m_xRepeatHeaderCombo;
std::unique_ptr<weld::SpinButton> m_xRepeatHeaderNF;
std::unique_ptr<weld::ComboBoxText> m_xTextDirectionLB;
std::unique_ptr<weld::ComboBoxText> m_xVertOrientLB;
DECL_LINK(PageBreakHdl_Impl, weld::ToggleButton&, void);
DECL_LINK(ApplyCollClickHdl_Impl, weld::ToggleButton&, void);
DECL_LINK(PageBreakPosHdl_Impl, weld::ToggleButton&, void);
DECL_LINK(PageBreakTypeHdl_Impl, weld::ToggleButton&, void);
DECL_LINK(PageNoClickHdl_Impl, weld::ToggleButton&, void);
DECL_LINK(SplitHdl_Impl, weld::ToggleButton&, void);
DECL_LINK(HeadLineCBClickHdl, weld::ToggleButton&, void);
public:
SwTextFlowPage( vcl::Window* pParent, const SfxItemSet& rSet );
SwTextFlowPage(TabPageParent pParent, const SfxItemSet& rSet);
virtual ~SwTextFlowPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
......
sw/uiconfig/swriter/ui/tabletextflowpage.ui
Dosyayı görüntüle @ f3226c4c
<?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">
<property name="upper">9999</property>
<property name="value">1</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
<property name="value">1</property>
</object>
<object class="GtkAdjustment" id="adjustment2">
<property name="upper">100</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkListStore" id="liststore1">
<columns>
<!-- column-name gchararray1 -->
<column type="gchararray"/>
<!-- column-name gint1 -->
<column type="gint"/>
</columns>
<data>
<row>
<col id="0" translatable="yes" context="tabletextflowpage|liststore1">Horizontal</col>
<col id="1">0</col>
</row>
<row>
<col id="0" translatable="yes" context="tabletextflowpage|liststore1">Vertical</col>
<col id="1">2</col>
</row>
<row>
<col id="0" translatable="yes" context="tabletextflowpage|liststore1">Use superordinate object settings</col>
<col id="1">4</col>
</row>
</data>
</object>
<object class="GtkListStore" id="liststore2">
<columns>
<!-- column-name gchararray1 -->
<column type="gchararray"/>
<!-- column-name gint1 -->
<column type="gint"/>
</columns>
<data>
<row>
<col id="0" translatable="yes" context="tabletextflowpage|liststore2">Top</col>
<col id="1">0</col>
</row>
<row>
<col id="0" translatable="yes" context="tabletextflowpage|liststore2">Centered</col>
<col id="1">1</col>
</row>
<row>
<col id="0" translatable="yes" context="tabletextflowpage|liststore2">Bottom</col>
<col id="1">2</col>
</row>
</data>
</object>
<object class="GtkGrid" id="TableTextFlowPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
......@@ -117,7 +73,6 @@
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">column</property>
<accessibility>
<relation type="member-of" target="break"/>
</accessibility>
......@@ -156,7 +111,6 @@
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">after</property>
<accessibility>
<relation type="member-of" target="break"/>
</accessibility>
......@@ -175,6 +129,7 @@
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">before</property>
<accessibility>
<relation type="member-of" target="break"/>
</accessibility>
......@@ -219,10 +174,12 @@
</child>
<child>
<object class="GtkCheckButton" id="pagenoft">
<property name="label" translatable="yes" context="tabletextflowpage|pagenoft">Page _number</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes" context="tabletextflowpage|pagenoft">Page _number</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">False</property>
</object>
<packing>
<property name="left_attach">2</property>
......@@ -233,6 +190,7 @@
<object class="GtkSpinButton" id="pagenonf">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activates_default">True</property>
<property name="adjustment">adjustment1</property>
<accessibility>
<relation type="labelled-by" target="pagenoft"/>
......@@ -247,8 +205,6 @@
<object class="GtkComboBoxText" id="pagestylelb">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<accessibility>
<relation type="labelled-by" target="pagestyle"/>
</accessibility>
......@@ -335,10 +291,14 @@
</packing>
</child>
<child>
<object class="GtkComboBox" id="textdirection">
<object class="GtkComboBoxText" id="textdirection">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="model">liststore1</property>
<items>
<item id="0" translatable="yes" context="tabletextflowpage|liststore1">Horizontal</item>
<item id="2" translatable="yes" context="tabletextflowpage|liststore1">Vertical</item>
<item id="4" translatable="yes" context="tabletextflowpage|liststore1">Use superordinate object settings</item>
</items>
</object>
<packing>
<property name="left_attach">1</property>
......@@ -404,6 +364,7 @@
<object class="GtkSpinButton" id="repeatheadernf">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activates_default">True</property>
<property name="adjustment">adjustment2</property>
</object>
<packing>
......@@ -474,10 +435,14 @@
</packing>
</child>
<child>
<object class="GtkComboBox" id="vertorient">
<object class="GtkComboBoxText" id="vertorient">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="model">liststore2</property>
<items>
<item id="0" translatable="yes" context="tabletextflowpage|liststore2">Top</item>
<item id="1" translatable="yes" context="tabletextflowpage|liststore2">Centered</item>
<item id="2" translatable="yes" context="tabletextflowpage|liststore2">Bottom</item>
</items>
</object>
<packing>
<property name="left_attach">1</property>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment