Skip to content

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

weld RangeChooserTabPage 

Change-Id: I3006d215cc734d28b208c0c4e8b9c719b70d4954
Reviewed-on: https://gerrit.libreoffice.org/61799
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 27a5f7d3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 59 deletions
chart2/source/controller/dialogs/dlg_DataSource.cxx
Dosyayı görüntüle @ aa75bf8b
...@@ -135,9 +135,9 @@ DataSourceDialog::DataSourceDialog(vcl::Window * pParent, ...@@ -135,9 +135,9 @@ DataSourceDialog::DataSourceDialog(vcl::Window * pParent,
m_pTabControl->Show(); m_pTabControl->Show();
m_pRangeChooserTabPage = VclPtr<RangeChooserTabPage>::Create( m_pTabControl, *(m_apDialogModel.get()), m_pRangeChooserTabPage = VclPtr<RangeChooserTabPage>::Create(TabPageParent(m_pTabControl), *(m_apDialogModel.get()),
m_apDocTemplateProvider.get(), this, true /* bHideDescription */ ); m_apDocTemplateProvider.get(), this, true /* bHideDescription */ );
m_pDataSourceTabPage = VclPtr<DataSourceTabPage>::Create( m_pTabControl, *(m_apDialogModel.get()), m_pDataSourceTabPage = VclPtr<DataSourceTabPage>::Create(m_pTabControl, *(m_apDialogModel.get()),
m_apDocTemplateProvider.get(), this, true /* bHideDescription */ ); m_apDocTemplateProvider.get(), this, true /* bHideDescription */ );
m_pTabControl->InsertPage( TP_RANGECHOOSER, SchResId(STR_PAGE_DATA_RANGE) ); m_pTabControl->InsertPage( TP_RANGECHOOSER, SchResId(STR_PAGE_DATA_RANGE) );
......
chart2/source/controller/dialogs/tp_RangeChooser.hxx
Dosyayı görüntüle @ aa75bf8b
...@@ -41,11 +41,9 @@ class RangeChooserTabPage final : public svt::OWizardPage, public RangeSelection ...@@ -41,11 +41,9 @@ class RangeChooserTabPage final : public svt::OWizardPage, public RangeSelection
{ {
public: public:
RangeChooserTabPage( vcl::Window* pParent RangeChooserTabPage(TabPageParent pParent, DialogModel & rDialogModel,
, DialogModel & rDialogModel ChartTypeTemplateProvider* pTemplateProvider,
, ChartTypeTemplateProvider* pTemplateProvider Dialog * pParentDialog, bool bHideDescription = false);
, Dialog * pParentDialog
, bool bHideDescription = false );
virtual ~RangeChooserTabPage() override; virtual ~RangeChooserTabPage() override;
virtual void dispose() override; virtual void dispose() override;
...@@ -69,30 +67,11 @@ private: ...@@ -69,30 +67,11 @@ private:
bool isValid(); bool isValid();
void setDirty(); void setDirty();
DECL_LINK( ChooseRangeHdl, Button*, void ); DECL_LINK( ChooseRangeHdl, weld::Button&, void );
DECL_LINK( ControlChangedHdl, Edit&, void ); DECL_LINK( ControlChangedHdl, weld::Entry&, void );
DECL_LINK( ControlChangedCheckBoxHdl, CheckBox&, void ); DECL_LINK( ControlChangedCheckBoxHdl, weld::ToggleButton&, void );
DECL_LINK( ControlChangedRadioHdl, RadioButton&, void ); DECL_LINK( ControlChangedRadioHdl, weld::ToggleButton&, void );
DECL_LINK( ControlEditedHdl, Edit&, void ); DECL_LINK( ControlEditedHdl, weld::Entry&, void );
VclPtr<FixedText> m_pFT_Caption;
VclPtr<FixedText> m_pFT_Range;
VclPtr<Edit> m_pED_Range;
VclPtr<PushButton> m_pIB_Range;
VclPtr<RadioButton> m_pRB_Rows;
VclPtr<RadioButton> m_pRB_Columns;
VclPtr<CheckBox> m_pCB_FirstRowAsLabel;
VclPtr<CheckBox> m_pCB_FirstColumnAsLabel;
VclPtr<FixedText> m_pFTTitle;
VclPtr<FixedLine> m_pFL_TimeBased;
VclPtr<CheckBox> m_pCB_TimeBased;
VclPtr<FixedText> m_pFT_TimeStart;
VclPtr<Edit> m_pEd_TimeStart;
VclPtr<FixedText> m_pFT_TimeEnd;
VclPtr<Edit> m_pEd_TimeEnd;
sal_Int32 m_nChangingControlCalls; sal_Int32 m_nChangingControlCalls;
bool m_bIsDirty; bool m_bIsDirty;
...@@ -105,6 +84,21 @@ private: ...@@ -105,6 +84,21 @@ private:
VclPtr<Dialog> m_pParentDialog; VclPtr<Dialog> m_pParentDialog;
TabPageNotifiable * m_pTabPageNotifiable; TabPageNotifiable * m_pTabPageNotifiable;
std::unique_ptr<weld::Label> m_xFT_Caption;
std::unique_ptr<weld::Label> m_xFT_Range;
std::unique_ptr<weld::Entry> m_xED_Range;
std::unique_ptr<weld::Button> m_xIB_Range;
std::unique_ptr<weld::RadioButton> m_xRB_Rows;
std::unique_ptr<weld::RadioButton> m_xRB_Columns;
std::unique_ptr<weld::CheckButton> m_xCB_FirstRowAsLabel;
std::unique_ptr<weld::CheckButton> m_xCB_FirstColumnAsLabel;
std::unique_ptr<weld::Label> m_xFTTitle;
std::unique_ptr<weld::Widget> m_xFL_TimeBased;
std::unique_ptr<weld::CheckButton> m_xCB_TimeBased;
std::unique_ptr<weld::Label> m_xFT_TimeStart;
std::unique_ptr<weld::Entry> m_xEd_TimeStart;
std::unique_ptr<weld::Label> m_xFT_TimeEnd;
std::unique_ptr<weld::Entry> m_xEd_TimeEnd;
}; };
} //namespace chart } //namespace chart
......
chart2/uiconfig/ui/tp_RangeChooser.ui
Dosyayı görüntüle @ aa75bf8b
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 --> <!-- Generated with glade 3.22.1 -->
<interface domain="chart"> <interface domain="chart">
<requires lib="gtk+" version="3.18"/> <requires lib="gtk+" version="3.18"/>
<object class="GtkImage" id="imageIB_RANGE"> <object class="GtkImage" id="imageIB_RANGE">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes" context="tp_RangeChooser|imageIB_RANGE|tooltip_text">Select data range</property> <property name="tooltip_text" translatable="yes" context="tp_RangeChooser|imageIB_RANGE|tooltip_text">Select data range</property>
<property name="pixbuf">chart2/res/selectrange.png</property> <property name="icon_name">chart2/res/selectrange.png</property>
</object> </object>
<object class="GtkBox" id="tp_RangeChooser"> <object class="GtkBox" id="tp_RangeChooser">
<property name="visible">True</property> <property name="visible">True</property>
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
<object class="GtkLabel" id="FT_CAPTION_FOR_WIZARD"> <object class="GtkLabel" id="FT_CAPTION_FOR_WIZARD">
<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="tp_RangeChooser|FT_CAPTION_FOR_WIZARD">Choose a Data Range</property> <property name="label" translatable="yes" context="tp_RangeChooser|FT_CAPTION_FOR_WIZARD">Choose a Data Range</property>
<property name="xalign">0</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
...@@ -46,10 +46,10 @@ ...@@ -46,10 +46,10 @@
<object class="GtkLabel" id="FT_RANGE"> <object class="GtkLabel" id="FT_RANGE">
<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="tp_RangeChooser|FT_RANGE">_Data range:</property> <property name="label" translatable="yes" context="tp_RangeChooser|FT_RANGE">_Data range:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="mnemonic_widget">ED_RANGE</property> <property name="mnemonic_widget">ED_RANGE</property>
<property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -60,8 +60,9 @@ ...@@ -60,8 +60,9 @@
<child> <child>
<object class="GtkEntry" id="ED_RANGE"> <object class="GtkEntry" id="ED_RANGE">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="activates_default">True</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -71,9 +72,8 @@ ...@@ -71,9 +72,8 @@
</child> </child>
<child> <child>
<object class="GtkButton" id="IB_RANGE"> <object class="GtkButton" id="IB_RANGE">
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes" context="tp_RangeChooser|IB_RANGE|tooltip_text">Select data range</property> <property name="tooltip_text" translatable="yes" context="tp_RangeChooser|IB_RANGE|tooltip_text">Select data range</property>
<property name="image">imageIB_RANGE</property> <property name="image">imageIB_RANGE</property>
...@@ -94,15 +94,13 @@ ...@@ -94,15 +94,13 @@
<child> <child>
<object class="GtkRadioButton" id="RB_DATAROWS"> <object class="GtkRadioButton" id="RB_DATAROWS">
<property name="label" translatable="yes" context="tp_RangeChooser|RB_DATAROWS">Data series in _rows</property> <property name="label" translatable="yes" context="tp_RangeChooser|RB_DATAROWS">Data series in _rows</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<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">RB_DATACOLS</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -113,13 +111,11 @@ ...@@ -113,13 +111,11 @@
<child> <child>
<object class="GtkRadioButton" id="RB_DATACOLS"> <object class="GtkRadioButton" id="RB_DATACOLS">
<property name="label" translatable="yes" context="tp_RangeChooser|RB_DATACOLS">Data series in _columns</property> <property name="label" translatable="yes" context="tp_RangeChooser|RB_DATACOLS">Data series in _columns</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">RB_DATAROWS</property> <property name="group">RB_DATAROWS</property>
</object> </object>
...@@ -132,9 +128,8 @@ ...@@ -132,9 +128,8 @@
<child> <child>
<object class="GtkCheckButton" id="CB_FIRST_ROW_ASLABELS"> <object class="GtkCheckButton" id="CB_FIRST_ROW_ASLABELS">
<property name="label" translatable="yes" context="tp_RangeChooser|CB_FIRST_ROW_ASLABELS">_First row as label</property> <property name="label" translatable="yes" context="tp_RangeChooser|CB_FIRST_ROW_ASLABELS">_First row as label</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
...@@ -149,9 +144,8 @@ ...@@ -149,9 +144,8 @@
<child> <child>
<object class="GtkCheckButton" id="CB_FIRST_COLUMN_ASLABELS"> <object class="GtkCheckButton" id="CB_FIRST_COLUMN_ASLABELS">
<property name="label" translatable="yes" context="tp_RangeChooser|CB_FIRST_COLUMN_ASLABELS">F_irst column as label</property> <property name="label" translatable="yes" context="tp_RangeChooser|CB_FIRST_COLUMN_ASLABELS">F_irst column as label</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
...@@ -177,7 +171,6 @@ ...@@ -177,7 +171,6 @@
<child> <child>
<object class="GtkCheckButton" id="CB_TIME_BASED"> <object class="GtkCheckButton" id="CB_TIME_BASED">
<property name="label" translatable="yes" context="tp_RangeChooser|CB_TIME_BASED">Time based charting</property> <property name="label" translatable="yes" context="tp_RangeChooser|CB_TIME_BASED">Time based charting</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
...@@ -200,29 +193,27 @@ ...@@ -200,29 +193,27 @@
<object class="GtkEntry" id="ED_TIME_BASED_START"> <object class="GtkEntry" id="ED_TIME_BASED_START">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="activates_default">True</property>
<property name="width_chars">5</property> <property name="width_chars">5</property>
<property name="text" translatable="no">0</property> <property name="text">0</property>
<property name="input_purpose">number</property> <property name="input_purpose">number</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">0</property> <property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkEntry" id="ED_TIME_BASED_END"> <object class="GtkEntry" id="ED_TIME_BASED_END">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="activates_default">True</property>
<property name="width_chars">5</property> <property name="width_chars">5</property>
<property name="text" translatable="no">0</property> <property name="text">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">3</property> <property name="left_attach">3</property>
<property name="top_attach">0</property> <property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -237,8 +228,6 @@ ...@@ -237,8 +228,6 @@
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">0</property> <property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -253,8 +242,6 @@ ...@@ -253,8 +242,6 @@
<packing> <packing>
<property name="left_attach">2</property> <property name="left_attach">2</property>
<property name="top_attach">0</property> <property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
</object> </object>
......
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