mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-10-01 20:42:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added the app version to the bottom of the settings screen

Browse Source
This commit is contained in:
casey langen 2020-12-05 15:00:25 -08:00
parent ad09b30b18
commit f001a48b43
4 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.txt
View File

@ -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
--------------------------------------------------------------------------------

2
src/musikcore/version.h
View File

@ -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 {

10
src/musikcube/app/layout/SettingsLayout.cpp
View File

@ -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) {

1
src/musikcube/app/layout/SettingsLayout.h
View File

@ -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;