X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiPrefs.h;h=2a0405fb3ec337eb1a482fd30757f8fe31bf801a;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=6aed28dfefe3ecee45ef259a53b5b4e94c843e69;hpb=d748af0299e20fafdab6c9813f7df56b7e795ba9;p=lyx.git

diff --git a/src/frontends/qt4/GuiPrefs.h b/src/frontends/qt4/GuiPrefs.h
index 6aed28dfef..2a0405fb3e 100644
--- a/src/frontends/qt4/GuiPrefs.h
+++ b/src/frontends/qt4/GuiPrefs.h
@@ -75,8 +75,6 @@ public Q_SLOTS:
 public:
 	/// Apply changes
 	void applyView();
-	/// update (do we need this?)
-	void updateContents();
 
 	std::vector<PrefModule *> modules_;
 
@@ -93,7 +91,6 @@ public:
 	QString browsebind(QString const & file) const;
 	QString browseUI(QString const & file) const;
 	QString browsekbmap(QString const & file) const;
-	QString browsedict(QString const & file) const;
 
 	/// general browse
 	QString browse(QString const & file, QString const & title) const;
@@ -179,6 +176,9 @@ public:
 
 	virtual void apply(LyXRC & rc) const;
 	virtual void update(LyXRC const & rc);
+
+private Q_SLOTS:
+	void on_DateED_textChanged(const QString &);
 };
 
 
@@ -209,6 +209,10 @@ public:
 
 	virtual void apply(LyXRC & rc) const;
 	virtual void update(LyXRC const & rc);
+	virtual void enableCB();
+private Q_SLOTS:
+	void on_popupTextCB_clicked();
+	void on_inlineTextCB_clicked();
 };
 
 
@@ -220,6 +224,17 @@ public:
 
 	virtual void apply(LyXRC & rc) const;
 	virtual void update(LyXRC const & rc);
+
+private Q_SLOTS:
+	void on_latexEncodingCB_stateChanged(int state);
+	void on_latexBibtexCO_activated(int n);
+	void on_latexIndexCO_activated(int n);
+
+private:
+	///
+	std::set<std::string> bibtex_alternatives;
+	///
+	std::set<std::string> index_alternatives;
 };
 
 
@@ -233,9 +248,9 @@ public:
 	virtual void update(LyXRC const & rc);
 
 private Q_SLOTS:
-	void select_roman(const QString&);
-	void select_sans(const QString&);
-	void select_typewriter(const QString&);
+	void selectRoman(const QString&);
+	void selectSans(const QString&);
+	void selectTypewriter(const QString&);
 };
 
 
@@ -249,8 +264,8 @@ public:
 	void update(LyXRC const & rc);
 
 private Q_SLOTS:
-	void change_color();
-	void change_lyxObjects_selection();
+	void changeColor();
+	void changeLyxObjectsSelection();
 
 private:
 	std::vector<ColorCode> lcolors_;
@@ -267,6 +282,9 @@ public:
 
 	void apply(LyXRC & rc) const;
 	void update(LyXRC const & rc);
+
+private Q_SLOTS:
+	void on_instantPreviewCO_currentIndexChanged(int);
 };
 
 
@@ -280,12 +298,14 @@ public:
 	void update(LyXRC const & rc);
 
 private Q_SLOTS:
-	void select_exampledir();
-	void select_templatedir();
-	void select_tempdir();
-	void select_backupdir();
-	void select_workingdir();
-	void select_lyxpipe();
+	void selectExampledir();
+	void selectTemplatedir();
+	void selectTempdir();
+	void selectBackupdir();
+	void selectWorkingdir();
+	void selectThesaurusdir();
+	void selectHunspelldir();
+	void selectLyxPipe();
 
 };
 
@@ -299,8 +319,6 @@ public:
 	void apply(LyXRC & rc) const;
 	void update(LyXRC const & rc);
 
-private Q_SLOTS:
-	void select_dict();
 };
 
 
@@ -317,10 +335,10 @@ public Q_SLOTS:
 	void updateGui();
 
 private Q_SLOTS:
-	void update_converter();
-	void switch_converter();
-	void converter_changed();
-	void remove_converter();
+	void updateConverter();
+	void switchConverter();
+	void removeConverter();
+	void changeConverter();
 	void on_cacheCB_stateChanged(int state);
 
 private:
@@ -353,11 +371,21 @@ private Q_SLOTS:
 	void on_formatsCB_editTextChanged(const QString &);
 	void on_formatNewPB_clicked();
 	void on_formatRemovePB_clicked();
+	void on_viewerCO_currentIndexChanged(int i);
+	void on_editorCO_currentIndexChanged(int i);
 	void setFlags();
 	void updatePrettyname();
 
 private:
 	Format & currentFormat();
+	///
+	void updateViewers();
+	///
+	void updateEditors();
+	///
+	LyXRC::Alternatives viewer_alternatives;
+	///
+	LyXRC::Alternatives editor_alternatives;
 };
 
 
@@ -396,7 +424,8 @@ public:
 	void update(LyXRC const & rc);
 
 public Q_SLOTS:
-	void select_ui();
+	void selectUi();
+	void on_clearSessionPB_clicked();
 };
 
 
@@ -422,15 +451,6 @@ public:
 class PrefShortcuts : public PrefModule, public Ui::PrefShortcuts
 {
 	Q_OBJECT
-private:
-	enum ItemType {
-		System,         //< loaded from a bind file
-		UserBind,       //< \bind loaded from user.bind
-		UserUnbind,     //< \unbind loaded from user.bind, with corresponding
-		                //<    entry in system bind file
-		UserExtraUnbind	//< \unbind loaded from user.bind, without
-		                //<    corresponding entry in system bind file.
-	};
 public:
 	PrefShortcuts(GuiPreferences * form);
 
@@ -438,22 +458,26 @@ public:
 	void update(LyXRC const & rc);
 	void updateShortcutsTW();
 	void modifyShortcut();
+	void removeShortcut();
 	///
-	void setItemType(QTreeWidgetItem * item, ItemType tag);
+	void setItemType(QTreeWidgetItem * item, KeyMap::ItemType tag);
 	QTreeWidgetItem * insertShortcutItem(FuncRequest const & lfun, 
-		KeySequence const & shortcut, ItemType tag);
+		KeySequence const & shortcut, KeyMap::ItemType tag);
 
 public Q_SLOTS:
-	void select_bind();
+	void selectBind();
 	void on_modifyPB_pressed();
 	void on_newPB_pressed();
 	void on_removePB_pressed();
 	void on_searchLE_textEdited();
 	///
 	void on_shortcutsTW_itemSelectionChanged();
-	void shortcut_okPB_pressed();
-	void shortcut_clearPB_pressed();
 	void on_shortcutsTW_itemDoubleClicked();
+	///
+	void shortcutOkPressed();
+	void shortcutCancelPressed();
+	void shortcutClearPressed();
+	void shortcutRemovePressed();
 
 private:
 	///
@@ -476,6 +500,8 @@ private:
 	KeyMap system_bind_;
 	KeyMap user_bind_;
 	KeyMap user_unbind_;
+	///
+	QString save_lfun_;
 };