Le 04/03/2020 à 11:33, Jean-Marc Lasgouttes a écrit :
commit cf9827dfc149ed8eeb9d8facc65e11d2e5766f74
Author: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date: Wed Mar 4 11:01:31 2020 +0100
List is obsoleted by Labeling: update icons
This does not change much in master but it is cleaner since the List
layout has been obsolete since 2010 (7f8b868f).
See bug #11770.
Riki,
Would it be possible to use pref2pref to transform different forms of
List layouts lfuns to Labeling? In this case I could get rid of the
List-related icons.
JMarc
---
lib/Makefile.am | 9 +++++++++
lib/images/bidi_ltr_layout-toggle_Labeling.svgz | Bin 0 -> 1568 bytes
lib/images/bidi_rtl_layout-toggle_Labeling.svgz | Bin 0 -> 1857 bytes
.../classic/bidi_ltr_layout-toggle_Labeling.png | Bin 0 -> 199 bytes
.../classic/bidi_rtl_layout-toggle_Labeling.png | Bin 0 -> 158 bytes
lib/images/classic/layout-toggle_Labeling.png | Bin 0 -> 199 bytes
lib/images/layout-toggle_Labeling.svgz | Bin 0 -> 1568 bytes
.../oxygen/bidi_ltr_layout-toggle_Labeling.svgz | Bin 0 -> 1677 bytes
.../oxygen/bidi_rtl_layout-toggle_Labeling.svgz | Bin 0 -> 1937 bytes
lib/images/oxygen/layout-toggle_Labeling.svgz | Bin 0 -> 1677 bytes
lib/ui/stdtoolbars.inc | 4 ++--
11 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 83e58bb..a84be5b 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -521,6 +521,7 @@ dist_images_DATA1X = \
images/bidi_ltr_layout-toggle_Description.svgz \
images/bidi_ltr_layout-toggle_Enumerate.svgz \
images/bidi_ltr_layout-toggle_Itemize.svgz \
+ images/bidi_ltr_layout-toggle_Labeling.svgz \
images/bidi_ltr_layout-toggle_List.svgz \
images/bidi_ltr_layout-toggle_Section.svgz \
images/bidi_rtl_depth-decrement.svgz \
@@ -528,6 +529,7 @@ dist_images_DATA1X = \
images/bidi_rtl_layout-toggle_Description.svgz \
images/bidi_rtl_layout-toggle_Enumerate.svgz \
images/bidi_rtl_layout-toggle_Itemize.svgz \
+ images/bidi_rtl_layout-toggle_Labeling.svgz \
images/bidi_rtl_layout-toggle_List.svgz \
images/bidi_rtl_layout-toggle_Section.svgz \
images/bookmark-goto.svgz \
@@ -626,6 +628,7 @@ dist_images_DATA1X = \
images/layout-toggle_Description.svgz \
images/layout-toggle_Enumerate.svgz \
images/layout-toggle_Itemize.svgz \
+ images/layout-toggle_Labeling.svgz \
images/layout-toggle_List.svgz \
images/layout-toggle_LyX-Code.svgz \
images/layout-toggle_Chunk.svgz \
@@ -1821,6 +1824,7 @@ dist_imagesoxygen_DATA1X = \
images/oxygen/bidi_ltr_layout-toggle_Description.svgz \
images/oxygen/bidi_ltr_layout-toggle_Enumerate.svgz \
images/oxygen/bidi_ltr_layout-toggle_Itemize.svgz \
+ images/oxygen/bidi_ltr_layout-toggle_Labeling.svgz \
images/oxygen/bidi_ltr_layout-toggle_List.svgz \
images/oxygen/bidi_ltr_layout-toggle_Section.svgz \
images/oxygen/bidi_rtl_depth-decrement.svgz \
@@ -1828,6 +1832,7 @@ dist_imagesoxygen_DATA1X = \
images/oxygen/bidi_rtl_layout-toggle_Description.svgz \
images/oxygen/bidi_rtl_layout-toggle_Enumerate.svgz \
images/oxygen/bidi_rtl_layout-toggle_Itemize.svgz \
+ images/oxygen/bidi_rtl_layout-toggle_Labeling.svgz \
images/oxygen/bidi_rtl_layout-toggle_List.svgz \
images/oxygen/bidi_rtl_layout-toggle_Section.svgz \
images/oxygen/bookmark-goto.svgz \
@@ -1922,6 +1927,7 @@ dist_imagesoxygen_DATA1X = \
images/oxygen/layout-toggle_Description.svgz \
images/oxygen/layout-toggle_Enumerate.svgz \
images/oxygen/layout-toggle_Itemize.svgz \
+ images/oxygen/layout-toggle_Labeling.svgz \
images/oxygen/layout-toggle_List.svgz \
images/oxygen/layout-toggle_LyX-Code.svgz \
images/oxygen/layout-toggle_Section.svgz \
@@ -2038,6 +2044,7 @@ dist_imagesclassic_DATA = \
images/classic/bidi_ltr_layout-toggle_Description.png \
images/classic/bidi_ltr_layout-toggle_Enumerate.png \
images/classic/bidi_ltr_layout-toggle_Itemize.png \
+ images/classic/bidi_ltr_layout-toggle_Labeling.png \
images/classic/bidi_ltr_layout-toggle_List.png \
images/classic/bidi_ltr_layout-toggle_Section.png \
images/classic/bidi_rtl_depth-decrement.png \
@@ -2045,6 +2052,7 @@ dist_imagesclassic_DATA = \
images/classic/bidi_rtl_layout-toggle_Description.png \
images/classic/bidi_rtl_layout-toggle_Enumerate.png \
images/classic/bidi_rtl_layout-toggle_Itemize.png \
+ images/classic/bidi_rtl_layout-toggle_Labeling.png \
images/classic/bidi_rtl_layout-toggle_List.png \
images/classic/bidi_rtl_layout-toggle_Section.png \
images/classic/bookmark-goto.png \
@@ -2135,6 +2143,7 @@ dist_imagesclassic_DATA = \
images/classic/layout-toggle_Description.png \
images/classic/layout-toggle_Enumerate.png \
images/classic/layout-toggle_Itemize.png \
+ images/classic/layout-toggle_Labeling.png \
images/classic/layout-toggle_List.png \
images/classic/layout-toggle_LyX-Code.png \
images/classic/layout-toggle_Chunk.png \
diff --git a/lib/images/bidi_ltr_layout-toggle_Labeling.svgz
b/lib/images/bidi_ltr_layout-toggle_Labeling.svgz
new file mode 100644
index 0000000..5266ad5
Binary files /dev/null and b/lib/images/bidi_ltr_layout-toggle_Labeling.svgz
differ
diff --git a/lib/images/bidi_rtl_layout-toggle_Labeling.svgz
b/lib/images/bidi_rtl_layout-toggle_Labeling.svgz
new file mode 100644
index 0000000..b24502f
Binary files /dev/null and b/lib/images/bidi_rtl_layout-toggle_Labeling.svgz
differ
diff --git a/lib/images/classic/bidi_ltr_layout-toggle_Labeling.png
b/lib/images/classic/bidi_ltr_layout-toggle_Labeling.png
new file mode 100644
index 0000000..6875511
Binary files /dev/null and
b/lib/images/classic/bidi_ltr_layout-toggle_Labeling.png differ
diff --git a/lib/images/classic/bidi_rtl_layout-toggle_Labeling.png
b/lib/images/classic/bidi_rtl_layout-toggle_Labeling.png
new file mode 100644
index 0000000..5f0c84e
Binary files /dev/null and
b/lib/images/classic/bidi_rtl_layout-toggle_Labeling.png differ
diff --git a/lib/images/classic/layout-toggle_Labeling.png
b/lib/images/classic/layout-toggle_Labeling.png
new file mode 100644
index 0000000..6875511
Binary files /dev/null and b/lib/images/classic/layout-toggle_Labeling.png
differ
diff --git a/lib/images/layout-toggle_Labeling.svgz
b/lib/images/layout-toggle_Labeling.svgz
new file mode 100644
index 0000000..5266ad5
Binary files /dev/null and b/lib/images/layout-toggle_Labeling.svgz differ
diff --git a/lib/images/oxygen/bidi_ltr_layout-toggle_Labeling.svgz
b/lib/images/oxygen/bidi_ltr_layout-toggle_Labeling.svgz
new file mode 100644
index 0000000..036a6f9
Binary files /dev/null and
b/lib/images/oxygen/bidi_ltr_layout-toggle_Labeling.svgz differ
diff --git a/lib/images/oxygen/bidi_rtl_layout-toggle_Labeling.svgz
b/lib/images/oxygen/bidi_rtl_layout-toggle_Labeling.svgz
new file mode 100644
index 0000000..ca26ee0
Binary files /dev/null and
b/lib/images/oxygen/bidi_rtl_layout-toggle_Labeling.svgz differ
diff --git a/lib/images/oxygen/layout-toggle_Labeling.svgz
b/lib/images/oxygen/layout-toggle_Labeling.svgz
new file mode 100644
index 0000000..036a6f9
Binary files /dev/null and b/lib/images/oxygen/layout-toggle_Labeling.svgz
differ
diff --git a/lib/ui/stdtoolbars.inc b/lib/ui/stdtoolbars.inc
index 2c7ad20..ca29aed 100644
--- a/lib/ui/stdtoolbars.inc
+++ b/lib/ui/stdtoolbars.inc
@@ -119,8 +119,8 @@ ToolbarSet
Item "Numbered list" "bidi rtl layout-toggle Enumerate"
Item "Itemized list" "bidi ltr layout-toggle Itemize"
Item "Itemized list" "bidi rtl layout-toggle Itemize"
- Item "List" "bidi ltr layout-toggle List"
- Item "List" "bidi rtl layout-toggle List"
+ Item "List" "bidi ltr layout-toggle Labeling"
+ Item "List" "bidi rtl layout-toggle Labeling"
Item "Description" "bidi ltr layout-toggle Description"
Item "Description" "bidi rtl layout-toggle Description"
Item "Increase depth" "bidi ltr depth-increment"
--
lyx-devel mailing list
lyx-devel@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-devel
