[LyX/master] Fix UI of document color selection
commit d90484de0a78d44d5119ce5bc78610571afcd3fc
Author: Juergen Spitzmueller
Date: Fri Dec 23 09:14:03 2022 +0100
Fix UI of document color selection
The coloring of push buttons does not work with all themes, so use a
dedicated widget.
Also, accelerators have been used multiple times.
---
src/frontends/qt/GuiDocument.cpp | 81
src/frontends/qt/ui/ColorUi.ui | 373 +++---
2 files changed, 272 insertions(+), 182 deletions(-)
diff --git a/src/frontends/qt/GuiDocument.cpp b/src/frontends/qt/GuiDocument.cpp
index 33f79a7..1effaa1 100644
--- a/src/frontends/qt/GuiDocument.cpp
+++ b/src/frontends/qt/GuiDocument.cpp
@@ -86,9 +86,8 @@
#include
-// a style sheet for buttons
-// this is for example used for the background color setting button
-static inline QString colorButtonStyleSheet(QColor const & bgColor)
+// a style sheet for color frame widgets
+static inline QString colorFrameStyleSheet(QColor const & bgColor)
{
if (bgColor.isValid()) {
QString rc = QLatin1String("background-color:");
@@ -2260,10 +2259,10 @@ void GuiDocument::changeBackgroundColor()
rgb2qcolor(set_backgroundcolor), asQWidget());
if (!newColor.isValid())
return;
- // set the button color and text
- colorModule->backgroundPB->setStyleSheet(
- colorButtonStyleSheet(newColor));
- colorModule->backgroundPB->setText(qt_("&Change..."));
+ // set the color
+ colorModule->pageBackgroundCF->setVisible(true);
+ colorModule->pageBackgroundCF->setStyleSheet(
+ colorFrameStyleSheet(newColor));
// save color
set_backgroundcolor = rgbFromHexName(fromqstr(newColor.name()));
is_backgroundcolor = true;
@@ -2273,10 +2272,9 @@ void GuiDocument::changeBackgroundColor()
void GuiDocument::deleteBackgroundColor()
{
- // set the button color back to default by setting an empty StyleSheet
- colorModule->backgroundPB->setStyleSheet(QLatin1String(""));
- // change button text
- colorModule->backgroundPB->setText(qt_("&Default..."));
+ // set the color back to default by setting an empty StyleSheet
+ colorModule->pageBackgroundCF->setStyleSheet(QLatin1String(""));
+ colorModule->pageBackgroundCF->setVisible(false);
// save default color (white)
set_backgroundcolor = rgbFromHexName("#ff");
is_backgroundcolor = false;
@@ -2290,10 +2288,10 @@ void GuiDocument::changeFontColor()
rgb2qcolor(set_fontcolor), asQWidget());
if (!newColor.isValid())
return;
- // set the button color and text
- colorModule->fontColorPB->setStyleSheet(
- colorButtonStyleSheet(newColor));
- colorModule->fontColorPB->setText(qt_("&Change..."));
+ // set the color
+ colorModule->mainTextCF->setVisible(true);
+ colorModule->mainTextCF->setStyleSheet(
+ colorFrameStyleSheet(newColor));
// save color
set_fontcolor = rgbFromHexName(fromqstr(newColor.name()));
is_fontcolor = true;
@@ -2304,9 +2302,8 @@ void GuiDocument::changeFontColor()
void GuiDocument::deleteFontColor()
{
// set the button color back to default by setting an empty StyleSheet
- colorModule->fontColorPB->setStyleSheet(QLatin1String(""));
- // change button text
- colorModule->fontColorPB->setText(qt_("&Default..."));
+ colorModule->mainTextCF->setStyleSheet(QLatin1String(""));
+ colorModule->mainTextCF->setVisible(false);
// save default color (black)
set_fontcolor = rgbFromHexName("#00");
is_fontcolor = false;
@@ -2320,9 +2317,9 @@ void GuiDocument::changeNoteFontColor()
rgb2qcolor(set_notefontcolor), asQWidget());
if (!newColor.isValid())
return;
- // set the button color
- colorModule->noteFontColorPB->setStyleSheet(
- colorButtonStyleSheet(newColor));
+ // set the color
+ colorModule->noteFontCF->setStyleSheet(
+ colorFrameStyleSheet(newColor));
// save color
set_notefontcolor = rgbFromHexName(fromqstr(newColor.name()));
is_notefontcolor = true;
@@ -2332,10 +2329,10 @@ void GuiDocument::changeNoteFontColor()
void GuiDocument::deleteNoteFontColor()
{
- // set the button color back to pref
+ // set the color back to pref
theApp()->getRgbColor(Color_greyedouttext, set_notefontcolor);
- colorModule->noteFontColorPB->setStyleSheet(
- colorButtonStyleSheet(rgb2qcolor(set_notefontcolor)));
+ colorModule->noteFontCF->setStyleSheet(
+ colorFrameStyleSheet(rgb2qcolor(set_notefontcolor)));
is_notefontcolor = false;
change_adaptor();
}
@@ -2347,9 +2344,9 @@ void GuiDocument::changeBoxBackgroundColor()
rgb2qcolor(set_boxbgcolor), asQWidget())
[LyX/master] Update fr.po
commit b41679235402cc6c3b1b5cc012860433a84d33a0 Author: jpc Date: Fri Dec 23 09:26:52 2022 +0100 Update fr.po --- po/fr.gmo | Bin 637831 -> 637897 bytes po/fr.po | 437 +++-- 2 files changed, 224 insertions(+), 213 deletions(-) diff --git a/po/fr.gmo b/po/fr.gmo index ce31cb7..bcda28f 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index 17aad3d..2740956 100644 --- a/po/fr.po +++ b/po/fr.po @@ -362,8 +362,8 @@ msgid "" msgstr "" "Project-Id-Version: LyX 2.4\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" -"POT-Creation-Date: 2022-12-22 16:03+0100\n" -"PO-Revision-Date: 2022-12-22 16:06+0100\n" +"POT-Creation-Date: 2022-12-23 09:24+0100\n" +"PO-Revision-Date: 2022-12-23 09:26+0100\n" "Last-Translator: Jean-Pierre Chrétien \n" "Language-Team: lyxfr\n" "Language: fr\n" @@ -528,7 +528,7 @@ msgstr "Le style définissant la mise en forme des citations" msgid "Reset to the preset default" msgstr "Revenir au préréglage implicite" -#: src/frontends/qt/ui/BiblioUi.ui:183 +#: src/frontends/qt/ui/BiblioUi.ui:183 src/frontends/qt/ui/ColorUi.ui:253 msgid "Rese&t" msgstr "&RàZ" @@ -547,9 +547,7 @@ msgstr "" "Le style définissant la mise en forme de la bibliographie engendrée par " "biblatex" -#: src/frontends/qt/ui/BiblioUi.ui:244 src/frontends/qt/ui/ColorUi.ui:73 -#: src/frontends/qt/ui/ColorUi.ui:134 src/frontends/qt/ui/ColorUi.ui:211 -#: src/frontends/qt/ui/ColorUi.ui:272 +#: src/frontends/qt/ui/BiblioUi.ui:244 src/frontends/qt/ui/ColorUi.ui:126 msgid "R&eset" msgstr "Rà&Z" @@ -573,7 +571,7 @@ msgstr "" "Vous pouvez définir ici un style BibTeX suggéré implicitement par le " "dialogue BibTeX" -#: src/frontends/qt/ui/BiblioUi.ui:294 +#: src/frontends/qt/ui/BiblioUi.ui:294 src/frontends/qt/ui/ColorUi.ui:148 msgid "&Reset" msgstr "&RàZ" @@ -843,7 +841,7 @@ msgstr "Type de boîte intérieure" #: src/frontends/qt/ui/ListingsUi.ui:105 src/frontends/qt/ui/TabularUi.ui:1200 #: src/frontends/qt/ui/TabularUi.ui:1219 src/frontends/qt/ui/TabularUi.ui:1267 #: src/frontends/qt/GuiBox.cpp:420 src/frontends/qt/GuiBox.cpp:630 -#: src/frontends/qt/GuiDocument.cpp:124 src/frontends/qt/GuiGraphics.cpp:597 +#: src/frontends/qt/GuiDocument.cpp:123 src/frontends/qt/GuiGraphics.cpp:597 #: src/frontends/qt/GuiIndex.cpp:41 src/frontends/qt/GuiMathMatrix.cpp:33 #: src/frontends/qt/GuiPrefs.cpp:2326 src/frontends/qt/GuiPrefs.cpp:2351 msgid "None" @@ -946,7 +944,7 @@ msgstr "Élongation" #: src/frontends/qt/ui/BoxUi.ui:265 src/frontends/qt/ui/ListingsUi.ui:110 #: src/frontends/qt/ui/TabularUi.ui:344 src/frontends/qt/ui/TabularUi.ui:1553 -#: src/frontends/qt/ui/WrapUi.ui:47 src/frontends/qt/GuiDocument.cpp:1569 +#: src/frontends/qt/ui/WrapUi.ui:47 src/frontends/qt/GuiDocument.cpp:1571 #: src/frontends/qt/GuiParagraph.cpp:115 src/frontends/qt/GuiTabular.cpp:1042 msgid "Left" msgstr "À gauche" @@ -959,7 +957,7 @@ msgstr "Centré" #: src/frontends/qt/ui/BoxUi.ui:275 src/frontends/qt/ui/ListingsUi.ui:115 #: src/frontends/qt/ui/TabularUi.ui:354 src/frontends/qt/ui/WrapUi.ui:52 -#: src/frontends/qt/GuiDocument.cpp:1571 src/frontends/qt/GuiParagraph.cpp:116 +#: src/frontends/qt/GuiDocument.cpp:1573 src/frontends/qt/GuiParagraph.cpp:116 #: src/frontends/qt/GuiTabular.cpp:1044 msgid "Right" msgstr "À droite" @@ -1168,16 +1166,16 @@ msgstr "&Taille :" #: src/frontends/qt/GuiCharacter.cpp:85 src/frontends/qt/GuiCharacter.cpp:98 #: src/frontends/qt/GuiCharacter.cpp:136 src/frontends/qt/GuiCharacter.cpp:147 #: src/frontends/qt/GuiCharacter.cpp:190 src/frontends/qt/GuiCharacter.cpp:241 -#: src/frontends/qt/GuiDocument.cpp:120 src/frontends/qt/GuiDocument.cpp:865 -#: src/frontends/qt/GuiDocument.cpp:887 src/frontends/qt/GuiDocument.cpp:1054 -#: src/frontends/qt/GuiDocument.cpp:1139 src/frontends/qt/GuiDocument.cpp:1185 -#: src/frontends/qt/GuiDocument.cpp:1198 src/frontends/qt/GuiDocument.cpp:1444 -#: src/frontends/qt/GuiDocument.cpp:1562 src/frontends/qt/GuiDocument.cpp:1570 +#: src/frontends/qt/GuiDocument.cpp:119 src/frontends/qt/GuiDocument.cpp:867 +#: src/frontends/qt/GuiDocument.cpp:889 src/frontends/qt/GuiDocument.cpp:1056 +#: src/frontends/qt/GuiDocument.cpp:1141 src/frontends/qt/GuiDocument.cpp:1187 +#: src/frontends/qt/GuiDocument.cpp:1200 src/frontends/qt/GuiDocument.cpp:1446 +#: src/frontends/qt/GuiDocument.cpp:1564 src/frontends/qt/GuiDocument.cpp:1572 #: src/frontends/qt/GuiDocument.cpp:2632 src/frontends/qt/GuiDocument.cpp:2719 #: src/frontends/qt/GuiDocument.cpp:2720 src/frontends/qt/GuiDocument.cpp:2721 #: src/frontends/qt/GuiDocument.cpp:2745 src/frontends/qt/GuiDocument.cpp:2752 #: src/frontends/qt/GuiDocument.cpp:2759 src/frontends/qt/GuiDocument.cpp:2849 -#: src/frontends/qt/GuiDocument.cpp:3455 src/frontends/qt/GuiDocument.cpp:4932 +#: src/frontends/qt/GuiDocument.cpp:3455 src/frontends/qt/GuiDocument.cpp:4936 #: src/frontends/qt/GuiExternal.cpp:76 src/frontends/qt
[LyX/master] \R and \L are not defined in babel with Xe/LuaTeX
commit 0bb25ee3cd66c5ac78127a7ccc0d6014cb27edf4
Author: Juergen Spitzmueller
Date: Fri Dec 23 10:04:41 2022 +0100
\R and \L are not defined in babel with Xe/LuaTeX
---
src/Font.cpp|2 +-
src/insets/InsetTabular.cpp |2 +-
src/output_latex.cpp|2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Font.cpp b/src/Font.cpp
index cd741d1..0e4aa2b 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -294,7 +294,7 @@ int Font::latexWriteStartChanges(otexstream & os,
BufferParams const & bparams,
os << "\\textLR{";
count += 8;
// currently the remaining RTL languages are arabic_arabtex and
hebrew
- } else if (isRightToLeft() != prev.isRightToLeft()) {
+ } else if (isRightToLeft() != prev.isRightToLeft() &&
!runparams.isFullUnicode()) {
if (needs_cprotection) {
os << "\\cprotect";
count += 9;
diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index e9c03b9..18481a5 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -3208,7 +3208,7 @@ void Tabular::TeXRow(otexstream & os, row_type row,
bool rtl = par.isRTL(buffer().params())
&& !par.empty()
&& getPWidth(cell).zero()
- && !runparams.use_polyglossia;
+ && !runparams.isFullUnicode();
if (rtl) {
string const lang =
diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 1061f3d..04d63ae 100644
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -1063,7 +1063,7 @@ void TeXOnePar(Buffer const & buf,
else if (outer_language->lang() ==
"arabic_arabi")
os << "\\textLR{";
// remaining RTL languages currently is hebrew
- else if (par_language->rightToLeft())
+ else if (par_language->rightToLeft() &&
!runparams.isFullUnicode())
os << "\\R{";
else
os << "\\L{";
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] de.po
commit 6731c51a074c18710307a34274cda12e1eb9fb56 Author: Juergen Spitzmueller Date: Fri Dec 23 10:32:22 2022 +0100 de.po --- po/de.po | 441 -- 1 files changed, 226 insertions(+), 215 deletions(-) diff --git a/po/de.po b/po/de.po index d9658a9..3c9c594 100644 --- a/po/de.po +++ b/po/de.po @@ -94,8 +94,8 @@ msgid "" msgstr "" "Project-Id-Version: LyX 2.4git\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" -"POT-Creation-Date: 2022-12-22 15:42+0100\n" -"PO-Revision-Date: 2022-12-22 15:56+0100\n" +"POT-Creation-Date: 2022-12-23 10:25+0100\n" +"PO-Revision-Date: 2022-12-23 10:31+0100\n" "Last-Translator: Jürgen Spitzmüller \n" "Language-Team: Deutsch \n" "Language: de\n" @@ -262,9 +262,9 @@ msgstr "Der Stil, der das Aussehen der Literaturverweise bestimmt" msgid "Reset to the preset default" msgstr "Auf voreingestellten Wert zurücksetzen" -#: src/frontends/qt/ui/BiblioUi.ui:183 +#: src/frontends/qt/ui/BiblioUi.ui:183 src/frontends/qt/ui/ColorUi.ui:253 msgid "Rese&t" -msgstr "Z&urücksetzen" +msgstr "Zurück&setzen" #: src/frontends/qt/ui/BiblioUi.ui:201 msgid "Bibliography Style" @@ -280,9 +280,7 @@ msgid "" msgstr "" "Der Stil, der das Aussehen der BibTeX-generierten Bibliographie bestimmt" -#: src/frontends/qt/ui/BiblioUi.ui:244 src/frontends/qt/ui/ColorUi.ui:73 -#: src/frontends/qt/ui/ColorUi.ui:134 src/frontends/qt/ui/ColorUi.ui:211 -#: src/frontends/qt/ui/ColorUi.ui:272 +#: src/frontends/qt/ui/BiblioUi.ui:244 src/frontends/qt/ui/ColorUi.ui:126 msgid "R&eset" msgstr "&Zurücksetzen" @@ -306,7 +304,7 @@ msgstr "" "Hier können Sie einen BibTeX-Stil angeben, der im BibTeX-Dialog als Standard " "vorgeschlagen wird." -#: src/frontends/qt/ui/BiblioUi.ui:294 +#: src/frontends/qt/ui/BiblioUi.ui:294 src/frontends/qt/ui/ColorUi.ui:148 msgid "&Reset" msgstr "Zurü&cksetzen" @@ -573,7 +571,7 @@ msgstr "Art der inneren Box" #: src/frontends/qt/ui/ListingsUi.ui:105 src/frontends/qt/ui/TabularUi.ui:1200 #: src/frontends/qt/ui/TabularUi.ui:1219 src/frontends/qt/ui/TabularUi.ui:1267 #: src/frontends/qt/GuiBox.cpp:420 src/frontends/qt/GuiBox.cpp:630 -#: src/frontends/qt/GuiDocument.cpp:124 src/frontends/qt/GuiGraphics.cpp:597 +#: src/frontends/qt/GuiDocument.cpp:123 src/frontends/qt/GuiGraphics.cpp:597 #: src/frontends/qt/GuiIndex.cpp:41 src/frontends/qt/GuiMathMatrix.cpp:33 #: src/frontends/qt/GuiPrefs.cpp:2326 src/frontends/qt/GuiPrefs.cpp:2351 msgid "None" @@ -676,7 +674,7 @@ msgstr "Dehnen" #: src/frontends/qt/ui/BoxUi.ui:265 src/frontends/qt/ui/ListingsUi.ui:110 #: src/frontends/qt/ui/TabularUi.ui:344 src/frontends/qt/ui/TabularUi.ui:1553 -#: src/frontends/qt/ui/WrapUi.ui:47 src/frontends/qt/GuiDocument.cpp:1569 +#: src/frontends/qt/ui/WrapUi.ui:47 src/frontends/qt/GuiDocument.cpp:1571 #: src/frontends/qt/GuiParagraph.cpp:115 src/frontends/qt/GuiTabular.cpp:1042 msgid "Left" msgstr "Links" @@ -689,7 +687,7 @@ msgstr "Zentriert" #: src/frontends/qt/ui/BoxUi.ui:275 src/frontends/qt/ui/ListingsUi.ui:115 #: src/frontends/qt/ui/TabularUi.ui:354 src/frontends/qt/ui/WrapUi.ui:52 -#: src/frontends/qt/GuiDocument.cpp:1571 src/frontends/qt/GuiParagraph.cpp:116 +#: src/frontends/qt/GuiDocument.cpp:1573 src/frontends/qt/GuiParagraph.cpp:116 #: src/frontends/qt/GuiTabular.cpp:1044 msgid "Right" msgstr "Rechts" @@ -899,16 +897,16 @@ msgstr "&Größe:" #: src/frontends/qt/GuiCharacter.cpp:85 src/frontends/qt/GuiCharacter.cpp:98 #: src/frontends/qt/GuiCharacter.cpp:136 src/frontends/qt/GuiCharacter.cpp:147 #: src/frontends/qt/GuiCharacter.cpp:190 src/frontends/qt/GuiCharacter.cpp:241 -#: src/frontends/qt/GuiDocument.cpp:120 src/frontends/qt/GuiDocument.cpp:865 -#: src/frontends/qt/GuiDocument.cpp:887 src/frontends/qt/GuiDocument.cpp:1054 -#: src/frontends/qt/GuiDocument.cpp:1139 src/frontends/qt/GuiDocument.cpp:1185 -#: src/frontends/qt/GuiDocument.cpp:1198 src/frontends/qt/GuiDocument.cpp:1444 -#: src/frontends/qt/GuiDocument.cpp:1562 src/frontends/qt/GuiDocument.cpp:1570 +#: src/frontends/qt/GuiDocument.cpp:119 src/frontends/qt/GuiDocument.cpp:867 +#: src/frontends/qt/GuiDocument.cpp:889 src/frontends/qt/GuiDocument.cpp:1056 +#: src/frontends/qt/GuiDocument.cpp:1141 src/frontends/qt/GuiDocument.cpp:1187 +#: src/frontends/qt/GuiDocument.cpp:1200 src/frontends/qt/GuiDocument.cpp:1446 +#: src/frontends/qt/GuiDocument.cpp:1564 src/frontends/qt/GuiDocument.cpp:1572 #: src/frontends/qt/GuiDocument.cpp:2632 src/frontends/qt/GuiDocument.cpp:2719 #: src/frontends/qt/GuiDocument.cpp:2720 src/frontends/qt/GuiDocument.cpp:2721 #: src/frontends/qt/GuiDocument.cpp:2745 src/frontends/qt/GuiDocument.cpp:2752 #: src/frontends/qt/GuiDocument.cpp:2759 src/frontends/qt/GuiDocument.cpp:2849 -#: src/frontends/qt/GuiDocument.cpp:3455 src/frontends/qt/GuiDocument.cpp:4932 +#: src/frontends/qt/GuiDocument.cpp:3455 src/frontends/qt/GuiDocument.cpp:4936 #: src/frontends/qt/GuiExternal.cpp:76 src/frontends/qt/GuiGraphics.cpp:71 #: sr
[LyX/master] Update sk.po
commit 962d8ae35f55fc880d6f33d1125c01c4c80fcf6d Author: Kornel Benko Date: Fri Dec 23 14:22:27 2022 +0100 Update sk.po --- po/sk.po | 33 - 1 files changed, 20 insertions(+), 13 deletions(-) diff --git a/po/sk.po b/po/sk.po index 68d64a1..ddac220 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: 2022-12-22 15:25+0100\n" -"PO-Revision-Date: 2022-12-22 14:32+\n" +"POT-Creation-Date: 2022-12-23 14:04+0100\n" +"PO-Revision-Date: 2022-12-23 13:19+\n" "Last-Translator: Kornel Benko \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -1177,15 +1177,15 @@ msgstr "Farby písma" msgid "Main text:" msgstr "Hlavný text:" +#: src/frontends/qt/ui/ColorUi.ui:110 +msgid "C&hange..." +msgstr "V&ymeniť…" + #: src/frontends/qt/ui/ColorUi.ui:54 src/frontends/qt/ui/ColorUi.ui:115 #: src/frontends/qt/ui/ColorUi.ui:192 src/frontends/qt/ui/ColorUi.ui:253 msgid "Click to change the color" msgstr "Kliknite na zmenu farby" -#: src/frontends/qt/ui/ColorUi.ui:57 src/frontends/qt/ui/ColorUi.ui:195 -msgid "Default..." -msgstr "Štandard…" - #: src/frontends/qt/ui/ColorUi.ui:70 src/frontends/qt/ui/ColorUi.ui:131 #: src/frontends/qt/ui/ColorUi.ui:208 src/frontends/qt/ui/ColorUi.ui:269 msgid "Revert the color to the default" @@ -1195,10 +1195,9 @@ msgstr "Návrat farby na štandard" msgid "Greyed-out notes:" msgstr "Zosivelé poznámky:" -#: src/frontends/qt/ui/ColorUi.ui:118 src/frontends/qt/ui/ColorUi.ui:256 -#: src/frontends/qt/GuiDocument.cpp:2205 src/frontends/qt/GuiDocument.cpp:2235 +#: src/frontends/qt/ui/ColorUi.ui:48 msgid "&Change..." -msgstr "&Zmena…" +msgstr "&Vymeniť…" #: src/frontends/qt/ui/ColorUi.ui:165 msgid "Background Colors" @@ -1212,6 +1211,18 @@ msgstr "Strana:" msgid "Shaded boxes:" msgstr "Tieňované rámiky:" +#: src/frontends/qt/ui/ColorUi.ui:298 +msgid "Ch&ange..." +msgstr "Vy&meniť…" + +#: src/frontends/qt/ui/ColorUi.ui:314 +msgid "Re&set" +msgstr "O&bnoviť" + +#: src/frontends/qt/ui/ColorUi.ui:336 +msgid "Chan&ge..." +msgstr "Vym&eniť…" + #: src/frontends/qt/ui/CompareHistoryUi.ui:23 msgid "Compare Revisions" msgstr "Porovnať revízie" @@ -32454,10 +32465,6 @@ msgstr "" "Bez danej hodnoty sa predvoľby berú z balíka geometry alebo z triedy " "použitého balíka." -#: src/frontends/qt/GuiDocument.cpp:2218 src/frontends/qt/GuiDocument.cpp:2248 -msgid "&Default..." -msgstr "Štan&dard…" - #: src/frontends/qt/GuiDocument.cpp:2449 msgid "Direct (No inputenc)" msgstr "Priamo (bez inputenc)" -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix signals
commit f06ddb23426f4c307d90e9153a90abef43b86c32 Author: Juergen Spitzmueller Date: Fri Dec 23 16:07:47 2022 +0100 Fix signals --- src/frontends/qt/GuiView.cpp |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/frontends/qt/GuiView.cpp b/src/frontends/qt/GuiView.cpp index 864721e..c88b600 100644 --- a/src/frontends/qt/GuiView.cpp +++ b/src/frontends/qt/GuiView.cpp @@ -655,7 +655,7 @@ GuiView::GuiView(int id) stat_counts_->hide(); statusBar()->addPermanentWidget(stat_counts_); - connect(stat_counts_, SIGNAL(clicked()), this, SLOT(statsPressed())); + connect(stat_counts_, SIGNAL(pressed()), this, SLOT(statsPressed())); zoom_slider_ = new QSlider(Qt::Horizontal, statusBar()); // Small size slider for macOS to prevent the status bar from enlarging @@ -701,8 +701,8 @@ GuiView::GuiView(int id) connect(zoom_slider_, SIGNAL(sliderMoved(int)), this, SLOT(zoomSliderMoved(int))); connect(zoom_slider_, SIGNAL(valueChanged(int)), this, SLOT(zoomValueChanged(int))); connect(this, SIGNAL(currentZoomChanged(int)), zoom_slider_, SLOT(setValue(int))); - connect(zoom_in_, SIGNAL(clicked()), this, SLOT(zoomInPressed())); - connect(zoom_out_, SIGNAL(clicked()), this, SLOT(zoomOutPressed())); + connect(zoom_in_, SIGNAL(pressed()), this, SLOT(zoomInPressed())); + connect(zoom_out_, SIGNAL(pressed()), this, SLOT(zoomOutPressed())); // QPalette palette = statusBar()->palette(); -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Insert entries for Braille, FiXme, PDF Comments, PDF Forms, Ruby and TODO notes into Chapter 4 Modules of Additional.lyx
commit d7ed4b9bd0b7510158b1588625e8fe57e99e29bb
Author: John R Hudson
Date: Fri Dec 23 09:46:42 2022 +
Insert entries for Braille, FiXme, PDF Comments, PDF Forms, Ruby and TODO
notes into Chapter 4 Modules of Additional.lyx
---
lib/doc/Additional.lyx | 270
1 files changed, 270 insertions(+), 0 deletions(-)
diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx
index 465ccd7..3f57fd6 100644
--- a/lib/doc/Additional.lyx
+++ b/lib/doc/Additional.lyx
@@ -13252,6 +13252,276 @@ Linguistics
\end_layout
\begin_layout Section
+
+\change_inserted 564990737 1671788778
+
+\lang american
+Accessibility
+\end_layout
+
+\begin_layout Subsection
+
+\change_inserted 564990737 1671788778
+
+\lang american
+Braille
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted 564990737 1671788778
+
+\lang american
+This module supports the Braille writing system.
+ It requires the \SpecialChar LaTeX
+ package
+\family typewriter
+braille.sty
+\family default
+.
+ This and its documentation can be obtained from
+\begin_inset CommandInset href
+LatexCommand href
+name "CTAN"
+target "https://www.ctan.org/pkg/braille";
+literal "false"
+
+\end_inset
+
+.
+ You do not have to reconfigure your system after installing it.
+ See
+\family sans
+\bar under
+H
+\bar default
+elp\SpecialChar menuseparator
+S
+\bar under
+p
+\bar default
+ecific
+\begin_inset space ~
+\end_inset
+
+Manuals\SpecialChar menuseparator
+
+\bar under
+B
+\bar default
+raille
+\family default
+ and
+\family sans
+File\SpecialChar menuseparator
+Open Example\SpecialChar menuseparator
+Modules\SpecialChar menuseparator
+Braille
+\family default
+.
+\end_layout
+
+\begin_layout Section
+
+\change_inserted 564990737 1671788778
+
+\lang american
+Annotation & Revision
+\end_layout
+
+\begin_layout Subsection
+
+\change_inserted 564990737 1671788778
+
+\lang american
+FiXme Notes
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted 564990737 1671788778
+
+\lang american
+This module provides “FiXme” (marginal) annotations for document revision
+ purposes.
+ A list of annotations can be produced by using the “List of FIXMEs” paragraph
+ style.
+ The annotations are customizable via the LaTeX preamble.
+ See the FiXme documentation which can be obtained from
+\begin_inset CommandInset href
+LatexCommand href
+name "CTAN"
+target "http://mirrors.ctan.org/macros/latex/contrib/fixme/fixme.pdf";
+literal "false"
+
+\end_inset
+
+.
+
+\end_layout
+
+\begin_layout Paragraph
+
+\change_inserted 564990737 1671788778
+
+\lang american
+Note:
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted 564990737 1671788778
+
+\lang american
+by default, the notes are only displayed in “draft” mode (if the option
+ “draft” has been inserted in
+\family sans
+Document\SpecialChar menuseparator
+Settings\SpecialChar menuseparator
+Document Class\SpecialChar menuseparator
+Class Options\SpecialChar menuseparator
+Custom
+\family default
+).
+ To display them always, insert
+\family typewriter
+
+\backslash
+fxsetup{draft}
+\family default
+ in
+\family sans
+Document\SpecialChar menuseparator
+Settings\SpecialChar menuseparator
+\SpecialChar LaTeX
+ Preamble
+\family default
+.
+
+\end_layout
+
+\begin_layout Subsection
+
+\change_inserted 564990737 1671788778
+
+\lang american
+PDF Comments
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted 564990737 1671788778
+
+\lang american
+This module provides various kinds of annotations for PDF output.
+ See
+\family sans
+Help\SpecialChar menuseparator
+Specific Manuals\SpecialChar menuseparator
+PDF comments and File\SpecialChar menuseparator
+Open Example\SpecialChar menuseparator
+Modules\SpecialChar menuseparator
+PDF Comments
+\family default
+.
+\end_layout
+
+\begin_layout Subsection
+
+\change_inserted 564990737 1671788778
+
+\series bold
+\lang american
+PDF Form
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted 564990737 1671788778
+
+\lang american
+This module provides fields and buttons for PDF forms.
+ See the
+\begin_inset CommandInset href
+LatexCommand href
+name "hyperref documentation"
+target
"http://mirrors.ctan.org/macros/latex/contrib/hyperref/doc/hyperref-doc.pdf";
+literal "false"
+
+\end_inset
+
+,
+\family sans
+Help\SpecialChar menuseparator
+Specific Manuals\SpecialChar menuseparator
+PDF forms and File\SpecialChar menuseparator
+Open Example\SpecialChar menuseparator
+Modules\SpecialChar menuseparator
+PDF Form
+\family default
+.
+\end_layout
+
+\begin_layout Subsection
+
+\change_inserted 564990737 1671788778
+
+\series bold
+\lang american
+Ruby (Furigana)
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted 564990737 1671788778
+
+\lang american
+This module defines an inset to typeset reading aids (ruby, furigana) to
+ Chinese characters.
+ It uses the “okumakro,” “luatexja-ruby” or “ruby” package (depending on
+ the TeX engine) or a fallback definition.
+
+\end_layout
+
+\begin_layout Sub
[LyX/master] Insert entries for APA with NatBiB, Fancy Colored Boxes and Graphic Boxes to Chapter 4: Modules of Additional.lyx
commit af5da98cae339d3f894889fa91d5914db8fa6c9f Author: John R Hudson Date: Fri Dec 23 20:58:43 2022 + Insert entries for APA with NatBiB, Fancy Colored Boxes and Graphic Boxes to Chapter 4: Modules of Additional.lyx --- lib/doc/Additional.lyx | 582 1 files changed, 582 insertions(+), 0 deletions(-) diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx index 3f57fd6..4af6e09 100644 --- a/lib/doc/Additional.lyx +++ b/lib/doc/Additional.lyx @@ -36,6 +36,7 @@ theorems-ams theorems-ams-extended multicol shapepar +graphicboxes \end_modules \maintain_unincluded_children no \language english @@ -61,6 +62,8 @@ shapepar \output_sync 0 \bibtex_command default \index_command default +\float_placement class +\float_alignment class \paperfontsize 12 \spacing single \use_hyperref true @@ -13522,6 +13525,585 @@ literal "false" \end_layout \begin_layout Section + +\change_inserted 564990737 1671829045 + +\lang american +Bibliography +\end_layout + +\begin_layout Subsection + +\change_inserted 564990737 1671829045 + +\lang american +APA Style with NatBib +\end_layout + +\begin_layout Standard + +\change_inserted 564990737 1671829045 + +\lang american +This module adds support for using natbib together with apacite (the bibliograph +y style need not be apacite — it could be apacite, apacitex, or any bibliography + that works with both the natbib and apacite packages.) +\end_layout + +\begin_layout Section + +\change_inserted 564990737 1671829045 + +\lang american +Boxes +\end_layout + +\begin_layout Subsection + +\change_inserted 564990737 1671829045 + +\lang american +Fancy Colored Boxes +\end_layout + +\begin_layout Standard + +\change_inserted 564990737 1671829045 + +\lang american +This module adds ten custom insets that support colored boxes via the tcolorbox + package. + See +\family sans +Help\SpecialChar menuseparator +Specific Manuals\SpecialChar menuseparator +Colored boxes +\family default +, +\family sans +File\SpecialChar menuseparator +Open Example\SpecialChar menuseparator +Modules\SpecialChar menuseparator +Fancy Color Boxes +\family default + the +\begin_inset CommandInset href +LatexCommand href +name "tcolorbox documentation" +target "http://mirrors.ctan.org/macros/latex/contrib/tcolorbox/tcolorbox.pdf"; +literal "false" + +\end_inset + + for details. + +\end_layout + +\begin_layout Subsection + +\change_inserted 564990737 1671829045 + +\lang american +Graphic boxes +\end_layout + +\begin_layout Standard + +\change_inserted 564990737 1671829045 + +\lang american +This provides the custom insets +\family sans +Reflectbox +\family default +, +\family sans +Resizebox +\family default +, +\family sans +Rotatebox +\family default + and +\family sans +Scalebox +\family default + to scale and rotate its content. +\end_layout + +\begin_layout Standard + +\change_inserted 564990737 1671829045 + +\family sans +\lang american +Reflectbox +\family default + is a simple way of reversing text without any other enhancement: +\end_layout + +\begin_layout Standard + +\change_inserted 564990737 1671829045 + +\lang american +\begin_inset Flex Reflectbox +status open + +\begin_layout Plain Layout + +\change_inserted 564990737 1671829045 + +\lang american +Great Western Railway +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard + +\change_inserted 564990737 1671829045 + +\lang american +(You will need to use Ctrl-R to see any of these examples.) +\end_layout + +\begin_layout Standard + +\change_inserted 564990737 1671829045 + +\family sans +\lang american +Resizebox +\family default + allows you to specify the dimensions of the text or image; permissible + units are em, ex, in, pt, pc, cm, mm, dd, cc, nd, nc, bp, or sp; if you + enter +\family typewriter +! +\family default + for +\family typewriter +Height +\family default + it scales by the width factor: +\end_layout + +\begin_layout Standard + +\change_inserted 564990737 1671829045 + +\lang american +\begin_inset Flex Resizebox +status open + +\begin_layout Plain Layout + +\change_inserted 564990737 1671829045 + +\lang american +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout + +\change_inserted 564990737 1671829045 + +\lang american +48mm +\end_layout + +\end_inset + + +\begin_inset Argument 2 +status open + +\begin_layout Plain Layout + +\change_inserted 564990737 1671829045 + +\lang american +! +\end_layout + +\end_inset + +Great Western Railway +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard + +\change_inserted 564990737 1671829045 + +\family sans +\lang american +Rotatebox +\family default + allows you to rotate text around the reference point of the box. + If you wish to rotate the box around a different origin, place the cursor + inside the box and select Insert\SpecialChar menuseparator +Origin; o +\family typewriter +rigin +\family default + is specified as +\family typewriter +c +\family default +, +\f
[LyX/master] Used pressed() signal in status bar widgets (fixes #12613)
commit 064955b151783dd5328d9fa5d98c08c1149d5984 Author: Juergen Spitzmueller Date: Sat Dec 24 07:20:39 2022 +0100 Used pressed() signal in status bar widgets (fixes #12613) --- src/frontends/qt/GuiView.cpp |8 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/frontends/qt/GuiView.cpp b/src/frontends/qt/GuiView.cpp index c88b600..e7a3b29 100644 --- a/src/frontends/qt/GuiView.cpp +++ b/src/frontends/qt/GuiView.cpp @@ -644,7 +644,7 @@ GuiView::GuiView(int id) processStop, SLOT(show())); connect(&d.processing_thread_watcher_, SIGNAL(finished()), processStop, SLOT(hide())); - connect(processStop, SIGNAL(pressed()), this, SLOT(checkCancelBackground())); + connect(processStop, SIGNAL(clicked()), this, SLOT(checkCancelBackground())); connect(this, SIGNAL(scriptKilled()), busySVG, SLOT(hide())); connect(this, SIGNAL(scriptKilled()), processStop, SLOT(hide())); @@ -655,7 +655,7 @@ GuiView::GuiView(int id) stat_counts_->hide(); statusBar()->addPermanentWidget(stat_counts_); - connect(stat_counts_, SIGNAL(pressed()), this, SLOT(statsPressed())); + connect(stat_counts_, SIGNAL(clicked()), this, SLOT(statsPressed())); zoom_slider_ = new QSlider(Qt::Horizontal, statusBar()); // Small size slider for macOS to prevent the status bar from enlarging @@ -701,8 +701,8 @@ GuiView::GuiView(int id) connect(zoom_slider_, SIGNAL(sliderMoved(int)), this, SLOT(zoomSliderMoved(int))); connect(zoom_slider_, SIGNAL(valueChanged(int)), this, SLOT(zoomValueChanged(int))); connect(this, SIGNAL(currentZoomChanged(int)), zoom_slider_, SLOT(setValue(int))); - connect(zoom_in_, SIGNAL(pressed()), this, SLOT(zoomInPressed())); - connect(zoom_out_, SIGNAL(pressed()), this, SLOT(zoomOutPressed())); + connect(zoom_in_, SIGNAL(clicked()), this, SLOT(zoomInPressed())); + connect(zoom_out_, SIGNAL(clicked()), this, SLOT(zoomOutPressed())); // QPalette palette = statusBar()->palette(); -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
