[LyX/master] de.po
commit 797be75c177c06e2df8f2f7c685fa586e3de9e9f Author: Juergen Spitzmueller Date: Sat Jun 6 09:23:23 2020 +0200 de.po po/de.po | 1433 +++--- 1 files changed, 725 insertions(+), 708 deletions(-) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.3.x] de.po
commit 8f19bede2f29c7bc3be836db17ae6158e87caf30 Author: Juergen Spitzmueller Date: Sat Jun 6 09:29:27 2020 +0200 de.po po/de.gmo | Bin 549603 -> 550142 bytes po/de.po | 513 - 2 files changed, 273 insertions(+), 240 deletions(-) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Update to Russian from Yuriy
commit 2e21b10aeddb00aeef391c0666343a80be3e7f52 Author: Juergen Spitzmueller Date: Sat Jun 6 09:58:21 2020 +0200 Update to Russian from Yuriy --- lib/doc/ru/Tutorial.lyx | 24 +++--- po/ru.po| 83 ++ 2 files changed, 52 insertions(+), 55 deletions(-) diff --git a/lib/doc/ru/Tutorial.lyx b/lib/doc/ru/Tutorial.lyx index cedae6b..ae20ab6 100644 --- a/lib/doc/ru/Tutorial.lyx +++ b/lib/doc/ru/Tutorial.lyx @@ -918,15 +918,15 @@ WYSIWYM: Пробельное пространство в \SpecialChar LyX \end_layout \begin_layout Standard -Одно из самого сложного для новичков — это привыкнуть к способу обращения - \SpecialChar LyX - с пробельным пространством. +Для новичков сложнее всего — привыкнуть к способу обращения \SpecialChar LyX + с пробельным + пространством. Сколько бы раз вы ни нажимали \family sans Enter \family default , вы получите только одну пустую строку. - Сколько бы вы раз ни нажимали + Сколько бы раз вы ни нажимали \family sans Пробел \family default @@ -1112,7 +1112,7 @@ Tab \begin_inset Quotes cld \end_inset -Обычный +Обычный текст \begin_inset Quotes crd \end_inset @@ -1184,7 +1184,7 @@ Enter \begin_inset Quotes cld \end_inset -Обычный +Обычный текст \begin_inset Quotes crd \end_inset @@ -1305,7 +1305,7 @@ Enter \family default , чтобы вернуться к окружению \family sans -Обычный +Обычный текст \family default , и наберите следующие строки: \end_layout @@ -1630,7 +1630,7 @@ Ctrl+Enter ). Чтобы завершить ввод списка, вам нужно заново выбрать окружение \family sans -Обычный +Обычный текст \family default (или дважды нажать \family sans @@ -1646,7 +1646,7 @@ Enter Но что, если вы хотите пронумеровать причины? Что ж, просто выделите весь список \begin_inset Foot -status open +status collapsed \begin_layout Plain Layout \SpecialChar LyX @@ -2282,7 +2282,7 @@ Letter Описание \family default , вам знакомы. - Вы можете немного с ними поиграть и посмотреть, как они работают. + Вы можете с ними немного поэкспериментировать и увидеть, как они работают. Например, вы заметите, что окружение \family sans Подпись @@ -2291,13 +2291,13 @@ Letter \begin_inset Quotes rld \end_inset -Signature: +Подпись: \begin_inset Quotes rrd \end_inset , выведенное красным цветом. Это слово не будет показано в распечатанном письме, в чем вы можете убедиться, - если напечатаете файл. + если просмотрите PDF-файл. Оно здесь просто для того, чтобы вы знали, что это подпись. Также заметьте, что не имеет значения место расположения строки \family sans diff --git a/po/ru.po b/po/ru.po index 3bfbac4..0c6a881 100644 --- a/po/ru.po +++ b/po/ru.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: LyX 2.4\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" "POT-Creation-Date: 2020-05-03 13:31+0200\n" -"PO-Revision-Date: 2020-05-26 10:50+0300\n" +"PO-Revision-Date: 2020-06-05 18:17+0300\n" "Last-Translator: Yuriy Skalko \n" "Language-Team: Russian \n" "Language: ru\n" @@ -20,9 +20,6 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 2.3\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Poedit-Bookmarks: 1979,613,-1,-1,-1,-1,-1,-1,-1,-1\n" #: src/frontends/qt/ui/AboutUi.ui:42 msgid "Version" @@ -729,7 +726,7 @@ msgstr "Добавить &всё" #: src/frontends/qt/GuiView.cpp:4150 src/frontends/qt/GuiView.cpp:4157 #: src/insets/InsetBibtex.cpp:149 msgid "&Cancel" -msgstr "&Отменить" +msgstr "&Отмена" #: src/frontends/qt/ui/BranchesUnknownUi.ui:65 #: src/frontends/qt/ui/BranchesUnknownUi.ui:78 @@ -1166,7 +1163,7 @@ msgstr "Сравнить версии" #: src/frontends/qt/ui/CompareHistoryUi.ui:34 msgid "Revisions ba&ck" -msgstr "Предыдущие версии" +msgstr "Версий назад" #: src/frontends/qt/ui/CompareHistoryUi.ui:87 msgid "&Between revisions" @@ -7085,7 +7082,7 @@ msgstr "IEEE Transactions" #: lib/layouts/tufte-book.layout:34 lib/ui/stdtoolbars.inc:75 #: src/insets/InsetRef.cpp:549 msgid "Standard" -msgstr "Обычный" +msgstr "Обычный текст" #: lib/layouts/IEEEtran.layout:67 lib/layouts/aa.layout:204 #: lib/layouts/aapaper.layout:78 lib/layouts/aapaper.layout:172 @@ -19568,20 +19565,20 @@ msgstr "Копировать как ссылку|К" #: lib/ui/stdtoolbars.inc:86 src/Text3.cpp:1536 #: src/mathed/InsetMathNest.cpp:559 msgid "Cut" -msgstr "Вырезать|В" +msgstr "Вырезать" #: lib/ui/stdcontext.inc:62 lib/ui/stdcontext.inc:348 lib/ui/stdmenus.inc:109 #: lib/ui/stdtoolbars.inc:87 src/Text3.cpp:1541 #: src/mathed/InsetMathNest.cpp:568 msgid "Copy" -msgstr "Копировать|К" +msgstr "Копировать" #: lib/ui/stdcontext.inc:63 lib/ui/stdcontext.inc:349 lib/ui/stdmenus.inc:110 #: lib/ui/stdtoolbars.inc:88 src/Text3.cpp:1481 #: src/frontends/qt/GuiToolbar.cpp:410 src/mathed/InsetMathGrid.cpp:1586 #: src/mathed/InsetMathNest.cpp:538 msgid "Paste" -msgstr "Вставить|а"
[LyX/master] Update to Russian UG by Yuriy and Henry
commit 0572fafacd980c79d00d79fdca568e0e4e470876 Author: Juergen Spitzmueller Date: Sat Jun 6 09:59:59 2020 +0200 Update to Russian UG by Yuriy and Henry lib/doc/ru/UserGuide.lyx | 603 -- 1 files changed, 262 insertions(+), 341 deletions(-) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Update sk.po
commit bb912da6eab9c6695826513c0b1c754d1e713281
Author: Kornel Benko
Date: Sat Jun 6 10:54:10 2020 +0200
Update sk.po
---
po/sk.po | 28 ++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/po/sk.po b/po/sk.po
index eac8dec..9f10514 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: LyX-2.4\n"
"Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
-"POT-Creation-Date: 2020-05-16 09:50+0200\n"
-"PO-Revision-Date: 2020-05-16 07:55+\n"
+"POT-Creation-Date: 2020-06-06 10:43+0200\n"
+"PO-Revision-Date: 2020-06-06 08:51+\n"
"Last-Translator: Kornel Benko \n"
"Language-Team: Slovak \n"
"Language: sk\n"
@@ -9646,6 +9646,10 @@ msgstr "(\\alph{enumii})"
msgid "American Psychological Association (APA), v. 6"
msgstr "Americká Psychologická Spoločnosť (APA), v. 6"
+#: lib/layouts/apa7.layout:3
+msgid "American Psychological Association (APA), v. 7"
+msgstr "Americká Psychologická Spoločnosť (APA), v. 7"
+
#: lib/layouts/apa6.layout:113
msgid "FiveAuthors"
msgstr "Päť autorov"
@@ -9712,6 +9716,26 @@ msgstr "Číslo v hlavičke"
msgid "*"
msgstr "*"
+#: lib/layouts/apax.inc:557
+msgid "Course"
+msgstr "Kurz"
+
+#: lib/layouts/apax.inc:573
+msgid "Course: "
+msgstr "Kurz: "
+
+#: lib/layouts/apax.inc:581
+msgid "addORCIDlink"
+msgstr "Pridať ORCID odkaz"
+
+#: lib/layouts/apax.inc:585
+msgid "ORCID-link: "
+msgstr "ORCID-odkaz: "
+
+#: lib/layouts/apax.inc:593
+msgid "Author-name"
+msgstr "Meno autora"
+
#: lib/layouts/arab-article.layout:3
msgid "Arabic Article"
msgstr "Arabský článok"
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.3.x] Amend cb680fcf: Added apa7 layout
commit bb69829bd713ea2bb17a81ea1a263cdf1a8bc0b9 Author: Kornel Benko Date: Sat Jun 6 11:24:29 2020 +0200 Amend cb680fcf: Added apa7 layout Remove non existent feature in lyx2.3 which slipped in from lyx2.4 version of apa6.layout Thanks Jürgen. --- lib/layouts/apax.inc | 10 -- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/lib/layouts/apax.inc b/lib/layouts/apax.inc index c4b0d7a..2b43c39 100644 --- a/lib/layouts/apax.inc +++ b/lib/layouts/apax.inc @@ -474,16 +474,6 @@ Style Itemize LabelString "Custom Item|s" Tooltip "A customized item string" EndArgument - Argument listpreamble:1 - LabelString"List preamble" - MenuString "List Preamble" - Tooltip"LaTeX code to be inserted before the first item" - PassThru 1 - Font - Family typewriter - Color latex - EndFont - EndArgument End -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.3.x] Amend(2) cb680fcf: 2 more instances to remove
commit d1d1bb1ad03f44db1231564408098faf2a75d6e1
Author: Kornel Benko
Date: Sat Jun 6 11:38:58 2020 +0200
Amend(2) cb680fcf: 2 more instances to remove
---
lib/layouts/apax.inc | 20
1 files changed, 0 insertions(+), 20 deletions(-)
diff --git a/lib/layouts/apax.inc b/lib/layouts/apax.inc
index 2b43c39..885bda7 100644
--- a/lib/layouts/apax.inc
+++ b/lib/layouts/apax.inc
@@ -499,16 +499,6 @@ Style Enumerate
LabelString "Custom Item|s"
Tooltip "A customized item string"
EndArgument
- Argument listpreamble:1
- LabelString"List preamble"
- MenuString "List Preamble"
- Tooltip"LaTeX code to be inserted before the first item"
- PassThru 1
- Font
- Family typewriter
- Color latex
- EndFont
- EndArgument
End
@@ -532,16 +522,6 @@ Style Seriate
LabelString "(\alph{enumii})"
LabelStringAppendix "(\alph{enumii})"
RefPrefix ser
- Argument listpreamble:1
- LabelString"List preamble"
- MenuString "List Preamble"
- Tooltip"LaTeX code to be inserted before the first item"
- PassThru 1
- Font
- Family typewriter
- Color latex
- EndFont
- EndArgument
End
Style Course
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.3.x] Update sk.po
commit 4b21811681477919bf80917e30552d51a4dc4db3
Author: Kornel Benko
Date: Sat Jun 6 11:42:05 2020 +0200
Update sk.po
---
po/sk.po | 28 ++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/po/sk.po b/po/sk.po
index 472b9fe..d5e7b66 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: LyX-2.3\n"
"Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
-"POT-Creation-Date: 2020-05-20 15:52-0400\n"
-"PO-Revision-Date: 2020-05-18 17:19+\n"
+"POT-Creation-Date: 2020-06-06 11:39+0200\n"
+"PO-Revision-Date: 2020-06-06 09:40+\n"
"Last-Translator: Kornel Benko \n"
"Language-Team: Slovak \n"
"Language: sk\n"
@@ -9137,6 +9137,10 @@ msgstr "(\\alph{enumii})"
msgid "American Psychological Association (APA), v. 6"
msgstr "Americká Psychologická Spoločnosť (APA), v. 6"
+#: lib/layouts/apa7.layout:3
+msgid "American Psychological Association (APA), v. 7"
+msgstr "Americká Psychologická Spoločnosť (APA), v. 7"
+
#: lib/layouts/apa6.layout:113
msgid "FiveAuthors"
msgstr "Päť autorov"
@@ -9203,6 +9207,26 @@ msgstr "Číslo v hlavičke"
msgid "*"
msgstr "*"
+#: lib/layouts/apax.inc:557
+msgid "Course"
+msgstr "Kurz"
+
+#: lib/layouts/apax.inc:573
+msgid "Course: "
+msgstr "Kurz: "
+
+#: lib/layouts/apax.inc:581
+msgid "addORCIDlink"
+msgstr "Pridať ORCID odkaz"
+
+#: lib/layouts/apax.inc:585
+msgid "ORCID-link: "
+msgstr "ORCID-odkaz: "
+
+#: lib/layouts/apax.inc:583
+msgid "Author-name"
+msgstr "Meno autora"
+
#: lib/layouts/arab-article.layout:3
msgid "Arabic Article"
msgstr "Arabský článok"
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.3.x] Typo
commit 696d9dc52b62cb6a2241f8ddeb8c2b4ce4a84474 Author: Kornel Benko Date: Sat Jun 6 11:47:06 2020 +0200 Typo --- lib/layouts/apa6.layout |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/layouts/apa6.layout b/lib/layouts/apa6.layout index cbe561d..589341c 100644 --- a/lib/layouts/apa6.layout +++ b/lib/layouts/apa6.layout @@ -7,6 +7,6 @@ Format 66 Input apax.inc -NoStyle course +NoStyle Course NoStyle addORCIDlink -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Typo
commit 6a0dda1719fe884268c727019180f91466c7952e Author: Kornel Benko Date: Sat Jun 6 11:47:28 2020 +0200 Typo --- lib/layouts/apa6.layout |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/layouts/apa6.layout b/lib/layouts/apa6.layout index 1ce958d..00a0420 100644 --- a/lib/layouts/apa6.layout +++ b/lib/layouts/apa6.layout @@ -7,6 +7,6 @@ Format 81 Input apax.inc -NoStyle course +NoStyle Course NoStyle addORCIDlink -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Add some localized (Russian) cliparts, by Yuriy
commit ca6c973ab091fa3e4986f73170660fa5500736b7 Author: Juergen Spitzmueller Date: Sat Jun 6 12:54:43 2020 +0200 Add some localized (Russian) cliparts, by Yuriy --- lib/doc/Makefile.am|5 - lib/doc/ru/clipart/Abstract.pdf| Bin 0 -> 25311 bytes lib/doc/ru/clipart/ERT.png | Bin 0 -> 1498 bytes lib/doc/ru/clipart/StandardToolbar.png | Bin 0 -> 16078 bytes lib/doc/ru/clipart/ToolbarEnvBox.png | Bin 790 -> 589 bytes 5 files changed, 4 insertions(+), 1 deletions(-) diff --git a/lib/doc/Makefile.am b/lib/doc/Makefile.am index a15169a..8654b76 100644 --- a/lib/doc/Makefile.am +++ b/lib/doc/Makefile.am @@ -284,7 +284,10 @@ dist_rudoc_DATA = \ ruclipartdocdir = $(rudocdir)/clipart dist_ruclipartdoc_DATA = \ - ru/clipart/ToolbarEnvBox.png + ru/clipart/ERT.png \ + ru/clipart/StandardToolbar.png \ + ru/clipart/ToolbarEnvBox.png \ + ru/clipart/Abstract.pdf skdocdir = $(docdir)/sk dist_skdoc_DATA = \ diff --git a/lib/doc/ru/clipart/Abstract.pdf b/lib/doc/ru/clipart/Abstract.pdf new file mode 100644 index 000..df17890 Binary files /dev/null and b/lib/doc/ru/clipart/Abstract.pdf differ diff --git a/lib/doc/ru/clipart/ERT.png b/lib/doc/ru/clipart/ERT.png new file mode 100644 index 000..0bb13ca Binary files /dev/null and b/lib/doc/ru/clipart/ERT.png differ diff --git a/lib/doc/ru/clipart/StandardToolbar.png b/lib/doc/ru/clipart/StandardToolbar.png new file mode 100644 index 000..5deb7e6 Binary files /dev/null and b/lib/doc/ru/clipart/StandardToolbar.png differ diff --git a/lib/doc/ru/clipart/ToolbarEnvBox.png b/lib/doc/ru/clipart/ToolbarEnvBox.png index dc7e49f..d47c577 100644 Binary files a/lib/doc/ru/clipart/ToolbarEnvBox.png and b/lib/doc/ru/clipart/ToolbarEnvBox.png differ -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] New Win Installer, by Eugene
commit 68e227c9fa5f720bbb79abc20e9be0a80a8497da Author: Juergen Spitzmueller Date: Sat Jun 6 12:58:39 2020 +0200 New Win Installer, by Eugene development/Win32/packaging/installer/Readme.txt | 12 +- .../Win32/packaging/installer2/lyx_standard.nsi| 30 + .../installer2/src/CustomPages/LaTeXFolder.nsddef | 13 + .../installer2/src/CustomPages/LaTeXFolder.nsdinc | 69 ++ .../packaging/installer2/src/dictionaries.nsh | 870 +++ .../installer2/src/lang/TranslatedLanguages.nsh| 33 + .../Win32/packaging/installer2/src/main.nsh| 1152 7 files changed, 2176 insertions(+), 3 deletions(-) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Having two folders just differing in case is not such a good idea.
commit 33e74e51174a692a36ff3d9ccac1cd979e9b9dab
Author: Juergen Spitzmueller
Date: Sat Jun 6 13:56:46 2020 +0200
Having two folders just differing in case is not such a good idea.
See #11882
---
development/Win32/lyxrc.dist.in | 16
development/cmake/Install.cmake |2 +-
development/win32/lyxrc.dist.in | 16
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/development/Win32/lyxrc.dist.in b/development/Win32/lyxrc.dist.in
new file mode 100644
index 000..9a5257f
--- /dev/null
+++ b/development/Win32/lyxrc.dist.in
@@ -0,0 +1,16 @@
+### This file is part of
+###
+### LyX, The Document Processor
+###
+### Copyright 1995 Matthias Ettrich
+### Copyright 1995-2020 The LyX Team.
+###
+###
+
+# This file is written by LyX, if you want to make your own
+# modifications you should do them from inside LyX and save
+
+Format 25
+
+\serverpipe "\\.\pipe\$$UserDir\lyxpipe"
+
diff --git a/development/cmake/Install.cmake b/development/cmake/Install.cmake
index d60e8e3..b3b06ba 100755
--- a/development/cmake/Install.cmake
+++ b/development/cmake/Install.cmake
@@ -156,7 +156,7 @@ elseif(UNIX)
elseif(CYGWIN)
set(lyxrcorig "${TOP_SRC_DIR}/development/cygwin/lyxrc.dist.in")
elseif(WIN32)
- set(lyxrcorig "${TOP_SRC_DIR}/development/win32/lyxrc.dist.in")
+ set(lyxrcorig "${TOP_SRC_DIR}/development/Win32/lyxrc.dist.in")
endif()
if(NOT lyxrcorig STREQUAL "")
diff --git a/development/win32/lyxrc.dist.in b/development/win32/lyxrc.dist.in
deleted file mode 100644
index 2de6007..000
--- a/development/win32/lyxrc.dist.in
+++ /dev/null
@@ -1,16 +0,0 @@
-### This file is part of
-###
-### LyX, The Document Processor
-###
-### Copyright 1995 Matthias Ettrich
-### Copyright 1995-2018 The LyX Team.
-###
-###
-
-# This file is written by LyX, if you want to make your own
-# modifications you should do them from inside LyX and save
-
-Format 25
-
-\serverpipe "\\.\pipe\$$UserDir\lyxpipe"
-
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Need this for std::endl now, according to Eugene
commit da362a6a59a7d2bd2bb922a0daa782202f9623e2 Author: Richard Kimberly Heck Date: Sat Jun 6 13:05:43 2020 -0400 Need this for std::endl now, according to Eugene --- src/support/os_win32.cpp |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/support/os_win32.cpp b/src/support/os_win32.cpp index 82e57d2..e4f9ebd 100644 --- a/src/support/os_win32.cpp +++ b/src/support/os_win32.cpp @@ -32,6 +32,7 @@ #include "support/lassert.h" #include +#include #include #include -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Get rid of Qt resources
commit 2d48072e664099385b2442f7166b3c57129799bb
Author: Jean-Marc Lasgouttes
Date: Sun Jun 7 00:57:40 2020 +0200
Get rid of Qt resources
It turns out that the resources were mostly not used anyway. Removing
them shrinks LyX binary by ~6MB.
Only autotools have been adapted. cmake will require the same
simplification.
---
src/frontends/qt/.gitignore |2 -
src/frontends/qt/BulletsModule.cpp |3 +-
src/frontends/qt/GuiApplication.cpp | 51 +++
src/frontends/qt/GuiCompleter.cpp | 22 ---
src/frontends/qt/Makefile.am| 14 -
src/insets/InsetInfo.cpp|8 -
src/mathed/InsetMathNest.cpp|4 +-
7 files changed, 26 insertions(+), 78 deletions(-)
diff --git a/src/frontends/qt/.gitignore b/src/frontends/qt/.gitignore
index f487992..388b165 100644
--- a/src/frontends/qt/.gitignore
+++ b/src/frontends/qt/.gitignore
@@ -1,5 +1,3 @@
-Resources.cpp
-Resources.qrc
liblyxqt.a
ui_*.h
moc_*.cpp
diff --git a/src/frontends/qt/BulletsModule.cpp
b/src/frontends/qt/BulletsModule.cpp
index ba96453..2dca758 100644
--- a/src/frontends/qt/BulletsModule.cpp
+++ b/src/frontends/qt/BulletsModule.cpp
@@ -11,6 +11,7 @@
#include
#include "BulletsModule.h"
+#include "GuiApplication.h"
#include "qt_helpers.h"
#include
@@ -64,7 +65,7 @@ void BulletsModule::setupPanel(QListWidget * lw, QString
const & panelname,
bulletpaneCO->addItem(panelname);
// get pixmap with bullets
- QPixmap pixmap(":/images/" + toqstr(fname) + ".png");
+ QPixmap pixmap = getPixmap("images", toqstr(fname), ".png");
int const w = pixmap.width() / 6;
int const h = pixmap.height() / 6;
diff --git a/src/frontends/qt/GuiApplication.cpp
b/src/frontends/qt/GuiApplication.cpp
index e9244e1..d2ff132 100644
--- a/src/frontends/qt/GuiApplication.cpp
+++ b/src/frontends/qt/GuiApplication.cpp
@@ -157,16 +157,6 @@ using namespace std;
using namespace lyx::support;
-static void initializeResources()
-{
- static bool initialized = false;
- if (!initialized) {
- Q_INIT_RESOURCE(Resources);
- initialized = true;
- }
-}
-
-
namespace lyx {
frontend::Application * createApplication(int & argc, char * argv[])
@@ -490,7 +480,6 @@ QString themeIconName(QString const & action)
// the returned bool is true if the icon needs to be flipped
pair iconName(FuncRequest const & f, bool unknown, bool rtl)
{
- initializeResources();
QStringList names;
QString lfunname = toqstr(lyxaction.getActionName(f.action()));
@@ -538,36 +527,25 @@ pair iconName(FuncRequest const & f, bool
unknown, bool rtl)
names << "unknown";
search_mode const mode = theGuiApp()->imageSearchMode();
+ // The folders where icons are searched for
QStringList imagedirs;
imagedirs << "images/" << "images/ipa/";
+ // This is used to search for rtl version of icons which have the +rrtl
suffix.
QStringList suffixes;
if (rtl)
suffixes << "+rtl";
suffixes << QString();
+
for (QString const & imagedir : imagedirs)
for (QString const & name : names)
for (QString const & suffix : suffixes) {
QString id = imagedir;
FileName fname = imageLibFileSearch(id, name +
suffix, "svgz,png", mode);
if (fname.exists())
- return
make_pair(toqstr(fname.absFileName()), rtl && suffix.isEmpty());
+ return
make_pair(toqstr(fname.absFileName()),
+rtl &&
suffix.isEmpty());
}
- QString const resdir(":/images/");
- QDir res(resdir);
- if (!res.exists()) {
- LYXERR0("Directory :/images/ not found in resource!");
- return make_pair(QString(), false);
- }
-
- for (QString const & name : names)
- for (QString const & suffix : suffixes) {
- if (res.exists(name + suffix + ".svgz"))
- return make_pair(resdir + name + ".svgz", rtl
&& suffix.isEmpty());
- if (res.exists(name + suffix + ".png"))
- return make_pair(resdir + name + ".png", rtl &&
suffix.isEmpty());
- }
-
LYXERR(Debug::GUI, "Cannot find icon for command \""
<< lyxaction.getActionName(f.action())
<< '(' << to_utf8(f.argument()) << ")\"");
@@ -583,22 +561,13 @@ QPixmap getPixmap(QString const & path, QString const &
name, QString const & ex
QString fpath = toqstr(fname.absFileName());
QPixmap pixmap = QPixmap();
- if (pixmap.load(fpath)) {
+ if (pixmap.
[LyX/master] Move BulletsModule to frontend namespace
commit 6b221751c1adc72af1727b6072f2346a15282df0
Author: Jean-Marc Lasgouttes
Date: Sun Jun 7 00:57:03 2020 +0200
Move BulletsModule to frontend namespace
---
src/frontends/qt/BulletsModule.cpp |4
src/frontends/qt/BulletsModule.h |4
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/frontends/qt/BulletsModule.cpp
b/src/frontends/qt/BulletsModule.cpp
index ef21bd9..ba96453 100644
--- a/src/frontends/qt/BulletsModule.cpp
+++ b/src/frontends/qt/BulletsModule.cpp
@@ -20,6 +20,8 @@ using namespace std;
namespace lyx {
+namespace frontend {
+
BulletsModule::BulletsModule(QWidget * parent)
: QWidget(parent)
{
@@ -193,6 +195,8 @@ Bullet const & BulletsModule::bullet(int level) const
return bullets_[level];
}
+} // namespace frontend
+
} // namespace lyx
diff --git a/src/frontends/qt/BulletsModule.h b/src/frontends/qt/BulletsModule.h
index 8feeb22..036de41 100644
--- a/src/frontends/qt/BulletsModule.h
+++ b/src/frontends/qt/BulletsModule.h
@@ -20,6 +20,8 @@
namespace lyx {
+namespace frontend {
+
class BulletsModule : public QWidget, public Ui::BulletsUi
{
Q_OBJECT
@@ -56,6 +58,8 @@ private:
int current_char_;
};
+} // namespace frontend
+
} // namespace lyx
#endif // BULLETSMODULE_H
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
