diff -r b1742ee91d5b -r c8aae45afd85 src/configDialog.h --- a/src/configDialog.h Sun Aug 30 17:20:55 2015 +0300 +++ b/src/configDialog.h Mon Aug 31 04:57:16 2015 +0300 @@ -18,6 +18,7 @@ #pragma once #include "mainwindow.h" +#include "toolsets/extprogramtoolset.h" #include class Ui_ConfigUI; @@ -35,8 +36,15 @@ QListWidgetItem (view, type) {} }; +struct ExternalProgramWidgets +{ + class QLineEdit* input; + class QPushButton* setPathButton; + class QCheckBox* wineBox; +}; + // ============================================================================= -class ConfigDialog : public QDialog +class ConfigDialog : public QDialog, public HierarchyElement { Q_OBJECT @@ -53,7 +61,7 @@ DownloadTab }; - explicit ConfigDialog (Tab deftab = InterfaceTab, QWidget* parent = null, Qt::WindowFlags f = 0); + explicit ConfigDialog (QWidget* parent = nullptr, Tab defaulttab = (Tab) 0, Qt::WindowFlags f = 0); virtual ~ConfigDialog(); QList quickColors; @@ -62,6 +70,7 @@ Ui_ConfigUI* ui; QList quickColorItems; QMap m_buttonColors; + ExternalProgramWidgets m_externalProgramWidgets[NumExternalPrograms]; void applySettings(); void addShortcut (QAction* act); @@ -73,7 +82,7 @@ QListWidgetItem* getSelectedQuickColor(); QList getShortcutSelection(); void initExtProgs(); - void m_applyToWidgetOptions (std::function func); + void applyToWidgetOptions (std::function func); private slots: void setButtonColor();