merge QPref and QPrefDialog

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17971 a592a061-630c-0410-9148-cb99ea01b6c8

src/frontends/qt4/Makefile.am

@@ -62,7 +62,6 @@ libqt4_la_SOURCES = \
 	QLyXKeySym.C QLyXKeySym.h \
 	QNomencl.C QNomencl.h \
 	QNote.C QNote.h \
-	QPrefs.C QPrefs.h \
 	QPrint.C QPrint.h \
 	QRef.C QRef.h \
 	QSendto.C QSendto.h \

src/frontends/qt4/Makefile.dialogs

@@ -115,7 +115,7 @@ MOCFILES = \
 	QNomenclDialog.C QNomenclDialog.h \
 	QNoteDialog.C QNoteDialog.h \
 	QParagraph.C QParagraph.h \
-	QPrefsDialog.C QPrefsDialog.h \
+	QPrefs.C QPrefs.h \
 	QRefDialog.C QRefDialog.h \
 	QSearch.C QSearch.h \
 	QSendtoDialog.C QSendtoDialog.h \

src/frontends/qt4/QPrefs.h

@@ -13,10 +13,35 @@
 #define QPREFS_H
 
 #include "QDialogView.h"
-#include "QPrefsDialog.h"
+
+#include "LColor.h"
+#include "lyxrc.h"
+
+#include "ui/PrefsUi.h"
 
 #include <vector>
 
+#include <QDialog>
+#include <QCloseEvent>
+
+#include "ui/PrefPlaintextUi.h"
+#include "ui/PrefDateUi.h"
+#include "ui/PrefKeyboardUi.h"
+#include "ui/PrefLatexUi.h"
+#include "ui/PrefScreenFontsUi.h"
+#include "ui/PrefColorsUi.h"
+#include "ui/PrefCygwinPathUi.h"
+#include "ui/PrefDisplayUi.h"
+#include "ui/PrefPathsUi.h"
+#include "ui/PrefSpellcheckerUi.h"
+#include "ui/PrefConvertersUi.h"
+#include "ui/PrefCopiersUi.h"
+#include "ui/PrefFileformatsUi.h"
+#include "ui/PrefLanguageUi.h"
+#include "ui/PrefPrinterUi.h"
+#include "ui/PrefUi.h"
+#include "ui/PrefIdentityUi.h"
+
 namespace lyx {
 
 class Converters;
@@ -25,6 +50,333 @@ class Movers;
 
 namespace frontend {
 
+class QPrefs;
+
+class PrefModule : public QWidget
+{
+	Q_OBJECT
+public:
+	PrefModule(lyx::docstring const & cat, lyx::docstring const & t, QPrefs * form = 0, QWidget * parent = 0)
+		: QWidget(parent), category_(cat), title_(t), form_(form)
+	{
+	}
+
+	virtual void apply(LyXRC & rc) const = 0;
+	virtual void update(LyXRC const & rc) = 0;
+
+	lyx::docstring const & category() {
+		return category_;
+	}
+
+	lyx::docstring const & title() {
+		return title_;
+	}
+
+protected:
+	lyx::docstring category_;
+	lyx::docstring title_;
+	QPrefs * form_;
+
+Q_SIGNALS:
+	void changed();
+};
+
+
+class PrefPlaintext :  public PrefModule, public Ui::QPrefPlaintextUi
+{
+	Q_OBJECT
+public:
+	PrefPlaintext(QWidget * parent = 0);
+
+	virtual void apply(LyXRC & rc) const;
+	virtual void update(LyXRC const & rc);
+};
+
+
+class PrefDate :  public PrefModule, public Ui::QPrefDateUi
+{
+	Q_OBJECT
+public:
+	PrefDate(QWidget * parent = 0);
+
+	virtual void apply(LyXRC & rc) const;
+	virtual void update(LyXRC const & rc);
+};
+
+
+class PrefKeyboard :  public PrefModule, public Ui::QPrefKeyboardUi
+{
+	Q_OBJECT
+public:
+	PrefKeyboard(QPrefs * form, QWidget * parent = 0);
+
+	virtual void apply(LyXRC & rc) const;
+	virtual void update(LyXRC const & rc);
+
+private Q_SLOTS:
+	void on_firstKeymapPB_clicked(bool);
+	void on_secondKeymapPB_clicked(bool);
+	void on_keymapCB_toggled(bool);
+
+private:
+	QString testKeymap(QString keymap);
+};
+
+
+class PrefLatex :  public PrefModule, public Ui::QPrefLatexUi
+{
+	Q_OBJECT
+public:
+	PrefLatex(QPrefs * form, QWidget * parent = 0);
+
+	virtual void apply(LyXRC & rc) const;
+	virtual void update(LyXRC const & rc);
+};
+
+
+class PrefScreenFonts :  public PrefModule, public Ui::QPrefScreenFontsUi
+{
+	Q_OBJECT
+public:
+	PrefScreenFonts(QPrefs * form, QWidget * parent = 0);
+
+	virtual void apply(LyXRC & rc) const;
+	virtual void update(LyXRC const & rc);
+
+private Q_SLOTS:
+	void select_roman(const QString&);
+	void select_sans(const QString&);
+	void select_typewriter(const QString&);
+};
+
+
+class PrefColors :  public PrefModule, public Ui::QPrefColorsUi
+{
+	Q_OBJECT
+public:
+	PrefColors(QPrefs * form, QWidget * parent = 0);
+
+	void apply(LyXRC & rc) const;
+	void update(LyXRC const & rc);
+
+private Q_SLOTS:
+	void change_color();
+
+private:
+	std::vector<LColor_color> lcolors_;
+	// FIXME the use of mutable here is required due to the
+	// fact that initialization is not done in the controller
+	// but in the constructor.
+	mutable std::vector<QString> curcolors_;
+	std::vector<QString> newcolors_;
+
+};
+
+
+class PrefCygwinPath :  public PrefModule, public Ui::QPrefCygwinPathUi
+{
+	Q_OBJECT
+public:
+	PrefCygwinPath(QWidget * parent = 0);
+
+	void apply(LyXRC & rc) const;
+	void update(LyXRC const & rc);
+};
+
+
+class PrefDisplay :  public PrefModule, public Ui::QPrefDisplayUi
+{
+	Q_OBJECT
+public:
+	PrefDisplay(QWidget * parent = 0);
+
+	void apply(LyXRC & rc) const;
+	void update(LyXRC const & rc);
+};
+
+
+class PrefPaths :  public PrefModule, public Ui::QPrefPathsUi
+{
+	Q_OBJECT
+public:
+	PrefPaths(QPrefs * form, QWidget * parent = 0);
+
+	void apply(LyXRC & rc) const;
+	void update(LyXRC const & rc);
+
+private Q_SLOTS:
+	void select_templatedir();
+	void select_tempdir();
+	void select_backupdir();
+	void select_workingdir();
+	void select_lyxpipe();
+
+};
+
+
+class PrefSpellchecker :  public PrefModule, public Ui::QPrefSpellcheckerUi
+{
+	Q_OBJECT
+public:
+	PrefSpellchecker(QPrefs * form, QWidget * parent = 0);
+
+	void apply(LyXRC & rc) const;
+	void update(LyXRC const & rc);
+
+private Q_SLOTS:
+	void select_dict();
+};
+
+
+class PrefConverters :  public PrefModule, public Ui::QPrefConvertersUi
+{
+	Q_OBJECT
+public:
+	PrefConverters(QPrefs * form, QWidget * parent = 0);
+
+	void apply(LyXRC & rc) const;
+	void update(LyXRC const & rc);
+
+public Q_SLOTS:
+	void updateGui();
+
+private Q_SLOTS:
+	void update_converter();
+	void switch_converter();
+	void converter_changed();
+	void remove_converter();
+	void on_cacheCB_stateChanged(int state);
+
+private:
+	void updateButtons();
+};
+
+
+class PrefCopiers :  public PrefModule, public Ui::QPrefCopiersUi
+{
+	Q_OBJECT
+public:
+	PrefCopiers(QPrefs * form, QWidget * parent = 0);
+
+	void apply(LyXRC & rc) const;
+	void update(LyXRC const & rc);
+
+	void update();
+
+private Q_SLOTS:
+	void switch_copierLB(int nr);
+	void switch_copierCO(int nr);
+	void copiers_changed();
+	void new_copier();
+	void modify_copier();
+	void remove_copier();
+
+private:
+	void updateButtons();
+};
+
+
+class PrefFileformats :  public PrefModule, public Ui::QPrefFileformatsUi
+{
+	Q_OBJECT
+public:
+	PrefFileformats(QPrefs * form, QWidget * parent = 0);
+
+	void apply(LyXRC & rc) const;
+	void update(LyXRC const & rc);
+
+	void update();
+Q_SIGNALS:
+	void formatsChanged();
+private:
+	void updateButtons();
+
+private Q_SLOTS:
+	void switch_format(int);
+	void fileformat_changed();
+	void new_format();
+	void modify_format();
+	void remove_format();
+};
+
+
+class PrefLanguage :  public PrefModule, public Ui::QPrefLanguageUi
+{
+	Q_OBJECT
+public:
+	PrefLanguage(QWidget * parent = 0);
+
+	void apply(LyXRC & rc) const;
+	void update(LyXRC const & rc);
+
+private:
+	std::vector<std::string> lang_;
+};
+
+
+class PrefPrinter :  public PrefModule, public Ui::QPrefPrinterUi
+{
+	Q_OBJECT
+public:
+	PrefPrinter(QWidget * parent = 0);
+
+	void apply(LyXRC & rc) const;
+	void update(LyXRC const & rc);
+};
+
+
+class PrefUserInterface :  public PrefModule, public Ui::QPrefUi
+{
+	Q_OBJECT
+public:
+	PrefUserInterface(QPrefs * form, QWidget * parent = 0);
+
+	void apply(LyXRC & rc) const;
+	void update(LyXRC const & rc);
+
+public Q_SLOTS:
+	void select_ui();
+	void select_bind();
+	void on_loadWindowSizeCB_toggled(bool);
+
+};
+
+
+class PrefIdentity :  public PrefModule, public Ui::QPrefIdentityUi
+{
+	Q_OBJECT
+public:
+	PrefIdentity(QWidget * parent = 0);
+
+	void apply(LyXRC & rc) const;
+	void update(LyXRC const & rc);
+};
+
+///
+class QPrefsDialog : public QDialog, public Ui::QPrefsUi
+{
+	Q_OBJECT
+public:
+	QPrefsDialog(QPrefs *);
+
+	void apply(LyXRC & rc) const;
+	void updateRc(LyXRC const & rc);
+
+public Q_SLOTS:
+	void change_adaptor();
+
+protected:
+	void closeEvent(QCloseEvent * e);
+
+private:
+	void add(PrefModule * module);
+
+private:
+	QPrefs * form_;
+	std::vector<PrefModule *> modules_;
+};
+
+
 class ControlPrefs;
 
 class QPrefs