Mercurial > ldforge / file diff

--- a/src/configDialog.h	Thu Oct 03 18:07:06 2013 +0300
+++ b/src/configDialog.h	Thu Oct 03 20:56:20 2013 +0300
@@ -27,91 +27,91 @@
 class QDoubleSpinBox;
 
 // =============================================================================
-class ShortcutListItem : public QListWidgetItem {
-	PROPERTY (KeySequenceConfig*, keyConfig, setKeyConfig)
+class ShortcutListItem : public QListWidgetItem
+{	PROPERTY (KeySequenceConfig*, keyConfig, setKeyConfig)
 	PROPERTY (QAction*, action, setAction)
-	
-public:
-	explicit ShortcutListItem (QListWidget* view = null, int type = Type) :
-		QListWidgetItem (view, type) {}
+
+	public:
+		explicit ShortcutListItem (QListWidget* view = null, int type = Type) :
+			QListWidgetItem (view, type) {}
 };
 
 // =============================================================================
-class ConfigDialog : public QDialog {
-	Q_OBJECT
-	
-public:
-	enum Tab {
-		InterfaceTab,
-		ProfileTab,
-		ShortcutsTab,
-		QuickColorsTab,
-		GridsTab,
-		ExtProgsTab,
-		DownloadTab
-	};
-	
-	explicit ConfigDialog (Tab deftab = InterfaceTab, QWidget* parent = null, Qt::WindowFlags f = 0);
-	virtual ~ConfigDialog();
-	float getGridValue (int i, int j) const;
-	
-	List<LDQuickColor> quickColors;
-	QDoubleSpinBox* dsb_gridData[3][4];
-	
-private:
-	Ui_ConfigUI* ui;
-	QLabel* lb_gridLabels[3];
-	QLabel* lb_gridIcons[3];
-	List<QListWidgetItem*> quickColorItems;
-	
-	void applySettings();
-	void addShortcut (KeySequenceConfig& cfg, QAction* act, ulong& i);
-	void setButtonBackground (QPushButton* button, str value);
-	void pickColor (StringConfig& cfg, QPushButton* button);
-	void updateQuickColorList (LDQuickColor* sel = null);
-	void setShortcutText (ShortcutListItem* item);
-	int getItemRow (QListWidgetItem* item, List<QListWidgetItem*>& haystack);
-	str quickColorString();
-	QListWidgetItem* getSelectedQuickColor();
-	QList<ShortcutListItem*> getShortcutSelection();
-	void initGrids();
-	void initExtProgs();
-	
-private slots:
-	void slot_setGLBackground();
-	void slot_setGLForeground();
-	void slot_setShortcut();
-	void slot_resetShortcut();
-	void slot_clearShortcut();
-	void slot_setColor();
-	void slot_delColor();
-	void slot_addColorSeparator();
-	void slot_moveColor();
-	void slot_clearColors();
-	void slot_setExtProgPath();
-	void slot_findDownloadFolder();
-	void buttonClicked (QAbstractButton* button);
+class ConfigDialog : public QDialog
+{	Q_OBJECT
+
+	public:
+		enum Tab
+		{	InterfaceTab,
+			ProfileTab,
+			ShortcutsTab,
+			QuickColorsTab,
+			GridsTab,
+			ExtProgsTab,
+			DownloadTab
+		};
+
+		explicit ConfigDialog (Tab deftab = InterfaceTab, QWidget* parent = null, Qt::WindowFlags f = 0);
+		virtual ~ConfigDialog();
+		float getGridValue (int i, int j) const;
+
+		List<LDQuickColor> quickColors;
+		QDoubleSpinBox* dsb_gridData[3][4];
+
+	private:
+		Ui_ConfigUI* ui;
+		QLabel* lb_gridLabels[3];
+		QLabel* lb_gridIcons[3];
+		List<QListWidgetItem*> quickColorItems;
+
+		void applySettings();
+		void addShortcut (KeySequenceConfig& cfg, QAction* act, ulong& i);
+		void setButtonBackground (QPushButton* button, str value);
+		void pickColor (StringConfig& cfg, QPushButton* button);
+		void updateQuickColorList (LDQuickColor* sel = null);
+		void setShortcutText (ShortcutListItem* item);
+		int getItemRow (QListWidgetItem* item, List<QListWidgetItem*>& haystack);
+		str quickColorString();
+		QListWidgetItem* getSelectedQuickColor();
+		QList<ShortcutListItem*> getShortcutSelection();
+		void initGrids();
+		void initExtProgs();
+
+	private slots:
+		void slot_setGLBackground();
+		void slot_setGLForeground();
+		void slot_setShortcut();
+		void slot_resetShortcut();
+		void slot_clearShortcut();
+		void slot_setColor();
+		void slot_delColor();
+		void slot_addColorSeparator();
+		void slot_moveColor();
+		void slot_clearColors();
+		void slot_setExtProgPath();
+		void slot_findDownloadFolder();
+		void buttonClicked (QAbstractButton* button);
 };
 
 // =============================================================================
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 // =============================================================================
-class KeySequenceDialog : public QDialog {
-	Q_OBJECT
+class KeySequenceDialog : public QDialog
+{	Q_OBJECT
+
+	public:
+		explicit KeySequenceDialog (QKeySequence seq, QWidget* parent = null, Qt::WindowFlags f = 0);
+		static bool staticDialog (KeySequenceConfig* cfg, QWidget* parent = null);
 
-public:
-	explicit KeySequenceDialog (QKeySequence seq, QWidget* parent = null, Qt::WindowFlags f = 0);
-	static bool staticDialog (KeySequenceConfig* cfg, QWidget* parent = null);
-	
-	QLabel* lb_output;
-	QDialogButtonBox* bbx_buttons;
-	QKeySequence seq;
-	
-private:
-	void updateOutput();
-	
-private slots:
-	virtual void keyPressEvent (QKeyEvent* ev) override;
+		QLabel* lb_output;
+		QDialogButtonBox* bbx_buttons;
+		QKeySequence seq;
+
+	private:
+		void updateOutput();
+
+	private slots:
+		virtual void keyPressEvent (QKeyEvent* ev) override;
 };
 
-#endif // CONFIGDIALOG_H
\ No newline at end of file
+#endif // CONFIGDIALOG_H