2.1.2 beta.1 - Fixes

.github/workflows/debian.yml

@@ -82,6 +82,8 @@ jobs:
             -v "${{ github.workspace }}:/source:rw" \
             -v "/tmp/deps:/tmp/deps:rw" \
             -w "/source" \
+            -e LANG="C.UTF-8" \
+            -e LC_ALL="C.UTF-8" \
             ghcr.io/hyperion-project/debian:${{ env.DOCKER_TAG }} \
             /bin/bash -c "cmake --preset linux-${{ env.BUILD_TYPE }} ${{ steps.dependencies.outputs.cmakeArgs }} -DPLATFORM=${{ matrix.os.platform }} ${{ env.CPACK_SYSTEM_PROCESSOR }} &&
             cmake --build --preset linux-${{ env.BUILD_TYPE }} --target package &&

.version

@@ -1 +1 @@
-2.1.1
+2.1.2-beta.1

CHANGELOG.md

@@ -16,10 +16,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### 🔧 Changed
 
+- **Fixes:**
+  - UI - Language is not selectable (#1877)
+  - CEC-Handler is not stopped properly
+  - Qt-Grabber (Windows) does not apply pixel ratio (#1882) - _Thanks to @SolberLight_
+
 ---
 
 ### 🗑️ Removed
 
+- Removed the ability to revoke API requests which are not issued from the same network segment. This includes the removal of IP-address white- & blacklisting (#1880)
+Rationale: Such kind of functionality is better to be dealt with via proper network management and setup, e.g. via firewalls, VLANs.
+
 ## [2.1.1](https://github.com/hyperion-project/hyperion.ng/compare/2.1.1...HEAD) - 2025-06-14
 
 ### 🔧 Changed

assets/webconfig/js/content_index.js

@@ -442,7 +442,28 @@ $(window.hyperion).on("cmd-config-setconfig", function (event) {
 
 function bindUiHandlers() {
 
-  // Side menu link click activation
+  // Handle language selection
+
+  // Prevent dropdown from closing when selecting language
+  $('#btn_setlang').on('click', function (e) {
+    e.stopPropagation();
+  });
+
+  $('#language-select').on('changed.bs.select', function () {
+    const newLang = $(this).val();
+    if (newLang !== storedLang) {
+      setStorage("langcode", newLang);
+      location.reload();
+    }
+  });
+
+  //Close selector, if open (and no change in language happend)
+  $(document).on("click", function () {
+    $(".bootstrap-select.open").removeClass("open");
+  });
+  //End language selection
+
+  // Side smenu link click activation
   $('#side-menu li a, #side-menu li ul li a').on("click", function () {
     $('#side-menu').find('.active').removeClass('active');
     $(this).addClass('active');
@@ -476,13 +497,6 @@ function bindUiHandlers() {
     logo.style.display = window.scrollY > 65 ? "none" : "";
   }, { passive: true });
 
-  // Language selector
-  $(".langSelect").off().on("click", function () {
-    const newLang = $(this).attr("id").replace("lang_", "");
-    setStorage("lang", newLang);
-    location.reload();
-  });
-
   // Toggle top menu for mobile
   $(".navbar-toggle").off().on("click", function () {
     const target = $(this).data("target");

assets/webconfig/js/content_network.js

@@ -266,16 +266,11 @@ $(document).ready(function () {
     $("#conf_cont_tok").insertAfter("#conf_cont_network");
 
     // Initial state check based on server config
-    checkApiTokenState(window.serverConfig.network.internetAccessAPI || window.serverConfig.network.localApiAuth || storedAccess === 'expert');
-
-    // Listen for changes on the Internet access API Auth toggle
-    $('#root_network_internetAccessAPI').on("change", function () {
-      checkApiTokenState($(this).is(":checked") || $('#root_network_localApiAuth').is(":checked"));
-    });
+    checkApiTokenState(window.serverConfig.network.localApiAuth || storedAccess === 'expert');
 
     // Listen for changes on the local API Auth toggle
     $('#root_network_localApiAuth').on("change", function () {
-      checkApiTokenState($(this).is(":checked") || $('#root_network_internetAccessAPI').is(":checked"));
+      checkApiTokenState($(this).is(":checked"));
     });
 
     $('#btn_create_tok').off().on('click', function () {
@@ -317,7 +312,7 @@ $(document).ready(function () {
     }
 
     function checkApiTokenState(state) {
-      if (!state) {
+      if (!state && storedAccess !== 'expert') {
         $("#conf_cont_tok").hide();
       } else {
         $("#conf_cont_tok").show();

assets/webconfig/js/ui_utils.js

@@ -188,40 +188,41 @@
 }
 
 function initLanguageSelection() {
-  // Initialize language selection list with supported languages
+  const $select = $('#language-select');
+  $select.empty(); // clear existing options
+
   for (let i = 0; i < availLang.length; i++) {
-    $("#language-select").append(
-      '<option value="' + i + '" selected="">' + availLangText[i] + '</option>'
-    );
+    $select.append('<option value="' + availLang[i] + '">' + availLangText[i] + '</option>');
   }
 
   let langLocale = storedLang;
-  let langText = '';
+  if (!langLocale) {
+    langLocale = navigator.language?.substring(0, 2) || 'en';
+  }
 
-  // Test if the language is supported by Hyperion
+  let langText = '';
   let langIdx = availLang.indexOf(langLocale);
-  if (langIdx > -1) {
-    langText = availLangText[langIdx];
-  } else {
-    // If the language is not supported, try the fallback language
+
+  if (langIdx === -1) {
+    // Try fallback
     langLocale = $.i18n().options.fallbackLocale.substring(0, 2);
     langIdx = availLang.indexOf(langLocale);
-    if (langIdx > -1) {
-      langText = availLangText[langIdx];
-    } else {
-      // Default to English if fallback language is also unsupported
-      langLocale = 'en';
-      langIdx = availLang.indexOf(langLocale);
-      if (langIdx > -1) {
-        langText = availLangText[langIdx];
-      }
-    }
+  }
+
+  if (langIdx === -1) {
+    // Default to English
+    langLocale = 'en';
+    langIdx = availLang.indexOf(langLocale);
   }
 
   // Update the language select dropdown
-  $('#language-select').prop('title', langText);
-  $("#language-select").val(langIdx);
-  $("#language-select").selectpicker("refresh");
+  $select.val(langLocale); 
+  $select.selectpicker({
+    container: 'body',
+    width: 'fit',
+    style: 'btn-transparent'
+  });
+  $select.selectpicker('refresh');
 }
 
 function updateUiOnInstance(inst) {

bin/scripts/docker-compile.sh

@@ -272,7 +272,9 @@ $DOCKER run --rm --platform=${PLATFORM_ARCHITECTURE} \
 	${ENTRYPOINT_OPTION} \
 	-v "${DEPLOY_PATH}:/deploy" \
 	-v "${CODE_PATH}/:/source:rw" \
-	${REGISTRY_URL}/${DISTRIBUTION}:${CODENAME} \
+	-e LANG="C.UTF-8" \
+	-e LC_ALL="C.UTF-8" \
+	"${REGISTRY_URL}/${DISTRIBUTION}:${CODENAME}" \
 	/bin/bash -c "mkdir -p /source/${BUILD_DIR} && cd /source/${BUILD_DIR} &&
 	cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${PLATFORM} ${BUILD_ARGS} .. || exit 2 &&
 	cmake --build . ${PACKAGES} -- -j $(nproc) || exit 3 || : &&

cmake/windows/inno/windows.iss.in

@@ -251,6 +251,7 @@ begin
     PageDescriptionLabel.Visible := False;
     PageNameLabel.Visible := False;
     Bevel1.Visible := False;
+    RunList.Left := InnerNotebook.Left;
 
     with WizardSmallBitmapImage do
     begin
@@ -261,6 +262,32 @@ begin
       Center              := True;
       Align               := alClient;
     end;
+
+    with FinishedLabel do
+    begin
+      Left                := InnerNotebook.Left;
+      Width               := InnerNotebook.Width;
+    end;
+
+    with FinishedHeadingLabel do
+    begin
+      Left                := InnerNotebook.Left;
+      Width               := InnerNotebook.Width;
+      Top                 := 0;
+    end;
+
+    with WizardBitmapImage2 do
+    begin
+      Parent              := FinishedHeadingLabel;
+      Bitmap.AlphaFormat  := afDefined;
+      Width               := Parent.Width;
+      Height              := Parent.Height;
+      AutoSize            := True;
+      Stretch             := False;
+      Center              := True;
+      Align               := alClient;
+      Bitmap              := WizardSmallBitmapImage.Bitmap;
+    end;
   end;
 end;
 

include/cec/CECHandler.h

@@ -33,7 +33,6 @@ class CECHandler : public QObject
 	Q_OBJECT
 public:
 	CECHandler(const QJsonDocument& config, QObject * parent = nullptr);
-	~CECHandler() override;
 
 	QString scan() const;
 

include/db/DBMigrationManager.h

@@ -22,6 +22,7 @@ class DBMigrationManager : public DBManager
 	bool upgradeGlobalSettings_2_0_12(semver::version& currentVersion, QJsonObject& config);
 	bool upgradeGlobalSettings_2_0_16(semver::version& currentVersion, QJsonObject& config);
 	bool upgradeGlobalSettings_2_1_0(semver::version& currentVersion, QJsonObject& config);
+	bool upgradeGlobalSettings_2_1_2(semver::version& currentVersion, QJsonObject& config);
 
 	bool upgradeInstanceSettings(const semver::version& currentVersion, quint8 instance, QJsonObject& config);
 	bool upgradeInstanceSettings_alpha_9(semver::version& currentVersion, quint8 instance, QJsonObject& config);

include/grabber/qt/QtGrabber.h

@@ -98,11 +98,17 @@ class QtGrabber : public Grabber
 private slots:
 
 	///
-	/// @brief is called whenever the current _screen changes it's geometry
+	/// @brief is called whenever the current screen changes it's geometry
 	/// @param geo   The new geometry
 	///
 	void geometryChanged(const QRect &geo);
 
+	///
+	/// @brief is called whenever the current pixel ratio changed
+	/// @param dpi The new dots per inch
+	///
+	void pixelRatioChanged(qreal dpi);
+
 private:
 
 	///

include/utils/NetOrigin.h

@@ -19,14 +19,6 @@ class NetOrigin : public QObject
 	NetOrigin(QObject* parent = nullptr, Logger* log = Logger::getInstance("NETWORK"));
 
 public:
-	///
-	/// @brief Check if address is allowed to connect. The local address is the network adapter ip this connection comes from
-	/// @param address  The peer address
-	/// @param local    The local address of the socket (Differs based on NetworkAdapter IP or localhost)
-	/// @return         True when allowed, else false
-	///
-	bool accessAllowed(const QHostAddress& address, const QHostAddress& local) const;
-
 	///
 	/// @brief Check if address is in subnet of local
 	/// @return True or false
@@ -36,21 +28,6 @@ class NetOrigin : public QObject
 	static NetOrigin *getInstance() { return instance; }
 	static NetOrigin *instance;
 
-private slots:
-	///
-	/// @brief Handle settings update from SettingsManager
-	/// @param type   settingyType from enum
-	/// @param config configuration object
-	///
-	void handleSettingsUpdate(settings::type type, const QJsonDocument& config);
-
 private:
 	Logger* _log;
-	/// True when internet access is allowed
-	bool _isInternetAccessAllowed;
-	/// True when internet access is restricted by a white list
-	bool _isInternetAccessRestricted;
-	/// Whitelisted ip addresses
-	QList<QHostAddress> _ipWhitelist;
-
 };

libsrc/cec/CECHandler.cpp

@@ -36,11 +36,6 @@ CECHandler::CECHandler(const QJsonDocument& config, QObject * parent)
 	_cecConfig.callbackParam = this;
 }
 
-CECHandler::~CECHandler()
-{
-	Info(_logger, "CEC handler stopped");
-}
-
 void CECHandler::handleSettingsUpdate(settings::type type, const QJsonDocument& config)
 {
 	if(type == settings::CECEVENTS)
@@ -124,6 +119,7 @@ void CECHandler::stop()
 		_cecAdapter->Close();
 		UnloadLibCec(_cecAdapter);
 	}
+	Info(_logger, "CEC handler stopped");
 }
 
 bool CECHandler::enable()

libsrc/db/DBMigrationManager.cpp

@@ -99,6 +99,8 @@ bool DBMigrationManager::upgradeGlobalSettings(const semver::version& currentVer
 	upgradeGlobalSettings_2_0_16(migratedVersion, config);
 	//Migration step for versions < 2.0.17
 	upgradeGlobalSettings_2_1_0(migratedVersion, config);
+	//Migration step for versions < 2.1.1
+	upgradeGlobalSettings_2_1_2(migratedVersion, config);
 
 	// Set the daqtabase version to the current build version
 	QJsonObject generalConfig = config["general"].toObject();
@@ -436,6 +438,32 @@ bool DBMigrationManager::upgradeGlobalSettings_2_1_0(semver::version& currentVer
 	return migrated;
 }
 
+bool DBMigrationManager::upgradeGlobalSettings_2_1_2(semver::version& currentVersion, QJsonObject& config)
+{
+	bool migrated = false;
+	const semver::version targetVersion{ "2.1.2" };
+
+	if (currentVersion < targetVersion)
+	{
+		Info(_log, "Global settings: Migrate from version [%s] to version [%s] or later", currentVersion.getVersion().c_str(), targetVersion.getVersion().c_str());
+		currentVersion = targetVersion;
+
+		if (config.contains("network"))
+		{
+			QJsonObject newNetworkConfig = config["network"].toObject();
+			newNetworkConfig.remove("internetAccessAPI");
+			newNetworkConfig.remove("restirctedInternetAccessAPI");
+			newNetworkConfig.remove("ipWhitelist");
+			config.insert("network", newNetworkConfig);
+
+			Debug(_log, "Network settings migrated");
+			migrated = true;
+		}
+	}
+
+	return migrated;
+}
+
 bool DBMigrationManager::upgradeInstanceSettings_alpha_9(semver::version& currentVersion, quint8 instance, QJsonObject& config)
 {
 	bool migrated = false;

libsrc/flatbufserver/FlatBufferServer.cpp

@@ -75,24 +75,19 @@ void FlatBufferServer::newConnection()
 	{
 		if(QTcpSocket* socket = _server->nextPendingConnection())
 		{
-			if(_netOrigin->accessAllowed(socket->peerAddress(), socket->localAddress()))
-			{
-				Debug(_log, "New connection from %s", QSTRING_CSTR(socket->peerAddress().toString()));
-				FlatBufferClient *client = new FlatBufferClient(socket, _timeout, this);
-
-				client->setPixelDecimation(_pixelDecimation);
-
-				// internal
-				connect(client, &FlatBufferClient::clientDisconnected, this, &FlatBufferServer::clientDisconnected);
-				connect(client, &FlatBufferClient::registerGlobalInput, GlobalSignals::getInstance(), &GlobalSignals::registerGlobalInput);
-				connect(client, &FlatBufferClient::clearGlobalInput, GlobalSignals::getInstance(), &GlobalSignals::clearGlobalInput);
-				connect(client, &FlatBufferClient::setGlobalInputImage, GlobalSignals::getInstance(), &GlobalSignals::setGlobalImage);
-				connect(client, &FlatBufferClient::setGlobalInputColor, GlobalSignals::getInstance(), &GlobalSignals::setGlobalColor);
-				connect(client, &FlatBufferClient::setBufferImage, GlobalSignals::getInstance(), &GlobalSignals::setBufferImage);
-				_openConnections.append(client);
-			}
-			else
-				socket->close();
+			Debug(_log, "New connection from %s", QSTRING_CSTR(socket->peerAddress().toString()));
+			FlatBufferClient *client = new FlatBufferClient(socket, _timeout, this);
+
+			client->setPixelDecimation(_pixelDecimation);
+
+			// internal
+			connect(client, &FlatBufferClient::clientDisconnected, this, &FlatBufferServer::clientDisconnected);
+			connect(client, &FlatBufferClient::registerGlobalInput, GlobalSignals::getInstance(), &GlobalSignals::registerGlobalInput);
+			connect(client, &FlatBufferClient::clearGlobalInput, GlobalSignals::getInstance(), &GlobalSignals::clearGlobalInput);
+			connect(client, &FlatBufferClient::setGlobalInputImage, GlobalSignals::getInstance(), &GlobalSignals::setGlobalImage);
+			connect(client, &FlatBufferClient::setGlobalInputColor, GlobalSignals::getInstance(), &GlobalSignals::setGlobalColor);
+			connect(client, &FlatBufferClient::setBufferImage, GlobalSignals::getInstance(), &GlobalSignals::setBufferImage);
+			_openConnections.append(client);
 		}
 	}
 }