[LyX/master] Remove redundant code and clarify strings

Juergen Spitzmueller spitz at lyx.org
Sat Sep 2 11:12:13 UTC 2023


commit aaae3ad5cc976cdf6082369757943304bad6c8db
Author: Juergen Spitzmueller <spitz at lyx.org>
Date:   Sat Sep 2 14:28:33 2023 +0200

    Remove redundant code and clarify strings
---
 src/frontends/qt/GuiDocument.cpp |   29 ++---------------------------
 1 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/src/frontends/qt/GuiDocument.cpp b/src/frontends/qt/GuiDocument.cpp
index 4d873bd..1948bb6 100644
--- a/src/frontends/qt/GuiDocument.cpp
+++ b/src/frontends/qt/GuiDocument.cpp
@@ -2178,30 +2178,6 @@ void GuiDocument::setMargins()
 		marginsModule->marginCB->setChecked(!bp_.use_geometry);
 		setCustomMargins(!bp_.use_geometry);
 	}
-
-	// set some placeholder text that hint on defaults
-	QString const placeholder = marginsModule->marginCB->isChecked() ?
-		qt_("Class defaults") : qt_("Package defaults");
-	// set tooltip depending on gemoetry state
-	QString const tooltip = marginsModule->marginCB->isChecked() ?
-		qt_("If no value is given, the defaults as set by the class are used.")
-		: qt_("If no value is given, the defaults as set by the geometry package or a package/class overriding geometry's defaults are used.");
-	marginsModule->topLE->setPlaceholderText(placeholder);
-	marginsModule->bottomLE->setPlaceholderText(placeholder);
-	marginsModule->innerLE->setPlaceholderText(placeholder);
-	marginsModule->outerLE->setPlaceholderText(placeholder);
-	marginsModule->headheightLE->setPlaceholderText(placeholder);
-	marginsModule->headsepLE->setPlaceholderText(placeholder);
-	marginsModule->footskipLE->setPlaceholderText(placeholder);
-	marginsModule->columnsepLE->setPlaceholderText(placeholder);
-	marginsModule->topLE->setToolTip(tooltip);
-	marginsModule->bottomLE->setToolTip(tooltip);
-	marginsModule->innerLE->setToolTip(tooltip);
-	marginsModule->outerLE->setToolTip(tooltip);
-	marginsModule->headheightLE->setToolTip(tooltip);
-	marginsModule->headsepLE->setToolTip(tooltip);
-	marginsModule->footskipLE->setToolTip(tooltip);
-	marginsModule->columnsepLE->setToolTip(tooltip);
 }
 
 
@@ -2267,10 +2243,10 @@ void GuiDocument::setCustomMargins(bool custom)
 
 	// set some placeholder text that hint on defaults
 	QString const placeholder = marginsModule->marginCB->isChecked() ?
-		qt_("Class defaults") : qt_("Package defaults");
+		qt_("Default margins") : qt_("Package defaults");
 	// set tooltip depending on gemoetry state
 	QString const tooltip = marginsModule->marginCB->isChecked() ?
-		qt_("If no value is given, the defaults as set by the class are used.")
+		qt_("If no value is given, the defaults as set by the class, a package or the preamble are used.")
 		: qt_("If no value is given, the defaults as set by the geometry package or a package/class overriding geometry's defaults are used.");
 	marginsModule->topLE->setPlaceholderText(placeholder);
 	marginsModule->bottomLE->setPlaceholderText(placeholder);
@@ -2288,7 +2264,6 @@ void GuiDocument::setCustomMargins(bool custom)
 	marginsModule->headsepLE->setToolTip(tooltip);
 	marginsModule->footskipLE->setToolTip(tooltip);
 	marginsModule->columnsepLE->setToolTip(tooltip);
-
 }
 
 


More information about the lyx-cvs mailing list