diff options
author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-01-30 00:21:47 +0100 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-02-09 14:16:41 +0100 |
commit | 8cb2877b2d58d889a314defc5c2fa51d1cf2bde2 (patch) | |
tree | 8682c92646b74d6b47d82ab852847573636afcb6 /chart2 | |
parent | 654f0932b94163dbed9c66bb32f595e8f6cea834 (diff) |
add the time based charting stuff to the ui files
Change-Id: I5ffb382f61e56d1c07dfb945f08fa354aea9d5fc
Diffstat (limited to 'chart2')
-rw-r--r-- | chart2/source/controller/dialogs/tp_RangeChooser.cxx | 12 | ||||
-rw-r--r-- | chart2/uiconfig/ui/tp_RangeChooser.ui | 119 |
2 files changed, 116 insertions, 15 deletions
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index a244504f544f..571b26070510 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -88,10 +88,9 @@ RangeChooserTabPage::RangeChooserTabPage( Window* pParent get(m_pCB_FirstRowAsLabel, "CB_FIRST_ROW_ASLABELS"); get(m_pCB_FirstColumnAsLabel, "CB_FIRST_COLUMN_ASLABELS"); get(m_pFTTitle, "STR_PAGE_DATA_RANGE");// OH:remove later with dialog title - m_pCB_TimeBased = NULL; - m_pFt_TimeBased = NULL; - m_pEd_TimeStart = NULL; - m_pEd_TimeEnd = NULL; + get(m_pCB_TimeBased, "CB_TIME_BASED"); + get(m_pEd_TimeStart, "ED_TIME_BASED_START"); + get(m_pEd_TimeEnd, "ED_TIME_BASED_END"); m_pFT_Caption->Show(!bHideDescription); @@ -118,11 +117,9 @@ RangeChooserTabPage::RangeChooserTabPage( Window* pParent m_pRB_Rows->SetToggleHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ) ); m_pCB_FirstRowAsLabel->SetToggleHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ) ); m_pCB_FirstColumnAsLabel->SetToggleHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ) ); -#if 0 m_pCB_TimeBased->SetToggleHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ) ); m_pEd_TimeStart->SetModifyHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ) ); m_pEd_TimeEnd->SetModifyHdl( LINK( this, RangeChooserTabPage, ControlChangedHdl ) ); -#endif } RangeChooserTabPage::~RangeChooserTabPage() @@ -210,10 +207,7 @@ void RangeChooserTabPage::changeDialogModelAccordingToControls() || ( m_pCB_FirstRowAsLabel->IsChecked() && !m_pRB_Rows->IsChecked() ); sal_Bool bHasCategories = ( m_pCB_FirstColumnAsLabel->IsChecked() && m_pRB_Columns->IsChecked() ) || ( m_pCB_FirstRowAsLabel->IsChecked() && m_pRB_Rows->IsChecked() ); - sal_Bool bTimeBased = false; -#if 0 sal_Bool bTimeBased = m_pCB_TimeBased->IsChecked(); -#endif Sequence< beans::PropertyValue > aArguments( DataSourceHelper::createArguments( diff --git a/chart2/uiconfig/ui/tp_RangeChooser.ui b/chart2/uiconfig/ui/tp_RangeChooser.ui index c9bbcc6cad6d..bc3a1b34ee38 100644 --- a/chart2/uiconfig/ui/tp_RangeChooser.ui +++ b/chart2/uiconfig/ui/tp_RangeChooser.ui @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.0 on Fri Jan 17 16:26:18 2014 --> <interface> <!-- interface-requires gtk+ 3.0 --> <object class="GtkImage" id="imageIB_RANGE"> @@ -72,10 +71,12 @@ </child> <child> <object class="GtkButton" id="IB_RANGE"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">True</property> <property name="tooltip_markup" translatable="yes">Select data range</property> + <property name="use_action_appearance">False</property> <property name="image">imageIB_RANGE</property> </object> <packing> @@ -88,15 +89,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> <object class="GtkRadioButton" id="RB_DATAROWS"> <property name="label" translatable="yes">Data series in _rows</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="active">True</property> @@ -106,15 +109,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> <child> <object class="GtkRadioButton" id="RB_DATACOLS"> <property name="label" translatable="yes">Data series in _columns</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="active">True</property> @@ -124,15 +129,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">3</property> </packing> </child> <child> <object class="GtkCheckButton" id="CB_FIRST_ROW_ASLABELS"> <property name="label" translatable="yes">_First row as label</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> @@ -140,15 +147,17 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">4</property> </packing> </child> <child> <object class="GtkCheckButton" id="CB_FIRST_COLUMN_ASLABELS"> <property name="label" translatable="yes">F_irst column as label</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> @@ -156,10 +165,108 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="separator1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">6</property> </packing> </child> <child> + <object class="GtkCheckButton" id="CB_TIME_BASED"> + <property name="label" translatable="yes">Time based charting</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="grid1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkEntry" id="ED_TIME_BASED_START"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + <property name="width_chars">5</property> + <property name="text" translatable="yes">0</property> + <property name="input_purpose">number</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="ED_TIME_BASED_END"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + <property name="width_chars">5</property> + <property name="text" translatable="yes">0</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xpad">4</property> + <property name="label" translatable="yes">Start Table Index</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xpad">8</property> + <property name="label" translatable="yes">End Table Index</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">8</property> + </packing> + </child> + <child> <object class="GtkLabel" id="STR_PAGE_DATA_RANGE"> <property name="can_focus">False</property> <property name="label" translatable="yes">Data Range</property> @@ -167,7 +274,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">11</property> </packing> </child> </object> |