Skip to content

C
core
Kaydet (Commit) 66f1e65f authored tarafından Yousuf Philips's avatar Yousuf Philips Kaydeden (comit) Markus Mohrhard
Dosyalara gözat
Seçenekler

tdf#91063 Improve the elements content panel of the chart sidebar 

Change-Id: I6fa83512a1a4949eb4f4dd9f849aab04b5f58374
Reviewed-on: https://gerrit.libreoffice.org/18658Reviewed-by: 's avatarMarkus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: 's avatarMarkus Mohrhard <markus.mohrhard@googlemail.com>
üst 935c228c
Show whitespace changes
Inline Side-by-side
Showing with 146 additions and 119 deletions
chart2/uiconfig/ui/sidebarelements.ui
Dosyayı görüntüle @ 66f1e65f
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 --> <!-- Generated with glade 3.16.1 -->
<interface> <interface>
<requires lib="gtk+" version="3.0"/> <requires lib="gtk+" version="3.0"/>
<object class="GtkGrid" id="ChartElementsPanel"> <object class="GtkGrid" id="ChartElementsPanel">
...@@ -42,6 +42,8 @@ ...@@ -42,6 +42,8 @@
<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>
...@@ -56,6 +58,8 @@ ...@@ -56,6 +58,8 @@
<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>
</object> </object>
...@@ -66,7 +70,7 @@ ...@@ -66,7 +70,7 @@
<object class="GtkLabel" id="l"> <object class="GtkLabel" id="l">
<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">Title</property> <property name="label" translatable="yes">Titles</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
...@@ -79,6 +83,104 @@ ...@@ -79,6 +83,104 @@
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </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="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox" id="box_legend">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="checkbutton_legend">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">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">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="placement_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">_Placement:</property>
<property name="use_underline">True</property>
<property name="ellipsize">end</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="comboboxtext_legend">
<property name="width_request">100</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<items>
<item translatable="yes">Right</item>
<item translatable="yes">Top</item>
<item translatable="yes">Bottom</item>
<item translatable="yes">Left</item>
<item translatable="yes">Manual</item>
</items>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</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="label_legen">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Legend</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> <child>
<object class="GtkFrame" id="frame2"> <object class="GtkFrame" id="frame2">
<property name="visible">True</property> <property name="visible">True</property>
...@@ -109,6 +211,8 @@ ...@@ -109,6 +211,8 @@
<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>
...@@ -123,6 +227,8 @@ ...@@ -123,6 +227,8 @@
<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>
...@@ -137,6 +243,8 @@ ...@@ -137,6 +243,8 @@
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -151,6 +259,8 @@ ...@@ -151,6 +259,8 @@
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -165,6 +275,8 @@ ...@@ -165,6 +275,8 @@
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">2</property> <property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -179,12 +291,13 @@ ...@@ -179,12 +291,13 @@
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">2</property> <property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="checkbutton_2nd_x_axis"> <object class="GtkCheckButton" id="checkbutton_2nd_x_axis">
<property name="label" translatable="yes">2nd X axis</property> <property name="label" translatable="yes">2nd X axis</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>
...@@ -193,12 +306,13 @@ ...@@ -193,12 +306,13 @@
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">3</property> <property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="checkbutton_2nd_x_axis_title"> <object class="GtkCheckButton" id="checkbutton_2nd_x_axis_title">
<property name="label" translatable="yes">2nd X axis title</property> <property name="label" translatable="yes">2nd X axis title</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>
...@@ -207,12 +321,13 @@ ...@@ -207,12 +321,13 @@
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">3</property> <property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="checkbutton_2nd_y_axis"> <object class="GtkCheckButton" id="checkbutton_2nd_y_axis">
<property name="label" translatable="yes">2nd Y axis</property> <property name="label" translatable="yes">2nd Y axis</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>
...@@ -221,12 +336,13 @@ ...@@ -221,12 +336,13 @@
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">4</property> <property name="top_attach">4</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="checkbutton_2nd_y_axis_title"> <object class="GtkCheckButton" id="checkbutton_2nd_y_axis_title">
<property name="label" translatable="yes">2nd Y axis title</property> <property name="label" translatable="yes">2nd Y axis title</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>
...@@ -235,6 +351,8 @@ ...@@ -235,6 +351,8 @@
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">4</property> <property name="top_attach">4</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
</object> </object>
...@@ -252,105 +370,6 @@ ...@@ -252,105 +370,6 @@
</object> </object>
</child> </child>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</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="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkCheckButton" id="checkbutton_legend">
<property name="label" translatable="yes">Show legend</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="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box_legend">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="placement_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">_Placement:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">comboboxtext_legend</property>
<property name="ellipsize">end</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="comboboxtext_legend">
<property name="visible">True</property>
<property name="can_focus">False</property>
<items>
<item translatable="yes">Bottom</item>
<item translatable="yes">Left</item>
<item translatable="yes">Right</item>
<item translatable="yes">Top</item>
<item translatable="yes">Manual</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">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label_legen">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Legend</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
...@@ -376,8 +395,8 @@ ...@@ -376,8 +395,8 @@
<property name="row_spacing">6</property> <property name="row_spacing">6</property>
<property name="column_spacing">6</property> <property name="column_spacing">6</property>
<child> <child>
<object class="GtkCheckButton" id="checkbutton_gridline_vertical_major"> <object class="GtkCheckButton" id="checkbutton_gridline_horizontal_major">
<property name="label" translatable="yes">Vertical major</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>
...@@ -387,11 +406,13 @@ ...@@ -387,11 +406,13 @@
<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>
<object class="GtkCheckButton" id="checkbutton_gridline_vertical_minor"> <object class="GtkCheckButton" id="checkbutton_gridline_vertical_major">
<property name="label" translatable="yes">Vertical minor</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>
...@@ -399,13 +420,15 @@ ...@@ -399,13 +420,15 @@
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">0</property>
<property name="top_attach">0</property> <property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="checkbutton_gridline_horizontal_major"> <object class="GtkCheckButton" id="checkbutton_gridline_horizontal_minor">
<property name="label" translatable="yes">Horizontal major</property> <property name="label" translatable="yes">Horizontal minor</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>
...@@ -413,13 +436,15 @@ ...@@ -413,13 +436,15 @@
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">1</property>
<property name="top_attach">1</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="GtkCheckButton" id="checkbutton_gridline_horizontal_minor"> <object class="GtkCheckButton" id="checkbutton_gridline_vertical_minor">
<property name="label" translatable="yes">Horizontal minor</property> <property name="label" translatable="yes">Vertical minor</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>
...@@ -429,6 +454,8 @@ ...@@ -429,6 +454,8 @@
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
</object> </object>
...@@ -456,6 +483,8 @@ ...@@ -456,6 +483,8 @@
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -470,7 +499,6 @@ ...@@ -470,7 +499,6 @@
<widget name="checkbutton_z_axis"/> <widget name="checkbutton_z_axis"/>
<widget name="checkbutton_2nd_x_axis"/> <widget name="checkbutton_2nd_x_axis"/>
<widget name="checkbutton_2nd_y_axis"/> <widget name="checkbutton_2nd_y_axis"/>
<widget name="placement_label"/>
<widget name="checkbutton_gridline_vertical_major"/> <widget name="checkbutton_gridline_vertical_major"/>
<widget name="checkbutton_gridline_horizontal_major"/> <widget name="checkbutton_gridline_horizontal_major"/>
</widgets> </widgets>
...@@ -483,7 +511,6 @@ ...@@ -483,7 +511,6 @@
<widget name="checkbutton_z_axis_title"/> <widget name="checkbutton_z_axis_title"/>
<widget name="checkbutton_2nd_x_axis_title"/> <widget name="checkbutton_2nd_x_axis_title"/>
<widget name="checkbutton_2nd_y_axis_title"/> <widget name="checkbutton_2nd_y_axis_title"/>
<widget name="comboboxtext_legend"/>
<widget name="checkbutton_gridline_vertical_minor"/> <widget name="checkbutton_gridline_vertical_minor"/>
<widget name="checkbutton_gridline_horizontal_minor"/> <widget name="checkbutton_gridline_horizontal_minor"/>
</widgets> </widgets>
......
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