[LyX/master] Revert "Add mechanism to change icons in RTL mode"
Jean-Marc Lasgouttes
lasgouttes at lyx.org
Tue Apr 14 20:27:53 UTC 2020
commit ce0538e37259372aa96f8106d790f98d98d09b9b
Author: Jean-Marc Lasgouttes <lasgouttes at lyx.org>
Date: Tue Apr 14 18:30:44 2020 +0200
Revert "Add mechanism to change icons in RTL mode"
This is really too clumsy. Revert in preparation for a better
mechanism.
This reverts commit 2898c335be6114194a15cb1aafe4a3c7c170f212.
---
lib/Makefile.am | 48 --------------------
lib/images/bidi_ltr_depth-decrement.svgz | Bin 2275 -> 0 bytes
lib/images/bidi_ltr_depth-increment.svgz | Bin 2282 -> 0 bytes
lib/images/bidi_ltr_layout-toggle_Description.svgz | Bin 1553 -> 0 bytes
lib/images/bidi_ltr_layout-toggle_Enumerate.svgz | Bin 2043 -> 0 bytes
lib/images/bidi_ltr_layout-toggle_Itemize.svgz | Bin 1441 -> 0 bytes
lib/images/bidi_ltr_layout-toggle_List.svgz | Bin 1568 -> 0 bytes
lib/images/bidi_ltr_layout-toggle_Section.svgz | Bin 3248 -> 0 bytes
lib/images/bidi_rtl_depth-decrement.svgz | Bin 2339 -> 0 bytes
lib/images/bidi_rtl_depth-increment.svgz | Bin 2378 -> 0 bytes
lib/images/bidi_rtl_layout-toggle_Description.svgz | Bin 1848 -> 0 bytes
lib/images/bidi_rtl_layout-toggle_Enumerate.svgz | Bin 2330 -> 0 bytes
lib/images/bidi_rtl_layout-toggle_Itemize.svgz | Bin 1745 -> 0 bytes
lib/images/bidi_rtl_layout-toggle_List.svgz | Bin 1857 -> 0 bytes
lib/images/bidi_rtl_layout-toggle_Section.svgz | Bin 3565 -> 0 bytes
lib/images/classic/bidi_ltr_depth-decrement.png | Bin 208 -> 0 bytes
lib/images/classic/bidi_ltr_depth-increment.png | Bin 215 -> 0 bytes
.../classic/bidi_ltr_layout-toggle_Description.png | Bin 210 -> 0 bytes
.../classic/bidi_ltr_layout-toggle_Enumerate.png | Bin 234 -> 0 bytes
.../classic/bidi_ltr_layout-toggle_Itemize.png | Bin 202 -> 0 bytes
lib/images/classic/bidi_ltr_layout-toggle_List.png | Bin 199 -> 0 bytes
.../classic/bidi_ltr_layout-toggle_Section.png | Bin 238 -> 0 bytes
lib/images/classic/bidi_rtl_depth-decrement.png | Bin 202 -> 0 bytes
lib/images/classic/bidi_rtl_depth-increment.png | Bin 205 -> 0 bytes
.../classic/bidi_rtl_layout-toggle_Description.png | Bin 192 -> 0 bytes
.../classic/bidi_rtl_layout-toggle_Enumerate.png | Bin 189 -> 0 bytes
.../classic/bidi_rtl_layout-toggle_Itemize.png | Bin 183 -> 0 bytes
lib/images/classic/bidi_rtl_layout-toggle_List.png | Bin 158 -> 0 bytes
.../classic/bidi_rtl_layout-toggle_Section.png | Bin 238 -> 0 bytes
lib/images/oxygen/bidi_ltr_depth-decrement.svgz | Bin 1982 -> 0 bytes
lib/images/oxygen/bidi_ltr_depth-increment.svgz | Bin 2068 -> 0 bytes
.../oxygen/bidi_ltr_layout-toggle_Description.svgz | Bin 1714 -> 0 bytes
.../oxygen/bidi_ltr_layout-toggle_Enumerate.svgz | Bin 4278 -> 0 bytes
.../oxygen/bidi_ltr_layout-toggle_Itemize.svgz | Bin 1850 -> 0 bytes
lib/images/oxygen/bidi_ltr_layout-toggle_List.svgz | Bin 1677 -> 0 bytes
.../oxygen/bidi_ltr_layout-toggle_Section.svgz | Bin 2681 -> 0 bytes
lib/images/oxygen/bidi_rtl_depth-decrement.svgz | Bin 2245 -> 0 bytes
lib/images/oxygen/bidi_rtl_depth-increment.svgz | Bin 2331 -> 0 bytes
.../oxygen/bidi_rtl_layout-toggle_Description.svgz | Bin 1979 -> 0 bytes
.../oxygen/bidi_rtl_layout-toggle_Enumerate.svgz | Bin 4121 -> 0 bytes
.../oxygen/bidi_rtl_layout-toggle_Itemize.svgz | Bin 2122 -> 0 bytes
lib/images/oxygen/bidi_rtl_layout-toggle_List.svgz | Bin 1937 -> 0 bytes
.../oxygen/bidi_rtl_layout-toggle_Section.svgz | Bin 2712 -> 0 bytes
lib/ui/stdtoolbars.inc | 20 +++------
src/FuncCode.h | 3 +-
src/LyXAction.cpp | 14 ------
src/frontends/qt/Action.cpp | 1 -
src/frontends/qt/GuiApplication.cpp | 35 +-------------
src/frontends/qt/GuiToolbar.cpp | 3 +-
49 files changed, 11 insertions(+), 113 deletions(-)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index a84be5b..0e51df7 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -516,22 +516,6 @@ dist_images_DATA1X = \
images/all-changes-accept.svgz \
images/all-changes-reject.svgz \
images/banner.svgz \
- images/bidi_ltr_depth-decrement.svgz \
- images/bidi_ltr_depth-increment.svgz \
- 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 \
- images/bidi_rtl_depth-increment.svgz \
- 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 \
images/bookmark-goto_0.svgz \
images/bookmark-save.svgz \
@@ -1819,22 +1803,6 @@ imagesoxygendir = $(imagesdir)/oxygen
dist_imagesoxygen_DATA1X = \
images/oxygen/all-changes-accept.svgz \
images/oxygen/all-changes-reject.svgz \
- images/oxygen/bidi_ltr_depth-decrement.svgz \
- images/oxygen/bidi_ltr_depth-increment.svgz \
- 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 \
- images/oxygen/bidi_rtl_depth-increment.svgz \
- 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 \
images/oxygen/bookmark-goto_0.svgz \
images/oxygen/bookmark-save.svgz \
@@ -2039,22 +2007,6 @@ imagesclassicdir = $(imagesdir)/classic
dist_imagesclassic_DATA = \
images/classic/all-changes-accept.png \
images/classic/all-changes-reject.png \
- images/classic/bidi_ltr_depth-decrement.png \
- images/classic/bidi_ltr_depth-increment.png \
- 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 \
- images/classic/bidi_rtl_depth-increment.png \
- 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 \
images/classic/bookmark-goto_0.png \
images/classic/bookmark-save.png \
diff --git a/lib/images/bidi_ltr_depth-decrement.svgz b/lib/images/bidi_ltr_depth-decrement.svgz
deleted file mode 100644
index 45bee9d..0000000
Binary files a/lib/images/bidi_ltr_depth-decrement.svgz and /dev/null differ
diff --git a/lib/images/bidi_ltr_depth-increment.svgz b/lib/images/bidi_ltr_depth-increment.svgz
deleted file mode 100644
index 088996d..0000000
Binary files a/lib/images/bidi_ltr_depth-increment.svgz and /dev/null differ
diff --git a/lib/images/bidi_ltr_layout-toggle_Description.svgz b/lib/images/bidi_ltr_layout-toggle_Description.svgz
deleted file mode 100644
index 00cc0aa..0000000
Binary files a/lib/images/bidi_ltr_layout-toggle_Description.svgz and /dev/null differ
diff --git a/lib/images/bidi_ltr_layout-toggle_Enumerate.svgz b/lib/images/bidi_ltr_layout-toggle_Enumerate.svgz
deleted file mode 100644
index aaab675..0000000
Binary files a/lib/images/bidi_ltr_layout-toggle_Enumerate.svgz and /dev/null differ
diff --git a/lib/images/bidi_ltr_layout-toggle_Itemize.svgz b/lib/images/bidi_ltr_layout-toggle_Itemize.svgz
deleted file mode 100644
index 53bde57..0000000
Binary files a/lib/images/bidi_ltr_layout-toggle_Itemize.svgz and /dev/null differ
diff --git a/lib/images/bidi_ltr_layout-toggle_List.svgz b/lib/images/bidi_ltr_layout-toggle_List.svgz
deleted file mode 100644
index 5266ad5..0000000
Binary files a/lib/images/bidi_ltr_layout-toggle_List.svgz and /dev/null differ
diff --git a/lib/images/bidi_ltr_layout-toggle_Section.svgz b/lib/images/bidi_ltr_layout-toggle_Section.svgz
deleted file mode 100644
index 65b4335..0000000
Binary files a/lib/images/bidi_ltr_layout-toggle_Section.svgz and /dev/null differ
diff --git a/lib/images/bidi_rtl_depth-decrement.svgz b/lib/images/bidi_rtl_depth-decrement.svgz
deleted file mode 100644
index cd87995..0000000
Binary files a/lib/images/bidi_rtl_depth-decrement.svgz and /dev/null differ
diff --git a/lib/images/bidi_rtl_depth-increment.svgz b/lib/images/bidi_rtl_depth-increment.svgz
deleted file mode 100644
index 7a77e62..0000000
Binary files a/lib/images/bidi_rtl_depth-increment.svgz and /dev/null differ
diff --git a/lib/images/bidi_rtl_layout-toggle_Description.svgz b/lib/images/bidi_rtl_layout-toggle_Description.svgz
deleted file mode 100644
index 8a421ea..0000000
Binary files a/lib/images/bidi_rtl_layout-toggle_Description.svgz and /dev/null differ
diff --git a/lib/images/bidi_rtl_layout-toggle_Enumerate.svgz b/lib/images/bidi_rtl_layout-toggle_Enumerate.svgz
deleted file mode 100644
index 203ac9f..0000000
Binary files a/lib/images/bidi_rtl_layout-toggle_Enumerate.svgz and /dev/null differ
diff --git a/lib/images/bidi_rtl_layout-toggle_Itemize.svgz b/lib/images/bidi_rtl_layout-toggle_Itemize.svgz
deleted file mode 100644
index dc8b357..0000000
Binary files a/lib/images/bidi_rtl_layout-toggle_Itemize.svgz and /dev/null differ
diff --git a/lib/images/bidi_rtl_layout-toggle_List.svgz b/lib/images/bidi_rtl_layout-toggle_List.svgz
deleted file mode 100644
index b24502f..0000000
Binary files a/lib/images/bidi_rtl_layout-toggle_List.svgz and /dev/null differ
diff --git a/lib/images/bidi_rtl_layout-toggle_Section.svgz b/lib/images/bidi_rtl_layout-toggle_Section.svgz
deleted file mode 100644
index 8d9e340..0000000
Binary files a/lib/images/bidi_rtl_layout-toggle_Section.svgz and /dev/null differ
diff --git a/lib/images/classic/bidi_ltr_depth-decrement.png b/lib/images/classic/bidi_ltr_depth-decrement.png
deleted file mode 100644
index deddc47..0000000
Binary files a/lib/images/classic/bidi_ltr_depth-decrement.png and /dev/null differ
diff --git a/lib/images/classic/bidi_ltr_depth-increment.png b/lib/images/classic/bidi_ltr_depth-increment.png
deleted file mode 100644
index 07afff7..0000000
Binary files a/lib/images/classic/bidi_ltr_depth-increment.png and /dev/null differ
diff --git a/lib/images/classic/bidi_ltr_layout-toggle_Description.png b/lib/images/classic/bidi_ltr_layout-toggle_Description.png
deleted file mode 100644
index c9305c5..0000000
Binary files a/lib/images/classic/bidi_ltr_layout-toggle_Description.png and /dev/null differ
diff --git a/lib/images/classic/bidi_ltr_layout-toggle_Enumerate.png b/lib/images/classic/bidi_ltr_layout-toggle_Enumerate.png
deleted file mode 100644
index 8c63143..0000000
Binary files a/lib/images/classic/bidi_ltr_layout-toggle_Enumerate.png and /dev/null differ
diff --git a/lib/images/classic/bidi_ltr_layout-toggle_Itemize.png b/lib/images/classic/bidi_ltr_layout-toggle_Itemize.png
deleted file mode 100644
index 92a67f0..0000000
Binary files a/lib/images/classic/bidi_ltr_layout-toggle_Itemize.png and /dev/null differ
diff --git a/lib/images/classic/bidi_ltr_layout-toggle_List.png b/lib/images/classic/bidi_ltr_layout-toggle_List.png
deleted file mode 100644
index 6875511..0000000
Binary files a/lib/images/classic/bidi_ltr_layout-toggle_List.png and /dev/null differ
diff --git a/lib/images/classic/bidi_ltr_layout-toggle_Section.png b/lib/images/classic/bidi_ltr_layout-toggle_Section.png
deleted file mode 100644
index e17c0dd..0000000
Binary files a/lib/images/classic/bidi_ltr_layout-toggle_Section.png and /dev/null differ
diff --git a/lib/images/classic/bidi_rtl_depth-decrement.png b/lib/images/classic/bidi_rtl_depth-decrement.png
deleted file mode 100644
index c5c10d0..0000000
Binary files a/lib/images/classic/bidi_rtl_depth-decrement.png and /dev/null differ
diff --git a/lib/images/classic/bidi_rtl_depth-increment.png b/lib/images/classic/bidi_rtl_depth-increment.png
deleted file mode 100644
index 82517d8..0000000
Binary files a/lib/images/classic/bidi_rtl_depth-increment.png and /dev/null differ
diff --git a/lib/images/classic/bidi_rtl_layout-toggle_Description.png b/lib/images/classic/bidi_rtl_layout-toggle_Description.png
deleted file mode 100644
index 9725c96..0000000
Binary files a/lib/images/classic/bidi_rtl_layout-toggle_Description.png and /dev/null differ
diff --git a/lib/images/classic/bidi_rtl_layout-toggle_Enumerate.png b/lib/images/classic/bidi_rtl_layout-toggle_Enumerate.png
deleted file mode 100644
index 9b22744..0000000
Binary files a/lib/images/classic/bidi_rtl_layout-toggle_Enumerate.png and /dev/null differ
diff --git a/lib/images/classic/bidi_rtl_layout-toggle_Itemize.png b/lib/images/classic/bidi_rtl_layout-toggle_Itemize.png
deleted file mode 100644
index 2e86102..0000000
Binary files a/lib/images/classic/bidi_rtl_layout-toggle_Itemize.png and /dev/null differ
diff --git a/lib/images/classic/bidi_rtl_layout-toggle_List.png b/lib/images/classic/bidi_rtl_layout-toggle_List.png
deleted file mode 100644
index 5f0c84e..0000000
Binary files a/lib/images/classic/bidi_rtl_layout-toggle_List.png and /dev/null differ
diff --git a/lib/images/classic/bidi_rtl_layout-toggle_Section.png b/lib/images/classic/bidi_rtl_layout-toggle_Section.png
deleted file mode 100644
index e17c0dd..0000000
Binary files a/lib/images/classic/bidi_rtl_layout-toggle_Section.png and /dev/null differ
diff --git a/lib/images/oxygen/bidi_ltr_depth-decrement.svgz b/lib/images/oxygen/bidi_ltr_depth-decrement.svgz
deleted file mode 100644
index fe32886..0000000
Binary files a/lib/images/oxygen/bidi_ltr_depth-decrement.svgz and /dev/null differ
diff --git a/lib/images/oxygen/bidi_ltr_depth-increment.svgz b/lib/images/oxygen/bidi_ltr_depth-increment.svgz
deleted file mode 100644
index 3cf9dfd..0000000
Binary files a/lib/images/oxygen/bidi_ltr_depth-increment.svgz and /dev/null differ
diff --git a/lib/images/oxygen/bidi_ltr_layout-toggle_Description.svgz b/lib/images/oxygen/bidi_ltr_layout-toggle_Description.svgz
deleted file mode 100644
index aa0ae3a..0000000
Binary files a/lib/images/oxygen/bidi_ltr_layout-toggle_Description.svgz and /dev/null differ
diff --git a/lib/images/oxygen/bidi_ltr_layout-toggle_Enumerate.svgz b/lib/images/oxygen/bidi_ltr_layout-toggle_Enumerate.svgz
deleted file mode 100644
index ad79d56..0000000
Binary files a/lib/images/oxygen/bidi_ltr_layout-toggle_Enumerate.svgz and /dev/null differ
diff --git a/lib/images/oxygen/bidi_ltr_layout-toggle_Itemize.svgz b/lib/images/oxygen/bidi_ltr_layout-toggle_Itemize.svgz
deleted file mode 100644
index bf45803..0000000
Binary files a/lib/images/oxygen/bidi_ltr_layout-toggle_Itemize.svgz and /dev/null differ
diff --git a/lib/images/oxygen/bidi_ltr_layout-toggle_List.svgz b/lib/images/oxygen/bidi_ltr_layout-toggle_List.svgz
deleted file mode 100644
index 036a6f9..0000000
Binary files a/lib/images/oxygen/bidi_ltr_layout-toggle_List.svgz and /dev/null differ
diff --git a/lib/images/oxygen/bidi_ltr_layout-toggle_Section.svgz b/lib/images/oxygen/bidi_ltr_layout-toggle_Section.svgz
deleted file mode 100644
index 2e14680..0000000
Binary files a/lib/images/oxygen/bidi_ltr_layout-toggle_Section.svgz and /dev/null differ
diff --git a/lib/images/oxygen/bidi_rtl_depth-decrement.svgz b/lib/images/oxygen/bidi_rtl_depth-decrement.svgz
deleted file mode 100644
index ceb1a7d..0000000
Binary files a/lib/images/oxygen/bidi_rtl_depth-decrement.svgz and /dev/null differ
diff --git a/lib/images/oxygen/bidi_rtl_depth-increment.svgz b/lib/images/oxygen/bidi_rtl_depth-increment.svgz
deleted file mode 100644
index b2890f4..0000000
Binary files a/lib/images/oxygen/bidi_rtl_depth-increment.svgz and /dev/null differ
diff --git a/lib/images/oxygen/bidi_rtl_layout-toggle_Description.svgz b/lib/images/oxygen/bidi_rtl_layout-toggle_Description.svgz
deleted file mode 100644
index 4c906b1..0000000
Binary files a/lib/images/oxygen/bidi_rtl_layout-toggle_Description.svgz and /dev/null differ
diff --git a/lib/images/oxygen/bidi_rtl_layout-toggle_Enumerate.svgz b/lib/images/oxygen/bidi_rtl_layout-toggle_Enumerate.svgz
deleted file mode 100644
index 19907b4..0000000
Binary files a/lib/images/oxygen/bidi_rtl_layout-toggle_Enumerate.svgz and /dev/null differ
diff --git a/lib/images/oxygen/bidi_rtl_layout-toggle_Itemize.svgz b/lib/images/oxygen/bidi_rtl_layout-toggle_Itemize.svgz
deleted file mode 100644
index 1f71c41..0000000
Binary files a/lib/images/oxygen/bidi_rtl_layout-toggle_Itemize.svgz and /dev/null differ
diff --git a/lib/images/oxygen/bidi_rtl_layout-toggle_List.svgz b/lib/images/oxygen/bidi_rtl_layout-toggle_List.svgz
deleted file mode 100644
index ca26ee0..0000000
Binary files a/lib/images/oxygen/bidi_rtl_layout-toggle_List.svgz and /dev/null differ
diff --git a/lib/images/oxygen/bidi_rtl_layout-toggle_Section.svgz b/lib/images/oxygen/bidi_rtl_layout-toggle_Section.svgz
deleted file mode 100644
index ba5dfa5..0000000
Binary files a/lib/images/oxygen/bidi_rtl_layout-toggle_Section.svgz and /dev/null differ
diff --git a/lib/ui/stdtoolbars.inc b/lib/ui/stdtoolbars.inc
index 94fcfee..4af3606 100644
--- a/lib/ui/stdtoolbars.inc
+++ b/lib/ui/stdtoolbars.inc
@@ -113,20 +113,12 @@ ToolbarSet
Toolbar "extra" "Extra"
Item "Default" "layout"
- # The bidi function is used here to select a different
- # icon depending on the direction of the current text.
- Item "Numbered list" "bidi ltr layout-toggle Enumerate"
- 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 "Labeled List" "bidi ltr layout-toggle Labeling"
- Item "Labeled 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"
- Item "Increase depth" "bidi rtl depth-increment"
- Item "Decrease depth" "bidi ltr depth-decrement"
- Item "Decrease depth" "bidi rtl depth-decrement"
+ Item "Numbered list" "layout-toggle Enumerate"
+ Item "Itemized list" "layout-toggle Itemize"
+ Item "Labeled List" "layout-toggle Labeling"
+ Item "Description" "layout-toggle Description"
+ Item "Increase depth" "depth-increment"
+ Item "Decrease depth" "depth-decrement"
Separator
Item "Insert figure float" "float-insert figure"
Item "Insert table float" "float-insert table"
diff --git a/src/FuncCode.h b/src/FuncCode.h
index 762bc03..84deea3 100644
--- a/src/FuncCode.h
+++ b/src/FuncCode.h
@@ -485,9 +485,8 @@ enum FuncCode
LFUN_BUFFER_WRITE_AS_TEMPLATE, // spitz, 20190323
LFUN_TABULAR_STYLE_INSERT, // spitz, 20190325
LFUN_PARAGRAPH_SELECT, // Kornel, 20190416
- LFUN_BIDI,
- // 380
LFUN_BUFFER_RESET_EXPORT, // spitz 20191226
+ // 380
LFUN_MASTER_BUFFER_FORALL, // spitz 20191231
LFUN_IF_RELATIVES, // spitz 20200102
LFUN_LASTACTION // end of the table
diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp
index 6089e5e..9f4d3a5 100644
--- a/src/LyXAction.cpp
+++ b/src/LyXAction.cpp
@@ -333,20 +333,6 @@ void LyXAction::init()
/*!
- * \var lyx::FuncCode lyx::LFUN_BIDI
- * \li Action: Helper function for bidirectional toolbar icons
- * \li Notion: In a text, the function is marked as `unknown' when the
- current direction does not correspond to DIRECTION (ltr
- or rtl). Otherwise the function behaves exactly as
- ACTION. The result is that ACTION will be associated to
- a different icon depending on text direction.
- * \li Syntax: bidi <DIRECTION> <ACTION>
- * \li Origin: JMarc, 21 July 2019
- * \endvar
- */
- { LFUN_BIDI, "bidi", Noop, System },
-
-/*!
* \var lyx::FuncCode lyx::LFUN_BOOKMARK_CLEAR
* \li Action: Clears the list of saved bookmarks.
* \li Syntax: bookmark-clear
diff --git a/src/frontends/qt/Action.cpp b/src/frontends/qt/Action.cpp
index 0609351..bd102e6 100644
--- a/src/frontends/qt/Action.cpp
+++ b/src/frontends/qt/Action.cpp
@@ -76,7 +76,6 @@ void Action::update()
setCheckable(false);
}
- setVisible(!status.unknown());
setEnabled(status.enabled());
}
diff --git a/src/frontends/qt/GuiApplication.cpp b/src/frontends/qt/GuiApplication.cpp
index 573ebb9..64ab6cf 100644
--- a/src/frontends/qt/GuiApplication.cpp
+++ b/src/frontends/qt/GuiApplication.cpp
@@ -70,11 +70,11 @@
#include "support/lassert.h"
#include "support/lstrings.h"
#include "support/lyxalgo.h" // sorted
+#include "support/textutils.h"
#include "support/Messages.h"
#include "support/os.h"
#include "support/Package.h"
#include "support/TempFile.h"
-#include "support/textutils.h"
#ifdef Q_OS_MAC
#include "support/AppleScript.h"
@@ -928,7 +928,7 @@ public:
struct GuiApplication::Private
{
Private(): language_model_(0), meta_fake_bit(NoModifier),
- global_menubar_(0)
+ global_menubar_(0)
{
#if (QT_VERSION < 0x050000) || (QT_VERSION >= 0x050400)
#if defined(Q_OS_WIN) || defined(Q_CYGWIN_WIN)
@@ -1292,24 +1292,6 @@ bool GuiApplication::getStatus(FuncRequest const & cmd, FuncStatus & flag) const
break;
}
- case LFUN_BIDI: {
- string const dir = cmd.getArg(0);
- string const lfun = cmd.getLongArg(1);
- BufferView const * bv =
- current_view_ ? current_view_->currentBufferView() : nullptr;
- bool rtl = bv ? bv->cursor().innerParagraph().isRTL(bv->buffer().params())
- : layoutDirection() == Qt::RightToLeft;
- if (((rtl && dir != "rtl") || (!rtl && dir != "ltr"))) {
- flag.setUnknown(true);
- flag.setEnabled(false);
- } else {
- FuncRequest func(lyxaction.lookupFunc(lfun));
- func.setOrigin(cmd.origin());
- flag = getStatus(func);
- }
- break;
- }
-
case LFUN_IF_RELATIVES: {
string const lfun = to_utf8(cmd.argument());
BufferView const * bv =
@@ -1898,7 +1880,6 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
lyxrc.cursor_follows_scrollbar = !lyxrc.cursor_follows_scrollbar;
break;
- // --- syntax commands ----------------------------
case LFUN_REPEAT: {
// repeat command
string countstr;
@@ -2050,18 +2031,6 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
break;
}
- case LFUN_BIDI: {
- string const lfun = cmd.getLongArg(1);
- FuncRequest func(lyxaction.lookupFunc(cmd.getLongArg(1)));
- func.setOrigin(cmd.origin());
- FuncStatus const stat = getStatus(func);
- if (stat.enabled()) {
- dispatch(func);
- break;
- }
- break;
- }
-
case LFUN_IF_RELATIVES: {
string const lfun = to_utf8(cmd.argument());
FuncRequest func(lyxaction.lookupFunc(lfun));
diff --git a/src/frontends/qt/GuiToolbar.cpp b/src/frontends/qt/GuiToolbar.cpp
index 2e8c2b4..9da3306 100644
--- a/src/frontends/qt/GuiToolbar.cpp
+++ b/src/frontends/qt/GuiToolbar.cpp
@@ -519,7 +519,8 @@ void GuiToolbar::add(ToolbarItem const & item)
break;
}
case ToolbarItem::COMMAND: {
- addAction(addItem(item));
+ if (!getStatus(*item.func_).unknown())
+ addAction(addItem(item));
break;
}
default:
More information about the lyx-cvs
mailing list