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

2017-06-23 Thread Yousuf Philips
 sw/uiconfig/swriter/menubar/menubar.xml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ccd08a5a8fbf3fd4ca344181a700764d5339589d
Author: Yousuf Philips 
Date:   Tue Jun 20 05:15:53 2017 +0400

tdf#91781 Move watermark from insert to format menu

Change-Id: I747562462accc49e7f3dc851e1ebb274e36b93d7
Reviewed-on: https://gerrit.libreoffice.org/38988
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 
(cherry picked from commit 6ef59d7ace7e4db52caea601a384ed016365bcaf)
Reviewed-on: https://gerrit.libreoffice.org/38990
Tested-by: Jenkins 

diff --git a/sw/uiconfig/swriter/menubar/menubar.xml 
b/sw/uiconfig/swriter/menubar/menubar.xml
index 5e7dbb6374a4..ab7d4df0721d 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -267,7 +267,6 @@
 
   
   
-  
   
   
   
@@ -453,6 +452,7 @@
   
   
   
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2017-06-21 Thread Caolán McNamara
 sw/uiconfig/swriter/menubar/menubar.xml |   40 
 sw/uiconfig/swriter/popupmenu/table.xml |   10 
 sw/uiconfig/swriter/popupmenu/text.xml  |   10 
 3 files changed, 30 insertions(+), 30 deletions(-)

New commits:
commit fb7f91acecb6a3fa7adbe59603cdfdbc36a6b891
Author: Caolán McNamara 
Date:   Tue Jun 20 10:44:13 2017 +0100

these checkbox group entries are mutually exclusive

so they're closer to radio buttons than checkboxes

though this isn't great either as there are possibilites that are not 
listed,
in which case all are unchecked, and when is selected like buletting it 
cannot
be turned off from the menu

(cherry picked from commit 4d7054947d87174decf12ad204c09532f33599f8)

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

diff --git a/sw/uiconfig/swriter/menubar/menubar.xml 
b/sw/uiconfig/swriter/menubar/menubar.xml
index f7ca5750f37e..5e7dbb6374a4 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -564,26 +564,26 @@
   
   
 
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
   
   
   
diff --git a/sw/uiconfig/swriter/popupmenu/table.xml 
b/sw/uiconfig/swriter/popupmenu/table.xml
index a65f150522f5..5d6992de58b6 100644
--- a/sw/uiconfig/swriter/popupmenu/table.xml
+++ b/sw/uiconfig/swriter/popupmenu/table.xml
@@ -77,11 +77,11 @@
   
   
   
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
 
   
   
diff --git a/sw/uiconfig/swriter/popupmenu/text.xml 
b/sw/uiconfig/swriter/popupmenu/text.xml
index da39a8239b48..6f689036a5c6 100644
--- a/sw/uiconfig/swriter/popupmenu/text.xml
+++ b/sw/uiconfig/swriter/popupmenu/text.xml
@@ -48,11 +48,11 @@
   
   
   
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2017-06-19 Thread Yousuf Philips
 sw/uiconfig/swriter/toolbar/standardbar.xml   |2 ++
 sw/uiconfig/swriter/toolbar/textobjectbar.xml |1 +
 2 files changed, 3 insertions(+)

New commits:
commit e3a5998e64f4568ef9d68bb8c36207dae3f595d0
Author: Yousuf Philips 
Date:   Thu Jun 8 06:59:12 2017 +0400

tdf#81475 Add separator before clone formatting button

Also add some useful hidden commands for easy access for users to enable

Change-Id: I28806047f2fac51995d88b7c204d54479471aa29
Reviewed-on: https://gerrit.libreoffice.org/38552
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 
(cherry picked from commit dc31c2335b2469630cdbcef4ba38a44e01408e27)
Reviewed-on: https://gerrit.libreoffice.org/38572
Tested-by: Yousuf Philips 

diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml 
b/sw/uiconfig/swriter/toolbar/standardbar.xml
index a2eb2320a096..025ebbb0cd42 100644
--- a/sw/uiconfig/swriter/toolbar/standardbar.xml
+++ b/sw/uiconfig/swriter/toolbar/standardbar.xml
@@ -37,7 +37,9 @@
  
  
  
+ 
  
+ 
  
  
  
diff --git a/sw/uiconfig/swriter/toolbar/textobjectbar.xml 
b/sw/uiconfig/swriter/toolbar/textobjectbar.xml
index 87d91a0509f7..0b7f76b3b825 100644
--- a/sw/uiconfig/swriter/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/textobjectbar.xml
@@ -23,6 +23,7 @@
  
  
  
+ 
  
  
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2017-06-19 Thread Xisco Fauli
 sw/uiconfig/swriter/popupmenu/table.xml |2 +-
 sw/uiconfig/swriter/popupmenu/text.xml  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dc4cacf8beb3224a97693b0ba128a872c6a9a517
Author: Xisco Fauli 
Date:   Mon Jun 19 14:06:29 2017 +0200

tdf#85940 Use correct reference ID for Quotation

Change-Id: I5c2ead67465c79fa30fc7d7db9d48748bdaf5491
Reviewed-on: https://gerrit.libreoffice.org/38961
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 
(cherry picked from commit 60954fc67a022565741c4ccb4667581a5a790a10)
Reviewed-on: https://gerrit.libreoffice.org/38967
Reviewed-by: Xisco Faulí 
Tested-by: Xisco Faulí 

diff --git a/sw/uiconfig/swriter/popupmenu/table.xml 
b/sw/uiconfig/swriter/popupmenu/table.xml
index 2ee473826f59..a65f150522f5 100644
--- a/sw/uiconfig/swriter/popupmenu/table.xml
+++ b/sw/uiconfig/swriter/popupmenu/table.xml
@@ -80,7 +80,7 @@
   
   
   
-  
+  
   
 
   
diff --git a/sw/uiconfig/swriter/popupmenu/text.xml 
b/sw/uiconfig/swriter/popupmenu/text.xml
index 568ff95dd5b6..da39a8239b48 100644
--- a/sw/uiconfig/swriter/popupmenu/text.xml
+++ b/sw/uiconfig/swriter/popupmenu/text.xml
@@ -51,7 +51,7 @@
   
   
   
-  
+  
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2017-06-19 Thread Yousuf Philips
 sw/uiconfig/swriter/popupmenu/table.xml |6 ++
 sw/uiconfig/swriter/popupmenu/text.xml  |6 ++
 2 files changed, 12 insertions(+)

New commits:
commit 02cea29ce3831d5b72a0d4f71a9de57e38e65d71
Author: Yousuf Philips 
Date:   Sun Jun 11 04:48:47 2017 +0400

tdf#85940 Add basic character styles to context menu

Change-Id: Id25768dfd2c8db530a31ddf8a31108f9b5c67855
Reviewed-on: https://gerrit.libreoffice.org/38652
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 
(cherry picked from commit 41b8cdd0f4130f60027002f1d6daa9f6169b04d9)
Reviewed-on: https://gerrit.libreoffice.org/38740
Reviewed-by: Xisco Faulí 
Tested-by: Xisco Faulí 

diff --git a/sw/uiconfig/swriter/popupmenu/table.xml 
b/sw/uiconfig/swriter/popupmenu/table.xml
index 63f079f80134..2ee473826f59 100644
--- a/sw/uiconfig/swriter/popupmenu/table.xml
+++ b/sw/uiconfig/swriter/popupmenu/table.xml
@@ -76,6 +76,12 @@
   
   
   
+  
+  
+  
+  
+  
+  
 
   
   
diff --git a/sw/uiconfig/swriter/popupmenu/text.xml 
b/sw/uiconfig/swriter/popupmenu/text.xml
index 8374a5e4d8ce..568ff95dd5b6 100644
--- a/sw/uiconfig/swriter/popupmenu/text.xml
+++ b/sw/uiconfig/swriter/popupmenu/text.xml
@@ -47,6 +47,12 @@
   
   
   
+  
+  
+  
+  
+  
+  
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2017-06-19 Thread Gabor Kelemen
 sw/uiconfig/swriter/ui/mmaddressblockpage.ui |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 50bab52194f570d48b92eb2f240dc4de7b3e1d3c
Author: Gabor Kelemen 
Date:   Thu Jun 8 18:50:37 2017 +0200

tdf#108418 Fix vertical alignment of checkbox text

Change-Id: I8daa6c2c5941a894259a5af74a16f7ef32f8a867
Reviewed-on: https://gerrit.libreoffice.org/38577
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 
(cherry picked from commit 9d0ed8352ac9f27552f62d536c506f5cbc2a4afe)
Reviewed-on: https://gerrit.libreoffice.org/38956
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/sw/uiconfig/swriter/ui/mmaddressblockpage.ui 
b/sw/uiconfig/swriter/ui/mmaddressblockpage.ui
index 1e42b0f696b9..76d8980b363e 100644
--- a/sw/uiconfig/swriter/ui/mmaddressblockpage.ui
+++ b/sw/uiconfig/swriter/ui/mmaddressblockpage.ui
@@ -272,7 +272,6 @@
 False
 True
 0
-0
 True
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2017-06-19 Thread Adolfo Jayme Barrientos
 sw/uiconfig/swriter/ui/watermarkdialog.ui |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 50bf861da91fabee45917358ed688e984c3e0e4b
Author: Adolfo Jayme Barrientos 
Date:   Mon Jun 19 02:19:14 2017 -0500

Watermark: Right-align labels in dialog

And switch to a non-deprecated alignment property

Change-Id: I74b3d6bea1d7af09b8e044f7b3e25e906bf67c9b
(cherry picked from commit 9fe114e78f1285397dcd2a0d2e3d6afc3024fa66)
Reviewed-on: https://gerrit.libreoffice.org/38947
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/sw/uiconfig/swriter/ui/watermarkdialog.ui 
b/sw/uiconfig/swriter/ui/watermarkdialog.ui
index 2edb38bf7f3a..85602acbdbc2 100644
--- a/sw/uiconfig/swriter/ui/watermarkdialog.ui
+++ b/sw/uiconfig/swriter/ui/watermarkdialog.ui
@@ -81,8 +81,8 @@
   
 True
 False
+end
 Text
-0
   
   
 0
@@ -114,8 +114,8 @@
   
 True
 False
+end
 Font
-0
   
   
 0
@@ -126,8 +126,8 @@
   
 True
 False
+end
 Angle
-0
   
   
 0
@@ -138,8 +138,8 @@
   
 True
 False
+end
 Transparency
-0
   
   
 0
@@ -150,8 +150,8 @@
   
 True
 False
+end
 Color
-0
   
   
 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2017-05-31 Thread Caolán McNamara
 sw/uiconfig/swriter/ui/managechangessidebar.ui |   65 +
 1 file changed, 65 insertions(+)

New commits:
commit 27b2d6795edecd38b24cee5f595ee739e1010c94
Author: Caolán McNamara 
Date:   Wed May 31 15:37:26 2017 +0100

Resolves: tdf#108225 there are *two* possible .ui files for change tracking

the change-tracking side bar in experimental mode as well as the usual
dialog

Change-Id: Ic4d652d0d125b883bef0d91e4ab3cee4a9f84284
(cherry picked from commit b1f255ac35e06ca7b8cb9b9371bb72f87b4e4695)

diff --git a/sw/uiconfig/swriter/ui/managechangessidebar.ui 
b/sw/uiconfig/swriter/ui/managechangessidebar.ui
index 09e023e8bab9..1cb777a04c4a 100644
--- a/sw/uiconfig/swriter/ui/managechangessidebar.ui
+++ b/sw/uiconfig/swriter/ui/managechangessidebar.ui
@@ -149,4 +149,69 @@
   
 
   
+  
+True
+False
+
+  
+True
+False
+Edit Comment...
+  
+
+
+  
+True
+False
+Sort By
+True
+
+  
+True
+False
+
+  
+True
+False
+Action
+True
+  
+
+
+  
+True
+False
+Author
+True
+  
+
+
+  
+True
+False
+Date
+True
+  
+
+
+  
+True
+False
+Comment
+True
+  
+
+
+  
+True
+False
+Document 
Position
+True
+  
+
+  
+
+  
+
+  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2017-05-29 Thread Yousuf Philips
 sw/uiconfig/swriter/popupmenu/drawtext.xml |3 +++
 sw/uiconfig/swriter/popupmenu/table.xml|8 +++-
 sw/uiconfig/swriter/popupmenu/text.xml |8 +++-
 3 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit 2c21380ce9d1a65a55ecffe93116b42233d792f2
Author: Yousuf Philips 
Date:   Tue May 23 04:21:15 2017 +0400

tdf#102915 Restore 'Clear Direct Formatting' to context menu

Change-Id: If3f1a8c2255cb2daa280ca9745b91fd665bf127e
Reviewed-on: https://gerrit.libreoffice.org/37925
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 
(cherry picked from commit dc8ac5373d21c0ea35f73e2730940f3da35f5654)
Reviewed-on: https://gerrit.libreoffice.org/38092
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sw/uiconfig/swriter/popupmenu/drawtext.xml 
b/sw/uiconfig/swriter/popupmenu/drawtext.xml
index 0dd2aed1b1a4..32a75029e6cf 100644
--- a/sw/uiconfig/swriter/popupmenu/drawtext.xml
+++ b/sw/uiconfig/swriter/popupmenu/drawtext.xml
@@ -23,5 +23,8 @@
   
   
   
+  
+  
+  
   
 
diff --git a/sw/uiconfig/swriter/popupmenu/table.xml 
b/sw/uiconfig/swriter/popupmenu/table.xml
index 624905ff401c..63f079f80134 100644
--- a/sw/uiconfig/swriter/popupmenu/table.xml
+++ b/sw/uiconfig/swriter/popupmenu/table.xml
@@ -71,7 +71,13 @@
   
   
   
-  
+  
+
+  
+  
+  
+
+  
   
   
   
diff --git a/sw/uiconfig/swriter/popupmenu/text.xml 
b/sw/uiconfig/swriter/popupmenu/text.xml
index 603fe80ff19a..8374a5e4d8ce 100644
--- a/sw/uiconfig/swriter/popupmenu/text.xml
+++ b/sw/uiconfig/swriter/popupmenu/text.xml
@@ -42,7 +42,13 @@
   
   
   
-  
+  
+
+  
+  
+  
+
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits