Skip to content

C
core
Kaydet (Commit) 4be80459 authored tarafından Markus Mohrhard's avatar Markus Mohrhard
Dosyalara gözat
Seçenekler

adapt to UX discussion 

Change-Id: I6a7ba1f13cddf20b2751f2ee113427db43978cfa
üst a40526eb
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 116 deletions
chart2/source/controller/sidebar/ChartElementsPanel.cxx
Dosyayı görüntüle @ 4be80459
...@@ -269,8 +269,10 @@ ChartElementsPanel::ChartElementsPanel( ...@@ -269,8 +269,10 @@ ChartElementsPanel::ChartElementsPanel(
get(mpCB2ndYAxis, "checkbutton_2nd_y_axis"); get(mpCB2ndYAxis, "checkbutton_2nd_y_axis");
get(mpCB2ndYAxisTitle, "checkbutton_2nd_y_axis_title"); get(mpCB2ndYAxisTitle, "checkbutton_2nd_y_axis_title");
get(mpCBLegend, "checkbutton_legend"); get(mpCBLegend, "checkbutton_legend");
get(mpCBGridVertical, "checkbutton_gridline_vertical"); get(mpCBGridVerticalMajor, "checkbutton_gridline_vertical_major");
get(mpCBGridHorizontal, "checkbutton_gridline_horizontal"); get(mpCBGridHorizontalMajor, "checkbutton_gridline_horizontal_major");
get(mpCBGridVerticalMinor, "checkbutton_gridline_vertical_minor");
get(mpCBGridHorizontalMinor, "checkbutton_gridline_horizontal_minor");
Initialize(); Initialize();
} }
...@@ -298,8 +300,10 @@ void ChartElementsPanel::dispose() ...@@ -298,8 +300,10 @@ void ChartElementsPanel::dispose()
mpCB2ndYAxis.clear(); mpCB2ndYAxis.clear();
mpCB2ndYAxisTitle.clear(); mpCB2ndYAxisTitle.clear();
mpCBLegend.clear(); mpCBLegend.clear();
mpCBGridVertical.clear(); mpCBGridVerticalMajor.clear();
mpCBGridHorizontal.clear(); mpCBGridHorizontalMajor.clear();
mpCBGridVerticalMinor.clear();
mpCBGridHorizontalMinor.clear();
PanelLayout::dispose(); PanelLayout::dispose();
} }
...@@ -324,8 +328,10 @@ void ChartElementsPanel::Initialize() ...@@ -324,8 +328,10 @@ void ChartElementsPanel::Initialize()
mpCB2ndYAxis->SetClickHdl(aLink); mpCB2ndYAxis->SetClickHdl(aLink);
mpCB2ndYAxisTitle->SetClickHdl(aLink); mpCB2ndYAxisTitle->SetClickHdl(aLink);
mpCBLegend->SetClickHdl(aLink); mpCBLegend->SetClickHdl(aLink);
mpCBGridVertical->SetClickHdl(aLink); mpCBGridVerticalMajor->SetClickHdl(aLink);
mpCBGridHorizontal->SetClickHdl(aLink); mpCBGridHorizontalMajor->SetClickHdl(aLink);
mpCBGridVerticalMinor->SetClickHdl(aLink);
mpCBGridHorizontalMinor->SetClickHdl(aLink);
} }
void ChartElementsPanel::updateData() void ChartElementsPanel::updateData()
...@@ -342,8 +348,10 @@ void ChartElementsPanel::updateData() ...@@ -342,8 +348,10 @@ void ChartElementsPanel::updateData()
mpCBZAxisTitle->Check(isTitleVisisble(mxModel, TitleHelper::Z_AXIS_TITLE)); mpCBZAxisTitle->Check(isTitleVisisble(mxModel, TitleHelper::Z_AXIS_TITLE));
mpCB2ndXAxisTitle->Check(isTitleVisisble(mxModel, TitleHelper::SECONDARY_X_AXIS_TITLE)); mpCB2ndXAxisTitle->Check(isTitleVisisble(mxModel, TitleHelper::SECONDARY_X_AXIS_TITLE));
mpCB2ndYAxisTitle->Check(isTitleVisisble(mxModel, TitleHelper::SECONDARY_Y_AXIS_TITLE)); mpCB2ndYAxisTitle->Check(isTitleVisisble(mxModel, TitleHelper::SECONDARY_Y_AXIS_TITLE));
mpCBGridVertical->Check(isGridVisible(mxModel, GridType::VERT_MAJOR)); mpCBGridVerticalMajor->Check(isGridVisible(mxModel, GridType::VERT_MAJOR));
mpCBGridHorizontal->Check(isGridVisible(mxModel, GridType::HOR_MAJOR)); mpCBGridHorizontalMajor->Check(isGridVisible(mxModel, GridType::HOR_MAJOR));
mpCBGridVerticalMinor->Check(isGridVisible(mxModel, GridType::VERT_MINOR));
mpCBGridHorizontalMinor->Check(isGridVisible(mxModel, GridType::HOR_MINOR));
mpCBXAxis->Check(isAxisVisible(mxModel, AxisType::X_MAIN)); mpCBXAxis->Check(isAxisVisible(mxModel, AxisType::X_MAIN));
mpCBYAxis->Check(isAxisVisible(mxModel, AxisType::Y_MAIN)); mpCBYAxis->Check(isAxisVisible(mxModel, AxisType::Y_MAIN));
mpCBZAxis->Check(isAxisVisible(mxModel, AxisType::Z_MAIN)); mpCBZAxis->Check(isAxisVisible(mxModel, AxisType::Z_MAIN));
...@@ -434,10 +442,14 @@ IMPL_LINK(ChartElementsPanel, CheckBoxHdl, CheckBox*, pCheckBox) ...@@ -434,10 +442,14 @@ IMPL_LINK(ChartElementsPanel, CheckBoxHdl, CheckBox*, pCheckBox)
setTitleVisible(mxModel, TitleHelper::SECONDARY_Y_AXIS_TITLE, bChecked); setTitleVisible(mxModel, TitleHelper::SECONDARY_Y_AXIS_TITLE, bChecked);
else if (pCheckBox == mpCBLegend.get()) else if (pCheckBox == mpCBLegend.get())
setLegendVisible(mxModel, bChecked); setLegendVisible(mxModel, bChecked);
else if (pCheckBox == mpCBGridVertical.get()) else if (pCheckBox == mpCBGridVerticalMajor.get())
setGridVisible(mxModel, GridType::VERT_MAJOR, bChecked); setGridVisible(mxModel, GridType::VERT_MAJOR, bChecked);
else if (pCheckBox == mpCBGridHorizontal.get()) else if (pCheckBox == mpCBGridHorizontalMajor.get())
setGridVisible(mxModel, GridType::HOR_MAJOR, bChecked); setGridVisible(mxModel, GridType::HOR_MAJOR, bChecked);
else if (pCheckBox == mpCBGridVerticalMinor.get())
setGridVisible(mxModel, GridType::VERT_MINOR, bChecked);
else if (pCheckBox == mpCBGridHorizontalMinor.get())
setGridVisible(mxModel, GridType::HOR_MINOR, bChecked);
return 0; return 0;
} }
......
chart2/source/controller/sidebar/ChartElementsPanel.hxx
Dosyayı görüntüle @ 4be80459
...@@ -85,8 +85,10 @@ private: ...@@ -85,8 +85,10 @@ private:
VclPtr<CheckBox> mpCB2ndYAxis; VclPtr<CheckBox> mpCB2ndYAxis;
VclPtr<CheckBox> mpCB2ndYAxisTitle; VclPtr<CheckBox> mpCB2ndYAxisTitle;
VclPtr<CheckBox> mpCBLegend; VclPtr<CheckBox> mpCBLegend;
VclPtr<CheckBox> mpCBGridVertical; VclPtr<CheckBox> mpCBGridVerticalMajor;
VclPtr<CheckBox> mpCBGridHorizontal; VclPtr<CheckBox> mpCBGridHorizontalMajor;
VclPtr<CheckBox> mpCBGridVerticalMinor;
VclPtr<CheckBox> mpCBGridHorizontalMinor;
css::uno::Reference<css::frame::XFrame> mxFrame; css::uno::Reference<css::frame::XFrame> mxFrame;
::sfx2::sidebar::EnumContext maContext; ::sfx2::sidebar::EnumContext maContext;
......
chart2/uiconfig/ui/sidebarelements.ui
Dosyayı görüntüle @ 4be80459
...@@ -333,8 +333,7 @@ ...@@ -333,8 +333,7 @@
<object class="GtkLabel" id="label_grid"> <object class="GtkLabel" id="label_grid">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">Gridlines <property name="label" translatable="yes">Gridlines</property>
</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -347,8 +346,8 @@ ...@@ -347,8 +346,8 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<child> <child>
<object class="GtkCheckButton" id="checkbutton_gridline_vertical"> <object class="GtkCheckButton" id="checkbutton_gridline_vertical_major">
<property name="label" translatable="yes">Vertical</property> <property name="label" translatable="yes">Vertical Major</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>
...@@ -362,54 +361,14 @@ ...@@ -362,54 +361,14 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkComboBoxText" id="comboboxtext2"> <object class="GtkCheckButton" id="checkbutton_gridline_vertical_minor">
<property name="visible">True</property> <property name="label" translatable="yes">Vertical minor</property>
<property name="can_focus">False</property>
<items>
<item translatable="yes">major</item>
</items>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">12</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkCheckButton" id="checkbutton_gridline_horizontal">
<property name="label" translatable="yes">Horizontal</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>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="yalign">0.56000000238418579</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="comboboxtext3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<items>
<item translatable="yes">major</item>
</items>
</object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
...@@ -420,32 +379,21 @@ ...@@ -420,32 +379,21 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">13</property> <property name="position">12</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label_data">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Data</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">14</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkBox" id="box10"> <object class="GtkBox" id="box9">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<child> <child>
<object class="GtkCheckButton" id="checkbutton_label"> <object class="GtkCheckButton" id="checkbutton_gridline_horizontal_major">
<property name="label" translatable="yes">Show label</property> <property name="label" translatable="yes">Horizontal Major</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>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="yalign">0.56000000238418579</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
</object> </object>
<packing> <packing>
...@@ -455,53 +403,14 @@ ...@@ -455,53 +403,14 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkComboBoxText" id="comboboxtext4"> <object class="GtkCheckButton" id="checkbutton_gridline_horizontal_minor">
<property name="visible">True</property> <property name="label" translatable="yes">Horizontal major</property>
<property name="can_focus">False</property>
<items>
<item translatable="yes">above</item>
</items>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">15</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkCheckButton" id="checkbutton_trendline">
<property name="label" translatable="yes">Trendline</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>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="comboboxtext5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<items>
<item translatable="yes">linear</item>
</items>
</object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
...@@ -512,7 +421,7 @@ ...@@ -512,7 +421,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">16</property> <property name="position">13</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