Skip to content

C
core
Kaydet (Commit) 2d4223e3 authored tarafından Katarina Behrens's avatar Katarina Behrens
Dosyalara gözat
Seçenekler

Some (mostly HIG) tweaks to chart data series panel 

Additional tweak: use 'Data series %1' as frame label, substitute
%1 by real series name

Change-Id: Id5bee4c2e52ccd98fa40649ec539b3efdee55962
Reviewed-on: https://gerrit.libreoffice.org/17387Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarKatarina Behrens <Katarina.Behrens@cib.de>
üst 93d301a2
Show whitespace changes
Inline Side-by-side
Showing with 221 additions and 62 deletions
chart2/source/controller/sidebar/ChartSeriesPanel.cxx
Dosyayı görüntüle @ 2d4223e3
...@@ -302,9 +302,11 @@ ChartSeriesPanel::ChartSeriesPanel( ...@@ -302,9 +302,11 @@ ChartSeriesPanel::ChartSeriesPanel(
get(mpRBPrimaryAxis, "radiobutton_primary_axis"); get(mpRBPrimaryAxis, "radiobutton_primary_axis");
get(mpRBSecondaryAxis, "radiobutton_secondary_axis"); get(mpRBSecondaryAxis, "radiobutton_secondary_axis");
get(mpBoxLabelPlacement, "datalabel_box");
get(mpLBLabelPlacement, "comboboxtext_label"); get(mpLBLabelPlacement, "comboboxtext_label");
get(mpFTSeriesName, "label_series_name"); get(mpFTSeriesName, "label_series_name");
get(mpFTSeriesTemplate, "label_series_tmpl");
Initialize(); Initialize();
} }
...@@ -330,9 +332,11 @@ void ChartSeriesPanel::dispose() ...@@ -330,9 +332,11 @@ void ChartSeriesPanel::dispose()
mpRBPrimaryAxis.clear(); mpRBPrimaryAxis.clear();
mpRBSecondaryAxis.clear(); mpRBSecondaryAxis.clear();
mpBoxLabelPlacement.clear();
mpLBLabelPlacement.clear(); mpLBLabelPlacement.clear();
mpFTSeriesName.clear(); mpFTSeriesName.clear();
mpFTSeriesTemplate.clear();
PanelLayout::dispose(); PanelLayout::dispose();
} }
...@@ -374,10 +378,12 @@ void ChartSeriesPanel::updateData() ...@@ -374,10 +378,12 @@ void ChartSeriesPanel::updateData()
mpRBPrimaryAxis->Check(bPrimaryAxis); mpRBPrimaryAxis->Check(bPrimaryAxis);
mpRBSecondaryAxis->Check(!bPrimaryAxis); mpRBSecondaryAxis->Check(!bPrimaryAxis);
mpLBLabelPlacement->Enable(bLabelVisible); mpBoxLabelPlacement->Enable(bLabelVisible);
mpLBLabelPlacement->SelectEntryPos(getDataLabelPlacement(mxModel, aCID)); mpLBLabelPlacement->SelectEntryPos(getDataLabelPlacement(mxModel, aCID));
mpFTSeriesName->SetText(getSeriesLabel(mxModel, aCID)); OUString aFrameLabel = mpFTSeriesTemplate->GetText();
aFrameLabel = aFrameLabel.replaceFirst("%1", getSeriesLabel(mxModel, aCID));
mpFTSeriesName->SetText(aFrameLabel);
} }
VclPtr<vcl::Window> ChartSeriesPanel::Create ( VclPtr<vcl::Window> ChartSeriesPanel::Create (
......
chart2/source/controller/sidebar/ChartSeriesPanel.hxx
Dosyayı görüntüle @ 2d4223e3
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <sfx2/sidebar/IContextChangeReceiver.hxx> #include <sfx2/sidebar/IContextChangeReceiver.hxx>
#include <sfx2/sidebar/SidebarModelUpdate.hxx> #include <sfx2/sidebar/SidebarModelUpdate.hxx>
#include <svx/sidebar/PanelLayout.hxx> #include <svx/sidebar/PanelLayout.hxx>
#include <vcl/layout.hxx>
#include "ChartSidebarModifyListener.hxx" #include "ChartSidebarModifyListener.hxx"
#include "ChartSidebarSelectionListener.hxx" #include "ChartSidebarSelectionListener.hxx"
...@@ -91,9 +92,11 @@ private: ...@@ -91,9 +92,11 @@ private:
VclPtr<RadioButton> mpRBPrimaryAxis; VclPtr<RadioButton> mpRBPrimaryAxis;
VclPtr<RadioButton> mpRBSecondaryAxis; VclPtr<RadioButton> mpRBSecondaryAxis;
VclPtr<VclHBox> mpBoxLabelPlacement;
VclPtr<ListBox> mpLBLabelPlacement; VclPtr<ListBox> mpLBLabelPlacement;
VclPtr<FixedText> mpFTSeriesName; VclPtr<FixedText> mpFTSeriesName;
VclPtr<FixedText> mpFTSeriesTemplate;
css::uno::Reference<css::frame::XFrame> mxFrame; css::uno::Reference<css::frame::XFrame> mxFrame;
......
chart2/uiconfig/ui/sidebarseries.ui
Dosyayı görüntüle @ 2d4223e3
...@@ -5,24 +5,43 @@ ...@@ -5,24 +5,43 @@
<object class="GtkGrid" id="ChartSeriesPanel"> <object class="GtkGrid" id="ChartSeriesPanel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="border_width">6</property>
<child> <child>
<object class="GtkGrid" id="grid2"> <object class="GtkBox" id="box1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child> <child>
<object class="GtkLabel" id="label_series_name"> <placeholder/>
</child>
<child>
<object class="GtkFrame" id="frame1">
<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">label</property> <property name="label_xalign">0</property>
</object> <property name="shadow_type">none</property>
<packing> <child>
<property name="left_attach">0</property> <object class="GtkAlignment" id="alignment1">
<property name="top_attach">0</property> <property name="visible">True</property>
</packing> <property name="can_focus">False</property>
</child> <property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child> <child>
<object class="GtkCheckButton" id="checkbutton_label"> <object class="GtkCheckButton" id="checkbutton_label">
<property name="label" translatable="yes">Show data label</property> <property name="label" translatable="yes">Show data labels</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>
...@@ -30,70 +49,117 @@ ...@@ -30,70 +49,117 @@
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="expand">False</property>
<property name="top_attach">1</property> <property name="fill">True</property>
<property name="position">0</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="checkbutton_trendline"> <object class="GtkBox" id="datalabel_box">
<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">False</property>
<property name="receives_default">False</property> <property name="margin_left">12</property>
<property name="xalign">0</property> <property name="spacing">6</property>
<property name="draw_indicator">True</property> <child>
<object class="GtkLabel" id="label_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">P_lacement:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">comboboxtext_label</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="expand">False</property>
<property name="top_attach">2</property> <property name="fill">True</property>
<property name="position">0</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="label2"> <object class="GtkComboBoxText" id="comboboxtext_label">
<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">Axis:</property> <items>
<item translatable="yes">Above</item>
<item translatable="yes">Below</item>
<item translatable="yes">Center</item>
<item translatable="yes">Outside</item>
<item translatable="yes">Inside</item>
<item translatable="yes">Near origin</item>
</items>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="expand">False</property>
<property name="top_attach">3</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">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkRadioButton" id="radiobutton_primary_axis"> <object class="GtkCheckButton" id="checkbutton_trendline">
<property name="label" translatable="yes">Primary Y-Axis</property> <property name="label" translatable="yes">Show 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="active">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="expand">False</property>
<property name="top_attach">3</property> <property name="fill">True</property>
<property name="position">1</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkRadioButton" id="radiobutton_secondary_axis"> <placeholder/>
<property name="label" translatable="yes">Secondary Y-Axis</property> </child>
<child>
<object class="GtkFrame" id="frame3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkBox" id="box6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="checkbutton_y_error">
<property name="label" translatable="yes">Y error bars</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.49000000953674316</property>
<property name="active">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">radiobutton_primary_axis</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="expand">False</property>
<property name="top_attach">4</property> <property name="fill">True</property>
<property name="position">0</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="checkbutton_y_error"> <object class="GtkCheckButton" id="checkbutton_x_error">
<property name="label" translatable="yes">Y Error Bars</property> <property name="label" translatable="yes">X error bars</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>
...@@ -101,50 +167,134 @@ ...@@ -101,50 +167,134 @@
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="expand">False</property>
<property name="top_attach">5</property> <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Error Bars</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="checkbutton_x_error"> <object class="GtkFrame" id="frame2">
<property name="label" translatable="yes">X Error Bars</property> <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkBox" id="box5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkRadioButton" id="radiobutton_primary_axis">
<property name="label" translatable="yes">Primary Y axis</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="active">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="expand">False</property>
<property name="top_attach">5</property> <property name="fill">True</property>
<property name="position">0</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkComboBoxText" id="comboboxtext_label"> <object class="GtkRadioButton" id="radiobutton_secondary_axis">
<property name="label" translatable="yes">Secondary Y axis</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="axis_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<items> <property name="label" translatable="yes">Align Series to Axis</property>
<item translatable="yes">Above</item> <attributes>
<item translatable="yes">Below</item> <attribute name="weight" value="bold"/>
<item translatable="yes">Center</item> </attributes>
<item translatable="yes">Outside</item> </object>
<item translatable="yes">Inside</item> </child>
<item translatable="yes">Near origin</item>
</items>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="expand">False</property>
<property name="top_attach">1</property> <property name="fill">True</property>
<property name="position">4</property>
</packing> </packing>
</child> </child>
<child> <child>
<placeholder/> <object class="GtkLabel" id="label_series_tmpl">
<property name="can_focus">False</property>
<property name="label" translatable="yes">Data series '%1'</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">5</property>
</packing>
</child> </child>
<child> </object>
<placeholder/>
</child> </child>
<child> </object>
<placeholder/> </child>
<child type="label">
<object class="GtkLabel" id="label_series_name">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">label</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child> </child>
</object> </object>
<packing> <packing>
......
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