date:20230618

[LyX/master] de.po

2023-06-18 Thread Juergen Spitzmueller

commit 066e91a2fe601aa0facd8312ec2ba2e5f5de650f
Author: Juergen Spitzmueller 
Date:   Sun Jun 18 11:57:51 2023 +0200

de.po
---
 po/de.po |  255 +++---
 1 files changed, 127 insertions(+), 128 deletions(-)

diff --git a/po/de.po b/po/de.po
index e49cb58..baa2a39 100644
--- a/po/de.po
+++ b/po/de.po
@@ -94,15 +94,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LyX 2.4git\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
-"POT-Creation-Date: 2023-06-15 09:05+0200\n"
-"PO-Revision-Date: 2023-06-15 09:06+0200\n"
+"POT-Creation-Date: 2023-06-18 11:54+0200\n"
+"PO-Revision-Date: 2023-06-18 11:55+0200\n"
 "Last-Translator: Juergen Spitzmueller \n"
-"Language-Team: German \n"
+"Language-Team: German \n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 18.12.1\n"
+"X-Generator: Lokalize 23.04.2\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: src/frontends/qt/ui/AboutUi.ui:27
@@ -2692,21 +2692,21 @@ msgstr "Benut&zerdefiniert:"
 msgid "Inset Parameter Configuration"
 msgstr "Konfiguration von Inset-Parametern"
 
-#: src/frontends/qt/ui/InsetParamsUi.ui:47
+#: src/frontends/qt/ui/InsetParamsUi.ui:57
 msgid "Update dialog when moving context"
 msgstr ""
 "Aktualisiere dieses Dialogfenster, wenn der Cursor in eine andere Umgebung "
 "platziert wird"
 
-#: src/frontends/qt/ui/InsetParamsUi.ui:50
+#: src/frontends/qt/ui/InsetParamsUi.ui:60
 msgid "S&ynchronize Dialog"
 msgstr "Dialog s&ynchronisieren"
 
-#: src/frontends/qt/ui/InsetParamsUi.ui:57
+#: src/frontends/qt/ui/InsetParamsUi.ui:67
 msgid "Apply settings immediately"
 msgstr "Änderungen sofort anwenden"
 
-#: src/frontends/qt/ui/InsetParamsUi.ui:63
+#: src/frontends/qt/ui/InsetParamsUi.ui:73
 #: src/frontends/qt/ui/ParagraphUi.ui:237
 msgid "I&mmediate Apply"
 msgstr "&Direkt anwenden"
@@ -17600,34 +17600,6 @@ msgstr "Kapitel \\thechapter"
 msgid "Appendix \\thechapter"
 msgstr "Anhang \\thechapter"
 
-#: lib/layouts/stdspecialchars.inc:8 lib/ui/stdmenus.inc:464
-msgid "Ligature Break|k"
-msgstr "Ligaturtrenner|r"
-
-#: lib/layouts/stdspecialchars.inc:17 lib/ui/stdmenus.inc:416
-msgid "End of Sentence|E"
-msgstr "Satzendepunkt|S"
-
-#: lib/layouts/stdspecialchars.inc:26 lib/ui/stdmenus.inc:415
-msgid "Ellipsis|i"
-msgstr "Fortsetzungspunkte|F"
-
-#: lib/layouts/stdspecialchars.inc:36 lib/ui/stdmenus.inc:422
-msgid "Menu Separator|M"
-msgstr "Menütrenner|M"
-
-#: lib/layouts/stdspecialchars.inc:49 lib/ui/stdmenus.inc:463
-msgid "Hyphenation Point|H"
-msgstr "Trennmöglichkeit|ö"
-
-#: lib/layouts/stdspecialchars.inc:56 lib/ui/stdmenus.inc:420
-msgid "Breakable Slash|a"
-msgstr "Umbruchfähiger Schrägstrich|ä"
-
-#: lib/layouts/stdspecialchars.inc:65
-msgid "Protected Hyphen|y"
-msgstr "Geschützter Trennstrich|T"
-
 #: lib/layouts/stdstarsections.inc:109
 msgid "Subparagraph*"
 msgstr "Unterparagraph*"
@@ -20886,8 +20858,8 @@ msgid "Emphasized Page Formatting|z"
 msgstr "Hervorgehobener Seitenverweis|H"
 
 #: lib/ui/stdcontext.inc:647
-msgid "Custom Page Formatting|u"
-msgstr "Benutzerdefinierter Seitenverweis|u"
+msgid "Custom Page Formatting...|u"
+msgstr "Benutzerdefinierter Seitenverweis...|u"
 
 #: lib/ui/stdcontext.inc:651
 msgid "Insert Subentry|b"
@@ -21685,6 +21657,14 @@ msgstr "Eingebettete Vorschau|i"
 msgid "Symbols...|b"
 msgstr "Symbole...|b"
 
+#: lib/ui/stdmenus.inc:415
+msgid "Ellipsis|i"
+msgstr "Fortsetzungspunkte|F"
+
+#: lib/ui/stdmenus.inc:416
+msgid "End of Sentence|E"
+msgstr "Satzendepunkt|S"
+
 #: lib/ui/stdmenus.inc:417
 msgid "Plain Quotation Mark|Q"
 msgstr "Nicht-typographisches Anführungszeichen|N"
@@ -21697,10 +21677,18 @@ msgstr "Inneres Anführungszeichen|I"
 msgid "Non-Breaking Hyphen|y"
 msgstr "Geschützter Trennstrich|T"
 
+#: lib/ui/stdmenus.inc:420
+msgid "Breakable Slash|a"
+msgstr "Umbruchfähiger Schrägstrich|ä"
+
 #: lib/ui/stdmenus.inc:421
 msgid "Visible Space|V"
 msgstr "Sichtbares Leerzeichen|L"
 
+#: lib/ui/stdmenus.inc:422
+msgid "Menu Separator|M"
+msgstr "Menütrenner|M"
+
 #: lib/ui/stdmenus.inc:423
 msgid "Phonetic Symbols|P"
 msgstr "Phonetische Symbole|P"
@@ -21801,6 +21789,14 @@ msgstr "Vertikaler Abstand...|V"
 msgid "Phantom|m"
 msgstr "Phantom|m"
 
+#: lib/ui/stdmenus.inc:463
+msgid "Hyphenation Point|H"
+msgstr "Trennmöglichkeit|ö"
+
+#: lib/ui/stdmenus.inc:464
+msgid "Ligature Break|k"
+msgstr "Ligaturtrenner|r"
+
 #: lib/ui/stdmenus.inc:465
 msgid "Optional Line Break|B"
 msgstr "Optionaler Zeilenumbruch|p"
@@ -27515,14 +27511,14 @@ msgid "LyX Archive (tar.gz)"
 msgstr "LyX-Archiv (tar.gz)"
 
 #: lib/examples/Articles:0
-msgid "Game 2"
-msgstr "Spiel 2"
-
-#: lib/examples/Articles:0
 msgid "Game 1"
 msgstr "Spiel 1"
 
 #: lib/examples/Articles:0
+msgid "Game 2"
+msgstr "Spiel 2"
+
+#: lib/examples/Articles:0
 msgid "Example (LyXified)"
 msgstr "Beispiel (geLyXt)"
 
@@ -27540,52 +27536,52 @@ msgid "External Material"
 msgstr "Externes Material"

[LyX/master] Properly uncheck insert table toolbutton

2023-06-18 Thread Stephan Witt

commit ca5a75b23e88ec40ecf13acbae09ecaf3f0253e5
Author: Daniel Ramoeller 
Date:   Sat Jun 10 10:22:26 2023 +0200

Properly uncheck insert table toolbutton

Fix for bug #12801
---
 src/frontends/qt/InsertTableWidget.cpp |7 +++
 src/frontends/qt/InsertTableWidget.h   |1 +
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/frontends/qt/InsertTableWidget.cpp 
b/src/frontends/qt/InsertTableWidget.cpp
index 07ae061..325c053 100644
--- a/src/frontends/qt/InsertTableWidget.cpp
+++ b/src/frontends/qt/InsertTableWidget.cpp
@@ -63,6 +63,13 @@ void InsertTableWidget::show(bool show)
 }
 
 
+void InsertTableWidget::hideEvent(QHideEvent * event)
+{
+   QWidget::hideEvent(event);
+   visible(false);
+}
+
+
 void InsertTableWidget::resetGeometry()
 {
QPoint p = 
parentWidget()->mapToGlobal(parentWidget()->geometry().bottomLeft());
diff --git a/src/frontends/qt/InsertTableWidget.h 
b/src/frontends/qt/InsertTableWidget.h
index 5e2e244..4917392 100644
--- a/src/frontends/qt/InsertTableWidget.h
+++ b/src/frontends/qt/InsertTableWidget.h
@@ -41,6 +41,7 @@ protected Q_SLOTS:
void mouseReleaseEvent(QMouseEvent *) override;
void mousePressEvent(QMouseEvent *) override;
void paintEvent(QPaintEvent *) override;
+   void hideEvent(QHideEvent * event);
 
 private:
//! update the geometry
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] Disable LFUN_INDEX_TAG_ALL if there is noting to tag (#12812)

2023-06-18 Thread Juergen Spitzmueller

commit 2bbc420032a3ec293aff5465473d05171254a72e
Author: Juergen Spitzmueller 
Date:   Sun Jun 18 12:45:25 2023 +0200

Disable LFUN_INDEX_TAG_ALL if there is noting to tag (#12812)
---
 src/BufferView.cpp|6 ++
 src/insets/InsetIndex.cpp |   28 ++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 913c459..15911e8 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -1759,6 +1759,10 @@ void BufferView::dispatch(FuncRequest const & cmd, 
DispatchResult & dr)
}
 
case LFUN_INDEX_TAG_ALL: {
+   if (cur.pos() == 0)
+   // nothing precedes
+   break;
+
Inset * ins = cur.nextInset();
if (!ins || ins->lyxCode() != INDEX_CODE)
// not at index inset
@@ -1795,6 +1799,8 @@ void BufferView::dispatch(FuncRequest const & cmd, 
DispatchResult & dr)
// Get word or selection
cur.text()->selectWord(cur, WHOLE_WORD);
docstring const searched_string = cur.selectionAsString(false);
+   if (searched_string.empty())
+   break;
// Start from the beginning
lyx::dispatch(FuncRequest(LFUN_BUFFER_BEGIN));
while (findOne(this, searched_string,
diff --git a/src/insets/InsetIndex.cpp b/src/insets/InsetIndex.cpp
index f494b07..536288d 100644
--- a/src/insets/InsetIndex.cpp
+++ b/src/insets/InsetIndex.cpp
@@ -27,6 +27,7 @@
 #include "IndicesList.h"
 #include "InsetList.h"
 #include "Language.h"
+#include "Paragraph.h"
 #include "LaTeX.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
@@ -693,8 +694,31 @@ bool InsetIndex::getStatus(Cursor & cur, FuncRequest const 
& cmd,
case LFUN_INDEXMACRO_INSERT:
return macrosPossible(cmd.getArg(0));
 
-   case LFUN_INDEX_TAG_ALL:
-   return true;
+   case LFUN_INDEX_TAG_ALL: {
+   if (cur.pos() == 0)
+   // nothing to tag
+   return false;
+   // move backwards into preceding word
+   // skip over other index insets
+   DocIterator dit(cur);
+   dit.backwardPosIgnoreCollapsed();
+   while (true) {
+   if (dit.inset().lyxCode() == INDEX_CODE)
+   dit.pop_back();
+   else if (dit.prevInset() && dit.prevInset()->lyxCode() 
== INDEX_CODE)
+   dit.backwardPosIgnoreCollapsed();
+   else
+   break;
+   }
+   if (!dit.inTexted())
+   // action not possible
+   return false;
+   // Check if we actually have a word to tag
+   FontSpan tw = dit.locateWord(WHOLE_WORD);
+
+   // action possible if we have a word of at least one char
+   return (tw.size() > 0);
+   }
 
default:
return InsetCollapsible::getStatus(cur, cmd, flag);
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] Improved LYX_BUILD_TYPE detection for cmake - case insensitive AC_INIT processing

2023-06-18 Thread Stephan Witt

commit f88986eff5aedf6cce5832b0f5028124e72482a4
Author: Stephan Witt 
Date:   Mon Jun 19 08:00:08 2023 +0200

Improved LYX_BUILD_TYPE detection for cmake - case insensitive AC_INIT 
processing
---
 development/cmake/modules/LyXMacros.cmake |5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/development/cmake/modules/LyXMacros.cmake 
b/development/cmake/modules/LyXMacros.cmake
index 501da11..e221af1 100644
--- a/development/cmake/modules/LyXMacros.cmake
+++ b/development/cmake/modules/LyXMacros.cmake
@@ -430,12 +430,13 @@ function(determineversionandbuildtype configfile package 
version dirs date build
   setstripped(PACKAGE_VERSION ${_PV})
   setstripped(PACKAGE_BUGREPORT ${_PBU})
   set(${package} ${PACKAGE_BASE} ${PACKAGE_VERSION} ${PACKAGE_BUGREPORT} 
PARENT_SCOPE)
-  if(PACKAGE_VERSION MATCHES 
"^\([0-9]+\)\\.\([0-9]+\)\(\\.\([0-9]+\)\(\\.\([0-9]+\)\)?\)?-?\([a-z]*[0-9]*\).*$")
+  if(PACKAGE_VERSION MATCHES 
"^\([0-9]+\)\\.\([0-9]+\)\(\\.\([0-9]+\)\(\\.\([0-9]+\)\)?\)?-?\([A-Za-z]*[0-9]*\).*$")
 set(LYX_MAJOR_VERSION ${CMAKE_MATCH_1})
 set(LYX_MINOR_VERSION ${CMAKE_MATCH_2})
 set(LYX_RELEASE_LEVEL ${CMAKE_MATCH_4})
 set(LYX_RELEASE_PATCH ${CMAKE_MATCH_6})
-set(LYX_BUILD_TYPE ${CMAKE_MATCH_7})
+set(LYX_BUILD_TYPE_MATCH ${CMAKE_MATCH_7})
+string(TOLOWER "${LYX_BUILD_TYPE_MATCH}" LYX_BUILD_TYPE)
 set(LYX_DIR_VER "LYX_DIR_${CMAKE_MATCH_1}${CMAKE_MATCH_2}x")
 set(LYX_USERDIR_VER "LYX_USERDIR_${CMAKE_MATCH_1}${CMAKE_MATCH_2}x")
 if (NOT LYX_RELEASE_LEVEL)
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] de.po

[LyX/master] Properly uncheck insert table toolbutton

[LyX/master] Disable LFUN_INDEX_TAG_ALL if there is noting to tag (#12812)

[LyX/master] Improved LYX_BUILD_TYPE detection for cmake - case insensitive AC_INIT processing

4 matches

Site Navigation

Mail list logo

Footer information