Skip to content

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

weld SfxManageStyleSheetPage 

Change-Id: I3769d294e5a5458d3172c330360f7e6207c3d1b1
Reviewed-on: https://gerrit.libreoffice.org/55961
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst c67b7d79
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 45 deletions
include/sfx2/mgetempl.hxx
Dosyayı görüntüle @ e371a4a1
......@@ -37,24 +37,6 @@ class SfxStyleSheetBase;
class SfxManageStyleSheetPage final : public SfxTabPage
{
VclPtr<VclMultiLineEdit> m_pNameRo;
VclPtr<Edit> m_pNameRw;
VclPtr<CheckBox> m_pAutoCB;
VclPtr<FixedText> m_pFollowFt;
VclPtr<ListBox> m_pFollowLb;
VclPtr<PushButton> m_pEditStyleBtn;
VclPtr<FixedText> m_pBaseFt;
VclPtr<ListBox> m_pBaseLb;
VclPtr<PushButton> m_pEditLinkStyleBtn;
VclPtr<FixedText> m_pFilterFt;
VclPtr<ListBox> m_pFilterLb;
VclPtr<FixedText> m_pDescFt;
SfxStyleSheetBase *pStyle;
std::unique_ptr<SfxStyleFamilies> pFamilies;
const SfxStyleFamilyItem *pItem;
......@@ -67,16 +49,30 @@ class SfxManageStyleSheetPage final : public SfxTabPage
OUString aParent;
SfxStyleSearchBits nFlags;
std::unique_ptr<weld::TextView> m_xNameRo;
std::unique_ptr<weld::Entry> m_xNameRw;
std::unique_ptr<weld::CheckButton> m_xAutoCB;
std::unique_ptr<weld::Label> m_xFollowFt;
std::unique_ptr<weld::ComboBoxText> m_xFollowLb;
std::unique_ptr<weld::Button> m_xEditStyleBtn;
std::unique_ptr<weld::Label> m_xBaseFt;
std::unique_ptr<weld::ComboBoxText> m_xBaseLb;
std::unique_ptr<weld::Button> m_xEditLinkStyleBtn;
std::unique_ptr<weld::Label> m_xFilterFt;
std::unique_ptr<weld::ComboBoxText> m_xFilterLb;
std::unique_ptr<weld::Label> m_xDescFt;
std::unique_ptr<weld::Label> m_xNameFt;
friend class SfxStyleDialog;
DECL_LINK( GetFocusHdl, Control&, void );
DECL_LINK( LoseFocusHdl, Control&, void );
DECL_LINK( EditStyleSelectHdl_Impl, ListBox&, void );
DECL_LINK( EditStyleHdl_Impl, Button*, void );
DECL_LINK( EditLinkStyleSelectHdl_Impl, ListBox&, void );
DECL_LINK( EditLinkStyleHdl_Impl, Button*, void );
DECL_LINK(GetFocusHdl, weld::Widget&, void);
DECL_LINK(LoseFocusHdl, weld::Widget&, void);
DECL_LINK(EditStyleSelectHdl_Impl, weld::ComboBoxText&, void);
DECL_LINK(EditStyleHdl_Impl, weld::Button&, void);
DECL_LINK(EditLinkStyleSelectHdl_Impl, weld::ComboBoxText&, void);
DECL_LINK(EditLinkStyleHdl_Impl, weld::Button&, void);
void UpdateName_Impl(ListBox *, const OUString &rNew);
void UpdateName_Impl(weld::ComboBoxText*, const OUString &rNew);
void SetDescriptionText_Impl();
virtual ~SfxManageStyleSheetPage() override;
......@@ -94,7 +90,7 @@ friend class SfxStyleDialog;
virtual DeactivateRC DeactivatePage(SfxItemSet *) override;
public:
SfxManageStyleSheetPage(vcl::Window *pParent, const SfxItemSet &rAttrSet );
SfxManageStyleSheetPage(TabPageParent pParent, const SfxItemSet &rAttrSet);
};
#endif
......
include/vcl/weld.hxx
Dosyayı görüntüle @ e371a4a1
......@@ -281,7 +281,7 @@ public:
}
void save_value() { m_sSavedValue = get_active_text(); }
OUString get_saved_value() const { return m_sSavedValue; }
bool get_value_changed_from_saved() const { return m_sSavedValue != get_active_text(); }
};
......
sfx2/source/dialog/mgetempl.cxx
Dosyayı görüntüle @ e371a4a1
This diff is collapsed.
sfx2/uiconfig/ui/managestylepage.ui
Dosyayı görüntüle @ e371a4a1
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
<!-- Generated with glade 3.22.1 -->
<interface domain="sfx">
<requires lib="gtk+" version="3.18"/>
<object class="GtkBox" id="ManageStylePage">
......@@ -34,10 +34,10 @@
<object class="GtkLabel" id="nameft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes" context="managestylepage|nameft">_Name:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">namerw</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -48,10 +48,10 @@
<object class="GtkLabel" id="nextstyleft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes" context="managestylepage|nextstyleft">Ne_xt style:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">nextstyle</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -62,10 +62,10 @@
<object class="GtkLabel" id="linkedwithft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes" context="managestylepage|linkedwithft">Inherit from:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">linkedwith</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -76,10 +76,10 @@
<object class="GtkLabel" id="categoryft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes" context="managestylepage|categoryft">_Category:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">category</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -103,6 +103,7 @@
<property name="label" translatable="yes" context="managestylepage|editstyle">Edit Style</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">False</property>
</object>
<packing>
<property name="left_attach">2</property>
......@@ -126,6 +127,7 @@
<property name="label" translatable="yes" context="managestylepage|editlinkstyle">Edit Style</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">False</property>
</object>
<packing>
<property name="left_attach">2</property>
......@@ -150,29 +152,38 @@
<property name="can_focus">False</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkTextView" id="namero:border">
<object class="GtkEntry" id="namerw">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="editable">False</property>
<property name="cursor_visible">False</property>
<property name="width_chars">52</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="namerw">
<object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="width_chars">52</property>
<property name="hscrollbar_policy">never</property>
<property name="vscrollbar_policy">never</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTextView" id="namero">
<property name="can_focus">True</property>
<property name="no_show_all">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="editable">False</property>
<property name="cursor_visible">False</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
......@@ -200,6 +211,15 @@
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
</child>
</object>
......@@ -237,10 +257,10 @@
<object class="GtkLabel" id="desc">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="wrap">True</property>
<property name="max_width_chars">52</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
</object>
</child>
</object>
......
vcl/source/window/builder.cxx
Dosyayı görüntüle @ e371a4a1
......@@ -1306,7 +1306,7 @@ vcl::Window* VclBuilder::prepareWidgetOwnScrolling(vcl::Window *pParent, WinBits
{
WinBits nScrollBits = pParent->GetStyle();
nScrollBits &= (WB_AUTOHSCROLL|WB_HSCROLL|WB_AUTOVSCROLL|WB_VSCROLL);
rWinStyle |= nScrollBits;
rWinStyle |= nScrollBits | WB_BORDER;
pParent = pParent->GetParent();
}
......
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