diff options
author | Tünde Tóth <tundeth@gmail.com> | 2020-03-02 08:56:11 +0100 |
---|---|---|
committer | László Németh <nemeth@numbertext.org> | 2020-03-05 12:27:04 +0100 |
commit | 9fab1ba8ddc59924c633aa17c65f7330a4762726 (patch) | |
tree | a3c1ad1a03c6970182c7345a41d220a1df726d3a /chart2/uiconfig | |
parent | d264170ebbc92f8a920cd51d7f6f2744aa465be1 (diff) |
tdf#75330 add a new overlay/no-overlay feature for the legend
Implement "Show the legend without overlapping the chart" option
for chart legend.
Change-Id: Ifbba4c81136e13995d276434dc17a97b0675428c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89810
Tested-by: Jenkins
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'chart2/uiconfig')
-rw-r--r-- | chart2/uiconfig/ui/sidebarelements.ui | 110 | ||||
-rw-r--r-- | chart2/uiconfig/ui/tp_LegendPosition.ui | 55 |
2 files changed, 124 insertions, 41 deletions
diff --git a/chart2/uiconfig/ui/sidebarelements.ui b/chart2/uiconfig/ui/sidebarelements.ui index 75b25d41ba6d..22b1ff60c87e 100644 --- a/chart2/uiconfig/ui/sidebarelements.ui +++ b/chart2/uiconfig/ui/sidebarelements.ui @@ -94,68 +94,96 @@ <property name="top_padding">6</property> <property name="left_padding">12</property> <child> - <object class="GtkGrid" id="grid5"> + <object class="GtkBox" id="box_legend2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</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="tooltip_text" translatable="yes" context="sidebarelements|checkbutton_legend|tooltip_text">Show Legend</property> - <property name="margin_right">5</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box_legend"> + <object class="GtkGrid" id="grid5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> <child> - <object class="GtkLabel" id="placement_label"> + <object class="GtkCheckButton" id="checkbutton_legend"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="sidebarelements|placement_label">_Placement:</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes" context="sidebarelements|checkbutton_legend|tooltip_text">Show Legend</property> + <property name="margin_right">5</property> <property name="use_underline">True</property> - <property name="ellipsize">end</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> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="comboboxtext_legend"> - <property name="width_request">100</property> + <object class="GtkBox" id="box_legend"> <property name="visible">True</property> <property name="can_focus">False</property> - <items> - <item translatable="yes" context="sidebarelements|comboboxtext_legend">Right</item> - <item translatable="yes" context="sidebarelements|comboboxtext_legend">Top</item> - <item translatable="yes" context="sidebarelements|comboboxtext_legend">Bottom</item> - <item translatable="yes" context="sidebarelements|comboboxtext_legend">Left</item> - <item translatable="yes" context="sidebarelements|comboboxtext_legend">Manual</item> - </items> + <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" context="sidebarelements|placement_label">_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">0</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" context="sidebarelements|comboboxtext_legend">Right</item> + <item translatable="yes" context="sidebarelements|comboboxtext_legend">Top</item> + <item translatable="yes" context="sidebarelements|comboboxtext_legend">Bottom</item> + <item translatable="yes" context="sidebarelements|comboboxtext_legend">Left</item> + </items> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="checkbutton_no_overlay"> + <property name="label" translatable="yes" context="sidebarelements|checkbutton_no_overlay">Show the legend without overlapping the chart</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">False</property> + <property name="use_underline">True</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">1</property> </packing> </child> </object> diff --git a/chart2/uiconfig/ui/tp_LegendPosition.ui b/chart2/uiconfig/ui/tp_LegendPosition.ui index 5ea8d662fbf6..993c040962f3 100644 --- a/chart2/uiconfig/ui/tp_LegendPosition.ui +++ b/chart2/uiconfig/ui/tp_LegendPosition.ui @@ -174,5 +174,60 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkFrame" id="frameOVERLAY"> + <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="spacing">12</property> + <child> + <object class="GtkCheckButton" id="CB_NO_OVERLAY"> + <property name="label" translatable="yes" context="tp_LegendPosition|CB_NO_OVERLAY">Show the legend without overlapping the chart</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">False</property> + <property name="use_underline">True</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> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="TXT_OVERLAY"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="tp_LegendPosition|TXT_OVERLAY">Overlay</property> + <property name="xalign">0</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">2</property> + </packing> + </child> </object> </interface> |