From 444e75ea06ae82ce18e85d0b074e1ef6130e60d7 Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Sat, 29 Mar 2025 21:48:23 +0100 Subject: [PATCH] fixed typo and added necessary update for the theme flags. --- src/musredit_qt5/mupp/PmuppAdmin.cpp | 4 ++-- src/musredit_qt5/mupp/PmuppGui.cpp | 3 +++ src/musredit_qt6/mupp/PmuppAdmin.cpp | 4 ++-- src/musredit_qt6/mupp/PmuppGui.cpp | 3 +++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/musredit_qt5/mupp/PmuppAdmin.cpp b/src/musredit_qt5/mupp/PmuppAdmin.cpp index 74626719..d454ea03 100644 --- a/src/musredit_qt5/mupp/PmuppAdmin.cpp +++ b/src/musredit_qt5/mupp/PmuppAdmin.cpp @@ -158,9 +158,9 @@ bool PmuppAdminXMLParser::startElement() fKeyWord = eRecentFile; } else if (qName == "ignore_theme_auto_detection") { fKeyWord = eIgnoreThemeAutoDetection; - } else if (qName == "dark_theme_icons_menu") { + } else if (qName == "dark_theme_icon_menu") { fKeyWord = eDarkThemeIconsMenu; - } else if (qName == "dark_theme_icons_toolbar") { + } else if (qName == "dark_theme_icon_toolbar") { fKeyWord = eDarkThemeIconsToolbar; } else if (qName == "marker") { fKeyWord = eMarker; diff --git a/src/musredit_qt5/mupp/PmuppGui.cpp b/src/musredit_qt5/mupp/PmuppGui.cpp index 92e9b2dd..aa8707c8 100644 --- a/src/musredit_qt5/mupp/PmuppGui.cpp +++ b/src/musredit_qt5/mupp/PmuppGui.cpp @@ -250,6 +250,9 @@ PmuppGui::PmuppGui(QStringList fln) readCmdHistory(); fAdmin = new PmuppAdmin(); + fIgnoreThemeAutoDetection = fAdmin->getIgnoreThemeAutoDetection(); + fDarkThemeIconsMenu = fAdmin->getDarkThemeIconsMenuFlag(); + fDarkThemeIconsToolbar = fAdmin->getDarkThemeIconsToolbarFlag(); fParamDataHandler = new PParamDataHandler(); bool dataAtStartup = false; diff --git a/src/musredit_qt6/mupp/PmuppAdmin.cpp b/src/musredit_qt6/mupp/PmuppAdmin.cpp index 963afad4..43f7000a 100644 --- a/src/musredit_qt6/mupp/PmuppAdmin.cpp +++ b/src/musredit_qt6/mupp/PmuppAdmin.cpp @@ -158,9 +158,9 @@ bool PmuppAdminXMLParser::startElement() fKeyWord = eRecentFile; } else if (qName == "ignore_theme_auto_detection") { fKeyWord = eIgnoreThemeAutoDetection; - } else if (qName == "dark_theme_icons_menu") { + } else if (qName == "dark_theme_icon_menu") { fKeyWord = eDarkThemeIconsMenu; - } else if (qName == "dark_theme_icons_toolbar") { + } else if (qName == "dark_theme_icon_toolbar") { fKeyWord = eDarkThemeIconsToolbar; } else if (qName == "marker") { fKeyWord = eMarker; diff --git a/src/musredit_qt6/mupp/PmuppGui.cpp b/src/musredit_qt6/mupp/PmuppGui.cpp index 7f0482a7..c9b74528 100644 --- a/src/musredit_qt6/mupp/PmuppGui.cpp +++ b/src/musredit_qt6/mupp/PmuppGui.cpp @@ -250,6 +250,9 @@ PmuppGui::PmuppGui(QStringList fln) readCmdHistory(); fAdmin = new PmuppAdmin(); + fIgnoreThemeAutoDetection = fAdmin->getIgnoreThemeAutoDetection(); + fDarkThemeIconsMenu = fAdmin->getDarkThemeIconsMenuFlag(); + fDarkThemeIconsToolbar = fAdmin->getDarkThemeIconsToolbarFlag(); fParamDataHandler = new PParamDataHandler(); bool dataAtStartup = false;