From ddaa599385f157ed03b274b49ac84d5654de0ef1 Mon Sep 17 00:00:00 2001 From: Raul Metsma Date: Tue, 13 Oct 2026 15:33:23 +0300 Subject: [PATCH] Fix installer HTML pages WE2-1296 Signed-off-by: Raul Metsma --- .github/workflows/cmake-macos.yml | 4 ++-- .github/workflows/cmake-windows.yml | 6 +++--- install/English.lproj/Conclusion.html | 3 ++- install/English.lproj/Welcome.html | 3 ++- install/cs.lproj/Conclusion.html | 3 ++- install/cs.lproj/Welcome.html | 3 ++- install/et.lproj/Conclusion.html | 3 ++- install/et.lproj/Welcome.html | 3 ++- install/ru.lproj/Conclusion.html | 3 ++- install/ru.lproj/Welcome.html | 3 ++- install/sk.lproj/Conclusion.html | 3 ++- install/sk.lproj/Welcome.html | 3 ++- lib/libelectronic-id | 2 +- src/controller/application.cpp | 2 +- src/controller/application.hpp | 6 +++--- src/ui/webeiddialog.cpp | 2 +- 16 files changed, 31 insertions(+), 21 deletions(-) diff --git a/.github/workflows/cmake-macos.yml b/.github/workflows/cmake-macos.yml index 6abae6bf..c5430a89 100644 --- a/.github/workflows/cmake-macos.yml +++ b/.github/workflows/cmake-macos.yml @@ -3,7 +3,7 @@ name: CMake (macOS) -on: [push, pull_request] +on: [push, pull_request, workflow_dispatch] permissions: contents: read @@ -20,7 +20,7 @@ env: jobs: build: - runs-on: macos-latest + runs-on: xcode-27 timeout-minutes: 120 steps: diff --git a/.github/workflows/cmake-windows.yml b/.github/workflows/cmake-windows.yml index 1d251d76..e6422ea3 100644 --- a/.github/workflows/cmake-windows.yml +++ b/.github/workflows/cmake-windows.yml @@ -3,7 +3,7 @@ name: CMake (Windows) -on: [push, pull_request] +on: [push, pull_request, workflow_dispatch] permissions: contents: read @@ -40,7 +40,7 @@ jobs: - name: Install Qt x64 uses: jurplel/install-qt-action@a9c63c7c123f3069cff414e7e482d95dfa9d8125 # v4.4.1 with: - version: 6.11.2 + version: 6.12.0 arch: win64_msvc2022_64 cache: true aqtsource: git+https://github.com/miurahr/aqtinstall.git@16db45a70b5905ad596941b223469bc86a56901e @@ -53,7 +53,7 @@ jobs: - name: Install Qt arm64 uses: jurplel/install-qt-action@a9c63c7c123f3069cff414e7e482d95dfa9d8125 # v4.4.1 with: - version: 6.11.2 + version: 6.12.0 arch: win64_msvc2022_arm64_cross_compiled cache: true aqtsource: git+https://github.com/miurahr/aqtinstall.git@16db45a70b5905ad596941b223469bc86a56901e diff --git a/install/English.lproj/Conclusion.html b/install/English.lproj/Conclusion.html index 36d6385a..25e25052 100644 --- a/install/English.lproj/Conclusion.html +++ b/install/English.lproj/Conclusion.html @@ -1,6 +1,7 @@ + -
+

In order to use ID-card in e-services make sure that the extension is installed and enabled.

  1. Open browser
  2. Go to Extensions
    3. diff --git a/install/English.lproj/Welcome.html b/install/English.lproj/Welcome.html index 0eefda34..c8f0775b 100644 --- a/install/English.lproj/Welcome.html +++ b/install/English.lproj/Welcome.html @@ -1,4 +1,5 @@ + -
    +

    You will be guided through the steps necessary to install this software.

    \ No newline at end of file diff --git a/install/cs.lproj/Conclusion.html b/install/cs.lproj/Conclusion.html index e46a38e4..bc8c2540 100644 --- a/install/cs.lproj/Conclusion.html +++ b/install/cs.lproj/Conclusion.html @@ -1,6 +1,7 @@ + -
    +

    Abyste mohli používat ID kartu v elektronických službách ujistěte se, že je rozšíření nainstalováno a povoleno.

    1. Otevřít prohlížeč
    2. Přejít na Rozšíření
      3. diff --git a/install/cs.lproj/Welcome.html b/install/cs.lproj/Welcome.html index 2a0583b3..90a3e23e 100644 --- a/install/cs.lproj/Welcome.html +++ b/install/cs.lproj/Welcome.html @@ -1,4 +1,5 @@ + -
      +

      Provedeme vás kroky nezbytnými k instalaci tohoto softwaru.

      \ No newline at end of file diff --git a/install/et.lproj/Conclusion.html b/install/et.lproj/Conclusion.html index 511c1f15..9f31a18a 100644 --- a/install/et.lproj/Conclusion.html +++ b/install/et.lproj/Conclusion.html @@ -1,6 +1,7 @@ + -
      +

      ID-kaardi kasutamiseks e-teenustes veendu, et laiendus on paigaldatud ning aktiveeritud.

      1. Ava veebilehitseja
      2. Ava menüüst Laiendused
        3. diff --git a/install/et.lproj/Welcome.html b/install/et.lproj/Welcome.html index 3a9536e6..01fdbfc2 100644 --- a/install/et.lproj/Welcome.html +++ b/install/et.lproj/Welcome.html @@ -1,4 +1,5 @@ + -
        +

        Järgnevad juhised tarkvara installeerimiseks.

        \ No newline at end of file diff --git a/install/ru.lproj/Conclusion.html b/install/ru.lproj/Conclusion.html index 8f76eb7e..8e14e242 100644 --- a/install/ru.lproj/Conclusion.html +++ b/install/ru.lproj/Conclusion.html @@ -1,6 +1,7 @@ + -
        +

        Для использования ID-карты в э-услугах, убедитесь, что расширение установлено и включено.

        1. Открой интерет браузер
        2. Открой в меню Расширения
          3. diff --git a/install/ru.lproj/Welcome.html b/install/ru.lproj/Welcome.html index c75a99ad..1fa0d1ed 100644 --- a/install/ru.lproj/Welcome.html +++ b/install/ru.lproj/Welcome.html @@ -1,4 +1,5 @@ + -
          +

          Вам будут предложены шаги по установке данного ПО.

          \ No newline at end of file diff --git a/install/sk.lproj/Conclusion.html b/install/sk.lproj/Conclusion.html index 8a2587a8..c08fba64 100644 --- a/install/sk.lproj/Conclusion.html +++ b/install/sk.lproj/Conclusion.html @@ -1,6 +1,7 @@ + -
          +

          Aby ste mohli používať ID kartu v elektronických službách uistite sa, že je rozšírenie nainštalované a povolené.

          1. Otvoriť prehliadač
          2. Prejsť na Rozšírenie
            3. diff --git a/install/sk.lproj/Welcome.html b/install/sk.lproj/Welcome.html index 185bc87e..688cb106 100644 --- a/install/sk.lproj/Welcome.html +++ b/install/sk.lproj/Welcome.html @@ -1,4 +1,5 @@ + -
            +

            Prevedieme vás krokmi potrebnými na inštaláciu tohto softvéru.

            \ No newline at end of file diff --git a/lib/libelectronic-id b/lib/libelectronic-id index c0cbecb5..b2f9ec8f 160000 --- a/lib/libelectronic-id +++ b/lib/libelectronic-id @@ -1 +1 @@ -Subproject commit c0cbecb577b1559380d2e6d508cdf81e1101fb99 +Subproject commit b2f9ec8f0d3cb58a134a873c4cc442400e9c0fdc diff --git a/src/controller/application.cpp b/src/controller/application.cpp index 5ffc698e..d4df4d78 100644 --- a/src/controller/application.cpp +++ b/src/controller/application.cpp @@ -61,7 +61,7 @@ Application::Application(int& argc, char** argv, const QString& name) : registerMetatypes(); -#ifdef Q_OS_MAC +#ifdef Q_OS_MACOS menuBar = std::make_unique(); QAction* about = menuBar->addMenu(tr("&File"))->addAction(tr("&About")); about->setMenuRole(QAction::AboutRole); diff --git a/src/controller/application.hpp b/src/controller/application.hpp index 748ec810..ace94d17 100644 --- a/src/controller/application.hpp +++ b/src/controller/application.hpp @@ -9,7 +9,7 @@ #include -#ifdef Q_OS_MAC +#ifdef Q_OS_MACOS #include #include #endif @@ -37,7 +37,7 @@ class Application : public QApplication // see class SafariApplication in src/mac/main.mm and WebEidDialog::showAboutPage(). virtual bool isSafariExtensionContainingApp() { return false; } virtual void requestSafariExtensionState() { } -#ifdef Q_OS_MAC +#ifdef Q_OS_MACOS void showAbout(); #endif virtual void showSafariSettings() { } @@ -47,7 +47,7 @@ class Application : public QApplication private: QTranslator* translator; -#ifdef Q_OS_MAC +#ifdef Q_OS_MACOS std::unique_ptr menuBar; #endif }; diff --git a/src/ui/webeiddialog.cpp b/src/ui/webeiddialog.cpp index 5eb28784..e3ee2e2b 100644 --- a/src/ui/webeiddialog.cpp +++ b/src/ui/webeiddialog.cpp @@ -135,7 +135,7 @@ WebEidDialog::WebEidDialog(QWidget* parent) : WebEidUI(parent), ui(new Private) showPinInputWarning(false); ui->okButton->setEnabled(ui->pinInput->hasAcceptableInput()); }); -#ifdef Q_OS_MAC +#ifdef Q_OS_MACOS // Fix pressing Enter in PIN input field in macOS. connect(ui->pinInput, &QLineEdit::returnPressed, ui->okButton, &QPushButton::click); #endif