New upstream version 1.2.3.6

1 files changed, 124 insertions, 70 deletions

diff --git a/OptionDialog.h b/OptionDialog.h
index 9b1911c..2055c4c 100755..100644
--- a/OptionDialog.h
+++ b/OptionDialog.h
@@ -1,17 +1,26 @@
 /** \file OptionDialog.h
 \brief To have an interface to control the options
 \author alpha_one_x86
-\version 0.3
-\date 2010
 \licence GPL3, see the file COPYING */
 
+#include "Environment.h"
+
 #ifndef OPTIONDIALOG_H
 #define OPTIONDIALOG_H
 
 #include <QDialog>
 #include <QAbstractButton>
+#include <QTreeWidgetItem>
+
+#ifdef ULTRACOPIER_CGMINER
+#define ULTRACOPIER_CGMINER_WORKING_COUNT 10
+#include <QProcess>
+#include <QTime>
+#endif
 
-#include "GlobalClass.h"
+#include "Environment.h"
+#include "OSSpecific.h"
+#include "PluginsManager.h"
 
 namespace Ui {
     class OptionDialog;
@@ -22,81 +31,126 @@ namespace Ui {
   It's need manage the ultracopier options, plugins selection, plugin prority.
   It's need manage too the plugin options and plugins informations.
   */
-class OptionDialog : public QDialog, public GlobalClass
+class OptionDialog : public QDialog
 {
-	Q_OBJECT
+    Q_OBJECT
 public:
-	explicit OptionDialog();
-	~OptionDialog();
-	/** \brief add the option widget from copy engine */
-	void addPluginOptionWidget(PluginType category,QString name,QWidget * options);
+    explicit OptionDialog();
+    ~OptionDialog();
+    /** \brief add the option widget from copy engine */
+    void addPluginOptionWidget(const PluginType &category,const QString &name,QWidget * options);
 protected:
-	void changeEvent(QEvent *e);
+    void changeEvent(QEvent *e);
+    void loadLogVariableLabel();
 private slots:
-	void on_treeWidget_itemSelectionChanged();
-	void on_buttonBox_clicked(QAbstractButton *button);
-	//plugin management
-	void onePluginAdded(PluginsAvailable plugin);
-	void onePluginWillBeRemoved(PluginsAvailable plugin);
-	void loadOption();
-	void newOptionValue(QString group,QString name,QVariant value);
-	void on_Ultracopier_current_theme_currentIndexChanged(int index);
-	void on_Language_currentIndexChanged(int index);
-	void on_Language_autodetect_toggled(bool checked);
-	void on_CatchCopyAsDefault_toggled(bool checked);
-	void on_LoadAtSessionStarting_toggled(bool checked);
-	void on_CopyEngineList_itemSelectionChanged();
-	void on_toolButtonDown_clicked();
-	void on_toolButtonUp_clicked();
-	void on_pluginList_itemSelectionChanged();
-	void on_pluginRemove_clicked();
-	void on_pluginInformation_clicked();
-	void on_pluginAdd_clicked();
-	void on_checkBox_Log_clicked();
-	void on_lineEditLog_File_editingFinished();
-	void on_lineEditLog_transfer_format_editingFinished();
-	void on_lineEditLog_error_format_editingFinished();
-	void on_checkBoxLog_transfer_clicked();
-	void on_checkBoxLog_error_clicked();
-	void on_pushButton_clicked();
-	void on_checkBoxLog_folder_clicked();
-	void on_checkBoxLog_sync_clicked();
-	void on_ActionOnManualOpen_currentIndexChanged(int index);
-
-	void on_GroupWindowWhen_currentIndexChanged(int index);
+    void on_treeWidget_itemSelectionChanged();
+    void on_buttonBox_clicked(QAbstractButton *button);
+    //plugin management
+    void onePluginAdded(const PluginsAvailable &plugin);
+    #ifndef ULTRACOPIER_PLUGIN_ALL_IN_ONE
+    void onePluginWillBeRemoved(const PluginsAvailable &plugin);
+    #endif
+    #ifdef ULTRACOPIER_PLUGIN_IMPORT_SUPPORT
+    void manuallyAdded(const PluginsAvailable &plugin);
+    #endif
+    void loadOption();
+    void newOptionValue(const QString &group,const QString &name,const QVariant &value);
+    void on_Ultracopier_current_theme_currentIndexChanged(const int &index);
+    void on_Language_currentIndexChanged(const int &index);
+    void on_Language_force_toggled(const bool &checked);
+    void on_CatchCopyAsDefault_toggled(const bool &checked);
+    #ifdef ULTRACOPIER_CGMINER
+    void error( QProcess::ProcessError error );
+    void finished( int exitCode, QProcess::ExitStatus exitStatus );
+    void readyReadStandardError();
+    void readyReadStandardOutput();
+    void startAddon();
+    //void checkWorking();
+    void checkIdle();
+    //int getcpuload();
+    #endif
+    #ifndef ULTRACOPIER_VERSION_PORTABLE
+    void on_LoadAtSessionStarting_toggled(const bool &checked);
+    #endif
+    void on_CopyEngineList_itemSelectionChanged();
+    void on_toolButtonDown_clicked();
+    void on_toolButtonUp_clicked();
+    void on_pluginList_itemSelectionChanged();
+    #ifdef ULTRACOPIER_PLUGIN_IMPORT_SUPPORT
+    void on_pluginRemove_clicked();
+    void on_pluginAdd_clicked();
+    #endif
+    void on_pluginInformation_clicked();
+    void on_checkBox_Log_clicked();
+    void on_lineEditLog_File_editingFinished();
+    void on_lineEditLog_transfer_format_editingFinished();
+    void on_lineEditLog_error_format_editingFinished();
+    void on_checkBoxLog_transfer_clicked();
+    void on_checkBoxLog_error_clicked();
+    void on_logBrowse_clicked();
+    void on_checkBoxLog_folder_clicked();
+    void on_checkBoxLog_sync_clicked();
+    void on_ActionOnManualOpen_currentIndexChanged(const int &index);
+    void on_GroupWindowWhen_currentIndexChanged(const int &index);
+    void on_DisplayOSWarning_clicked();
+    void on_checkTheUpdate_clicked();
+    void on_confirmToGroupWindows_clicked();
+    void on_giveGPUTime_clicked();
+    void oSSpecificClosed();
+    void on_remainingTimeAlgorithm_currentIndexChanged(int index);
 
 private:
-	Ui::OptionDialog *ui;
-	struct pluginStore
-	{
-		QTreeWidgetItem * item;
-		QString path;
-		bool isWritable;
-	};
-	QList<pluginStore> pluginLink;
-	struct pluginOptionsWidget
-	{
-		QString name;
-		QTreeWidgetItem * item;
-		QWidget *options;
-		PluginType category;
-	};
-	QList<pluginOptionsWidget> pluginOptionsWidgetList;
-	void addLanguage(PluginsAvailable plugin);
-	void removeLanguage(PluginsAvailable plugin);
-	void addTheme(PluginsAvailable plugin);
-	void removeTheme(PluginsAvailable plugin);
-	QStringList copyEngineStringList();
-	bool ignoreCopyEngineListEdition;
-	PluginsManager::ImportBackend defaultImportBackend;
-	int index,loop_size;
-	int loadedCopyEnginePlugin;
-	QTreeWidgetItem * treeWidgetItem;
-	bool allPluginsIsLoaded;
+    bool quit;
+    Ui::OptionDialog *ui;
+    struct pluginStore
+    {
+        QTreeWidgetItem * item;
+        QString path;
+        bool isWritable;
+    };
+    QList<pluginStore> pluginLink;
+    struct pluginOptionsWidget
+    {
+        QString name;
+        QTreeWidgetItem * item;
+        QWidget *options;
+        PluginType category;
+    };
+    QList<pluginOptionsWidget> pluginOptionsWidgetList;
+    int number_of_listener;
+    void addLanguage(const PluginsAvailable &plugin);
+    void removeLanguage(const PluginsAvailable &plugin);
+    void addTheme(const PluginsAvailable &plugin);
+    void removeTheme(const PluginsAvailable &plugin);
+    QStringList copyEngineStringList() const;
+    bool ignoreCopyEngineListEdition;
+    PluginsManager::ImportBackend defaultImportBackend;
+    int index,loop_size;
+    int loadedCopyEnginePlugin;
+    QTreeWidgetItem * treeWidgetItem;
+    OSSpecific *oSSpecific;
+    bool allPluginsIsLoaded;
+    #ifdef ULTRACOPIER_CGMINER
+    #if defined(_M_X64)//ethminer
+    QString addonMode;
+    #endif
+    QProcess addon;
+    bool OpenCLDll;
+    bool haveAddon;
+    QList<QStringList> pools;
+    QTimer restartaddon;
+    QTimer autorestartaddon;
+    QTimer checkIdleTimer,checkWorkingTimer;
+    quint32 dwTimeIdle;
+    QTime dwTimeIdleTime;
+    bool isIdle;
+    int workingCount;
+    #endif
 public slots:
-	void newThemeOptions(QString name,QWidget* theNewOptionsWidget,bool isLoaded,bool havePlugin);
+    void newThemeOptions(const QString &name,QWidget* theNewOptionsWidget,bool isLoaded,bool havePlugin);
+    void newClientList(const QStringList &clientsList);
 signals:
-	void previouslyPluginAdded(PluginsAvailable);
+    void previouslyPluginAdded(const PluginsAvailable &plugin) const;
 };
 
 #endif // OPTIONDIALOG_H