X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiVSpace.cpp;h=70d2ba7e6e4f7ffc642969da6645207bf8024ccf;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=f691ff008062158038a1596cd588d97f656493af;hpb=5342ee5aadefb73942e108f614f748bccf3c1496;p=lyx.git

diff --git a/src/frontends/qt4/GuiVSpace.cpp b/src/frontends/qt4/GuiVSpace.cpp
index f691ff0080..70d2ba7e6e 100644
--- a/src/frontends/qt4/GuiVSpace.cpp
+++ b/src/frontends/qt4/GuiVSpace.cpp
@@ -3,12 +3,12 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
- * \author Jürgen Vigna
+ * \author André Pönitz
+ * \author Jürgen Vigna
  * \author Rob Lahaye
  * \author Angus Leeming
  * \author Edwin Leuven
- * \author Jürgen Spitzmüller
+ * \author Jürgen Spitzmüller
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -21,30 +21,28 @@
 #include "qt_helpers.h"
 #include "Validator.h"
 
-#include "LyXRC.h" // to set the default length values
 #include "Spacing.h"
 #include "FuncRequest.h"
+
 #include "insets/InsetVSpace.h"
 
+#include "support/gettext.h"
 #include "support/lstrings.h"
 
 #include <QCheckBox>
-#include <QCloseEvent>
 #include <QLineEdit>
 #include <QPushButton>
 #include <QValidator>
 
-using std::string;
-
+using namespace std;
 
 namespace lyx {
 namespace frontend {
 
-GuiVSpace::GuiVSpace(LyXView & lv)
-	: GuiDialog(lv, "vspace")
+GuiVSpace::GuiVSpace(GuiView & lv)
+	: GuiDialog(lv, "vspace", qt_("Vertical Space Settings"))
 {
 	setupUi(this);
-	setViewTitle(_("Vertical Space Settings"));
 
 	connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
 	connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply()));
@@ -61,7 +59,7 @@ GuiVSpace::GuiVSpace(LyXView & lv)
 	connect(unitCO, SIGNAL(selectionChanged(lyx::Length::UNIT)),
 		this, SLOT(change_adaptor()));
 
-	valueLE->setValidator(unsignedLengthValidator(valueLE));
+	valueLE->setValidator(unsignedGlueLengthValidator(valueLE));
 
 	// Manage the ok, apply, restore and cancel/close buttons
 	bc().setPolicy(ButtonPolicy::OkApplyCancelReadOnlyPolicy);
@@ -77,16 +75,6 @@ GuiVSpace::GuiVSpace(LyXView & lv)
 
 	// initialize the length validator
 	bc().addCheckedLineEdit(valueLE, valueL);
-
-	// remove the %-items from the unit choice
-	unitCO->noPercents();
-}
-
-
-void GuiVSpace::closeEvent(QCloseEvent * e)
-{
-	slotClose();
-	e->accept();
 }
 
 
@@ -122,8 +110,7 @@ static void setWidgetsFromVSpace(VSpace const & space,
 	spacing->setCurrentIndex(item);
 	keep->setChecked(space.keep());
 
-	Length::UNIT default_unit =
-			(lyxrc.default_papersize > 3) ? Length::CM : Length::IN;
+	Length::UNIT const default_unit = Length::defaultUnit();
 	bool const custom_vspace = space.kind() == VSpace::LENGTH;
 	if (custom_vspace) {
 		value->setEnabled(true);
@@ -177,9 +164,8 @@ void GuiVSpace::updateContents()
 
 bool GuiVSpace::initialiseParams(string const & data)
 {
-	InsetVSpaceMailer::string2params(data, params_);
+	InsetVSpace::string2params(data, params_);
 	setButtonsValid(true);
-
 	return true;
 }
 
@@ -192,15 +178,15 @@ void GuiVSpace::clearParams()
 
 void GuiVSpace::dispatchParams()
 {
-	dispatch(FuncRequest(getLfun(), InsetVSpaceMailer::params2string(params_)));
+	dispatch(FuncRequest(getLfun(), InsetVSpace::params2string(params_)));
 }
 
 
-Dialog * createGuiVSpace(LyXView & lv) { return new GuiVSpace(lv); }
+Dialog * createGuiVSpace(GuiView & lv) { return new GuiVSpace(lv); }
 
 
 } // namespace frontend
 } // namespace lyx
 
 
-#include "GuiVSpace_moc.cpp"
+#include "moc_GuiVSpace.cpp"