Fixed singletons

km2442 · May 19, 2019 · ccaca9e · ccaca9e
1 parent 8de7c23
commit ccaca9e
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 50 deletions.
diff --git a/Windows/AutoSwitch/Source/Dialogs/passwordconfig.cpp b/Windows/AutoSwitch/Source/Dialogs/passwordconfig.cpp
@@ -229,8 +229,7 @@ void PasswordConfig::loadFromReg()
 
 PasswordConfig *PasswordConfig::getInstance()
 {
-    //return passwordConfigInstance;
-    return nullptr;
+    return passwordConfigInstance;
 }
 
 bool PasswordConfig::saveToRegistry(QString pw, bool pwr_run, bool pwr_settings, bool pwr_autorun, bool pwr_show)

diff --git a/Windows/AutoSwitch/Source/Main/mainwindow.cpp b/Windows/AutoSwitch/Source/Main/mainwindow.cpp
@@ -30,11 +30,11 @@ MainWindow::MainWindow(QWidget *parent) :
 
     if (isHibernateAvailable() == 0) ui->Main_Task_Hibernate->setEnabled(0);
 
-//    PasswordConfig *pc = PasswordConfig::getInstance();
-//    if (pc->getPasswordrules_run())
-//    {
-//        if (authorize() == false) exit(10);
-//    }
+    PasswordConfig *pc = PasswordConfig::getInstance();
+    if (pc->getPasswordrules_run())
+    {
+        if (authorize() == false) exit(10);
+    }
 
     Autorun AR;
     AR.autorunLoad(1);
@@ -45,8 +45,8 @@ MainWindow::MainWindow(QWidget *parent) :
 
     setAlignedIcons();
 
-//    SocketCommunicator server(nullptr, this);
-//    server.StartServer();
+    SocketCommunicator server(nullptr, this);
+    server.StartServer();
 }
 
 MainWindow::~MainWindow()

diff --git a/Windows/AutoSwitch/Source/Main/settings.cpp b/Windows/AutoSwitch/Source/Main/settings.cpp
@@ -34,8 +34,7 @@ Settings::Settings(QWidget *parent) :
 
 Settings *Settings::getInstance()
 {
-    //return settingsInstance;
-    return nullptr;
+    return settingsInstance;
 }
 
 Settings::~Settings()
@@ -63,45 +62,45 @@ void Settings::settingsLoad()
     QSettings setting(appData + "/config/settings.ini", QSettings::IniFormat);
     setting.beginGroup("Settings");
     ui->Settings_Theme_Choose->setCurrentIndex(setting.value("WindowStyle").toInt());
-//    ui->Settings_LanguageSelect->setCurrentIndex(setting.value("Language").toInt() - 1);
-//    ui->Settings_Log->setCurrentIndex(setting.value("LogActions").toInt());
-//    ui->Settings_Statistics->setCurrentIndex(setting.value("SendStatistics").toInt());
-//    ui->Settings_MultiInstance->setCurrentIndex(setting.value("AllowMultiInstance").toInt());
-//    ui->Settings_DeveloperMode->setCurrentIndex(setting.value("DeveloperOptions").toInt());
-//    ui->Settings_HideDialogWarning->setCurrentIndex(setting.value("HideDialogWarning").toInt());
-//    setting.endGroup();
-
-//    setting.beginGroup("TraySettings");
-//    ui->Settings_Tray_Switch->setCurrentIndex(setting.value("TrayActive").toInt());
-//    if (setting.value("ShutdownActive").toBool()) ui->Settings_Tray_Shutdown->setChecked(2);
-//    else ui->Settings_Tray_Shutdown->setChecked(0);
-//    if (setting.value("RebootActive").toBool()) ui->Settings_Tray_Reboot->setChecked(2);
-//    else ui->Settings_Tray_Reboot->setChecked(0);
-//    if (setting.value("SleepActive").toBool()) ui->Settings_Tray_Sleep->setChecked(2);
-//    else ui->Settings_Tray_Sleep->setChecked(0);
-//    if (setting.value("HibernateActive").toBool()) ui->Settings_Tray_Hibernate->setChecked(2);
-//    else ui->Settings_Tray_Hibernate->setChecked(0);
-//    if (setting.value("LogoffActive").toBool()) ui->Settings_Tray_Logoff->setChecked(2);
-//    else ui->Settings_Tray_Logoff->setChecked(0);
-//    if (setting.value("LockActive").toBool()) ui->Settings_Tray_Lock->setChecked(2);
-//    else ui->Settings_Tray_Lock->setChecked(0);
-//    if (setting.value("MonitorActive").toBool()) ui->Settings_Tray_Monitor->setChecked(2);
-//    else ui->Settings_Tray_Monitor->setChecked(0);
-//    setting.endGroup();
-
-//    setting.beginGroup("TraySettingsTime");
-//    ui->Settings_Tray_ShutdownTime->setCurrentIndex(setting.value("ShutdownTime").toInt());
-//    ui->Settings_Tray_RebootTime->setCurrentIndex(setting.value("RebootTime").toInt());
-//    ui->Settings_Tray_SleepTime->setCurrentIndex(setting.value("SleepTime").toInt());
-//    ui->Settings_Tray_HibernateTime->setCurrentIndex(setting.value("HibernateTime").toInt());
-//    ui->Settings_Tray_LogoffTime->setCurrentIndex(setting.value("LogoffTime").toInt());
-//    ui->Settings_Tray_LockTime->setCurrentIndex(setting.value("LockTime").toInt());
-//    ui->Settings_Tray_MonitorTime->setCurrentIndex(setting.value("MonitorTime").toInt());
-//    setting.endGroup();
-
-//    settings_changed = 0;
-//    tray_changed = 0;
-//    user_changed = 0;
+    ui->Settings_LanguageSelect->setCurrentIndex(setting.value("Language").toInt() - 1);
+    ui->Settings_Log->setCurrentIndex(setting.value("LogActions").toInt());
+    ui->Settings_Statistics->setCurrentIndex(setting.value("SendStatistics").toInt());
+    ui->Settings_MultiInstance->setCurrentIndex(setting.value("AllowMultiInstance").toInt());
+    ui->Settings_DeveloperMode->setCurrentIndex(setting.value("DeveloperOptions").toInt());
+    ui->Settings_HideDialogWarning->setCurrentIndex(setting.value("HideDialogWarning").toInt());
+    setting.endGroup();
+
+    setting.beginGroup("TraySettings");
+    ui->Settings_Tray_Switch->setCurrentIndex(setting.value("TrayActive").toInt());
+    if (setting.value("ShutdownActive").toBool()) ui->Settings_Tray_Shutdown->setChecked(2);
+    else ui->Settings_Tray_Shutdown->setChecked(0);
+    if (setting.value("RebootActive").toBool()) ui->Settings_Tray_Reboot->setChecked(2);
+    else ui->Settings_Tray_Reboot->setChecked(0);
+    if (setting.value("SleepActive").toBool()) ui->Settings_Tray_Sleep->setChecked(2);
+    else ui->Settings_Tray_Sleep->setChecked(0);
+    if (setting.value("HibernateActive").toBool()) ui->Settings_Tray_Hibernate->setChecked(2);
+    else ui->Settings_Tray_Hibernate->setChecked(0);
+    if (setting.value("LogoffActive").toBool()) ui->Settings_Tray_Logoff->setChecked(2);
+    else ui->Settings_Tray_Logoff->setChecked(0);
+    if (setting.value("LockActive").toBool()) ui->Settings_Tray_Lock->setChecked(2);
+    else ui->Settings_Tray_Lock->setChecked(0);
+    if (setting.value("MonitorActive").toBool()) ui->Settings_Tray_Monitor->setChecked(2);
+    else ui->Settings_Tray_Monitor->setChecked(0);
+    setting.endGroup();
+
+    setting.beginGroup("TraySettingsTime");
+    ui->Settings_Tray_ShutdownTime->setCurrentIndex(setting.value("ShutdownTime").toInt());
+    ui->Settings_Tray_RebootTime->setCurrentIndex(setting.value("RebootTime").toInt());
+    ui->Settings_Tray_SleepTime->setCurrentIndex(setting.value("SleepTime").toInt());
+    ui->Settings_Tray_HibernateTime->setCurrentIndex(setting.value("HibernateTime").toInt());
+    ui->Settings_Tray_LogoffTime->setCurrentIndex(setting.value("LogoffTime").toInt());
+    ui->Settings_Tray_LockTime->setCurrentIndex(setting.value("LockTime").toInt());
+    ui->Settings_Tray_MonitorTime->setCurrentIndex(setting.value("MonitorTime").toInt());
+    setting.endGroup();
+
+    settings_changed = 0;
+    tray_changed = 0;
+    user_changed = 0;
 }
 
 void Settings::settingsSave(bool p, QString path)