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

2018-09-19 Thread Libreoffice Gerrit user
 sw/uiconfig/swriter/ui/watermarkdialog.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 01abe2764f1778ad03cf643e799f0f387bd397e8
Author: Adolfo Jayme Barrientos 
AuthorDate: Wed Sep 19 05:04:14 2018 -0500
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Sep 19 13:30:59 2018 +0200

tdf#112356 follow-up: Make the Help button work

Change-Id: I7181e07f8d817dd402eec8bd98e8526503455f5e
(cherry picked from commit fee5b79543de5e35299b1e3576209c77ef64a4d6)
Reviewed-on: https://gerrit.libreoffice.org/60751
Reviewed-by: Xisco Faulí 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/sw/uiconfig/swriter/ui/watermarkdialog.ui 
b/sw/uiconfig/swriter/ui/watermarkdialog.ui
index 60450a06b10d..8035c6b9d47f 100644
--- a/sw/uiconfig/swriter/ui/watermarkdialog.ui
+++ b/sw/uiconfig/swriter/ui/watermarkdialog.ui
@@ -247,6 +247,7 @@
 
   ok
   cancel
+  help
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2018-09-04 Thread Libreoffice Gerrit user
 sw/uiconfig/swriter/ui/columnpage.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2fb0332c9edce317c371feafc5ae64d81c05febd
Author: Gabor Kelemen 
AuthorDate: Thu Aug 23 00:29:34 2018 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Sep 5 05:46:00 2018 +0200

tdf#119152 Hide Text Direction dropdown from Columns tab by default

To restore behavior seen before 6.1

Change-Id: I7dd6b566b4964298a3e08c6c6dd663f87857d038
Reviewed-on: https://gerrit.libreoffice.org/59479
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 
(cherry picked from commit 4f3dec1104a21d93d400c76ab0ae85083aec8492)
Reviewed-on: https://gerrit.libreoffice.org/59955
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sw/uiconfig/swriter/ui/columnpage.ui 
b/sw/uiconfig/swriter/ui/columnpage.ui
index 2b85eda09491..4648d383888d 100644
--- a/sw/uiconfig/swriter/ui/columnpage.ui
+++ b/sw/uiconfig/swriter/ui/columnpage.ui
@@ -704,7 +704,7 @@
 
 
   
-True
+True
 False
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2018-08-20 Thread Libreoffice Gerrit user
 sw/uiconfig/swriter/ui/assignstylesdialog.ui |   16 ++--
 1 file changed, 6 insertions(+), 10 deletions(-)

New commits:
commit a19a65193a564a0eccdb63b7e2ca272d32aa9180
Author: Olivier Hallot 
AuthorDate: Sat Jun 30 22:35:39 2018 -0300
Commit: Olivier Hallot 
CommitDate: Mon Aug 20 11:51:16 2018 +0200

tdf#118457 Place Help button on the left

Change-Id: Id1c386fab92a2e21e7b2f07f08daf08d5886d027
Reviewed-on: https://gerrit.libreoffice.org/56774
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit 15eadb56d0a24fb4b1e70c8afb41f6e02eb47761)
Reviewed-on: https://gerrit.libreoffice.org/56775
Reviewed-by: Olivier Hallot 

diff --git a/sw/uiconfig/swriter/ui/assignstylesdialog.ui 
b/sw/uiconfig/swriter/ui/assignstylesdialog.ui
index bc1e17069dc0..affe6ae33059 100644
--- a/sw/uiconfig/swriter/ui/assignstylesdialog.ui
+++ b/sw/uiconfig/swriter/ui/assignstylesdialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -18,6 +18,9 @@
 6
 Assign Styles
 dialog
+
+  
+
 
   
 False
@@ -69,6 +72,7 @@
 False
 True
 2
+True
   
 
   
@@ -153,16 +157,12 @@
   
 0
 0
-1
-1
   
 
   
   
 0
 2
-1
-1
   
 
 
@@ -178,22 +178,18 @@
   
 0
 1
-1
-1
   
 
 
   
 False
 True
-0
 Not applied
+0
   
   
 0
 0
-1
-1
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2018-07-18 Thread Libreoffice Gerrit user
 sw/uiconfig/swriter/ui/editsectiondialog.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4f2b38cb2b39c7c0362a7bf8b508d045a399c9ed
Author: Caolán McNamara 
AuthorDate: Wed Jul 18 16:40:10 2018 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Jul 18 20:38:58 2018 +0200

Resolves: tdf#118562 set correct help button placement

Change-Id: Ia7e5a5ba549c5824b43b36e6b3350b4b5f6c9118
Reviewed-on: https://gerrit.libreoffice.org/57658
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/sw/uiconfig/swriter/ui/editsectiondialog.ui 
b/sw/uiconfig/swriter/ui/editsectiondialog.ui
index 9b5604c61b9b..efbbe315d52f 100644
--- a/sw/uiconfig/swriter/ui/editsectiondialog.ui
+++ b/sw/uiconfig/swriter/ui/editsectiondialog.ui
@@ -89,6 +89,7 @@
 False
 True
 4
+True
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2018-07-10 Thread andreas kainz
 sw/uiconfig/sglobal/menubar/menubar.xml  |2 +-
 sw/uiconfig/sweb/menubar/menubar.xml |2 +-
 sw/uiconfig/swform/menubar/menubar.xml   |3 ++-
 sw/uiconfig/swreport/menubar/menubar.xml |3 ++-
 sw/uiconfig/swriter/menubar/menubar.xml  |2 +-
 sw/uiconfig/swxform/menubar/menubar.xml  |2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit d8911b6848fccf92a8310c77eef40eafab0325f0
Author: andreas kainz 
Date:   Tue Jul 10 09:01:48 2018 +0200

Menubar revert movement of Insert Doc

Change-Id: I4b0d95faa7e6986f268f5faf1d26bdfa6a84e550
Reviewed-on: https://gerrit.libreoffice.org/57216
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml 
b/sw/uiconfig/sglobal/menubar/menubar.xml
index 59776bb1bf80..c889ba6f87c2 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -257,7 +257,6 @@
 
   
   
-  
 
   
   
@@ -284,6 +283,7 @@
   
   
   
+  
   
   
   
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml 
b/sw/uiconfig/sweb/menubar/menubar.xml
index f41d3666c7c0..1b5624f22169 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -180,11 +180,11 @@
 
   
   
-  
 
   
   
   
+  
   
   
   
diff --git a/sw/uiconfig/swform/menubar/menubar.xml 
b/sw/uiconfig/swform/menubar/menubar.xml
index a9185d853626..08645a2889f9 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -230,13 +230,14 @@
   
   
   
-  
 
   
   
   
   
   
+  
+  
 
   
   
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml 
b/sw/uiconfig/swreport/menubar/menubar.xml
index 47ea1bfd73ff..b394fe95c35a 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -231,13 +231,14 @@
   
   
   
-  
 
   
   
   

   
+  
+  
 
   
   
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml 
b/sw/uiconfig/swriter/menubar/menubar.xml
index 9cd34bea88d7..f2148b3fa3fe 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -257,7 +257,6 @@
 
   
   
-  
 
   
   
@@ -284,6 +283,7 @@
   
   
   
+  
   
   
   
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml 
b/sw/uiconfig/swxform/menubar/menubar.xml
index b5157799d302..fe7d7e652a2d 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -257,7 +257,6 @@
 
   
   
-  
 
   
   
@@ -284,6 +283,7 @@
   
   
   
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2018-07-04 Thread andreas kainz
 sw/uiconfig/swriter/ui/notebookbar.ui|  667 +-
 sw/uiconfig/swriter/ui/notebookbar_compact.ui| 1014 ++-
 sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 4745 +--
 sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui|  717 ++
 4 files changed, 5011 insertions(+), 2132 deletions(-)

New commits:
commit 5ac2b0a3748078d92c3ca8caeef276318bdb7176
Author: andreas kainz 
Date:   Wed Jul 4 17:06:37 2018 +0200

NB add support for media and printpreview content view

Change-Id: I6c9376c96a4bb4b7385aad3f48facdd36899e29a
Reviewed-on: https://gerrit.libreoffice.org/56956
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui 
b/sw/uiconfig/swriter/ui/notebookbar.ui
index f7fd0a5b5d99..a2a609ef8bf5 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -1098,6 +1098,92 @@
   
 
   
+  
+True
+False
+
+  
+True
+False
+.uno:ShowSinglePage
+  
+
+
+  
+True
+False
+.uno:ShowTwoPages
+  
+
+
+  
+True
+False
+.uno:ShowBookview
+  
+
+
+  
+True
+False
+.uno:ShowMultiplePages
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+.uno:GoToStartOfDoc
+  
+
+
+  
+True
+False
+.uno:PageUp
+  
+
+
+  
+True
+False
+.uno:PageDown
+  
+
+
+  
+True
+False
+.uno:GoToEndOfDoc
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+.uno:Print
+  
+
+
+  
+True
+False
+.uno:ClosePreview
+  
+
+  
   
 True
 False
@@ -12249,6 +12335,447 @@
   
 
 
+  
+True
+False
+
+  
+True
+False
+center
+True
+
+  
+True
+False
+center
+True
+
+  
+True
+False
+immediate
+both
+False
+
+  
+True
+False
+.uno:ShowSinglePage
+  
+  
+False
+True
+  
+
+
+  
+True
+False
+.uno:ShowTwoPages
+  
+  
+False
+True
+  
+
+
+  
+True
+False
+.uno:ShowBookview
+  
+  
+False
+True
+  
+
+
+  
+True
+False
+center
+True
+.uno:ShowMultiplePages
+  
+  
+False
+False
+  
+
+  
+  
+False
+False
+0
+  
+
+
+  
+True
+False
+5
+5
+vertical
+  
+  
+False
+True
+5
+3
+  
+
+

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

2018-07-04 Thread heiko tietze
 sw/uiconfig/swriter/statusbar/statusbar.xml |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit ea5808780374cb520ec61c8e797f92fb7a6c37cb
Author: heiko tietze 
Date:   Tue Jul 3 12:37:43 2018 +0200

tdf#86612 - Keep zoom visible in Writer

Mandatory flags added to the statusbar

Change-Id: I2605c76d579aa50efb953a475aacbc5e3a6e3abb
Reviewed-on: https://gerrit.libreoffice.org/56859
Tested-by: Jenkins
Reviewed-by: Vasily Melenchuk 
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 9a8356d81bba69507861417a73aea98beca2b347)
Reviewed-on: https://gerrit.libreoffice.org/56930
Reviewed-by: Thorsten Behrens 

diff --git a/sw/uiconfig/swriter/statusbar/statusbar.xml 
b/sw/uiconfig/swriter/statusbar/statusbar.xml
index 8b3b9cc9b2b3..f85f07daa068 100644
--- a/sw/uiconfig/swriter/statusbar/statusbar.xml
+++ b/sw/uiconfig/swriter/statusbar/statusbar.xml
@@ -18,16 +18,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 http://openoffice.org/2001/statusbar; 
xmlns:xlink="http://www.w3.org/1999/xlink;>
- 
+ 
  
  
- 
- 
- 
- 
- 
- 
+ 
+ 
+ 
+ 
+ 
+ 
  
- 
- 
+ 
+ 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2018-07-03 Thread andreas kainz
 sw/uiconfig/swriter/ui/notebookbar.ui |  980 +++---
 1 file changed, 805 insertions(+), 175 deletions(-)

New commits:
commit e7fc3fe87487c36dc8524978c896deb2465a78d2
Author: andreas kainz 
Date:   Tue Jul 3 10:17:48 2018 +0200

NB writer: add media tab to notebookbar.ui

Change-Id: I83a094b88c3ac31dc200a152e83ad7b8329418ad
Reviewed-on: https://gerrit.libreoffice.org/56848
Tested-by: Jenkins
Reviewed-by: andreas_kainz 
(cherry picked from commit 796d60da3e03438c92c54c0a9010e859a7679c9e)
Reviewed-on: https://gerrit.libreoffice.org/56870

diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui 
b/sw/uiconfig/swriter/ui/notebookbar.ui
index 93ed4bb1318b..f7fd0a5b5d99 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -4,6 +4,100 @@
   
   
   
+  
+True
+False
+
+  
+True
+False
+.uno:WrapOff
+  
+
+
+  
+True
+False
+.uno:WrapOn
+  
+
+
+  
+True
+False
+.uno:WrapIdeal
+  
+
+
+  
+True
+False
+.uno:WrapLeft
+  
+
+
+  
+True
+False
+.uno:WrapRight
+  
+
+
+  
+True
+False
+.uno:WrapThrough
+  
+
+
+  
+True
+False
+.uno:WrapThroughTransparent
+  
+
+
+  
+True
+False
+.uno:WrapContour
+  
+
+
+  
+True
+False
+.uno:WrapAnchorOnly
+  
+
+
+  
+True
+False
+.uno:TextWrap
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+.uno:SetObjectToForeground
+  
+
+
+  
+True
+False
+.uno:SetObjectToBackground
+  
+
+  
   
 True
 False
@@ -5385,7 +5479,7 @@
 vertical
 
   
-Pag_e
+Layout
 True
 False
 False
@@ -10583,7 +10677,7 @@
 vertical
 
   
-_Graphic
+Image
 True
 False
 False
@@ -12144,7 +12238,7 @@
   
 True
 False
-Draw
+Draw
 
   
 
@@ -12155,38 +12249,89 @@
   
 
 
-  
+  
 True
 False
 
-  
+  
 True
 False
 center
 True
 
-  
+  
 True
 False
 center
 True
 
-  
+  
 True
 False
-center
-5
-True
-both
+immediate
+both-horiz
 False
-3
 
-  
+  
 True
 False
-center
-True
-.uno:InsertCaptionDialog
+.uno:AVMediaPlayer
+  
+  
+False
+True
+  
+
+  
+  
+False
+False
+0
+  
+
+
+  
+True
+False
+5
+5
+vertical
+  
+  
+False
+True
+5
+3
+  
+
+  
+  
+  

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

2018-07-02 Thread Olivier Hallot
 sw/uiconfig/swriter/menubar/menubar.xml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 20a5653e76f4a96f126d52d933e30fa5410a8a09
Author: Olivier Hallot 
Date:   Fri Jun 29 11:05:35 2018 -0300

tdf#118355 Repl Default / Text Body in Style menu

Replace Default Paragraph Style by Text Body, as justified in
bug report.

Change-Id: Idca1bf437af7d3df838b65bf9991f08e18260c85
Reviewed-on: https://gerrit.libreoffice.org/56710
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 

diff --git a/sw/uiconfig/swriter/menubar/menubar.xml 
b/sw/uiconfig/swriter/menubar/menubar.xml
index b745aeaa7989..7dd3f046371a 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -549,7 +549,7 @@
   
   
 
-  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2018-06-29 Thread andreas kainz
 sw/uiconfig/sglobal/menubar/menubar.xml  |2 +-
 sw/uiconfig/sweb/menubar/menubar.xml |2 +-
 sw/uiconfig/swform/menubar/menubar.xml   |3 +--
 sw/uiconfig/swreport/menubar/menubar.xml |3 +--
 sw/uiconfig/swriter/menubar/menubar.xml  |2 +-
 sw/uiconfig/swxform/menubar/menubar.xml  |2 +-
 6 files changed, 6 insertions(+), 8 deletions(-)

New commits:
commit dd8fe3e2e03e4de59e5359973c326146d5147b16
Author: andreas kainz 
Date:   Thu Jun 28 11:32:41 2018 +0200

Menubar: move InsertDoc in ObjectMenu Subsection like in calc

Insert section in writer is very long and when move InsertDoc
into the Object Subgroup it will be on the same level than
in calc

Change-Id: Ie34b5853dd462ed17df02f645a1e6953beaf3f13
Reviewed-on: https://gerrit.libreoffice.org/56584
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Reviewed-by: andreas_kainz 
(cherry picked from commit 6651e055e1bc847f9732269bfff12412c2cbef0d)
Reviewed-on: https://gerrit.libreoffice.org/56657

diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml 
b/sw/uiconfig/sglobal/menubar/menubar.xml
index ceb0a7350d2c..b745aeaa7989 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -258,6 +258,7 @@
 
   
   
+  
 
   
   
@@ -284,7 +285,6 @@
   
   
   
-  
   
   
   
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml 
b/sw/uiconfig/sweb/menubar/menubar.xml
index eedb4a8d00ba..a7d80cfe3b1d 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -181,11 +181,11 @@
 
   
   
+  
 
   
   
   
-  
   
   
   
diff --git a/sw/uiconfig/swform/menubar/menubar.xml 
b/sw/uiconfig/swform/menubar/menubar.xml
index d1e20349e2f4..6e43ecf9876a 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -231,14 +231,13 @@
   
   
   
+  
 
   
   
   
   
   
-  
-  
 
   
   
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml 
b/sw/uiconfig/swreport/menubar/menubar.xml
index 5c48aac64b36..abfc3c126997 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -232,14 +232,13 @@
   
   
   
+  
 
   
   
   

   
-  
-  
 
   
   
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml 
b/sw/uiconfig/swriter/menubar/menubar.xml
index ceb0a7350d2c..b745aeaa7989 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -258,6 +258,7 @@
 
   
   
+  
 
   
   
@@ -284,7 +285,6 @@
   
   
   
-  
   
   
   
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml 
b/sw/uiconfig/swxform/menubar/menubar.xml
index 771395ac0774..4e5d822dcd08 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -258,6 +258,7 @@
 
   
   
+  
 
   
   
@@ -284,7 +285,6 @@
   
   
   
-  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2018-06-26 Thread andreas kainz
 sw/uiconfig/sweb/menubar/menubar.xml |  428 ++-
 1 file changed, 319 insertions(+), 109 deletions(-)

New commits:
commit 19c2d4a10710a7a50de447e5ed6156faf04ca21e
Author: andreas kainz 
Date:   Mon Jun 18 22:18:00 2018 +0200

menubar web: sync with writer

use menubar file from writer if possible
swriter File section was used complete
swriter Edit section was used for the items which are available in sweb
swriter View section was used for the items which are available in sweb
swriter Insert section was used for the items which are available in sweb 
(script was sweb specific in insert)
swriter Styles section was used complete
swriter Table section was used complete
swriter Form section was used complete
swriter Tools section was used complete
swriter Window section was used complete
swriter Help section was used complete

Change-Id: I5970df57be8a55610bf1b5fb28e4315c54e95b63
Reviewed-on: https://gerrit.libreoffice.org/56064
Tested-by: Jenkins
Reviewed-by: andreas_kainz 
(cherry picked from commit 50d8f19c456f228a6d8b14bdb9b4ab343ec4f826)
Reviewed-on: https://gerrit.libreoffice.org/56389

diff --git a/sw/uiconfig/sweb/menubar/menubar.xml 
b/sw/uiconfig/sweb/menubar/menubar.xml
index 86a20c157e78..eedb4a8d00ba 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -92,24 +92,24 @@
   
   
   
+  
   
-  
+  
+  
   
 
   
   
 
   
-  
+  
   
   
   
-  
   
-  
-  
   
-  
+  
+  
   
   
   
@@ -128,20 +128,26 @@
   
   
   
+  
+  
+  
   
+  
   
   
-  
-  
-  
   
-  
-  
   
+  
+  
+  
+  
   
   
   
 
+  
+  
+  
   
   
   
@@ -155,50 +161,152 @@
   
   
 
-  
-  
-  
-
-  
-  
-  
-  
-  
-  
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
   
   
   
   
 
   
+  
+
+  
+  
+
+  
   
 
   
+  
   
 
-  
   
-  
+  
 
   
+  
+  
+  
+  
+  
   
   
   
-  
+  
+  
+  
+  
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+  
+  
+
+  
+  
+  
+
+  
+  
+  
+  
 
   
   
 
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+  
   
   
   
@@ -206,31 +314,10 @@
   
   
   
-  
-
-
-
-
-
-
-
-
-
-
-
-  
-  
   
-  
-  
-  
-
-  
-  
-  
-  
-
-  
+  
+  
+  
   
   
 
@@ -239,17 +326,57 @@
   
   
   
-  
   
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+  
+  
+
+  
+  
+
+  
+  
+  
+  
+  
+
+  
+  
+
+  
+  
+  
+  
 
   
   
+  
+  
+  
   
   
 
   
   
   
+  
+  
   
   
   
@@ -260,18 +387,6 @@
   
 
   
-  
-
-  
-   

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

2018-06-25 Thread andreas kainz
 sw/uiconfig/swriter/ui/notebookbar_compact.ui |  522 +-
 1 file changed, 508 insertions(+), 14 deletions(-)

New commits:
commit 00b35156a3f076b0ad06c4434c263f8ac6071c5e
Author: andreas kainz 
Date:   Mon Jun 18 11:24:27 2018 +0200

NB writer: notebookbar_compact add context-printpreview tab

Change-Id: Ie7ea10eeba74f07342fd47a78193d7c0193d6d40
Reviewed-on: https://gerrit.libreoffice.org/55985
Tested-by: Jenkins
Reviewed-by: andreas_kainz 
(cherry picked from commit d5b4b002d9f60c9757e5aa971254ec824e04afc7)
Reviewed-on: https://gerrit.libreoffice.org/56427

diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui 
b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
index 915ef138dac6..981a6ceab8e3 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
@@ -9716,6 +9716,500 @@
   
 
 
+  
+True
+False
+
+  
+True
+False
+center
+True
+
+  
+True
+False
+center
+True
+
+  
+True
+False
+icons
+False
+
+  
+True
+False
+.uno:ShowSinglePage
+  
+  
+False
+False
+  
+
+
+  
+True
+False
+.uno:ShowTwoPages
+  
+  
+False
+False
+  
+
+
+  
+True
+False
+.uno:ShowBookview
+  
+  
+False
+False
+  
+
+
+  
+True
+False
+.uno:ShowMultiplePages
+  
+  
+False
+False
+  
+
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+False
+5
+5
+vertical
+  
+  
+False
+True
+5
+2
+  
+
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+False
+center
+True
+
+  
+True
+False
+icons
+False
+
+  
+True
+False
+.uno:GoToStartOfDoc
+  
+  
+False
+False
+  
+
+
+  
+True
+False
+.uno:PageUp
+  
+  
+False
+ 

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

2018-06-22 Thread andreas kainz
 sw/uiconfig/swxform/menubar/menubar.xml |  556 
 1 file changed, 419 insertions(+), 137 deletions(-)

New commits:
commit 3e2fc725fe9b690c7b86d195b4722a395a5fc827
Author: andreas kainz 
Date:   Mon Jun 18 22:24:11 2018 +0200

menubar swxform: copy of swriter menubar.xml

swxform use the same actions than swriter
to a better maintanance swxform can use swriter
eg. the old menubar didn't had form items available

Change-Id: I6797ba26e3468a116795fdeb8f2acc0e51a48516
Reviewed-on: https://gerrit.libreoffice.org/56066
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit e7eaedda3e75de24be22bc410561b8aa00fdf1c1)
Reviewed-on: https://gerrit.libreoffice.org/56278
Reviewed-by: andreas_kainz 

diff --git a/sw/uiconfig/swxform/menubar/menubar.xml 
b/sw/uiconfig/swxform/menubar/menubar.xml
index 5e865c4917fd..771395ac0774 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -75,11 +75,18 @@
   
 
   
+  
   
   
   
   
   
+  
+
+  
+  
+
+  
   
   
   
@@ -94,46 +101,65 @@
   
   
   
+  
   
-  
+  
+  
   
 
   
   
 
   
-  
+  
+  
   
   
   
-  
+  
   
   
 
   
-  
   
   
   
-  
-  
   
+  
+  
+  
+  
+  
   
+  
+  
+  
+  
   
 
   
-  
   
-  
-  
-  
-  
-  
   
-  
+  
+
+  
+  
+  
+  
+
+  
+  
+
+  
+  
+  
+
+  
+  
   
   
   
+  
   
   
 
@@ -143,26 +169,54 @@
   
   
   
+  
   
   
-  
-  
+  
+
+  
+  
+
+  
+  
+
+  
+  
+
+  
   
   
+  
+  
+  
+  
+  
+
+  
+  
+  
+
+  
+  
+  
+  
   
   
-  
-  
-  
+  
   
-  
-  
-  
   
+  
+  
+  
+  
+  
   
   
   
 
+  
+  
+  
   
   
   
@@ -176,42 +230,16 @@
   
   
 
-  
-  
-  
-  
-
-  
-  
-  
-  
-  
-  
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
 
-  
-  
-  
+  
+  
+  
+  
 
   
   
-  
-  
   
   
 
@@ -222,27 +250,186 @@
   
 
   
-  
   
 
   
+  
   
 
-  
   
-  
+  
+
+  
+  
+
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
 
   
-  
-  
-  
-  
   
+  
   
+  
+  
+  
+  
+
+  
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+  
+  
+
+  
+  
+  
+
+  
+  
+
+  
+  
+  
+
+  
+  
+  
+  
+  
+
+  
+  
+
+  
+  
+  
+  
 
   
   
 
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+ 

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

2018-06-20 Thread andreas kainz
 sw/uiconfig/swriter/menubar/menubar.xml |1 -
 1 file changed, 1 deletion(-)

New commits:
commit b61975a16b534c8a4557e13bc364a2198783f677
Author: andreas kainz 
Date:   Mon Jun 18 21:55:37 2018 +0200

menubar writer: remove designmode from edit

designmode is for forms and available already there

Change-Id: I460b49bba8dbfd1e2f3a91b1478f5414fe09db86
Reviewed-on: https://gerrit.libreoffice.org/56060
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit 231035fe394138a924ef78780a02393bb122b14a)
Reviewed-on: https://gerrit.libreoffice.org/56145
Reviewed-by: andreas_kainz 

diff --git a/sw/uiconfig/swriter/menubar/menubar.xml 
b/sw/uiconfig/swriter/menubar/menubar.xml
index 9b9a239aec22..ceb0a7350d2c 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -161,7 +161,6 @@
   
   
   
-  
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2018-06-20 Thread andreas kainz
 sw/uiconfig/swriter/menubar/menubar.xml |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 361434e4e8fa58e02e694ec8cfa8187eecdf8c7f
Author: andreas kainz 
Date:   Mon Jun 18 22:00:47 2018 +0200

menubar writer: add separator between past and select

Add separators between logical groups within a menu.
Seek to organize the menu items into groups of 7 or
fewer strongly related items.

Change-Id: If905cfa85997ba3e107ce45fe29b737cea55a84a
Reviewed-on: https://gerrit.libreoffice.org/56061
Tested-by: Jenkins
Reviewed-by: V Stuart Foote 
Reviewed-by: andreas_kainz 
(cherry picked from commit c39bb4c8a7b9ee85f34daad3c3e67ea898e0750c)
Reviewed-on: https://gerrit.libreoffice.org/56130

diff --git a/sw/uiconfig/swriter/menubar/menubar.xml 
b/sw/uiconfig/swriter/menubar/menubar.xml
index f9b795fde774..9b9a239aec22 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -103,6 +103,7 @@
   
   
   
+  
   
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2018-06-19 Thread andreas kainz
 sw/uiconfig/sglobal/menubar/menubar.xml |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 914dab94c391dd8c587cb0eabf3f48fa43ed76ee
Author: andreas kainz 
Date:   Mon Jun 18 22:35:40 2018 +0200

menubar sglobal: copy of swriter menubar.xml

sglobal use the same actions than swriter
to a better maintanance sglobal can use swriter

Change-Id: Iaf7c3ad0e2f7e3e7fc9bf68927c1296fe593fb83
Reviewed-on: https://gerrit.libreoffice.org/56068
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit c551e503fbd22a5af00480a65266e45a2b47f737)
Reviewed-on: https://gerrit.libreoffice.org/56131
Reviewed-by: andreas_kainz 

diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml 
b/sw/uiconfig/sglobal/menubar/menubar.xml
index fd0fde3f549d..ceb0a7350d2c 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -103,6 +103,7 @@
   
   
   
+  
   
   
 
@@ -165,8 +166,8 @@
   
   
 
-  
-  
+  
+  
   
   
   
@@ -440,6 +441,7 @@
   
   
   
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits