Skip to content

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

weld ScDPSubtotalOptDlg 

Change-Id: I986346fa26f397fee6f0a2d9d724a1bdfb2e4220
Reviewed-on: https://gerrit.libreoffice.org/67872
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst bc99e56a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 40 deletions
sc/source/ui/dbgui/pvfundlg.cxx
Dosyayı görüntüle @ dfdd717c
This diff is collapsed.
sc/source/ui/inc/pvfundlg.hxx
Dosyayı görüntüle @ dfdd717c
...@@ -131,14 +131,13 @@ private: ...@@ -131,14 +131,13 @@ private:
bool mbEnableLayout; /// true = Enable Layout mode controls. bool mbEnableLayout; /// true = Enable Layout mode controls.
}; };
class ScDPSubtotalOptDlg : public ModalDialog class ScDPSubtotalOptDlg : public weld::GenericDialogController
{ {
public: public:
explicit ScDPSubtotalOptDlg( vcl::Window* pParent, ScDPObject& rDPObj, explicit ScDPSubtotalOptDlg(weld::Window* pParent, ScDPObject& rDPObj,
const ScDPLabelData& rLabelData, const ScDPNameVec& rDataFields, const ScDPLabelData& rLabelData, const ScDPNameVec& rDataFields,
bool bEnableLayout ); bool bEnableLayout );
virtual ~ScDPSubtotalOptDlg() override; virtual ~ScDPSubtotalOptDlg() override;
virtual void dispose() override;
void FillLabelData( ScDPLabelData& rLabelData ) const; void FillLabelData( ScDPLabelData& rLabelData ) const;
private: private:
...@@ -148,35 +147,32 @@ private: ...@@ -148,35 +147,32 @@ private:
ScDPName GetFieldName(const OUString& rLayoutName) const; ScDPName GetFieldName(const OUString& rLayoutName) const;
/** Searches for a listbox entry, starts search at specified position. */ /** Searches for a listbox entry, starts search at specified position. */
sal_Int32 FindListBoxEntry( const ListBox& rLBox, const OUString& rEntry, sal_Int32 nStartPos ) const; sal_Int32 FindListBoxEntry( const weld::ComboBox& rLBox, const OUString& rEntry, sal_Int32 nStartPos ) const;
DECL_LINK( RadioClickHdl, Button*, void ); DECL_LINK( RadioClickHdl, weld::Button&, void );
DECL_LINK( CheckHdl, Button*, void ); DECL_LINK( CheckHdl, weld::Button&, void );
DECL_LINK( SelectHdl, ListBox&, void ); DECL_LINK( SelectHdl, weld::ComboBox&, void );
private: private:
VclPtr<ListBox> m_pLbSortBy; std::unique_ptr<weld::ComboBox> m_xLbSortBy;
VclPtr<RadioButton> m_pRbSortAsc; std::unique_ptr<weld::RadioButton> m_xRbSortAsc;
VclPtr<RadioButton> m_pRbSortDesc; std::unique_ptr<weld::RadioButton> m_xRbSortDesc;
VclPtr<RadioButton> m_pRbSortMan; std::unique_ptr<weld::RadioButton> m_xRbSortMan;
VclPtr<VclContainer> m_pLayoutFrame; std::unique_ptr<weld::Widget> m_xLayoutFrame;
VclPtr<ListBox> m_pLbLayout; std::unique_ptr<weld::ComboBox> m_xLbLayout;
VclPtr<CheckBox> m_pCbLayoutEmpty; std::unique_ptr<weld::CheckButton> m_xCbLayoutEmpty;
VclPtr<CheckBox> m_pCbRepeatItemLabels; std::unique_ptr<weld::CheckButton> m_xCbRepeatItemLabels;
VclPtr<CheckBox> m_pCbShow; std::unique_ptr<weld::CheckButton> m_xCbShow;
VclPtr<NumericField> m_pNfShow; std::unique_ptr<weld::SpinButton> m_xNfShow;
VclPtr<FixedText> m_pFtShow; std::unique_ptr<weld::Label> m_xFtShow;
VclPtr<FixedText> m_pFtShowFrom; std::unique_ptr<weld::Label> m_xFtShowFrom;
VclPtr<ListBox> m_pLbShowFrom; std::unique_ptr<weld::ComboBox> m_xLbShowFrom;
VclPtr<FixedText> m_pFtShowUsing; std::unique_ptr<weld::Label> m_xFtShowUsing;
VclPtr<ListBox> m_pLbShowUsing; std::unique_ptr<weld::ComboBox> m_xLbShowUsing;
VclPtr<VclContainer> m_pHideFrame; std::unique_ptr<weld::Widget> m_xHideFrame;
VclPtr<SvxCheckListBox> m_pLbHide; std::unique_ptr<weld::TreeView> m_xLbHide;
VclPtr<FixedText> m_pFtHierarchy; std::unique_ptr<weld::Label> m_xFtHierarchy;
VclPtr<ListBox> m_pLbHierarchy; std::unique_ptr<weld::ComboBox> m_xLbHierarchy;
std::unique_ptr<ScDPListBoxWrapper> m_xLbLayoutWrp; /// Wrapper for direct usage of API constants.
std::unique_ptr<ScDPListBoxWrapper> m_xLbShowFromWrp; /// Wrapper for direct usage of API constants.
ScDPObject& mrDPObj; /// The DataPilot object (for member names). ScDPObject& mrDPObj; /// The DataPilot object (for member names).
ScDPLabelData maLabelData; /// Cache for members data. ScDPLabelData maLabelData; /// Cache for members data.
......
sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui
Dosyayı görüntüle @ dfdd717c
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 --> <!-- Generated with glade 3.22.1 -->
<interface domain="sc"> <interface domain="sc">
<requires lib="gtk+" version="3.18"/> <requires lib="gtk+" version="3.18"/>
<object class="GtkTreeStore" id="liststore2">
<columns>
<!-- column-name check1 -->
<column type="gboolean"/>
<!-- column-name text -->
<column type="gchararray"/>
<!-- column-name id -->
<column type="gchararray"/>
<!-- column-name checkvis1 -->
<column type="gboolean"/>
</columns>
</object>
<object class="GtkAdjustment" id="adjustment1"> <object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property> <property name="lower">1</property>
<property name="upper">999</property> <property name="upper">999</property>
...@@ -14,7 +26,13 @@ ...@@ -14,7 +26,13 @@
<property name="border_width">6</property> <property name="border_width">6</property>
<property name="title" translatable="yes" context="datafieldoptionsdialog|DataFieldOptionsDialog">Data Field Options</property> <property name="title" translatable="yes" context="datafieldoptionsdialog|DataFieldOptionsDialog">Data Field Options</property>
<property name="resizable">False</property> <property name="resizable">False</property>
<property name="modal">True</property>
<property name="default_width">0</property>
<property name="default_height">0</property>
<property name="type_hint">dialog</property> <property name="type_hint">dialog</property>
<child>
<placeholder/>
</child>
<child internal-child="vbox"> <child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1"> <object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property> <property name="can_focus">False</property>
...@@ -115,7 +133,6 @@ ...@@ -115,7 +133,6 @@
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="active">True</property> <property name="active">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">descending</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
...@@ -131,7 +148,7 @@ ...@@ -131,7 +148,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">manual</property> <property name="group">ascending</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
...@@ -244,10 +261,10 @@ ...@@ -244,10 +261,10 @@
<object class="GtkLabel" id="label3"> <object class="GtkLabel" id="label3">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes" context="datafieldoptionsdialog|label3">_Layout:</property> <property name="label" translatable="yes" context="datafieldoptionsdialog|label3">_Layout:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="mnemonic_widget">layout</property> <property name="mnemonic_widget">layout</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
...@@ -330,10 +347,10 @@ ...@@ -330,10 +347,10 @@
<object class="GtkLabel" id="showfromft"> <object class="GtkLabel" id="showfromft">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes" context="datafieldoptionsdialog|showfromft">_From:</property> <property name="label" translatable="yes" context="datafieldoptionsdialog|showfromft">_From:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="mnemonic_widget">from</property> <property name="mnemonic_widget">from</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
...@@ -344,10 +361,10 @@ ...@@ -344,10 +361,10 @@
<object class="GtkLabel" id="usingft"> <object class="GtkLabel" id="usingft">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes" context="datafieldoptionsdialog|usingft">_Using field:</property> <property name="label" translatable="yes" context="datafieldoptionsdialog|usingft">_Using field:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="mnemonic_widget">using</property> <property name="mnemonic_widget">using</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
...@@ -363,10 +380,10 @@ ...@@ -363,10 +380,10 @@
<object class="GtkLabel" id="showft"> <object class="GtkLabel" id="showft">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes" context="datafieldoptionsdialog|showft">items</property> <property name="label" translatable="yes" context="datafieldoptionsdialog|showft">items</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="mnemonic_widget">layout</property> <property name="mnemonic_widget">layout</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
...@@ -454,13 +471,53 @@ ...@@ -454,13 +471,53 @@
<property name="top_padding">6</property> <property name="top_padding">6</property>
<property name="left_padding">12</property> <property name="left_padding">12</property>
<child> <child>
<object class="svxcorelo-SvxCheckListBox" id="hideitems:border"> <object class="GtkScrolledWindow">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="vexpand">True</property> <property name="vexpand">True</property>
<child internal-child="selection"> <property name="shadow_type">in</property>
<object class="GtkTreeSelection" id="Check List Box-selection1"/> <child>
<object class="GtkTreeView" id="hideitems">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="model">liststore2</property>
<property name="headers_visible">False</property>
<property name="search_column">1</property>
<property name="show_expanders">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="Macro Library List-selection2"/>
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn4">
<property name="resizable">True</property>
<property name="spacing">6</property>
<property name="alignment">0.5</property>
<child>
<object class="GtkCellRendererToggle" id="cellrenderer5"/>
<attributes>
<attribute name="visible">3</attribute>
<attribute name="active">0</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn5">
<property name="resizable">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkCellRendererText" id="cellrenderer4"/>
<attributes>
<attribute name="text">1</attribute>
</attributes>
</child>
</object>
</child>
</object>
</child> </child>
</object> </object>
</child> </child>
...@@ -501,10 +558,10 @@ ...@@ -501,10 +558,10 @@
<object class="GtkLabel" id="hierarchyft"> <object class="GtkLabel" id="hierarchyft">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes" context="datafieldoptionsdialog|hierarchyft">Hierarch_y:</property> <property name="label" translatable="yes" context="datafieldoptionsdialog|hierarchyft">Hierarch_y:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="mnemonic_widget">hierarchy</property> <property name="mnemonic_widget">hierarchy</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <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