Skip to content

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

weld SwInsertSectionTabPage 

Change-Id: Ifdd794ae97eac3885c828f7610135b60ce7b3b7d
Reviewed-on: https://gerrit.libreoffice.org/69282Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 8bddb3c7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 47 deletions
solenv/sanitizers/ui/modules/swriter.suppr
Dosyayı görüntüle @ a98bb35d
......@@ -231,6 +231,7 @@ sw/uiconfig/swriter/ui/savemonitordialog.ui://GtkLabel[@id='saving'] orphan-labe
sw/uiconfig/swriter/ui/savemonitordialog.ui://GtkLabel[@id='printer'] orphan-label
sw/uiconfig/swriter/ui/savemonitordialog.ui://GtkLabel[@id='printinfo'] orphan-label
sw/uiconfig/swriter/ui/sectionpage.ui://GtkEntry[@id='filename'] duplicate-mnemonic
sw/uiconfig/swriter/ui/sectionpage.ui://GtkEntry[@id='sectionnames-entry'] no-labelled-by
sw/uiconfig/swriter/ui/selectaddressdialog.ui://GtkLabel[@id='desc'] orphan-label
sw/uiconfig/swriter/ui/selectaddressdialog.ui://GtkLabel[@id='label2'] orphan-label
sw/uiconfig/swriter/ui/selectaddressdialog.ui://svtlo-SvSimpleTableContainer[@id='sources:border'] no-labelled-by
......
sw/source/uibase/inc/condedit.hxx
Dosyayı görüntüle @ a98bb35d
......@@ -71,6 +71,7 @@ public:
OUString get_text() const { return m_xControl->get_text(); }
bool get_sensitive() const { return m_xControl->get_sensitive(); }
void set_sensitive(bool bSensitive) { m_xControl->set_sensitive(bSensitive); }
void hide() { m_xControl->hide(); }
weld::Entry& get_widget() { return *m_xControl; }
void ShowBrackets(bool bShow) { bBrackets = bShow; }
......
sw/source/uibase/inc/regionsw.hxx
Dosyayı görüntüle @ a98bb35d
......@@ -133,28 +133,6 @@ public:
// dialog "insert region"
class SwInsertSectionTabPage : public SfxTabPage
{
VclPtr<ComboBox> m_pCurName;
VclPtr<CheckBox> m_pFileCB;
VclPtr<CheckBox> m_pDDECB;
VclPtr<FixedText> m_pDDECommandFT;
VclPtr<FixedText> m_pFileNameFT;
VclPtr<Edit> m_pFileNameED;
VclPtr<PushButton> m_pFilePB;
VclPtr<FixedText> m_pSubRegionFT;
VclPtr<ComboBox> m_pSubRegionED;
VclPtr<CheckBox> m_pProtectCB;
VclPtr<CheckBox> m_pPasswdCB;
VclPtr<PushButton> m_pPasswdPB;
VclPtr<CheckBox> m_pHideCB;
VclPtr<FixedText> m_pConditionFT;
VclPtr<ConditionEdit> m_pConditionED;
// #114856# edit in readonly sections
VclPtr<CheckBox> m_pEditInReadonlyCB;
OUString m_sFileName;
OUString m_sFilterName;
OUString m_sFilePasswd;
......@@ -163,19 +141,39 @@ class SwInsertSectionTabPage : public SfxTabPage
SwWrtShell* m_pWrtSh;
std::unique_ptr<sfx2::DocumentInserter> m_pDocInserter;
DECL_LINK( ChangeHideHdl, Button *, void );
DECL_LINK( ChangeProtectHdl, Button *, void );
DECL_LINK( ChangePasswdHdl, Button *, void );
DECL_LINK( NameEditHdl, Edit&, void );
DECL_LINK( UseFileHdl, Button*, void );
DECL_LINK( FileSearchHdl, Button*, void );
DECL_LINK( DDEHdl, Button*, void );
std::unique_ptr<weld::EntryTreeView> m_xCurName;
std::unique_ptr<weld::CheckButton> m_xFileCB;
std::unique_ptr<weld::CheckButton> m_xDDECB;
std::unique_ptr<weld::Label> m_xDDECommandFT;
std::unique_ptr<weld::Label> m_xFileNameFT;
std::unique_ptr<weld::Entry> m_xFileNameED;
std::unique_ptr<weld::Button> m_xFilePB;
std::unique_ptr<weld::Label> m_xSubRegionFT;
std::unique_ptr<weld::ComboBox> m_xSubRegionED;
std::unique_ptr<weld::CheckButton> m_xProtectCB;
std::unique_ptr<weld::CheckButton> m_xPasswdCB;
std::unique_ptr<weld::Button> m_xPasswdPB;
std::unique_ptr<weld::CheckButton> m_xHideCB;
std::unique_ptr<weld::Label> m_xConditionFT;
std::unique_ptr<SwConditionEdit> m_xConditionED;
// #114856# edit in readonly sections
std::unique_ptr<weld::CheckButton> m_xEditInReadonlyCB;
void ChangePasswd(bool bChange);
DECL_LINK( ChangeHideHdl, weld::ToggleButton&, void );
DECL_LINK( ChangeProtectHdl, weld::ToggleButton&, void );
DECL_LINK( ChangePasswdHdl, weld::Button&, void );
DECL_LINK( TogglePasswdHdl, weld::ToggleButton&, void );
DECL_LINK( NameEditHdl, weld::ComboBox&, void );
DECL_LINK( UseFileHdl, weld::ToggleButton&, void );
DECL_LINK( FileSearchHdl, weld::Button&, void );
DECL_LINK( DDEHdl, weld::ToggleButton&, void );
DECL_LINK( DlgClosedHdl, sfx2::FileDialogHelper*, void );
public:
SwInsertSectionTabPage(vcl::Window *pParent, const SfxItemSet &rAttrSet);
SwInsertSectionTabPage(TabPageParent pParent, const SfxItemSet &rAttrSet);
virtual ~SwInsertSectionTabPage() override;
virtual void dispose() override;
void SetWrtShell(SwWrtShell& rSh);
......
sw/uiconfig/swriter/ui/sectionpage.ui
Dosyayı görüntüle @ a98bb35d
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
<!-- Generated with glade 3.22.1 -->
<interface domain="sw">
<requires lib="gtk+" version="3.18"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkTreeStore" id="liststore1">
<columns>
<!-- column-name text -->
<column type="gchararray"/>
<!-- column-name id -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkGrid" id="SectionPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
......@@ -27,18 +34,62 @@
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="VclComboBoxText" id="sectionnames">
<object class="GtkGrid" id="sectionnames">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="has_entry">True</property>
<property name="dropdown">False</property>
<property name="max_width_chars">18</property>
<child internal-child="entry">
<object class="GtkEntry" id="comboboxtext-entry">
<property name="row_spacing">3</property>
<child>
<object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="sectionnames-list">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="model">liststore1</property>
<property name="headers_visible">False</property>
<property name="headers_clickable">False</property>
<property name="search_column">0</property>
<property name="show_expanders">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection1"/>
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn1">
<child>
<object class="GtkCellRendererText" id="cellrenderertext1"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
</child>
</object>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="sectionnames-entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="activates_default">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
</object>
</child>
......@@ -125,10 +176,10 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes" context="sectionpage|sectionlabel">_Section</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">sectionname</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -149,16 +200,16 @@
</packing>
</child>
<child>
<object class="VclComboBoxText" id="sectionname">
<object class="GtkComboBoxText" id="sectionname">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="has_entry">True</property>
<property name="max_width_chars">18</property>
<child internal-child="entry">
<object class="GtkEntry" id="comboboxtext-entry1">
<property name="can_focus">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
</object>
</child>
</object>
......@@ -177,10 +228,10 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes" context="sectionpage|filelabel">_File name</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">filename</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
......@@ -192,10 +243,10 @@
<object class="GtkLabel" id="ddelabel">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes" context="sectionpage|ddelabel">DDE _command</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">filename</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
......@@ -355,7 +406,7 @@
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
<object class="swlo-ConditionEdit" id="withcond">
<object class="GtkEntry" id="withcond">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
......@@ -388,10 +439,10 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes" context="sectionpage|condlabel">_With Condition</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">withcond</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</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