[Libreoffice-commits] core.git: icon-themes/galaxy icon-themes/tango officecfg/registry sc/uiconfig

2014-11-25 Thread Yousuf Philips 
 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 db1a9ba11750fe8df475907f57a84f99f2f355de
Author: Yousuf Philips 
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/13021
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/icon-themes/galaxy/cmd/lc_colorscaleformatdialog.png 
b/icon-themes/galaxy/cmd/lc_colorscaleformatdialog.png
new file mode 100644
index 000..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 000..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 000..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 000..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 000..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 000..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 000..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 c3a2eaf..ab712a4 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 1518587..1077e09 100644
--- a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
+++ b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
@@ -70,6 +70,10 @@
  
  
  
- 
+ 
+ 
+ 
+ 
+ 
  
 
___

[Libreoffice-commits] core.git: icon-themes/galaxy icon-themes/tango officecfg/registry sc/uiconfig

2014-11-01 Thread Yousuf Philips 
 icon-themes/galaxy/cmd/lc_wraptext.png|binary
 icon-themes/galaxy/cmd/sc_wraptext.png|binary
 icon-themes/tango/cmd/lc_wraptext.png |binary
 icon-themes/tango/cmd/sc_wraptext.png |binary
 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |5 -
 sc/uiconfig/scalc/toolbar/formatobjectbar.xml |2 ++
 6 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 80f49553518e6d344dae81358b8d7fb5f24c3cf1
Author: Yousuf Philips 
Date:   Fri Oct 31 16:08:15 2014 +0400

fdo#60349 - FORMATTING: Icon in Calc toolbar for wrap text

Change-Id: I04390075006bd0492e0c39c5e1bf4a4eb107ed2c
Reviewed-on: https://gerrit.libreoffice.org/12163
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/icon-themes/galaxy/cmd/lc_wraptext.png 
b/icon-themes/galaxy/cmd/lc_wraptext.png
new file mode 100644
index 000..9df8481
Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_wraptext.png differ
diff --git a/icon-themes/galaxy/cmd/sc_wraptext.png 
b/icon-themes/galaxy/cmd/sc_wraptext.png
new file mode 100644
index 000..555db61
Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_wraptext.png differ
diff --git a/icon-themes/tango/cmd/lc_wraptext.png 
b/icon-themes/tango/cmd/lc_wraptext.png
new file mode 100644
index 000..9df8481
Binary files /dev/null and b/icon-themes/tango/cmd/lc_wraptext.png differ
diff --git a/icon-themes/tango/cmd/sc_wraptext.png 
b/icon-themes/tango/cmd/sc_wraptext.png
new file mode 100644
index 000..555db61
Binary files /dev/null and b/icon-themes/tango/cmd/sc_wraptext.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 64eb9ad..9c5e84f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -537,7 +537,10 @@
   
   
 
-  Automatic Row Break
+  Wrap Text
+
+
+  1
 
   
   
diff --git a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml 
b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
index 4386660..4fcc8c1 100644
--- a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
+++ b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
@@ -34,7 +34,9 @@
  
  
  
+ 
  
+ 
  
  
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits