vkconfig: Add preferences tab

Change-Id: Ib931952683592ad9e64a001d26692c5830fb9cd2

Author: christophe-lunarg

vkconfig_core/configurator.cpp

@@ -804,10 +804,6 @@ bool Configurator::Load() {
         // TAB_CONFIGURATIONS
         if (json_interface_object.value(GetToken(TAB_CONFIGURATIONS)) != QJsonValue::Undefined) {
             const QJsonObject& json_object = json_interface_object.value(GetToken(TAB_CONFIGURATIONS)).toObject();
-            this->use_system_tray = json_object.value("use_system_tray").toBool();
-            if (json_object.value("use_layer_dev_mode") != QJsonValue::Undefined) {
-                this->use_layer_dev_mode = json_object.value("use_layer_dev_mode").toBool();
-            }
             this->advanced = json_object.value("advanced").toBool();
             this->executable_scope = ::GetExecutableScope(json_object.value("executable_scope").toString().toStdString().c_str());
             this->selected_global_configuration = json_object.value("selected_global_configuration").toString().toStdString();
@@ -823,13 +819,13 @@ bool Configurator::Load() {
             const QJsonObject& json_object = json_interface_object.value(GetToken(TAB_APPLICATIONS)).toObject();
         }
 
-        // TAB_DIAGNOSTIC
-        if (json_interface_object.value(GetToken(TAB_DIAGNOSTIC)) != QJsonValue::Undefined) {
-            const QJsonObject& json_object = json_interface_object.value(GetToken(TAB_DIAGNOSTIC)).toObject();
+        // TAB_PREFERENCES
+        if (json_interface_object.value(GetToken(TAB_PREFERENCES)) != QJsonValue::Undefined) {
+            const QJsonObject& json_object = json_interface_object.value(GetToken(TAB_PREFERENCES)).toObject();
 
-            if (json_object.value("VK_HOME") != QJsonValue::Undefined) {
-                ::SetHomePath(json_object.value("VK_HOME").toString().toStdString());
-            }
+            this->use_layer_dev_mode = json_object.value("use_layer_dev_mode").toBool();
+            this->use_system_tray = json_object.value("use_system_tray").toBool();
+            ::SetHomePath(json_object.value("VK_HOME").toString().toStdString());
         }
 
         this->executables.Load(json_root_object);
@@ -854,8 +850,6 @@ bool Configurator::Save() const {
     // TAB_CONFIGURATIONS
     {
         QJsonObject json_object;
-        json_object.insert("use_system_tray", this->use_system_tray);
-        json_object.insert("use_layer_dev_mode", this->use_layer_dev_mode);
         json_object.insert("advanced", this->advanced);
         json_object.insert("executable_scope", ::GetToken(this->executable_scope));
         json_object.insert("selected_global_configuration", this->selected_global_configuration.c_str());
@@ -874,11 +868,13 @@ bool Configurator::Save() const {
         json_interface_object.insert(GetToken(TAB_APPLICATIONS), json_object);
     }
 
-    // TAB_DIAGNOSTIC
+    // TAB_PREFERENCES
     {
         QJsonObject json_object;
+        json_object.insert("use_system_tray", this->use_system_tray);
+        json_object.insert("use_layer_dev_mode", this->use_layer_dev_mode);
         json_object.insert("VK_HOME", ::Path(Path::HOME).RelativePath().c_str());
-        json_interface_object.insert(GetToken(TAB_DIAGNOSTIC), json_object);
+        json_interface_object.insert(GetToken(TAB_PREFERENCES), json_object);
     }
 
     // interface json object

vkconfig_core/type_tab.cpp

@@ -30,7 +30,7 @@ const char* GetLabel(TabType type) {
         "Application Launcher",      // TAB_APPLICATIONS
         "System Diagnostic",         // TAB_DIAGNOSTIC
         "Documentation",             // TAB_DOCUMENTATION
-        "Settings",                  // TAB_SETTINGS
+        "Preferences",               // TAB_PREFERENCES
         "About"                      // TAB_ABOUT
     };
 
@@ -46,7 +46,7 @@ const char* GetToken(TabType type) {
         "APPLICATIONS",    // TAB_APPLICATIONS
         "DIAGNOSTIC",      // TAB_DIAGNOSTIC
         "DOCUMENTATION",   // TAB_DOCUMENTATION
-        "SETTINGS",        // TAB_SETTINGS
+        "PREFERENCES",     // TAB_PREFERENCES
         "ABOUT"            // TAB_ABOUT
     };
 

vkconfig_core/type_tab.h

@@ -26,7 +26,7 @@ enum TabType {
     TAB_APPLICATIONS,
     TAB_DIAGNOSTIC,
     TAB_DOCUMENTATION,
-    TAB_SETTINGS,
+    TAB_PREFERENCES,
     TAB_ABOUT,
 
     TAB_FIRST = TAB_CONFIGURATIONS,

vkconfig_gui/mainwindow.cpp

@@ -64,7 +64,7 @@ MainWindow::MainWindow(QWidget *parent)
     this->tabs[TAB_LAYERS].reset(new TabLayers(*this, ui));
     this->tabs[TAB_CONFIGURATIONS].reset(new TabConfigurations(*this, ui));
     this->tabs[TAB_DOCUMENTATION].reset(new TabDocumentation(*this, ui));
-    this->tabs[TAB_SETTINGS].reset(new TabSettings(*this, ui));
+    this->tabs[TAB_PREFERENCES].reset(new TabPreferences(*this, ui));
     this->tabs[TAB_ABOUT].reset(new TabAbout(*this, ui));
 
     this->connect(qApp, &QGuiApplication::commitDataRequest, this, &MainWindow::commitDataRequest);
@@ -292,7 +292,7 @@ void MainWindow::closeEvent(QCloseEvent *event) {
             palette.setColor(QPalette::WindowText, QColor(Qt::red));
             this->ui->settings_keep_running->setPalette(palette);
 
-            this->ui->tab_widget->setCurrentIndex(TAB_SETTINGS);
+            this->ui->tab_widget->setCurrentIndex(TAB_PREFERENCES);
 
             int ret_val = alert.exec();
             if (alert.checkBox()->isChecked()) {

vkconfig_gui/mainwindow.h

@@ -28,7 +28,7 @@
 #include "tab_applications.h"
 #include "tab_diagnostics.h"
 #include "tab_documentation.h"
-#include "tab_settings.h"
+#include "tab_preferences.h"
 #include "tab_about.h"
 #include "ui_mainwindow.h"
 

vkconfig_gui/tab_settings.cpp vkconfig_gui/tab_preferences.cpp

@@ -18,15 +18,15 @@
  * - Christophe Riccio <[email protected]>
  */
 
-#include "tab_settings.h"
+#include "tab_preferences.h"
 #include "style.h"
 
 #include "../vkconfig_core/configurator.h"
 
 #include <QFileDialog>
 #include <QMessageBox>
 
-TabSettings::TabSettings(MainWindow &window, std::shared_ptr<Ui::MainWindow> ui) : Tab(TAB_DIAGNOSTIC, window, ui) {
+TabPreferences::TabPreferences(MainWindow &window, std::shared_ptr<Ui::MainWindow> ui) : Tab(TAB_DIAGNOSTIC, window, ui) {
     this->ui->settings_reset->setIcon(::Get(::ICON_RESET));
     this->ui->settings_vk_home_browse->setIcon(::Get(::ICON_FOLDER_SEARCH));
 
@@ -37,9 +37,9 @@ TabSettings::TabSettings(MainWindow &window, std::shared_ptr<Ui::MainWindow> ui)
     this->connect(this->ui->settings_layer_dev_mode, SIGNAL(toggled(bool)), this, SLOT(on_layer_dev_mode_toggled(bool)));
 }
 
-TabSettings::~TabSettings() {}
+TabPreferences::~TabPreferences() {}
 
-void TabSettings::UpdateUI(UpdateUIMode mode) {
+void TabPreferences::UpdateUI(UpdateUIMode mode) {
     (void)mode;
 
     Configurator &configurator = Configurator::Get();
@@ -58,21 +58,21 @@ void TabSettings::UpdateUI(UpdateUIMode mode) {
     this->ui->settings_layer_dev_mode->blockSignals(false);
 }
 
-void TabSettings::CleanUI() {}
+void TabPreferences::CleanUI() {}
 
-bool TabSettings::EventFilter(QObject *target, QEvent *event) {
+bool TabPreferences::EventFilter(QObject *target, QEvent *event) {
     (void)target;
     (void)event;
 
     return false;
 }
 
-void TabSettings::on_keep_running_toggled(bool checked) {
+void TabPreferences::on_keep_running_toggled(bool checked) {
     Configurator &configurator = Configurator::Get();
     configurator.SetUseSystemTray(checked);
 }
 
-void TabSettings::on_vk_home_text_pressed() {
+void TabPreferences::on_vk_home_text_pressed() {
     Path path(this->ui->settings_vk_home_text->text().toStdString());
     if (path.Exists()) {
         ::SetHomePath(this->ui->settings_vk_home_text->text().toStdString());
@@ -90,7 +90,7 @@ void TabSettings::on_vk_home_text_pressed() {
     }
 }
 
-void TabSettings::on_vk_home_browse_pressed() {
+void TabPreferences::on_vk_home_browse_pressed() {
     const QString selected_path = QFileDialog::getExistingDirectory(
         this->ui->settings_vk_home_browse, "Select the Vulkan Home Default Working Folder (Set ${VK_HOME} value)...",
         ::Path(Path::HOME).AbsolutePath().c_str());
@@ -102,7 +102,7 @@ void TabSettings::on_vk_home_browse_pressed() {
     }
 }
 
-void TabSettings::on_reset_hard_pressed() {
+void TabPreferences::on_reset_hard_pressed() {
     QMessageBox message;
     message.setIcon(QMessageBox::Critical);
     message.setWindowTitle(format("Restoring and Resetting %s to default...", VKCONFIG_NAME).c_str());
@@ -118,7 +118,7 @@ void TabSettings::on_reset_hard_pressed() {
     }
 }
 
-void TabSettings::on_layer_dev_mode_toggled(bool checked) {
+void TabPreferences::on_layer_dev_mode_toggled(bool checked) {
     Configurator &configurator = Configurator::Get();
     configurator.SetUseLayerDevMode(checked);
 }

vkconfig_gui/tab_settings.h vkconfig_gui/tab_preferences.h

@@ -22,12 +22,12 @@
 
 #include "tab.h"
 
-class TabSettings : public Tab {
+class TabPreferences : public Tab {
     Q_OBJECT
 
    public:
-    TabSettings(MainWindow &window, std::shared_ptr<Ui::MainWindow> ui);
-    virtual ~TabSettings();
+    TabPreferences(MainWindow &window, std::shared_ptr<Ui::MainWindow> ui);
+    virtual ~TabPreferences();
 
     virtual void UpdateUI(UpdateUIMode mode) override;
     virtual void CleanUI() override;

vkconfig_gui/vkconfig.pro

@@ -104,7 +104,7 @@ SOURCES += \
     tab_configurations.cpp \
     tab_diagnostics.cpp \
     tab_documentation.cpp \
-    tab_settings.cpp \
+    tab_preferences.cpp \
     tab_layers.cpp \
     settings_tree.cpp \
     style.cpp
@@ -185,7 +185,7 @@ HEADERS += \
     tab_configurations.h \
     tab_diagnostics.h \
     tab_documentation.h \
-    tab_settings.h \
+    tab_preferences.h \
     tab_layers.h \
     settings_tree.h \
     style.h