vkconfig3: Prepare Alpha build for internal testing

vkconfig_core/environment.h

@@ -46,12 +46,12 @@ class Environment : public Serialize {
 
     bool has_crashed = false;
     int hide_message_boxes_flags = 0;
+    TabType active_tab = TAB_CONFIGURATIONS;
 
    private:
     Environment(const Environment&) = delete;
     Environment& operator=(const Environment&) = delete;
 
-    TabType active_tab = TAB_DIAGNOSTIC;
     LogFlags loader_message_types_flags;
     Path home_sdk_path;
 };

vkconfig_core/test/test_ui.cpp

@@ -48,11 +48,11 @@ TEST(test_ui, ExtractLayerName_found) {
 TEST(test_ui, GetMainWindowTitle) {
     std::string title = GetMainWindowTitle(false, false);
 
-    EXPECT_STREQ(("Vulkan Configurator " + Version::VKCONFIG.str()).c_str(), title.c_str());
+    EXPECT_STREQ(("Vulkan Configurator " + Version::VKCONFIG.str() + "-Alpha").c_str(), title.c_str());
 }
 
 TEST(test_ui, GetMainWindowTitle_active) {
     std::string title = GetMainWindowTitle(true, false);
 
-    EXPECT_STREQ(("Vulkan Configurator " + Version::VKCONFIG.str() + " <ACTIVE>").c_str(), title.c_str());
+    EXPECT_STREQ(("Vulkan Configurator " + Version::VKCONFIG.str() + "-Alpha <ACTIVE>").c_str(), title.c_str());
 }

vkconfig_core/type_tab.cpp

@@ -30,7 +30,8 @@ const char* GetToken(TabType type) {
         "LAYERS",          // TAB_LAYERS
         "APPLICATIONS",    // TAB_APPLICATIONS
         "PREFERENCES",     // TAB_PREFERENCES
-        "HELP"             // TAB_HELP
+        "DOCUMENTATION",   // TAB_DOCUMENTATION
+        "ABOUT"            // TAB_ABOUT
     };
 
     static_assert(std::size(TOKENS) == TAB_COUNT, "The tranlation table size doesn't match the enum number of elements");

vkconfig_core/type_tab.h

@@ -26,10 +26,11 @@ enum TabType {
     TAB_LAYERS,
     TAB_APPLICATIONS,
     TAB_PREFERENCES,
-    TAB_HELP,
+    TAB_DOCUMENTATION,
+    TAB_ABOUT,
 
     TAB_FIRST = TAB_DIAGNOSTIC,
-    TAB_LAST = TAB_HELP
+    TAB_LAST = TAB_ABOUT
 };
 
 enum { TAB_COUNT = TAB_LAST - TAB_FIRST + 1 };

vkconfig_core/ui.cpp

@@ -33,7 +33,7 @@ std::string ExtractLayerName(const LayerManager& layer_manager, const std::strin
 }
 
 std::string GetMainWindowTitle(bool active, bool display_date) {
-    std::string title = format("%s %s", VKCONFIG_NAME, Version::VKCONFIG.str().c_str());
+    std::string title = format("%s %s-Alpha", VKCONFIG_NAME, Version::VKCONFIG.str().c_str());
 
 #if VKCONFIG_DATE
     if (display_date) {

vkconfig_gui/CHANGELOG.md

@@ -11,8 +11,16 @@
 
 # Release notes
 
-<<<<<<< HEAD:vkconfig/CHANGELOG.md
-## [Vulkan Configurator 2.6.2](https://github.com/LunarG/VulkanTools/tree/main) - October 2024
+## [Vulkan Configurator 3.0.0](https://github.com/LunarG/VulkanTools/tree/main) - January 2025
+
+### Features:
+- UI redesign: per use case tabs
+- Enable loading multiple versions of the same layer
+- Enable ordering all layers executed by Vulkan application
+- Enable ordering layers independently from enabling them
+- Enable storing multiple set applications options for the application launcher
+
+## [Vulkan Configurator 2.6.2](https://github.com/LunarG/VulkanTools/tree/vulkan-sdk-1.3.296.0) - October 2024
 
 ### Improvements:
 - Show message warnings when overriding implicit layer, either disabling or enabling
@@ -24,9 +32,6 @@
 - Fix renaming configuration with the same name but different cases
 
 ## [Vulkan Configurator 2.6.1](https://github.com/LunarG/VulkanTools/tree/vulkan-sdk-1.3.290.0) - July 2024
-=======
-## [Vulkan Configurator 3.0.0](https://github.com/LunarG/VulkanTools/tree/main) - ??? 2024
->>>>>>> a680297a5... vkconfig3: UI for new Vulkan Loader settings:vkconfig_gui/CHANGELOG.md
 
 ### Features:
 - Redesign main window UI around tabs

vkconfig_gui/main.cpp

@@ -20,7 +20,6 @@
 
 #include "mainwindow.h"
 
-#include "../vkconfig_core/vulkan_util.h"
 #include "../vkconfig_core/vulkan_util.h"
 #include "../vkconfig_core/alert.h"
 #include "../vkconfig_core/application_singleton.h"

vkconfig_gui/mainwindow.cpp

@@ -68,7 +68,8 @@ 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_PREFERENCES].reset(new TabPreferences(*this, ui));
-    this->tabs[TAB_HELP].reset(new TabHelp(*this, ui));
+    this->tabs[TAB_DOCUMENTATION].reset(new TabDocumentation(*this, ui));
+    this->tabs[TAB_ABOUT].reset(new TabAbout(*this, ui));
 
     connect(ui->action_find_more_layers, SIGNAL(triggered(bool)), this, SLOT(OnHelpFindLayers(bool)));
     connect(ui->actionAbout, SIGNAL(triggered(bool)), this, SLOT(OnHelpAbout(bool)));
@@ -96,7 +97,10 @@ MainWindow::MainWindow(QWidget *parent)
     this->restoreGeometry(settings.value("mainwindow/geometry").toByteArray());
     this->restoreState(settings.value("mainwindow/state").toByteArray());
 
-    this->tabs[this->ui->tab_widget->currentIndex()]->UpdateUI(UPDATE_REBUILD_UI);
+    const Configurator &configurator = Configurator::Get();
+
+    this->ui->tab_widget->setCurrentIndex(configurator.environment.active_tab);
+    this->tabs[configurator.environment.active_tab]->UpdateUI(UPDATE_REBUILD_UI);
 
     this->UpdateUI_Status();
     this->UpdateUI();
@@ -444,5 +448,9 @@ bool MainWindow::eventFilter(QObject *target, QEvent *event) {
 
 void MainWindow::on_tab_widget_currentChanged(int index) {
     assert(index >= 0);
+
+    Configurator &configurator = Configurator::Get();
+    configurator.environment.active_tab = static_cast<TabType>(index);
+
     this->tabs[index]->UpdateUI(UPDATE_REBUILD_UI);
 }

vkconfig_gui/mainwindow.h

@@ -25,10 +25,10 @@
 #include "tab_applications.h"
 #include "tab_configurations.h"
 #include "tab_diagnostics.h"
-#include "tab_help.h"
+#include "tab_documentation.h"
 #include "tab_layers.h"
 #include "tab_preferences.h"
-
+#include "tab_about.h"
 #include "ui_mainwindow.h"
 
 #include <QMainWindow>