date:20230207

[LyX/master] Disable "search in selection only" with instant search

2023-02-07 Thread Juergen Spitzmueller

commit 713264ae2b82f23e80ed6369b19ae6c9b030b6e4
Author: Juergen Spitzmueller 
Date:   Tue Feb 7 14:48:09 2023 +0100

Disable "search in selection only" with instant search

These two do not go well together. Making it work requires some major
overhaul of selection while searching (see #12655)
---
 src/frontends/qt/GuiSearch.cpp |   30 ++
 src/frontends/qt/GuiSearch.h   |1 +
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/frontends/qt/GuiSearch.cpp b/src/frontends/qt/GuiSearch.cpp
index 8ac62c6..b824bfe 100644
--- a/src/frontends/qt/GuiSearch.cpp
+++ b/src/frontends/qt/GuiSearch.cpp
@@ -79,6 +79,7 @@ GuiSearchWidget::GuiSearchWidget(QWidget * parent, GuiView & 
view)
connect(replacePB, SIGNAL(clicked()), this, SLOT(replaceClicked()));
connect(replacePrevPB, SIGNAL(clicked()), this, 
SLOT(replacePrevClicked()));
connect(replaceallPB, SIGNAL(clicked()), this, 
SLOT(replaceallClicked()));
+   connect(instantSearchCB, SIGNAL(clicked()), this, 
SLOT(immediateClicked()));
connect(findCO, SIGNAL(editTextChanged(QString)),
this, SLOT(findChanged()));
if(qApp->clipboard()->supportsFindBuffer()) {
@@ -196,6 +197,7 @@ void GuiSearchWidget::minimizeClicked(bool const toggle)
act_casesense_->setChecked(caseCB->isChecked());
act_immediate_->setChecked(instantSearchCB->isChecked());
act_selection_->setChecked(selectionCB->isChecked());
+   act_selection_->setEnabled(!instantSearchCB->isChecked());
act_wholewords_->setChecked(wordsCB->isChecked());
act_wrap_->setChecked(wrapCB->isChecked());
blockSignals(false);
@@ -368,11 +370,29 @@ void GuiSearchWidget::searchSelActTriggered()
 
 void GuiSearchWidget::immediateActTriggered()
 {
-   instantSearchCB->setChecked(act_immediate_->isChecked());
+   bool const immediate = act_immediate_->isChecked();
+   instantSearchCB->setChecked(immediate);
+   // FIXME: make these two work together eventually.
+   selectionCB->setEnabled(!immediate);
+   act_selection_->setEnabled(!immediate);
+   if (immediate) {
+   selectionCB->setChecked(false);
+   act_selection_->setChecked(false);
+   }
handleIndicators();
 }
 
 
+void GuiSearchWidget::immediateClicked()
+{
+   // FIXME: make these two work together eventually.
+   bool const immediate = instantSearchCB->isChecked();
+   selectionCB->setEnabled(!immediate);
+   if (immediate)
+   selectionCB->setChecked(false);
+}
+
+
 void GuiSearchWidget::wrapActTriggered()
 {
wrapCB->setChecked(act_wrap_->isChecked());
@@ -525,11 +545,13 @@ void GuiSearchWidget::restoreSession(QString const & 
session_key)
act_casesense_->setChecked(settings.value(session_key + 
"/casesensitive", false).toBool());
wordsCB->setChecked(settings.value(session_key + "/words", 
false).toBool());
act_wholewords_->setChecked(settings.value(session_key + "/words", 
false).toBool());
-   instantSearchCB->setChecked(settings.value(session_key + "/instant", 
false).toBool());
-   act_immediate_->setChecked(settings.value(session_key + "/instant", 
false).toBool());
+   bool const immediate = settings.value(session_key + "/instant", 
false).toBool();
+   instantSearchCB->setChecked(immediate);
+   act_immediate_->setChecked(immediate);
wrapCB->setChecked(settings.value(session_key + "/wrap", 
true).toBool());
act_wrap_->setChecked(settings.value(session_key + "/wrap", 
true).toBool());
-   selectionCB->setChecked(settings.value(session_key + "/selection", 
false).toBool());
+   selectionCB->setChecked(settings.value(session_key + "/selection", 
false).toBool() && !immediate);
+   selectionCB->setEnabled(!immediate);
act_selection_->setChecked(settings.value(session_key + "/selection", 
false).toBool());
minimized_ = settings.value(session_key + "/minimized", false).toBool();
// initialize hidings
diff --git a/src/frontends/qt/GuiSearch.h b/src/frontends/qt/GuiSearch.h
index 2fbc8c7..89234fe 100644
--- a/src/frontends/qt/GuiSearch.h
+++ b/src/frontends/qt/GuiSearch.h
@@ -57,6 +57,7 @@ private Q_SLOTS:
void wholeWordsActTriggered();
void searchSelActTriggered();
void immediateActTriggered();
+   void immediateClicked();
void wrapActTriggered();
 Q_SIGNALS:
void needTitleBarUpdate() const;
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] Update sk.po

2023-02-07 Thread Kornel Benko

commit fbc0f044378d0b36a66260f7076740cf5ade7634
Author: Kornel Benko 
Date:   Tue Feb 7 12:52:27 2023 +0100

Update sk.po
---
 po/sk.po |  230 ++
 1 files changed, 82 insertions(+), 148 deletions(-)

diff --git a/po/sk.po b/po/sk.po
index 1c8ba3e..fa391d2 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: 2023-02-02 09:27+0100\n"
-"PO-Revision-Date: 2023-02-02 09:06+\n"
+"POT-Creation-Date: 2023-02-06 15:44+0100\n"
+"PO-Revision-Date: 2023-02-07 11:47+\n"
 "Last-Translator: Kornel Benko \n"
 "Language-Team: Slovak \n"
 "Language: sk\n"
@@ -59,7 +59,7 @@ msgid "Copyright"
 msgstr "Autorské práva"
 
 #: lib/layouts/apa.layout:256 lib/layouts/iucr.layout:257
-msgid "Acknowledgments[[credits]]:"
+msgid "Acknowledgments:"
 msgstr "Poďakovania:"
 
 #: src/frontends/qt/ui/AboutUi.ui:313
@@ -6634,33 +6634,6 @@ msgstr "Heslá"
 msgid "Keywords:"
 msgstr "Heslá:"
 
-#: lib/layouts/AEA.layout:130 lib/layouts/elsart.layout:549
-#: lib/layouts/elsart.layout:555
-#: lib/layouts/theorems-ams-extended-bytype.module:325
-#: lib/layouts/theorems-ams-extended-bytype.module:334
-#: lib/layouts/theorems-ams-extended-bytype.module:337
-#: lib/layouts/theorems-ams-extended-bytype.module:360
-#: lib/layouts/theorems-ams-extended-bytype.module:363
-#: lib/layouts/theorems-ams-extended-chap-bytype.module:392
-#: lib/layouts/theorems-ams-extended-chap-bytype.module:405
-#: lib/layouts/theorems-ams-extended-chap-bytype.module:408
-#: lib/layouts/theorems-ams-extended-chap-bytype.module:431
-#: lib/layouts/theorems-ams-extended-chap-bytype.module:434
-#: lib/layouts/theorems-ams-extended.module:316
-#: lib/layouts/theorems-ams-extended.module:325
-#: lib/layouts/theorems-ams-extended.module:328
-#: lib/layouts/theorems-ams-extended.module:350
-#: lib/layouts/theorems-ams-extended.module:353
-msgid "Acknowledgment[[theorem]]"
-msgstr "Potvrdenie"
-
-#: lib/layouts/AEA.layout:132
-#: lib/layouts/theorems-ams-extended-bytype.module:354
-#: lib/layouts/theorems-ams-extended-chap-bytype.module:425
-#: lib/layouts/theorems-ams-extended.module:344
-msgid "Acknowledgment[[theorem]]."
-msgstr "Potvrdenie."
-
 #: lib/layouts/AEA.layout:125 lib/layouts/IEEEtran-CompSoc.layout:49
 #: lib/layouts/IEEEtran-TransMag.layout:27 lib/layouts/IEEEtran.layout:277
 #: lib/layouts/RJournal.layout:39 lib/layouts/aa.layout:329
@@ -6699,18 +6672,6 @@ msgstr "Potvrdenie."
 msgid "Abstract"
 msgstr "Súhrn"
 
-#: lib/layouts/AEA.layout:129 lib/layouts/aa.layout:169
-#: lib/layouts/aapaper.inc:82 lib/layouts/aapaper.layout:105
-#: lib/layouts/achemso.layout:283 lib/layouts/achemso.layout:290
-#: lib/layouts/egs.layout:621 lib/layouts/elsart.layout:549
-#: lib/layouts/svcommon.inc:625 lib/layouts/svmult.layout:158
-#: lib/layouts/theorems-ams-extended-bytype.module:346
-#: lib/layouts/theorems-ams-extended-chap-bytype.module:417
-#: lib/layouts/theorems-ams-extended.module:336
-#: lib/layouts/theorems-counters-extended-bytype.inc:28
-msgid "Acknowledgement"
-msgstr "Poďakovania"
-
 #: lib/layouts/AEA.layout:140
 msgid "Figure Notes"
 msgstr "Poznámky k obrázku"
@@ -7915,32 +7876,6 @@ msgstr "Mail"
 msgid "Correspondence to:"
 msgstr "Korešpodencia na:"
 
-#: lib/layouts/aa.layout:169 lib/layouts/aapaper.inc:82
-#: lib/layouts/aapaper.inc:93 lib/layouts/aapaper.layout:105
-#: lib/layouts/aastex.layout:354 lib/layouts/aastex62.layout:225
-#: lib/layouts/achemso.layout:283 lib/layouts/achemso.layout:290
-#: lib/layouts/acmart.layout:657 lib/layouts/acmart.layout:661
-#: lib/layouts/acmsiggraph-0-92.layout:346
-#: lib/layouts/acmsiggraph-0-92.layout:353 lib/layouts/acmsiggraph.layout:302
-#: lib/layouts/acmsiggraph.layout:309 lib/layouts/agutex.layout:193
-#: lib/layouts/apa.layout:243 lib/layouts/copernicus.layout:424
-#: lib/layouts/egs.layout:595 lib/layouts/iopart.layout:296
-#: lib/layouts/iopart.layout:310 lib/layouts/isprs.layout:221
-#: lib/layouts/iucr.layout:253 lib/layouts/jasatex.layout:284
-#: lib/layouts/jasatex.layout:290 lib/layouts/kluwer.layout:341
-#: lib/layouts/kluwer.layout:353 lib/layouts/maa-monthly.layout:144
-#: lib/layouts/maa-monthly.layout:150 lib/layouts/revtex4-x.inc:261
-#: lib/layouts/revtex4.layout:281 lib/layouts/revtex4.layout:291
-#: lib/layouts/sigplanconf.layout:235 lib/layouts/sigplanconf.layout:242
-#: lib/layouts/spie.layout:100 lib/layouts/svcommon.inc:640
-#: lib/layouts/svcommon.inc:653
-msgid "Acknowledgments[[credits]]"
-msgstr "Poďakovania"
-
-#: lib/layouts/aa.layout:181
-msgid "Acknowledgements[[credits]]."
-msgstr "Poďakovania."
-
 #: lib/layouts/aa.layout:196 lib/layouts/aapaper.layout:66
 #: lib/layouts/aapaper.layout:139 lib/layouts/aastex.layout:97
 #: lib/layouts/aguplus.inc:29 lib/layouts/amsart.layout:66
@@ -8090,16 +8025,6 @@ msgstr "E-mail"
 msgid "email:"
 msgstr "e-mail:"
 
-#: lib/layouts/aapaper.inc:93

[LyX/master] Update fr.po

2023-02-07 Thread jpc

commit e4807c9d7cff404d06e7747bc23eb3139fe3da02
Author: jpc 
Date:   Tue Feb 7 11:32:54 2023 +0100

 Update fr.po
---
 po/fr.gmo |  Bin 639562 -> 639564 bytes
 po/fr.po  |   18 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/po/fr.gmo b/po/fr.gmo
index 096da03..cd3ed62 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 9dd1569..1b56b82 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -363,7 +363,7 @@ msgstr ""
 "Project-Id-Version: LyX 2.4\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
 "POT-Creation-Date: 2023-01-31 11:35+0100\n"
-"PO-Revision-Date: 2023-01-31 17:16+0100\n"
+"PO-Revision-Date: 2023-02-07 11:32+0100\n"
 "Last-Translator: Jean-Pierre Chrétien \n"
 "Language-Team: lyxfr\n"
 "Language: fr\n"
@@ -2850,7 +2850,7 @@ msgid ""
 "used with \"See\" and \"See also\" references."
 msgstr ""
 "Personnaliser le format du numéro de page ici. Notez que ce format ne "
-"s'applique pas aux références du type « Voir » et « Voir aussi »"
+"s'applique pas aux références du type « Voir » et « Voir aussi »."
 
 #: src/frontends/qt/ui/IndexUi.ui:105
 msgid "Enter custom command here (without leading backslash)."
@@ -4638,7 +4638,7 @@ msgid ""
 "width is used."
 msgstr ""
 "Configurer le largeur du curseur de texte. Si la valeur vaut « Auto », le "
-"zoom automatique fixe la largeur du curseur. "
+"zoom automatique fixe la largeur du curseur."
 
 #: src/frontends/qt/ui/PrefEditUi.ui:180
 #: lib/citeengines/biblatex-natbib.citeengine:148
@@ -10991,7 +10991,7 @@ msgid ""
 "Help > Specific Manuals > Multilingual Captions."
 msgstr ""
 "Procure deux styles de légendes bilingues. Pour les détails, voir le fichier "
-"Aide > Manuels spécifiques >  Légendes multilingues"
+"Aide > Manuels spécifiques >  Légendes multilingues."
 
 #: lib/layouts/bicaption.module:11
 msgid "Caption setup"
@@ -11057,7 +11057,7 @@ msgid ""
 "Specific Manuals > Braille."
 msgstr ""
 "Définit un environnement pour saisir le Braille. Pour les détails, voir  "
-"Aide > Manuels spécifiques >  Braille"
+"Aide > Manuels spécifiques >  Braille."
 
 #: lib/layouts/braille.module:23
 msgid "Braille (default)"
@@ -30072,7 +30072,7 @@ msgid ""
 "View > Messages Pane!"
 msgstr ""
 "Le processeur d'index ne s'est pas exécuté correctement. Veuillez vérifier "
-"via Affichage > Panneau des messages."
+"via Affichage > Panneau des messages !"
 
 #: src/LaTeX.cpp:599
 msgid "Running Nomenclature Processor."
@@ -35321,7 +35321,7 @@ msgid ""
 "%1$s\n"
 "does not exist. Create empty file?"
 msgstr ""
-" Le fichier\n"
+"Le fichier\n"
 "%1$s\n"
 "n'existe pas. Créer un fichier vide ?"
 
@@ -36432,7 +36432,7 @@ msgstr ""
 
 #: src/insets/InsetCaption.cpp:416
 msgid "Orphaned caption:"
-msgstr "Légende oprpheline"
+msgstr "Légende orpheline :"
 
 #: src/insets/InsetCaption.cpp:432
 #, c-format
@@ -38348,7 +38348,7 @@ msgstr "Définition d'un clavier personnalisé"
 
 #: src/support/debug.cpp:50
 msgid "Output source file generation/processing"
-msgstr "Génération/traitement du fichier source exporté."
+msgstr "Génération/traitement du fichier source exporté"
 
 #: src/support/debug.cpp:51
 msgid "Output source file generation/processing (alias to 'outfile')"
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] Disable "search in selection only" with instant search

[LyX/master] Update sk.po

[LyX/master] Update fr.po

3 matches

Site Navigation

Mail list logo

Footer information