[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - officecfg/registry sw/uiconfig

2015-12-08 Thread Yousuf Philips 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu   |5 
-
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu|8 

 officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu |4 
++--
 sw/uiconfig/swriter/toolbar/drawingobjectbar.xml   |4 

 sw/uiconfig/swriter/toolbar/numobjectbar.xml   |   10 
+-
 sw/uiconfig/swriter/toolbar/oleobjectbar.xml   |2 
+-
 sw/uiconfig/swriter/toolbar/standardbar.xml|2 
+-
 sw/uiconfig/swriter/toolbar/tableobjectbar.xml |4 
++--
 sw/uiconfig/swriter/toolbar/textobjectbar.xml  |6 
--
 9 files changed, 31 insertions(+), 14 deletions(-)

New commits:
commit cbff71864a02674e9b7eba756aa3f881e39b5c27
Author: Yousuf Philips 
Date:   Mon Nov 30 12:23:37 2015 +0400

tdf#81475 Improvements to writer's toolbars

Hide entries in the standard and table toolbars and add useful entries into 
the formatting, object, and bullets toolbars. Also make bullets and table 
toolbars appear on a different line than the drawing toolbar.

Change-Id: I307e8f289fc5b1d8c7dd074989ffc0500697073f
Reviewed-on: https://gerrit.libreoffice.org/20279
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 
(cherry picked from commit bd7f0b0ba3391f3049cb3f2d7b70493a05362316)
Reviewed-on: https://gerrit.libreoffice.org/20443
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 09151c8..392aa6f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2170,6 +2170,9 @@
   
   
 
+  Edit Points
+
+
   Poi~nts
 
 
@@ -2691,7 +2694,7 @@
   
   
 
-  ~New Style from Selection...
+  ~New Style...
 
 
   1
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index d53d549..8aa8fee 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1052,7 +1052,7 @@
   
   
 
-  Align Top
+  Align Top to Anchor
 
 
   1
@@ -1060,7 +1060,7 @@
   
   
 
-  Align Bottom
+  Align Bottom to Anchor
 
 
   1
@@ -1068,7 +1068,7 @@
   
   
 
-  Align Vertical Center
+  Align Middle to Anchor
 
 
   1
@@ -1261,7 +1261,7 @@
   
   
 
-  Optimize
+  Optimize Size
 
 
   1
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
index d710e22..add0851 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
@@ -99,7 +99,7 @@
   
   
 
-  0,0
+  0,1
 
 
   1
@@ -119,7 +119,7 @@
   
   
 
-  0,0
+  0,2
 
 
   1
diff --git a/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml 
b/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml
index 308c8b1..2c3ba2a 100644
--- a/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml
@@ -51,8 +51,12 @@
  
  
  
+ 
+ 
  
  
+ 
+ 
  
  
  
diff --git a/sw/uiconfig/swriter/toolbar/numobjectbar.xml 
b/sw/uiconfig/swriter/toolbar/numobjectbar.xml
index f5b49ee..13119f1 100644
--- a/sw/uiconfig/swriter/toolbar/numobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/numobjectbar.xml
@@ -31,5 +31,13 @@
  
  
  
- 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
 
diff --git a/sw/uiconfig/swriter/toolbar/oleobjectbar.xml 
b/sw/uiconfig/swriter/toolbar/oleobjectbar.xml
index dc1cce5..941ba4f 100644
--- a/sw/uiconfig/swriter/toolbar/oleobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/oleobjectbar.xml
@@ -47,5 +47,5 @@
  
  
  
- 
+ 
 
diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml 
b/sw/uiconfig/swriter/toolbar/standardbar.xml
index 533ef8d..6d36cc0 100644
--- a/sw/uiconfig/swriter/toolbar/standardbar.xml
+++ b/sw/uiconfig/swriter/toolbar/standardbar.xml
@@ -61,7 +61,7 @@
  
  
  
- 
+ 
  
  
  
diff --git a/sw/uiconfig/swriter/toolbar/tableobjectbar.xml

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - officecfg/registry sw/uiconfig

2015-12-07 Thread Yousuf Philips 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   31 ++-
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |9 
 sw/uiconfig/swriter/menubar/menubar.xml  |   97 
--
 3 files changed, 115 insertions(+), 22 deletions(-)

New commits:
commit e5eb75cd21c78fd55f3165ce4af250109a46fefd
Author: Yousuf Philips 
Date:   Wed Nov 25 15:50:38 2015 +0400

tdf#91781 Add more shapes to the menu and additional tweaks

Special version for 5.1, not using ToolbarAsMenuController.
It's patch set 2 of https://gerrit.libreoffice.org/20167/

Change-Id: I0f6bc69afce27d5e4dd7fab3c8e8b87e292d6217

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 80d2325..09151c8 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1985,7 +1985,7 @@
   
   
 
-  Gr~id
+  Gr~id and Helplines
 
   
   
@@ -3369,6 +3369,30 @@
   1
 
   
+  
+
+  ~Line
+
+
+  1
+
+  
+  
+
+  ~Basic
+
+
+  1
+
+  
+  
+
+  ~Symbol
+
+
+  1
+
+  
   
 
   ~Rulers
@@ -4951,7 +4975,10 @@
   
   
 
-  Design Mode On/Off
+  Toggle Design Mode
+
+
+  Design Mode
 
 
   9
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 1ad103d..d53d549 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -122,7 +122,10 @@
   
   
 
-  Table of Contents or ~Index...
+  Insert Table of Contents, Index or 
Bibliography
+
+
+  Table of Contents, ~Index or 
Bibliography...
 
 
   1
@@ -533,7 +536,7 @@
   1
 
   
-  
+  
 
   ~Text Box and Shape
 
@@ -2587,7 +2590,7 @@
   Pre~formatted Text
 
   
-  
+  
 
   Text Body
 
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml 
b/sw/uiconfig/swriter/menubar/menubar.xml
index 509155f..07e85ae 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -125,13 +125,6 @@
   
 
   
-  
-
-  
-  
-  
-
-  
   
   
   
@@ -139,6 +132,7 @@
   
   
   
+  
   
 
   
@@ -149,7 +143,6 @@
   
   
   
-  
   
 
   
@@ -180,7 +173,7 @@
   
   
   
-  
+  
   
   
   
@@ -235,11 +228,73 @@
   
   
 
-  
-  
-  
-  
-  
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
 
   
   
@@ -308,9 +363,10 @@
 
   
   
-  
   
+  
   
+  
   
 
   
@@ -468,7 +524,7 @@
   
 
   
-  
+  
 
   
   
@@ -485,6 +541,12 @@
   
 
   
+  
+
+  
+  
+
+  
   
   
   
@@ -555,7 +617,7 @@
   
   
   
-  
+  
   
   
   
@@ -680,6 +742,7 @@
   
   
   
+  
   
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org