X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiParagraph.h;h=408765bbe433c0472641b62ecd9ba28ad63e1f4a;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=54e2603cd85915e4f1b49b2b7ca9c2234d549785;hpb=a98f82c292c7047478e3362449ab21aa35e03375;p=lyx.git

diff --git a/src/frontends/qt4/GuiParagraph.h b/src/frontends/qt4/GuiParagraph.h
index 54e2603cd8..408765bbe4 100644
--- a/src/frontends/qt4/GuiParagraph.h
+++ b/src/frontends/qt4/GuiParagraph.h
@@ -22,15 +22,11 @@
 #include "Layout.h"
 #include "ParagraphParameters.h"
 
-#include "support/debug.h"
-
 #include <QDialog>
-#include <QSettings>
 #include <QShowEvent>
 #include <QGridLayout>
 
 #include <map>
-#include <string>
 
 namespace lyx {
 namespace frontend {
@@ -44,11 +40,14 @@ public:
 
 	/// Dialog inherited methods
 	//@{
+	void applyView();
 	void updateView();
 	void dispatchParams();
 	void enableView(bool enable);
 	bool isBufferDependent() const { return true; }
 	virtual FuncCode getLfun() const { return LFUN_PARAGRAPH_PARAMS_APPLY; }
+	void saveSession() const;
+	void restoreSession();
 	//@}
 
 private:
@@ -57,16 +56,16 @@ private:
 	///
 	void alignmentToRadioButtons(LyXAlignment align = LYX_ALIGN_LAYOUT);
 	///
-	LyXAlignment getAlignmentFromDialog();
-	///
-	ParagraphParameters & params();
+	LyXAlignment getAlignmentFromDialog() const;
 	///
 	ParagraphParameters const & params() const;
 	///
-	bool haveMultiParSelection();
+	bool haveMultiParSelection() const;
 	///
 	bool canIndent() const;
 	///
+	bool hasLabelwidth() const;
+	///
 	LyXAlignment alignPossible() const;
 	///
 	LyXAlignment alignDefault() const;
@@ -82,20 +81,21 @@ private Q_SLOTS:
 	void on_linespacing_activated(int);
 	/// Apply changes
 	void on_applyPB_clicked();
+	/// Apply changes and close
+	void on_okPB_clicked();
+	/// Close/Cancel dialog
+	void on_closePB_clicked();
 
 private:
 	///
 	typedef std::map<LyXAlignment, QRadioButton *> RadioMap;
 	///
-	RadioMap radioMap;
-	///
-	typedef std::map<LyXAlignment, docstring> AlignmentLabels;
-	///
-	AlignmentLabels labelMap;
+	RadioMap radioMap_;
+
 	///
-	QString const alignDefaultLabel;
+	QString alignDefaultLabel_;
 	///
-	ParagraphParameters multiparsel_;
+	ParagraphParameters params_;
 };
 
 } // namespace frontend