vkconfig3: Preparing Alpha build for internal testing

Change-Id: I62745ffa66e77dd5ab29a6e985e548188751faeb
LunarG · Oct 2, 2024 · f48aef8 · f48aef8
1 parent bd6a590
commit f48aef8
Show file tree

Hide file tree

Showing 6 changed files with 388 additions and 351 deletions.
diff --git a/vkconfig_core/type_tab.cpp b/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");

diff --git a/vkconfig_core/type_tab.h b/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 };

diff --git a/vkconfig_core/ui.cpp b/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) {

diff --git a/vkconfig_gui/CHANGELOG.md b/vkconfig_gui/CHANGELOG.md
@@ -11,8 +11,13 @@
 
 # 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:
+- Implement Vulkan Loader setting file
+- 
+
+## [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
@@ -23,9 +28,6 @@
 - Fix overridden implicit layer ordering
 
 ## [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