From db1a9ba11750fe8df475907f57a84f99f2f355de Mon Sep 17 00:00:00 2001 From: Yousuf Philips Date: Fri, 21 Nov 2014 18:24:54 +0400 Subject: fdo#85594 enable conditional formatting button, add icons, and tooltips MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ia6fa678fba21f48de183798bb33ee2e34598b03e Reviewed-on: https://gerrit.libreoffice.org/13021 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- icon-themes/galaxy/cmd/lc_colorscaleformatdialog.png | Bin 0 -> 393 bytes icon-themes/galaxy/cmd/lc_conditionalformatdialog.png | Bin 0 -> 357 bytes icon-themes/galaxy/cmd/lc_databarformatdialog.png | Bin 0 -> 361 bytes icon-themes/galaxy/cmd/sc_conditionalformatmenu.png | Bin 240 -> 377 bytes icon-themes/tango/cmd/lc_colorscaleformatdialog.png | Bin 0 -> 393 bytes icon-themes/tango/cmd/lc_conditionalformatdialog.png | Bin 0 -> 357 bytes icon-themes/tango/cmd/lc_databarformatdialog.png | Bin 0 -> 361 bytes icon-themes/tango/cmd/lc_datadatapilotrun.png | Bin 0 -> 718 bytes icon-themes/tango/cmd/sc_conditionalformatmenu.png | Bin 240 -> 377 bytes .../data/org/openoffice/Office/UI/CalcCommands.xcu | 16 ++++++++++++++++ sc/uiconfig/scalc/toolbar/formatobjectbar.xml | 6 +++++- 11 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 icon-themes/galaxy/cmd/lc_colorscaleformatdialog.png create mode 100644 icon-themes/galaxy/cmd/lc_conditionalformatdialog.png create mode 100644 icon-themes/galaxy/cmd/lc_databarformatdialog.png create mode 100644 icon-themes/tango/cmd/lc_colorscaleformatdialog.png create mode 100644 icon-themes/tango/cmd/lc_conditionalformatdialog.png create mode 100644 icon-themes/tango/cmd/lc_databarformatdialog.png create mode 100644 icon-themes/tango/cmd/lc_datadatapilotrun.png diff --git a/icon-themes/galaxy/cmd/lc_colorscaleformatdialog.png b/icon-themes/galaxy/cmd/lc_colorscaleformatdialog.png new file mode 100644 index 000000000000..74961440e804 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 000000000000..feb733d044ba 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 000000000000..1148614af14c 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 9b2808370c5d..e34885a2f9ca 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 000000000000..74961440e804 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 000000000000..feb733d044ba 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 000000000000..1148614af14c 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 000000000000..3a5aaea13643 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 9b2808370c5d..e34885a2f9ca 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 c3a2eafaf671..ab712a44af9a 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 @@ + Conditional Formatting: Condition + + Condition... + 1 + Conditional Formatting: Color Scale + + Color Scale... @@ -458,6 +465,9 @@ + Conditional Formatting: Data Bar + + Data Bar... @@ -466,6 +476,9 @@ + Conditional Formatting: Icon Set + + Icon Set... @@ -474,6 +487,9 @@ + Conditional Formatting: Date + + Date... diff --git a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml index 15185879b23f..1077e09f215b 100644 --- a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml +++ b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml @@ -70,6 +70,10 @@ - + + + + + -- cgit v1.2.3