[LyX/master] Use combined toolbar icons for depth-(in|de)crement and outline-(in|out)

Jean-Marc Lasgouttes lasgouttes at lyx.org
Fri Jun 5 23:32:28 UTC 2020


commit b08791f7314965e3d8ff515d51ff0567d442b0bf
Author: Jean-Marc Lasgouttes <lasgouttes at lyx.org>
Date:   Tue May 12 19:53:47 2020 +0200

    Use combined toolbar icons for depth-(in|de)crement and outline-(in|out)
    
    The Tab binding already combines those (and more).
---
 lib/Makefile.am                                    |    6 ++++++
 ...and-alternatives_outline-in_depth-increment.png |  Bin 0 -> 215 bytes
 ...nd-alternatives_outline-out_depth-decrement.png |  Bin 0 -> 208 bytes
 ...nd-alternatives_outline-in_depth-increment.svgz |  Bin 0 -> 2282 bytes
 ...d-alternatives_outline-out_depth-decrement.svgz |  Bin 0 -> 2275 bytes
 ...nd-alternatives_outline-in_depth-increment.svgz |  Bin 0 -> 2068 bytes
 ...d-alternatives_outline-out_depth-decrement.svgz |  Bin 0 -> 1982 bytes
 lib/ui/stdtoolbars.inc                             |    4 ++--
 8 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 32a739a..6136bc3 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -566,6 +566,8 @@ dist_images_DATA1X = \
 	images/changes-track.svgz \
 	images/closetab.svgz \
 	images/tab-group-close.svgz \
+	images/command-alternatives_outline-in_depth-increment.svgz \
+	images/command-alternatives_outline-out_depth-decrement.svgz \
 	images/copy.svgz \
 	images/cut.svgz \
 	images/depth-decrement.svgz \
@@ -1854,6 +1856,8 @@ dist_imagesoxygen_DATA1X = \
 	images/oxygen/changes-output.svgz \
 	images/oxygen/changes-track.svgz \
 	images/oxygen/closetab.svgz \
+	images/oxygen/command-alternatives_outline-in_depth-increment.svgz \
+	images/oxygen/command-alternatives_outline-out_depth-decrement.svgz \
 	images/oxygen/copy.svgz \
 	images/oxygen/cut.svgz \
 	images/oxygen/depth-decrement.svgz \
@@ -2061,6 +2065,8 @@ dist_imagesclassic_DATA = \
 	images/classic/changes-output.png  \
 	images/classic/changes-track.png  \
 	images/classic/tab-group-close.png  \
+	images/classic/command-alternatives_outline-in_depth-increment.png \
+	images/classic/command-alternatives_outline-out_depth-decrement.png \
 	images/classic/copy.png  \
 	images/classic/cut.png  \
 	images/classic/depth-decrement.png  \
diff --git a/lib/images/classic/command-alternatives_outline-in_depth-increment.png b/lib/images/classic/command-alternatives_outline-in_depth-increment.png
new file mode 100644
index 0000000..07afff7
Binary files /dev/null and b/lib/images/classic/command-alternatives_outline-in_depth-increment.png differ
diff --git a/lib/images/classic/command-alternatives_outline-out_depth-decrement.png b/lib/images/classic/command-alternatives_outline-out_depth-decrement.png
new file mode 100644
index 0000000..deddc47
Binary files /dev/null and b/lib/images/classic/command-alternatives_outline-out_depth-decrement.png differ
diff --git a/lib/images/command-alternatives_outline-in_depth-increment.svgz b/lib/images/command-alternatives_outline-in_depth-increment.svgz
new file mode 100644
index 0000000..088996d
Binary files /dev/null and b/lib/images/command-alternatives_outline-in_depth-increment.svgz differ
diff --git a/lib/images/command-alternatives_outline-out_depth-decrement.svgz b/lib/images/command-alternatives_outline-out_depth-decrement.svgz
new file mode 100644
index 0000000..45bee9d
Binary files /dev/null and b/lib/images/command-alternatives_outline-out_depth-decrement.svgz differ
diff --git a/lib/images/oxygen/command-alternatives_outline-in_depth-increment.svgz b/lib/images/oxygen/command-alternatives_outline-in_depth-increment.svgz
new file mode 100644
index 0000000..3cf9dfd
Binary files /dev/null and b/lib/images/oxygen/command-alternatives_outline-in_depth-increment.svgz differ
diff --git a/lib/images/oxygen/command-alternatives_outline-out_depth-decrement.svgz b/lib/images/oxygen/command-alternatives_outline-out_depth-decrement.svgz
new file mode 100644
index 0000000..fe32886
Binary files /dev/null and b/lib/images/oxygen/command-alternatives_outline-out_depth-decrement.svgz differ
diff --git a/lib/ui/stdtoolbars.inc b/lib/ui/stdtoolbars.inc
index 481aa86..ce773f3 100644
--- a/lib/ui/stdtoolbars.inc
+++ b/lib/ui/stdtoolbars.inc
@@ -124,8 +124,8 @@ ToolbarSet
 		BidiItem "Labeled List" "layout-toggle Labeling"
 		BidiItem "Description" "layout-toggle Description"
 		BidiItem "Section" "layout-toggle Section"
-		BidiItem "Increase depth" "depth-increment"
-		BidiItem "Decrease depth" "depth-decrement"
+		BidiItem "Increase depth" "command-alternatives outline-in;depth-increment"
+		BidiItem "Decrease depth" "command-alternatives outline-out;depth-decrement"
 		Separator
 		Item "Insert figure float" "float-insert figure"
 		Item "Insert table float" "float-insert table"


More information about the lyx-cvs mailing list