[Libreoffice-commits] core.git: chart2/source chart2/uiconfig
Katarina Behrens
Katarina.Behrens at cib.de
Thu Jul 30 08:29:49 PDT 2015
chart2/source/controller/sidebar/ChartAxisPanel.cxx | 6 +
chart2/source/controller/sidebar/ChartAxisPanel.hxx | 2
chart2/uiconfig/ui/sidebaraxis.ui | 100 ++++++++++++--------
3 files changed, 72 insertions(+), 36 deletions(-)
New commits:
commit 00edc9567f5c5e45047edf46e0f994c285cfc4be
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Wed Jul 29 15:55:54 2015 +0200
Some (mostly HIG) tweaks to chart axis panel
+ added a text orientation spinbox to .ui file, but it does nothing so
far
Change-Id: Idb9177683c46fba50a153aff795aab7a2f419694
Reviewed-on: https://gerrit.libreoffice.org/17402
Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
index a9dcae7..fa6100e 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
@@ -197,6 +197,8 @@ ChartAxisPanel::ChartAxisPanel(
get(mpCBReverse, "checkbutton_reverse");
get(mpLBLabelPos, "comboboxtext_label_position");
+ //FIXME: add text orientation spinbox + its handler
+ get(mpGridLabel, "label_props");
Initialize();
}
@@ -219,6 +221,7 @@ void ChartAxisPanel::dispose()
mpCBReverse.clear();
mpLBLabelPos.clear();
+ mpGridLabel.clear();
PanelLayout::dispose();
}
@@ -322,7 +325,10 @@ IMPL_LINK(ChartAxisPanel, CheckBoxHdl, CheckBox*, pCheckbox)
bool bChecked = pCheckbox->IsChecked();
if (pCheckbox == mpCBShowLabel.get())
+ {
+ mpGridLabel->Enable(bChecked);
setLabelShown(mxModel, aCID, bChecked);
+ }
else if (pCheckbox == mpCBReverse.get())
setReverse(mxModel, aCID, bChecked);
diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.hxx b/chart2/source/controller/sidebar/ChartAxisPanel.hxx
index c21fa33..e6d878b 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.hxx
@@ -15,6 +15,7 @@
#include <sfx2/sidebar/IContextChangeReceiver.hxx>
#include <sfx2/sidebar/SidebarModelUpdate.hxx>
#include <svx/sidebar/PanelLayout.hxx>
+#include <vcl/layout.hxx>
#include "ChartSidebarModifyListener.hxx"
#include "ChartSidebarSelectionListener.hxx"
@@ -79,6 +80,7 @@ private:
VclPtr<CheckBox> mpCBReverse;
VclPtr<ListBox> mpLBLabelPos;
+ VclPtr<VclGrid> mpGridLabel;
css::uno::Reference<css::frame::XFrame> mxFrame;
diff --git a/chart2/uiconfig/ui/sidebaraxis.ui b/chart2/uiconfig/ui/sidebaraxis.ui
index 8ceb0512..b758e31 100644
--- a/chart2/uiconfig/ui/sidebaraxis.ui
+++ b/chart2/uiconfig/ui/sidebaraxis.ui
@@ -5,13 +5,17 @@
<object class="GtkGrid" id="ChartAxisPanel">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkCheckButton" id="checkbutton_show_label">
- <property name="label" translatable="yes">Show Labels</property>
+ <property name="label" translatable="yes">Show labels</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -38,10 +42,67 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label1">
+ <object class="GtkGrid" id="label_props">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Label Position</property>
+ <property name="margin_left">12</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">5</property>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">_Label position:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">comboboxtext_label_position</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="comboboxtext_label_position">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <items>
+ <item translatable="yes">Near Axis</item>
+ <item translatable="yes">Near Axis (other side)</item>
+ <item translatable="yes">Outside start</item>
+ <item translatable="yes">Outside end</item>
+ </items>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="valign">center</property>
+ <property name="label" translatable="yes">_Text orientation:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">spinbutton1:0degrees</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinbutton1:0degrees">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -49,39 +110,6 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Text orientation</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="comboboxtext_label_position">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <items>
- <item translatable="yes">Near Axis</item>
- <item translatable="yes">Near Axis (other side)</item>
- <item translatable="yes">Outside start</item>
- <item translatable="yes">Outside end</item>
- </items>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<placeholder/>
</child>
</object>
More information about the Libreoffice-commits
mailing list