diff -r c595cfb4791c -r 31540c1f22ea src/configDialog.h --- a/src/configDialog.h Wed Oct 23 13:14:17 2013 +0300 +++ b/src/configDialog.h Mon Jan 20 15:04:26 2014 +0200 @@ -1,6 +1,6 @@ /* * LDForge: LDraw parts authoring CAD - * Copyright (C) 2013 Santeri Piippo + * Copyright (C) 2013, 2014 Santeri Piippo * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,8 +28,9 @@ // ============================================================================= class ShortcutListItem : public QListWidgetItem -{ PROPERTY (KeySequenceConfig*, keyConfig, setKeyConfig) - PROPERTY (QAction*, action, setAction) +{ + PROPERTY (public, KeySequenceConfig*, KeyConfig, NO_OPS, STOCK_WRITE) + PROPERTY (public, QAction*, Action, NO_OPS, STOCK_WRITE) public: explicit ShortcutListItem (QListWidget* view = null, int type = Type) : @@ -38,11 +39,13 @@ // ============================================================================= class ConfigDialog : public QDialog -{ Q_OBJECT +{ + Q_OBJECT public: enum Tab - { InterfaceTab, + { + InterfaceTab, ProfileTab, ShortcutsTab, QuickColorsTab, @@ -66,12 +69,12 @@ void applySettings(); void addShortcut (KeySequenceConfig& cfg, QAction* act, int& i); - void setButtonBackground (QPushButton* button, str value); - void pickColor (StringConfig& cfg, QPushButton* button); + void setButtonBackground (QPushButton* button, QString value); + void pickColor (QString& conf, QPushButton* button); void updateQuickColorList (LDQuickColor* sel = null); void setShortcutText (ShortcutListItem* item); int getItemRow (QListWidgetItem* item, QList& haystack); - str quickColorString(); + QString quickColorString(); QListWidgetItem* getSelectedQuickColor(); QList getShortcutSelection(); void initGrids(); @@ -80,6 +83,7 @@ private slots: void slot_setGLBackground(); void slot_setGLForeground(); + void slot_setGLSelectColor(); void slot_setShortcut(); void slot_resetShortcut(); void slot_clearShortcut(); @@ -98,7 +102,8 @@ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ============================================================================= class KeySequenceDialog : public QDialog -{ Q_OBJECT +{ + Q_OBJECT public: explicit KeySequenceDialog (QKeySequence seq, QWidget* parent = null, Qt::WindowFlags f = 0);