icon-themes/galaxy/cmd/lc_colorscaleformatdialog.png |binary icon-themes/galaxy/cmd/lc_conditionalformatdialog.png |binary icon-themes/galaxy/cmd/lc_databarformatdialog.png |binary icon-themes/galaxy/cmd/sc_conditionalformatmenu.png |binary icon-themes/tango/cmd/lc_colorscaleformatdialog.png |binary icon-themes/tango/cmd/lc_conditionalformatdialog.png |binary icon-themes/tango/cmd/lc_databarformatdialog.png |binary icon-themes/tango/cmd/lc_datadatapilotrun.png |binary icon-themes/tango/cmd/sc_conditionalformatmenu.png |binary officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 16 ++++++++++ sc/uiconfig/scalc/toolbar/formatobjectbar.xml | 6 +++ 11 files changed, 21 insertions(+), 1 deletion(-)
New commits: commit 55f3e0d1f99023e8987af78d92267f5b8e414cfb Author: Yousuf Philips <philip...@hotmail.com> Date: Fri Nov 21 18:24:54 2014 +0400 fdo#85594 enable conditional formatting button, add icons, and tooltips Change-Id: Ia6fa678fba21f48de183798bb33ee2e34598b03e Reviewed-on: https://gerrit.libreoffice.org/13022 Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/icon-themes/galaxy/cmd/lc_colorscaleformatdialog.png b/icon-themes/galaxy/cmd/lc_colorscaleformatdialog.png new file mode 100644 index 0000000..7496144 Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_colorscaleformatdialog.png differ diff --git a/icon-themes/galaxy/cmd/lc_conditionalformatdialog.png b/icon-themes/galaxy/cmd/lc_conditionalformatdialog.png new file mode 100644 index 0000000..feb733d Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_conditionalformatdialog.png differ diff --git a/icon-themes/galaxy/cmd/lc_databarformatdialog.png b/icon-themes/galaxy/cmd/lc_databarformatdialog.png new file mode 100644 index 0000000..1148614 Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_databarformatdialog.png differ diff --git a/icon-themes/galaxy/cmd/sc_conditionalformatmenu.png b/icon-themes/galaxy/cmd/sc_conditionalformatmenu.png index 9b28083..e34885a 100644 Binary files a/icon-themes/galaxy/cmd/sc_conditionalformatmenu.png and b/icon-themes/galaxy/cmd/sc_conditionalformatmenu.png differ diff --git a/icon-themes/tango/cmd/lc_colorscaleformatdialog.png b/icon-themes/tango/cmd/lc_colorscaleformatdialog.png new file mode 100644 index 0000000..7496144 Binary files /dev/null and b/icon-themes/tango/cmd/lc_colorscaleformatdialog.png differ diff --git a/icon-themes/tango/cmd/lc_conditionalformatdialog.png b/icon-themes/tango/cmd/lc_conditionalformatdialog.png new file mode 100644 index 0000000..feb733d Binary files /dev/null and b/icon-themes/tango/cmd/lc_conditionalformatdialog.png differ diff --git a/icon-themes/tango/cmd/lc_databarformatdialog.png b/icon-themes/tango/cmd/lc_databarformatdialog.png new file mode 100644 index 0000000..1148614 Binary files /dev/null and b/icon-themes/tango/cmd/lc_databarformatdialog.png differ diff --git a/icon-themes/tango/cmd/lc_datadatapilotrun.png b/icon-themes/tango/cmd/lc_datadatapilotrun.png new file mode 100644 index 0000000..3a5aaea Binary files /dev/null and b/icon-themes/tango/cmd/lc_datadatapilotrun.png differ diff --git a/icon-themes/tango/cmd/sc_conditionalformatmenu.png b/icon-themes/tango/cmd/sc_conditionalformatmenu.png index 9b28083..e34885a 100644 Binary files a/icon-themes/tango/cmd/sc_conditionalformatmenu.png and b/icon-themes/tango/cmd/sc_conditionalformatmenu.png differ diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index 2a1da27e..6256909 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -442,14 +442,21 @@ </node> <node oor:name=".uno:ConditionalFormatDialog" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Conditional Formatting: Condition</value> + </prop> + <prop oor:name="ContextLabel" oor:type="xs:string"> <value xml:lang="en-US">Condition...</value> </prop> + <prop oor:name="Properties" oor:type="xs:int"> <value>1</value> </prop> </node> <node oor:name=".uno:ColorScaleFormatDialog" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Conditional Formatting: Color Scale</value> + </prop> + <prop oor:name="ContextLabel" oor:type="xs:string"> <value xml:lang="en-US">Color Scale...</value> </prop> <prop oor:name="Properties" oor:type="xs:int"> @@ -458,6 +465,9 @@ </node> <node oor:name=".uno:DataBarFormatDialog" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Conditional Formatting: Data Bar</value> + </prop> + <prop oor:name="ContextLabel" oor:type="xs:string"> <value xml:lang="en-US">Data Bar...</value> </prop> <prop oor:name="Properties" oor:type="xs:int"> @@ -466,6 +476,9 @@ </node> <node oor:name=".uno:IconSetFormatDialog" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Conditional Formatting: Icon Set</value> + </prop> + <prop oor:name="ContextLabel" oor:type="xs:string"> <value xml:lang="en-US">Icon Set...</value> </prop> <prop oor:name="Properties" oor:type="xs:int"> @@ -474,6 +487,9 @@ </node> <node oor:name=".uno:CondDateFormatDialog" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Conditional Formatting: Date</value> + </prop> + <prop oor:name="ContextLabel" oor:type="xs:string"> <value xml:lang="en-US">Date...</value> </prop> <prop oor:name="Properties" oor:type="xs:int"> diff --git a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml index 1518587..1077e09 100644 --- a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml +++ b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml @@ -70,6 +70,10 @@ <toolbar:toolbaritem xlink:href=".uno:LineStyle"/> <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:visible="false"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:ConditionalFormatDialog" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:ConditionalFormatDialog"/> + <toolbar:toolbaritem xlink:href=".uno:ColorScaleFormatDialog" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:DataBarFormatDialog" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:IconSetFormatDialog" toolbar:visible="false"/> + <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:ToggleSheetGrid" toolbar:visible="false"/> </toolbar:toolbar>
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits