diff -r b8fa9171be6e -r c82a86ea87be src/config.h --- a/src/config.h Mon Jun 01 17:06:13 2015 +0300 +++ b/src/config.h Fri Jun 05 18:33:51 2015 +0300 @@ -1,6 +1,6 @@ /* * ZCinema: Zandronum demo launcher - * Copyright (C) 2013 Santeri Piippo + * Copyright (C) 2013-2015 Teemu 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 @@ -16,51 +16,40 @@ * along with this program. If not, see . */ -#ifndef ZCINEMA_CONFIG_H -#define ZCINEMA_CONFIG_H - +#pragma once #include #include "main.h" #include "types.h" -class QFormLayout; -class QNetworkReply; -class QHBoxLayout; -class QLabel; -class QAbstractButton; -class QLineEdit; -class Ui_ConfigBox; -class QNetworkAccessManager; - -class ConfigBox : public QDialog { +class ConfigWindow : public QDialog +{ Q_OBJECT public: - explicit ConfigBox (QWidget* parent = null, Qt::WindowFlags f = 0); - virtual ~ConfigBox(); - void addPath (str path); + typedef QMap ZanBinaryMap; + + ConfigWindow (QWidget* parent = NULL, Qt::WindowFlags f = 0); + virtual ~ConfigWindow(); + void addPath (QString path); void initFromSettings(); void saveSettings(); void initVersions(); - static str getBinaryPath (QWidget* parent); + static QString getBinaryPath (QWidget* parent); public slots: void addPath(); void findPath(); void delPath(); void findZanBinary(); - void editBinaries(); - void buttonPressed (QAbstractButton* btn); + void buttonPressed (class QAbstractButton* btn); private: - Ui_ConfigBox* ui; - list m_zanBinaries; - list m_binaryLayoutWidgets; - QFormLayout* m_releaseLayout, - * m_testLayout; + class Ui_ConfigBox* ui; + ZanBinaryMap m_pathInputFields; + QList m_binaryLayoutWidgets; + class QVBoxLayout* m_releaseLayout; + class QVBoxLayout* m_testLayout; - void addVersion (const str& name, bool isRelease); -}; - -#endif // ZCINEMA_CONFIG_H \ No newline at end of file + void addVersion (const ZandronumVersion& version); +}; \ No newline at end of file