Skip to content

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

weld AddDataItemDialog 

Change-Id: I579d6d555b0f01df22e6f97912712a9ec2bf69a6
Reviewed-on: https://gerrit.libreoffice.org/67532
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst c953ff6c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 95 deletions
svx/source/form/datanavi.cxx
Dosyayı görüntüle @ 2d6313a9
This diff is collapsed.
svx/source/inc/datanavi.hxx
Dosyayı görüntüle @ 2d6313a9
......@@ -373,7 +373,6 @@ namespace svxform
const SfxPoolItem* pState ) override;
};
class SVX_DLLPUBLIC DataNavigatorManager : public SfxChildWindow
{
public:
......@@ -382,36 +381,9 @@ namespace svxform
SFX_DECL_CHILDWINDOW( DataNavigatorManager );
};
class AddDataItemDialog : public ModalDialog
class AddDataItemDialog : public weld::GenericDialogController
{
private:
VclPtr<VclFrame> m_pItemFrame;
VclPtr<FixedText> m_pNameFT;
VclPtr<Edit> m_pNameED;
VclPtr<FixedText> m_pDefaultFT;
VclPtr<Edit> m_pDefaultED;
VclPtr<PushButton> m_pDefaultBtn;
VclPtr<VclFrame> m_pSettingsFrame;
VclPtr<FixedText> m_pDataTypeFT;
VclPtr<ListBox> m_pDataTypeLB;
VclPtr<CheckBox> m_pRequiredCB;
VclPtr<PushButton> m_pRequiredBtn;
VclPtr<CheckBox> m_pRelevantCB;
VclPtr<PushButton> m_pRelevantBtn;
VclPtr<CheckBox> m_pConstraintCB;
VclPtr<PushButton> m_pConstraintBtn;
VclPtr<CheckBox> m_pReadonlyCB;
VclPtr<PushButton> m_pReadonlyBtn;
VclPtr<CheckBox> m_pCalculateCB;
VclPtr<PushButton> m_pCalculateBtn;
VclPtr<OKButton> m_pOKBtn;
css::uno::Reference< css::xforms::XFormsUIHelper1 >
m_xUIHelper;
css::uno::Reference< css::beans::XPropertySet >
......@@ -426,9 +398,31 @@ namespace svxform
OUString const m_sFL_Binding;
OUString const m_sFT_BindingExp;
DECL_LINK( CheckHdl, Button*, void );
DECL_LINK( ConditionHdl, Button*, void );
DECL_LINK( OKHdl, Button*, void);
std::unique_ptr<weld::Frame> m_xItemFrame;
std::unique_ptr<weld::Label> m_xNameFT;
std::unique_ptr<weld::Entry> m_xNameED;
std::unique_ptr<weld::Label> m_xDefaultFT;
std::unique_ptr<weld::Entry> m_xDefaultED;
std::unique_ptr<weld::Button> m_xDefaultBtn;
std::unique_ptr<weld::Widget> m_xSettingsFrame;
std::unique_ptr<weld::Label> m_xDataTypeFT;
std::unique_ptr<weld::ComboBox> m_xDataTypeLB;
std::unique_ptr<weld::CheckButton> m_xRequiredCB;
std::unique_ptr<weld::Button> m_xRequiredBtn;
std::unique_ptr<weld::CheckButton> m_xRelevantCB;
std::unique_ptr<weld::Button> m_xRelevantBtn;
std::unique_ptr<weld::CheckButton> m_xConstraintCB;
std::unique_ptr<weld::Button> m_xConstraintBtn;
std::unique_ptr<weld::CheckButton> m_xReadonlyCB;
std::unique_ptr<weld::Button> m_xReadonlyBtn;
std::unique_ptr<weld::CheckButton> m_xCalculateCB;
std::unique_ptr<weld::Button> m_xCalculateBtn;
std::unique_ptr<weld::Button> m_xOKBtn;
void Check(weld::ToggleButton* pBox);
DECL_LINK(CheckHdl, weld::ToggleButton&, void);
DECL_LINK(ConditionHdl, weld::Button&, void);
DECL_LINK(OKHdl, weld::Button&, void);
void InitDialog();
void InitFromNode();
......@@ -436,10 +430,9 @@ namespace svxform
public:
AddDataItemDialog(
vcl::Window* pParent, ItemNode* _pNode,
weld::Window* pParent, ItemNode* _pNode,
const css::uno::Reference< css::xforms::XFormsUIHelper1 >& _rUIHelper );
virtual ~AddDataItemDialog() override;
virtual void dispose() override;
void InitText( DataItemType _eType );
};
......
svx/uiconfig/ui/adddataitemdialog.ui
Dosyayı görüntüle @ 2d6313a9
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
<!-- Generated with glade 3.22.1 -->
<interface domain="svx">
<requires lib="gtk+" version="3.18"/>
<object class="GtkDialog" id="AddDataItemDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="modal">True</property>
<property name="default_width">0</property>
<property name="default_height">0</property>
<property name="type_hint">dialog</property>
<child>
<placeholder/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<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>
<property name="secondary">True</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="itemframe">
<property name="visible">True</property>
......@@ -35,6 +98,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
<property name="activates_default">True</property>
<property name="width_chars">46</property>
</object>
<packing>
......@@ -47,10 +111,10 @@
<object class="GtkLabel" id="nameft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes" context="adddataitemdialog|nameft">_Name:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">name</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -61,10 +125,10 @@
<object class="GtkLabel" id="valueft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes" context="adddataitemdialog|valueft">_Default value:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">value</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -90,6 +154,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
<property name="activates_default">True</property>
<property name="width_chars">46</property>
</object>
<packing>
......@@ -142,10 +207,10 @@
<object class="GtkLabel" id="datatypeft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes" context="adddataitemdialog|datatypeft">_Data type:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">datatype</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -330,63 +395,6 @@
<property name="position">1</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>
<property name="secondary">True</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">2</property>
</packing>
</child>
</object>
</child>
<action-widgets>
......
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