Update UI

awawa-dev · Aug 3, 2023 · 682a053 · 682a053
1 parent de2b4ba
commit 682a053
Show file tree

Hide file tree

Showing 23 changed files with 748 additions and 406 deletions.
diff --git a/include/api/API.h b/include/api/API.h
@@ -367,6 +367,8 @@ class API : public QObject
 	///
 	bool isUserAuthorized(const QString& password);
 
+	bool isUserBlocked();
+
 	///
 	/// @brief Test if Hyperhdr has the default PW
 	/// @return The result

diff --git a/include/base/AuthManager.h b/include/base/AuthManager.h
@@ -69,7 +69,7 @@ class AuthManager : public QObject
 	/// @brief Check if user auth is temporary blocked due to failed attempts
 	/// @return True on blocked and no further Auth requests will be accepted
 	///
-	bool isUserAuthBlocked() const;
+
 
 	///
 	/// @brief Check if token auth is temporary blocked due to failed attempts
@@ -92,6 +92,8 @@ public slots:
 	///
 	bool isUserAuthorized(const QString& user, const QString& pw);
 
+	bool isUserAuthBlocked() const;
+
 	///
 	/// @brief Check if token is authorized
 	/// @param  token  The token

diff --git a/include/utils/Logger.h b/include/utils/Logger.h
@@ -75,6 +75,7 @@ class Logger : public QObject
 	static void     deleteInstance(const QString& name = "");
 	static void     setLogLevel(LogLevel level, const QString& name = "");
 	static LogLevel getLogLevel(const QString& name = "");
+	static QString getLastError();
 
 	void     Message(LogLevel level, const char* sourceFile, const char* func, unsigned int line, const char* fmt, ...);
 	void     setMinLevel(LogLevel level);
@@ -98,6 +99,7 @@ class Logger : public QObject
 	static QMutex                 _mapLock;
 	static QMap<QString, Logger*> _loggerMap;
 	static QAtomicInteger<int>    GLOBAL_MIN_LOG_LEVEL;
+	static QString                _lastError;
 
 	const QString                _name;
 	const QString                _appname;

diff --git a/include/utils/RgbChannelAdjustment.h b/include/utils/RgbChannelAdjustment.h
@@ -18,7 +18,7 @@ class RgbChannelAdjustment
 	/// @param adjustR
 	/// @param adjustG
 	/// @param adjustB
-	RgbChannelAdjustment(quint8 instance, uint8_t adjustR, uint8_t adjustG, uint8_t adjustB, QString channelName);
+	RgbChannelAdjustment(quint8 instance, uint8_t adjustR, uint8_t adjustG, uint8_t adjustB, QString channelName, bool enabled);
 
 	///
 	/// Transform the given array value
@@ -63,6 +63,8 @@ class RgbChannelAdjustment
 
 	uint8_t correction(uint8_t input) const;
 
+	bool isEnabled();
+
 	static RgbChannelAdjustment createRgbChannelAdjustment(quint8 instance, const QJsonObject& colorConfig, const QString& channelName, int defaultR, int defaultG, int defaultB);
 
 private:
@@ -104,4 +106,6 @@ class RgbChannelAdjustment
 
 	/// current brightness value
 	uint8_t _brightness;
+
+	bool _enabled;
 };
diff --git a/sources/api/API.cpp b/sources/api/API.cpp
@@ -565,6 +565,13 @@ bool API::isUserAuthorized(const QString& password)
 	return res;
 }
 
+bool API::isUserBlocked()
+{
+	bool res;
+	SAFE_CALL_0_RET(_authManager, isUserAuthBlocked, bool, res);
+	return res;
+}
+
 bool API::hasHyperhdrDefaultPw()
 {
 	bool res;