* Licence details can be found in the file COPYING.
*
* \author John Levon
+ * \author Bo Peng
+ * \author Edwin Leuven
*
* Full author contact details are available in file CREDITS.
*/
#include "GuiDialog.h"
-#include "Color.h"
+#include "ColorCode.h"
#include "Converter.h"
#include "Format.h"
+#include "KeyMap.h"
+#include "lfuns.h"
#include "LyXRC.h"
#include "Mover.h"
#include "ui_PrefPlaintextUi.h"
#include "ui_PrefDateUi.h"
-#include "ui_PrefKeyboardUi.h"
+#include "ui_PrefInputUi.h"
#include "ui_PrefLatexUi.h"
#include "ui_PrefScreenFontsUi.h"
#include "ui_PrefColorsUi.h"
#include "ui_PrefDisplayUi.h"
#include "ui_PrefPathsUi.h"
+#include "ui_PrefShortcutsUi.h"
#include "ui_PrefSpellcheckerUi.h"
#include "ui_PrefConvertersUi.h"
#include "ui_PrefFileformatsUi.h"
#include "ui_PrefPrinterUi.h"
#include "ui_PrefUi.h"
#include "ui_PrefIdentityUi.h"
+#include "ui_ShortcutUi.h"
#include <QDialog>
#include <QValidator>
namespace lyx {
-class Color_color;
class Converters;
class Formats;
class Movers;
};
-class PrefKeyboard : public PrefModule, public Ui::PrefKeyboardUi
+class PrefInput : public PrefModule, public Ui::PrefInputUi
{
Q_OBJECT
public:
- PrefKeyboard(GuiPreferences * form, QWidget * parent = 0);
+ PrefInput(GuiPreferences * form, QWidget * parent = 0);
virtual void apply(LyXRC & rc) const;
virtual void update(LyXRC const & rc);
void change_lyxObjects_selection();
private:
- std::vector<Color_color> lcolors_;
+ std::vector<ColorCode> 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.
void update(LyXRC const & rc);
private Q_SLOTS:
+ void select_exampledir();
void select_templatedir();
void select_tempdir();
void select_backupdir();
public Q_SLOTS:
void select_ui();
+};
+
+
+class GuiShortcutDialog : public QDialog, public Ui::shortcutUi
+{
+public:
+ GuiShortcutDialog(QWidget * parent);
+};
+
+
+class PrefShortcuts : public PrefModule, public Ui::PrefShortcuts
+{
+ Q_OBJECT
+private:
+ enum item_type {
+ 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, QWidget * parent = 0);
+
+ void apply(LyXRC & rc) const;
+ void update(LyXRC const & rc);
+ void updateShortcutsTW();
+ ///
+ void setItemType(QTreeWidgetItem * item, item_type tag);
+ QTreeWidgetItem * insertShortcutItem(FuncRequest const & lfun,
+ KeySequence const & shortcut, item_type tag);
+
+public Q_SLOTS:
void select_bind();
- void on_loadWindowSizeCB_toggled(bool);
+ 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();
+private:
+ ///
+ GuiShortcutDialog * shortcut_;
+ ///
+ ButtonController shortcut_bc_;
+ /// category items
+ QTreeWidgetItem * editItem_;
+ QTreeWidgetItem * mathItem_;
+ QTreeWidgetItem * bufferItem_;
+ QTreeWidgetItem * layoutItem_;
+ QTreeWidgetItem * systemItem_;
+ // system_bind_ holds bindings from rc.bind_file
+ // user_bind_ holds \bind bindings from user.bind
+ // user_unbind_ holds \unbind bindings from user.bind
+ // When an item is inserted, it is added to user_bind_
+ // When an item from system_bind_ is deleted, it is added to user_unbind_
+ // When an item in user_bind_ or user_unbind_ is deleted, it is
+ // deleted (unbind)
+ KeyMap system_bind_;
+ KeyMap user_bind_;
+ KeyMap user_unbind_;
};
};
-class GuiPreferences : public GuiDialog, public Ui::PrefsUi, public Controller
+class GuiPreferences : public GuiDialog, public Ui::PrefsUi
{
Q_OBJECT
public:
- GuiPreferences(LyXView & lv);
+ GuiPreferences(GuiView & lv);
void apply(LyXRC & rc) const;
void updateRc(LyXRC const & rc);
void change_adaptor();
public:
- //
- void closeEvent(QCloseEvent * e);
///
void add(PrefModule * module);
- /// parent controller
- Controller & controller() { return *this; }
/// Apply changes
void applyView();
/// update (do we need this?)
docstring const & title) const;
/// set a color
- void setColor(Color_color col, std::string const & hex);
+ void setColor(ColorCode col, std::string const & hex);
/// update the screen fonts after change
void updateScreenFonts();