From f001a48b4376975c6d5d0bc50fa4a9d7b5432281 Mon Sep 17 00:00:00 2001
From: casey langen <casey.langen@gmail.com>
Date: Sat, 5 Dec 2020 15:00:25 -0800
Subject: [PATCH] Added the app version to the bottom of the settings screen

---
 CHANGELOG.txt                               |  6 ++++++
 src/musikcore/version.h                     |  2 +-
 src/musikcube/app/layout/SettingsLayout.cpp | 10 ++++++++++
 src/musikcube/app/layout/SettingsLayout.h   |  1 +
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 4bf0c3c6f..5d47f7c86 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,12 @@
 0.96.0
 
 * improved input latency, especially related to mouse events.
+* added support for older versions of libcurl <= 7.2.0
+* added an advanced setting to ignore client/server version mismatches when
+  connecting to remote libraries
+* added the server version to the user facing error that is displayed on
+  remote library version mismatch.
+* added the app version to the bottom of the settings screen.
 * fixed milkdrop plugin build
 
 --------------------------------------------------------------------------------
diff --git a/src/musikcore/version.h b/src/musikcore/version.h
index 887efa170..1e30be1da 100644
--- a/src/musikcore/version.h
+++ b/src/musikcore/version.h
@@ -39,7 +39,7 @@
 #define VERSION_MAJOR 0
 #define VERSION_MINOR 96
 #define VERSION_PATCH 0
-#define VERSION_COMMIT_HASH "#0e1e21e6"
+#define VERSION_COMMIT_HASH "#ad09b30b"
 #define VERSION "0.96.0"
 
 namespace musik {
diff --git a/src/musikcube/app/layout/SettingsLayout.cpp b/src/musikcube/app/layout/SettingsLayout.cpp
index c6623820e..9cbd22c7a 100755
--- a/src/musikcube/app/layout/SettingsLayout.cpp
+++ b/src/musikcube/app/layout/SettingsLayout.cpp
@@ -49,6 +49,7 @@
 #include <musikcore/audio/Outputs.h>
 #include <musikcore/support/Messages.h>
 #include <musikcore/sdk/ISchema.h>
+#include <musikcore/version.h>
 
 #include <app/util/Hotkeys.h>
 #include <app/util/Messages.h>
@@ -376,6 +377,8 @@ void SettingsLayout::OnLayout() {
     this->pluginsDropdown->MoveAndResize(column2, y++, columnCx, LABEL_HEIGHT);
     this->advancedDropdown->MoveAndResize(column2, y++, columnCx, LABEL_HEIGHT);
     this->updateDropdown->MoveAndResize(column2, y++, columnCx, LABEL_HEIGHT);
+
+    this->appVersion->MoveAndResize(0, cy - 1, cx, LABEL_HEIGHT);
 }
 
 void SettingsLayout::InitializeWindows() {
@@ -444,6 +447,12 @@ void SettingsLayout::InitializeWindows() {
 #endif
     CREATE_CHECKBOX(this->saveSessionCheckbox, _TSTR("settings_save_session_on_exit"));
 
+    this->appVersion = std::make_shared<TextLabel>();
+    this->appVersion->SetContentColor(Color::TextDisabled);
+    this->appVersion->SetAlignment(text::AlignCenter);
+    std::string version = u8fmt("%s %s", VERSION, VERSION_COMMIT_HASH);
+    this->appVersion->SetText(u8fmt(_TSTR("console_version"), version.c_str()));
+
     int order = 0;
     this->libraryTypeDropdown->SetFocusOrder(order++);
     this->localLibraryLayout->SetFocusOrder(order++);
@@ -506,6 +515,7 @@ void SettingsLayout::InitializeWindows() {
     this->AddWindow(this->pluginsDropdown);
     this->AddWindow(this->advancedDropdown);
     this->AddWindow(this->updateDropdown);
+    this->AddWindow(this->appVersion);
 }
 
 void SettingsLayout::SetShortcutsWindow(ShortcutsWindow* shortcuts) {
diff --git a/src/musikcube/app/layout/SettingsLayout.h b/src/musikcube/app/layout/SettingsLayout.h
index e13c576fb..232c21480 100755
--- a/src/musikcube/app/layout/SettingsLayout.h
+++ b/src/musikcube/app/layout/SettingsLayout.h
@@ -128,6 +128,7 @@ namespace musik { namespace cube {
             Text updateDropdown;
             Text themeDropdown;
             Text advancedDropdown;
+            Text appVersion;
 
             using Check = std::shared_ptr<cursespp::Checkbox>;
             Check paletteCheckbox;