New language menu

WE2-740

Signed-off-by: Raul Metsma <[email protected]>

Author: metsma

.github/workflows/cmake-macos.yml

@@ -7,6 +7,7 @@ env:
   BUILD_DIR: build
   BUILD_NUMBER: ${{github.run_number}}
   OPENSSL_ROOT_DIR: /usr/local/opt/[email protected]
+  HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
   QT_DIR: /usr/local/opt/qt6/lib/cmake/Qt6
   QT_QPA_PLATFORM: offscreen
   MAKEFLAGS: -j3

src/controller/CMakeLists.txt

@@ -20,9 +20,8 @@ add_library(controller STATIC
     controller.hpp
     inputoutputmode.cpp
     inputoutputmode.hpp
-    logging.hpp
     logging.cpp
-    observer_ptr.hpp
+    logging.hpp
     qeid.hpp
     retriableerror.cpp
     retriableerror.hpp
@@ -33,7 +32,9 @@ add_library(controller STATIC
     threads/controllerchildthread.hpp
     threads/waitforcardthread.hpp
     ui.hpp
-    utils.hpp
+    utils/observer_ptr.hpp
+    utils/qdisablecopymove.hpp
+    utils/utils.hpp
     writeresponse.cpp
     writeresponse.hpp
 )

src/controller/application.cpp

@@ -56,7 +56,7 @@ Application::Application(int& argc, char** argv, const QString& name) : QApplica
     setQuitOnLastWindowClosed(false);
 
     translator = new QTranslator(this);
-    QApplication::installTranslator(translator);
+    installTranslator(translator);
     loadTranslations();
 
     for (const QString& font : QDir(QStringLiteral(":/fonts")).entryList()) {
@@ -75,7 +75,7 @@ Application::Application(int& argc, char** argv, const QString& name) : QApplica
 }
 
 #ifndef Q_OS_MAC
-bool Application::isDarkTheme() const
+bool Application::isDarkTheme()
 {
 #ifdef Q_OS_WIN
     QSettings settings(
@@ -102,10 +102,10 @@ bool Application::isDarkTheme() const
 
 void Application::loadTranslations(const QString& lang)
 {
-    QLocale locale;
     static const QStringList SUPPORTED_LANGS {QStringLiteral("en"), QStringLiteral("et"),
                                               QStringLiteral("fi"), QStringLiteral("hr"),
                                               QStringLiteral("ru")};
+    QLocale locale;
     QString langSetting = QSettings().value(QStringLiteral("lang"), lang).toString();
     if (SUPPORTED_LANGS.contains(langSetting)) {
         locale = QLocale(langSetting);
@@ -119,10 +119,10 @@ CommandWithArgumentsPtr Application::parseArgs()
                                     QStringLiteral("Parent window handle (unused)"),
                                     QStringLiteral("parent-window"));
     QCommandLineParser parser;
-    parser.setApplicationDescription(
+    parser.setApplicationDescription(QStringLiteral(
         "Application that communicates with the Web eID browser extension via standard input and "
         "output, but also works standalone in command-line mode. Performs PKI cryptographic "
-        "operations with eID smart cards for signing and authentication purposes.");
+        "operations with eID smart cards for signing and authentication purposes."));
 
     parser.addHelpOption();
     parser.addOptions({{{"c", "command-line-mode"},

src/controller/application.hpp

@@ -45,9 +45,9 @@ class Application : public QApplication
 public:
     Application(int& argc, char** argv, const QString& name);
 
-    bool isDarkTheme() const;
+    static bool isDarkTheme();
     void loadTranslations(const QString& lang = {});
-    CommandWithArgumentsPtr parseArgs();
+    static CommandWithArgumentsPtr parseArgs();
     static void registerMetatypes();
 
     // Methods specific to Safari web extension's containing app,

src/controller/application.mm

@@ -27,7 +27,7 @@
 #import <AppKit/AppKit.h>
 #import <Cocoa/Cocoa.h>
 
-bool Application::isDarkTheme() const
+bool Application::isDarkTheme()
 {
     if (__builtin_available(macOS 10.14, *))
     {

src/controller/command-handlers/certificatereader.cpp

@@ -24,7 +24,7 @@
 
 #include "application.hpp"
 #include "signauthutils.hpp"
-#include "utils.hpp"
+#include "utils/utils.hpp"
 #include "magic_enum/magic_enum.hpp"
 
 using namespace electronic_id;

src/controller/command-handlers/sign.cpp

@@ -23,7 +23,7 @@
 #include "sign.hpp"
 
 #include "signauthutils.hpp"
-#include "utils.hpp"
+#include "utils/utils.hpp"
 
 using namespace electronic_id;
 

src/controller/command-handlers/signauthutils.cpp

@@ -24,7 +24,7 @@
 
 #include "ui.hpp"
 #include "commandhandler.hpp"
-#include "utils.hpp"
+#include "utils/utils.hpp"
 
 using namespace electronic_id;
 

src/controller/controller.cpp

@@ -27,7 +27,7 @@
 #include "threads/commandhandlerrunthread.hpp"
 #include "threads/waitforcardthread.hpp"
 
-#include "utils.hpp"
+#include "utils/utils.hpp"
 #include "inputoutputmode.hpp"
 #include "writeresponse.hpp"
 

src/controller/ui.hpp

@@ -26,7 +26,7 @@
 #include "certandpininfo.hpp"
 #include "retriableerror.hpp"
 
-#include "observer_ptr.hpp"
+#include "utils/observer_ptr.hpp"
 
 #include <QDialog>