Commit 3c64a473 authored by JanKusanagi's avatar JanKusanagi

ConfigDialog refactoring, part 1

parent b46cf5f9
This diff is collapsed.
......@@ -102,12 +102,12 @@ protected:
private:
QVBoxLayout *mainLayout;
QHBoxLayout *topLayout;
QVBoxLayout *m_mainLayout;
QHBoxLayout *m_topLayout;
QListWidget *categoriesListWidget;
QStackedWidget *categoriesStackedWidget;
QListWidget *m_categoriesListWidget;
QStackedWidget *m_categoriesStackedWidget;
// Page 1, general options
......@@ -125,25 +125,25 @@ private:
// Page 2, fonts
QWidget *fontOptionsWidget;
QVBoxLayout *fontOptionsLayout;
QWidget *m_fontOptionsWidget;
QVBoxLayout *m_fontOptionsLayout;
FontPicker *fontPicker1;
FontPicker *fontPicker2;
FontPicker *fontPicker3;
FontPicker *fontPicker4;
FontPicker *m_fontPicker1;
FontPicker *m_fontPicker2;
FontPicker *m_fontPicker3;
FontPicker *m_fontPicker4;
// Page 3, colors
QWidget *colorOptionsWidget;
QVBoxLayout *colorOptionsLayout;
QWidget *m_colorOptionsWidget;
QVBoxLayout *m_colorOptionsLayout;
ColorPicker *colorPicker1;
ColorPicker *colorPicker2;
ColorPicker *colorPicker3;
ColorPicker *colorPicker4;
ColorPicker *colorPicker5;
ColorPicker *colorPicker6;
ColorPicker *m_colorPicker1;
ColorPicker *m_colorPicker2;
ColorPicker *m_colorPicker3;
ColorPicker *m_colorPicker4;
ColorPicker *m_colorPicker5;
ColorPicker *m_colorPicker6;
// Page 4, timelines options
......@@ -190,12 +190,12 @@ private:
// Page 7, privacy options
QWidget *privacyOptionsWidget;
QFormLayout *privacyOptionsLayout;
QWidget *m_privacyOptionsWidget;
QFormLayout *m_privacyOptionsLayout;
QCheckBox *silentFollowsCheckbox;
QCheckBox *silentListsCheckbox;
QCheckBox *silentLikesCheckbox;
QCheckBox *m_silentFollowsCheckbox;
QCheckBox *m_silentListsCheckbox;
QCheckBox *m_silentLikesCheckbox;
......@@ -226,18 +226,19 @@ private:
QCheckBox *systrayHideCheckbox;
// Widgets below the tab widget
QLabel *dataDirectoryLabel;
///////////////////////////////////////////////////////////////////////
QDialogButtonBox *m_buttonBox;
QPushButton *saveConfigButton;
QPushButton *cancelButton;
// Widgets below the stack widget
QLabel *m_dataDirectoryLabel;
QDialogButtonBox *m_buttonBox;
QPushButton *m_saveConfigButton;
QPushButton *m_cancelButton;
QAction *closeAction;
QAction *m_closeAction;
FDNotifications *fdNotifier;
GlobalObject *globalObj;
FDNotifications *m_fdNotifier;
GlobalObject *m_globalObject;
};
#endif // CONFIGDIALOG_H
......@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
{
QApplication dianaraApp(argc, argv);
dianaraApp.setApplicationName("Dianara");
dianaraApp.setApplicationVersion("1.4.2-dev+6");
dianaraApp.setApplicationVersion("1.4.2-dev+7");
dianaraApp.setOrganizationName("JanCoding");
dianaraApp.setOrganizationDomain("jancoding.wordpress.com");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment