új telepítő

9 files changed, 468 insertions, 700 deletions

diff --git a/raveos-calamares-module/wifi/CMakeLists.txt b/raveos-calamares-module/wifi/CMakeLists.txt
index 28335b2..eb9771f 100644
--- a/raveos-calamares-module/wifi/CMakeLists.txt
+++ b/raveos-calamares-module/wifi/CMakeLists.txt
@@ -23,7 +23,6 @@ install(
 install(
     FILES
         ui/wifi.qml
-        ui/Style.qml
         ui/Translations.qml
         ui/qmldir
     DESTINATION lib/calamares/modules/wifi/ui
diff --git a/raveos-calamares-module/wifi/NetworkManager.cpp b/raveos-calamares-module/wifi/NetworkManager.cpp
index cb88698..94abe2b 100644
--- a/raveos-calamares-module/wifi/NetworkManager.cpp
+++ b/raveos-calamares-module/wifi/NetworkManager.cpp
@@ -1,5 +1,7 @@
 #include "NetworkManager.h"
 
+#include <algorithm>
+
 #include <QDBusInterface>
 #include <QDBusReply>
 #include <QDBusObjectPath>
@@ -17,6 +19,13 @@ typedef QMap<QString, QVariantMap> NMConnectionSettings;
 
 static const QString LOG_FILE = "/tmp/calamares-wifi.log";
 
+static constexpr uint NmDeviceTypeWifi = 2;
+static constexpr uint NmApFlagPrivacy = 0x1;
+static constexpr uint NmKeyMgmtPsk = 0x100;
+static constexpr uint NmKeyMgmt8021x = 0x200;
+static constexpr uint NmKeyMgmtSae = 0x400;
+static constexpr int NmPmfRequired = 3;
+
 static void wifiLog(const QString& message)
 {
     QString timestamp = QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss.zzz");
@@ -55,11 +64,6 @@ NetworkManager::NetworkManager(QObject* parent)
     timer->start(3000);
 }
 
-QStringList NetworkManager::networks() const
-{
-    return m_networks;
-}
-
 bool NetworkManager::isConnected() const
 {
     return m_connected;
@@ -142,7 +146,6 @@ void NetworkManager::updateConnectionState()
 
 void NetworkManager::scan()
 {
-    m_networks.clear();
     wifiLog("Starting scan...");
 
     QDBusInterface nm(
@@ -189,7 +192,7 @@ void NetworkManager::scan()
         uint deviceType = typeReply.isValid() ? typeReply.value().toUInt() : 0;
         wifiLog(QString("Device %1 type: %2").arg(dev.path()).arg(deviceType));
 
-        if (deviceType != 2)  // Not WiFi
+        if (deviceType != NmDeviceTypeWifi)
             continue;
 
         foundWireless = true;
@@ -219,7 +222,6 @@ void NetworkManager::scan()
 
 void NetworkManager::fetchAccessPoints()
 {
-    m_networks.clear();
     wifiLog("Fetching access points...");
 
     QDBusInterface nm(
@@ -232,6 +234,7 @@ void NetworkManager::fetchAccessPoints()
     if (!nm.isValid())
     {
         wifiLog("NM interface not valid in fetchAccessPoints");
+        m_accessPoints.clear();
         emit networksChanged();
         return;
     }
@@ -241,10 +244,13 @@ void NetworkManager::fetchAccessPoints()
     if (!devices.isValid())
     {
         wifiLog("GetDevices failed in fetchAccessPoints");
+        m_accessPoints.clear();
         emit networksChanged();
         return;
     }
 
+    QMap<QString, QVariantMap> strongest;
+
     for (const auto& dev : devices.value())
     {
         QDBusInterface devProps(
@@ -260,8 +266,8 @@ void NetworkManager::fetchAccessPoints()
             "DeviceType"
         );
 
-        if (!typeReply.isValid() || typeReply.value().toUInt() != 2)
-            continue;  // Not WiFi
+        if (!typeReply.isValid() || typeReply.value().toUInt() != NmDeviceTypeWifi)
+            continue;
 
         QDBusInterface wirelessIf(
             "org.freedesktop.NetworkManager",
@@ -289,22 +295,41 @@ void NetworkManager::fetchAccessPoints()
                 QDBusConnection::systemBus()
             );
 
-            QByteArray ssidRaw = apIf.property("Ssid").toByteArray();
-            QString ssid = QString::fromUtf8(ssidRaw);
+            const QString ssid = QString::fromUtf8(apIf.property("Ssid").toByteArray());
+            if (ssid.isEmpty())
+                continue;
 
-            uint frequency = apIf.property("Frequency").toUInt();
-            QString band = (frequency > 4000) ? "5GHz" : "2.4GHz";
+            const uint frequency = apIf.property("Frequency").toUInt();
+            const int strength = apIf.property("Strength").toInt();
+            const bool secured = (apIf.property("Flags").toUInt() & NmApFlagPrivacy) != 0
+                || apIf.property("WpaFlags").toUInt() != 0
+                || apIf.property("RsnFlags").toUInt() != 0;
 
-            wifiLog(QString("Found SSID: %1 (%2, %3 MHz)").arg(ssid, band).arg(frequency));
+            wifiLog(QString("Found SSID: %1 (%2 MHz, %3%)").arg(ssid).arg(frequency).arg(strength));
 
-            if (!ssid.isEmpty() && !m_networks.contains(ssid))
-                m_networks << ssid;
+            if (strongest.contains(ssid) && strongest[ssid].value("strength").toInt() >= strength)
+                continue;
+
+            QVariantMap item;
+            item.insert("ssid", ssid);
+            item.insert("strength", strength);
+            item.insert("secured", secured);
+            item.insert("band", frequency > 5900 ? QStringLiteral("6 GHz") : frequency > 4000 ? QStringLiteral("5 GHz") : QStringLiteral("2.4 GHz"));
+            strongest.insert(ssid, item);
         }
     }
 
-    m_networks.sort(Qt::CaseInsensitive);
+    QList<QVariantMap> sorted = strongest.values();
+    std::sort(sorted.begin(), sorted.end(), [](const QVariantMap& a, const QVariantMap& b)
+    {
+        return a.value("strength").toInt() > b.value("strength").toInt();
+    });
+
+    m_accessPoints.clear();
+    for (const auto& item : sorted)
+        m_accessPoints << item;
 
-    wifiLog(QString("Total networks found: %1").arg(m_networks.size()));
+    wifiLog(QString("Total networks found: %1").arg(m_accessPoints.size()));
     emit networksChanged();
 }
 
@@ -402,12 +427,12 @@ void NetworkManager::connectTo(const QString& ssid, const QString& password)
     }
 
 
-    bool apSupportsPsk = ((apWpaFlags & 0x100) != 0) || ((apRsnFlags & 0x100) != 0);
-    bool apSupportsSae = (apRsnFlags & 0x400) != 0;  // WPA3
-    bool apSupportsEnterprise = ((apWpaFlags & 0x200) != 0) || ((apRsnFlags & 0x200) != 0);
+    bool apSupportsPsk = ((apWpaFlags & NmKeyMgmtPsk) != 0) || ((apRsnFlags & NmKeyMgmtPsk) != 0);
+    bool apSupportsSae = (apRsnFlags & NmKeyMgmtSae) != 0;
+    bool apSupportsEnterprise = ((apWpaFlags & NmKeyMgmt8021x) != 0) || ((apRsnFlags & NmKeyMgmt8021x) != 0);
     bool apIsOpen = (apFlags == 0) && (apWpaFlags == 0) && (apRsnFlags == 0);
 
-    bool apHasPrivacy = (apFlags & 0x1) != 0;
+    bool apHasPrivacy = (apFlags & NmApFlagPrivacy) != 0;
 
     wifiLog(QString("Security detection: PSK=%1, SAE=%2, Enterprise=%3, Open=%4, Privacy=%5")
         .arg(apSupportsPsk).arg(apSupportsSae).arg(apSupportsEnterprise).arg(apIsOpen).arg(apHasPrivacy));
@@ -448,23 +473,13 @@ void NetworkManager::connectTo(const QString& ssid, const QString& password)
             wifiLog("Using WPA3-SAE security");
             wifiSecurity["key-mgmt"] = QString("sae");
             wifiSecurity["psk"] = password;
-            wifiSecurity["pmf"] = 3;
+            wifiSecurity["pmf"] = NmPmfRequired;
         }
         else if (apSupportsPsk)
         {
-            if (apSupportsSae)
-            {
-                wifiLog("Using WPA3-SAE (transition mode - both PSK and SAE available)");
-                wifiSecurity["key-mgmt"] = QString("sae");
-                wifiSecurity["psk"] = password;
-                wifiSecurity["pmf"] = 3;  // Required for SAE
-            }
-            else
-            {
-                wifiLog("Using WPA-PSK security");
-                wifiSecurity["key-mgmt"] = QString("wpa-psk");
-                wifiSecurity["psk"] = password;
-            }
+            wifiLog("Using WPA-PSK security");
+            wifiSecurity["key-mgmt"] = QString("wpa-psk");
+            wifiSecurity["psk"] = password;
         }
         else if (isHiddenNetwork)
         {
@@ -540,17 +555,13 @@ void NetworkManager::connectTo(const QString& ssid, const QString& password)
         {
             m_lastSecurityType = "sae";
         }
-        else if (apSupportsPsk && apSupportsSae)
-        {
-            m_lastSecurityType = "sae";  // Transition mode, we used SAE
-        }
         else if (apSupportsPsk)
         {
             m_lastSecurityType = "wpa-psk";
         }
         else
         {
-            m_lastSecurityType = "";  // Open network
+            m_lastSecurityType = "";
         }
         wifiLog(QString("Stored security type: '%1'").arg(m_lastSecurityType));
 
diff --git a/raveos-calamares-module/wifi/NetworkManager.h b/raveos-calamares-module/wifi/NetworkManager.h
index dd58a9a..9f74bcb 100644
--- a/raveos-calamares-module/wifi/NetworkManager.h
+++ b/raveos-calamares-module/wifi/NetworkManager.h
@@ -3,22 +3,23 @@
 #include <QObject>
 #include <QString>
 #include <QStringList>
+#include <QVariantList>
 
 class NetworkManager : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QStringList networks READ networks NOTIFY networksChanged)
+    Q_PROPERTY(QVariantList accessPoints READ accessPoints NOTIFY networksChanged)
     Q_PROPERTY(bool connected READ isConnected NOTIFY connectionChanged)
 
 public:
     explicit NetworkManager(QObject* parent = nullptr);
 
-    QStringList networks() const;
+    QVariantList accessPoints() const { return m_accessPoints; }
     bool isConnected() const;
 
     QString lastConnectedSsid() const { return m_lastConnectedSsid; }
     QString lastConnectedPassword() const { return m_lastConnectedPassword; }
-    QString lastSecurityType() const { return m_lastSecurityType; }  // "wpa-psk" or "sae"
+    QString lastSecurityType() const { return m_lastSecurityType; }
 
 public slots:
     void scan();
@@ -36,11 +37,11 @@ private:
     void updateConnectionState();
     void fetchAccessPoints();
 
-    QStringList m_networks;
+    QVariantList m_accessPoints;
     bool m_connected = false;
 
     QString m_lastConnectedSsid;
     QString m_lastConnectedPassword;
-    QString m_lastSecurityType;  // "wpa-psk", "sae", or "" (open)
+    QString m_lastSecurityType;
     int m_connectionCheckCount = 0;
 };
diff --git a/raveos-calamares-module/wifi/WifiViewStep.cpp b/raveos-calamares-module/wifi/WifiViewStep.cpp
index 350bd43..7f0e7dc 100644
--- a/raveos-calamares-module/wifi/WifiViewStep.cpp
+++ b/raveos-calamares-module/wifi/WifiViewStep.cpp
@@ -1,5 +1,7 @@
 #include "WifiViewStep.h"
 
+#include "../common/RaveBrandingQml.h"
+
 #include <QVBoxLayout>
 #include <QQuickWidget>
 #include <QQmlContext>
@@ -50,15 +52,24 @@ WifiViewStep::~WifiViewStep()
 
 QString WifiViewStep::prettyName() const
 {
-    m_locale = getLocale();
-
-    if (m_locale.startsWith("hu"))
-    {
-        return QStringLiteral("Wi-Fi");
-    }
     return QStringLiteral("Wi-Fi");
 }
 
+QString WifiViewStep::prettyStatus() const
+{
+    const QString ssid = m_networkManager && m_networkManager->isConnected() ? m_networkManager->lastConnectedSsid() : QString();
+    if (!ssid.isEmpty())
+        return QStringLiteral("Wi-Fi: <b>%1</b>").arg(ssid.toHtmlEscaped());
+    if (!hasActiveNetwork())
+        return QString();
+    const QString locale = getLocale();
+    if (locale.startsWith("hu"))
+        return QStringLiteral("Meglévő hálózati kapcsolat");
+    if (locale.startsWith("de"))
+        return QStringLiteral("Bestehende Netzwerkverbindung");
+    return QStringLiteral("Existing network connection");
+}
+
 QWidget* WifiViewStep::widget()
 {
     if (!m_widget)
@@ -88,6 +99,7 @@ QWidget* WifiViewStep::widget()
             qmlPath = QDir::currentPath() + QStringLiteral("/wifi/ui/wifi.qml");
         }
 
+        addRaveBrandingImportPath(m_quickWidget->engine());
         m_quickWidget->setSource(QUrl::fromLocalFile(qmlPath));
 
         layout->addWidget(m_quickWidget);
diff --git a/raveos-calamares-module/wifi/WifiViewStep.h b/raveos-calamares-module/wifi/WifiViewStep.h
index efe3e64..b03102a 100644
--- a/raveos-calamares-module/wifi/WifiViewStep.h
+++ b/raveos-calamares-module/wifi/WifiViewStep.h
@@ -21,6 +21,7 @@ public:
     ~WifiViewStep() override;
 
     QString prettyName() const override;
+    QString prettyStatus() const override;
     QWidget* widget() override;
 
     bool isNextEnabled() const override;
diff --git a/raveos-calamares-module/wifi/ui/Style.qml b/raveos-calamares-module/wifi/ui/Style.qml
deleted file mode 100644
index 360d4d2..0000000
--- a/raveos-calamares-module/wifi/ui/Style.qml
+++ /dev/null
@@ -1,161 +0,0 @@
-pragma Singleton
-import QtQuick 2.15
-
-/**
- * WiFi Modul Stílus Beállítások
- * ==============================
- *
- * Itt tudod testreszabni a modul kinézetét.
- * Minden szín hexadecimális formátumban van megadva: #RRGGBB
- *
- * Példa színek:
- *   Fehér: #ffffff
- *   Fekete: #000000
- *   Piros: #ff0000
- *   Zöld: #00ff00
- *   Kék: #0000ff
- */
-
-QtObject {
-    // =========================================
-    // HÁTTÉR SZÍNEK
-    // =========================================
-
-    // Fő háttérszín (az egész modul háttere)
-    readonly property color backgroundColor: "#404040"
-
-    // Lista háttérszín (ahol a WiFi hálózatok vannak)
-    readonly property color listBackgroundColor: "#2B2B2B"
-
-    // Lista fejléc háttérszín ("Elérhető hálózatok" sor)
-    readonly property color listHeaderColor: "#3d7839"
-
-    // Elem hover háttérszín (amikor az egér fölötte van)
-    readonly property color itemHoverColor: "#2d3238"
-
-    // Kiválasztott elem háttérszín
-    readonly property color itemSelectedColor: "#3d7839"
-
-    // =========================================
-    // SZÖVEG SZÍNEK
-    // =========================================
-
-    // Fő szöveg szín (címek, hálózat nevek)
-    readonly property color textColor: "#ffffff"
-
-    // Másodlagos szöveg szín (leírások, információk)
-    readonly property color textSecondaryColor: "#b2b2b2"
-
-    // Halványított szöveg szín (tippek, kihagyható info)
-    readonly property color textMutedColor: "#707070"
-
-    // Letiltott szöveg szín
-    readonly property color textDisabledColor: "#606060"
-
-    // =========================================
-    // GOMB SZÍNEK
-    // =========================================
-
-   // Fő gomb háttérszín (Csatlakozás gomb)
-    readonly property color buttonPrimaryColor: "#3d7839"
-
-    // Fő gomb hover szín
-    readonly property color buttonPrimaryHoverColor: "#3d7839"
-
-    // Másodlagos gomb háttérszín (Frissítés gomb)
-    readonly property color buttonSecondaryColor: "#3d4248"
-
-    // Másodlagos gomb hover szín
-    readonly property color buttonSecondaryHoverColor: "#4a5058"
-
-    // Letiltott gomb háttérszín
-    readonly property color buttonDisabledColor: "#3d4248"
-
-    // =========================================
-    // INPUT MEZŐ SZÍNEK
-    // =========================================
-
-    // Input mező háttérszín
-    readonly property color inputBackgroundColor: "#2B2B2B"
-
-    // Input mező letiltott háttérszín
-    readonly property color inputDisabledColor: "#2B2B2B"
-
-    // Input mező placeholder szöveg szín
-    readonly property color inputPlaceholderColor: "#FFFFFF"
-
-    // Input mező keret szín
-    readonly property color inputBorderColor: "#3d4248"
-
-    // Input mező fókuszált keret szín
-    readonly property color inputFocusBorderColor: "#3d7839"
-
-    // =========================================
-    // ÁLLAPOT SZÍNEK
-    // =========================================
-
-    // Sikeres állapot szín (csatlakozva)
-    readonly property color successColor: "#2e7d32"
-
-    // Sikeres pipa szín
-    readonly property color successCheckColor: "#4CAF50"
-
-    // Folyamatban állapot szín (csatlakozás...)
-    readonly property color progressColor: "#37474f"
-
-    // Toggle bekapcsolt szín
-    readonly property color toggleOnColor: "#4CAF50"
-
-    // Toggle kikapcsolt szín
-    readonly property color toggleOffColor: "#555555"
-
-    // =========================================
-    // KERET ÉS VONAL SZÍNEK
-    // =========================================
-
-    // Lista keret szín
-    readonly property color borderColor: "#3d4248"
-
-    // Elválasztó vonal szín (lista elemek között)
-    readonly property color separatorColor: "#3d4248"
-
-    // =========================================
-    // MÉRETEK
-    // =========================================
-
-    // Címsor betűméret
-    readonly property int fontSizeTitle: 24
-
-    // Alcím betűméret
-    readonly property int fontSizeSubtitle: 12
-
-    // Normál szöveg betűméret
-    readonly property int fontSizeNormal: 14
-
-    // Kis szöveg betűméret
-    readonly property int fontSizeSmall: 12
-
-    // Apró szöveg betűméret
-    readonly property int fontSizeTiny: 11
-
-    // Lista elem magasság
-    readonly property int listItemHeight: 48
-
-    // Gomb magasság
-    readonly property int buttonHeight: 48
-
-    // Input mező magasság
-    readonly property int inputHeight: 44
-
-    // Kerekítés sugara
-    readonly property int borderRadius: 6
-
-    // Nagy kerekítés sugara (lista)
-    readonly property int borderRadiusLarge: 8
-
-    // Belső margó
-    readonly property int spacing: 16
-
-    // Külső margó
-    readonly property int margin: 20
-}
\ No newline at end of file
diff --git a/raveos-calamares-module/wifi/ui/Translations.qml b/raveos-calamares-module/wifi/ui/Translations.qml
index 21ef6df..601e8eb 100644
--- a/raveos-calamares-module/wifi/ui/Translations.qml
+++ b/raveos-calamares-module/wifi/ui/Translations.qml
@@ -1,183 +1,88 @@
 pragma Singleton
 import QtQuick 2.15
 
-/**
- * WiFi Modul Fordítások
- * ======================
- *
- * Támogatott nyelvek:
- *   - hu_HU: Magyar
- *   - de_DE: Német
- *   - en_US, en_GB, stb.: Angol (alapértelmezett)
- *
- * Új nyelv hozzáadása:
- *   1. Adj hozzá egy új "else if" blokkot a setLanguage függvényben
- *   2. Másold be az összes szöveget és fordítsd le
- *
- * Használat QML-ben:
- *   Text { text: Translations.title }
- */
-
 QtObject {
-    id: root
-
-    // Aktuális nyelv kód (pl. "hu_HU", "en_US")
-    property string currentLanguage: "en_US"
-
-    // =========================================
-    // CÍMEK ÉS FEJLÉCEK
-    // =========================================
-
-    // Sidebar név (bal oldali menüben)
-    property string sidebarName: "Hálózat"
-
-    // Modul fő címe
-    property string title: "Wi-Fi Network"
-
-    // Alcím / leírás
-    property string subtitle: "Select a network from the list, or enter a hidden network name manually."
-
-    // Lista fejléc
+    property string eyebrow: "WI-FI"
+    property string title: "CONNECT TO A NETWORK"
+    property string subtitle: "The installer downloads the latest packages from the internet. With a cable connection this step is skipped automatically."
     property string availableNetworks: "Available networks"
-
-    // =========================================
-    // GOMBOK
-    // =========================================
-
-    // Frissítés gomb
     property string refresh: "Refresh"
-
-    // Csatlakozás gomb
+    property string noNetworks: "No networks found. Click Refresh to search again."
+    property string selected: "Selected"
+    property string noSelection: "Select a network from the list"
+    property string password: "Password"
     property string connect: "Connect"
-
-    // =========================================
-    // INPUT MEZŐK
-    // =========================================
-
-    // SSID mező placeholder
-    property string ssidPlaceholder: "Network name (SSID)"
-
-    // Jelszó mező placeholder
-    property string passwordPlaceholder: "Password"
-
-    // Jelszó megjelenítő/elrejtő gomb
-    property string showPassword: "Show"
-    property string hidePassword: "Hide"
-
-    // =========================================
-    // ÁLLAPOT ÜZENETEK
-    // =========================================
-
-    // Sikeres csatlakozás
-    property string connected: "Successfully connected!"
-
-    // Csatlakozás folyamatban
-    property string connecting: "Connecting..."
-
-    // Nincs hálózat
-    property string noNetworks: "No networks found.\nClick Refresh to scan."
-
-    // =========================================
-    // TOGGLE ÉS OPCIÓK
-    // =========================================
-
-    // Rejtett hálózat toggle
     property string hiddenNetwork: "Hidden network"
+    property string ssidLabel: "Network name (SSID)"
+    property string statusLabel: "Status"
+    property string statusDisconnected: "not connected"
+    property string statusConnecting: "connecting..."
+    property string statusConnected: "connected"
+    property string statusFailed: "connection failed"
+    property string secured: "Password protected"
+    property string showPassword: "Show password"
 
-    // =========================================
-    // INFORMÁCIÓS SZÖVEGEK
-    // =========================================
-
-    // Sikeres csatlakozás után
-    property string clickNextToContinue: "Click Next to continue."
-
-    // Ha van vezetékes kapcsolat
-    property string canSkipWithEthernet: "If you have a wired connection, you can skip this step."
-
-    // =========================================
-    // NYELV BEÁLLÍTÁS FÜGGVÉNY
-    // =========================================
-
-    /**
-     * Nyelv beállítása a locale kód alapján
-     * @param locale - Nyelv kód (pl. "hu_HU", "en_US")
-     */
     function setLanguage(locale) {
-        currentLanguage = locale
-
-        // ==================
-        // MAGYAR
-        // ==================
         if (locale.startsWith("hu")) {
-            sidebarName = "Hálózat"
-            title = "Wi-Fi hálózat"
-            subtitle = "Válassz egy hálózatot a listából, vagy add meg kézzel a rejtett hálózat nevét."
+            eyebrow = "WI-FI"
+            title = "CSATLAKOZÁS A HÁLÓZATHOZ"
+            subtitle = "A telepítő az internetről tölti le a legfrissebb csomagokat. Kábellel csatlakozva ez a lépés magától kimarad."
             availableNetworks = "Elérhető hálózatok"
             refresh = "Frissítés"
+            noNetworks = "Nem található hálózat. Kattints a Frissítésre az újbóli kereséshez."
+            selected = "Kiválasztva"
+            noSelection = "Válassz egy hálózatot a listából"
+            password = "Jelszó"
             connect = "Csatlakozás"
-            ssidPlaceholder = "Hálózat neve (SSID)"
-            passwordPlaceholder = "Jelszó"
-            showPassword = "Mutat"
-            hidePassword = "Elrejt"
-            connected = "Sikeresen csatlakozva!"
-            connecting = "Csatlakozás..."
-            noNetworks = "Nem található hálózat.\nKattints a Frissítés gombra."
             hiddenNetwork = "Rejtett hálózat"
-            clickNextToContinue = "Kattints a Tovább gombra a folytatáshoz."
-            canSkipWithEthernet = "Ha van vezetékes kapcsolatod, kihagyhatod ezt a lépést."
-        }
-        // ==================
-        // NÉMET
-        // ==================
-        else if (locale.startsWith("de")) {
-            sidebarName = "Netzwerk"
-            title = "WLAN-Netzwerk"
-            subtitle = "Wählen Sie ein Netzwerk aus der Liste oder geben Sie den Namen eines versteckten Netzwerks manuell ein."
+            ssidLabel = "Hálózat neve (SSID)"
+            statusLabel = "Állapot"
+            statusDisconnected = "nincs kapcsolat"
+            statusConnecting = "csatlakozás..."
+            statusConnected = "csatlakozva"
+            statusFailed = "a csatlakozás nem sikerült"
+            secured = "Jelszóval védett"
+            showPassword = "Jelszó megjelenítése"
+        } else if (locale.startsWith("de")) {
+            eyebrow = "WLAN"
+            title = "MIT EINEM NETZWERK VERBINDEN"
+            subtitle = "Der Installer lädt die neuesten Pakete aus dem Internet. Mit Kabelverbindung wird dieser Schritt automatisch übersprungen."
             availableNetworks = "Verfügbare Netzwerke"
             refresh = "Aktualisieren"
+            noNetworks = "Keine Netzwerke gefunden. Klicke auf Aktualisieren, um erneut zu suchen."
+            selected = "Ausgewählt"
+            noSelection = "Wähle ein Netzwerk aus der Liste"
+            password = "Passwort"
             connect = "Verbinden"
-            ssidPlaceholder = "Netzwerkname (SSID)"
-            passwordPlaceholder = "Passwort"
-            showPassword = "Anzeigen"
-            hidePassword = "Ausblenden"
-            connected = "Erfolgreich verbunden!"
-            connecting = "Verbinden..."
-            noNetworks = "Keine Netzwerke gefunden.\nZum Scannen auf Aktualisieren klicken."
             hiddenNetwork = "Verstecktes Netzwerk"
-            clickNextToContinue = "Klicken Sie auf Weiter, um fortzufahren."
-            canSkipWithEthernet = "Wenn Sie eine Kabelverbindung haben, können Sie diesen Schritt überspringen."
-        }
-        // ==================
-        // ANGOL (alapértelmezett)
-        // ==================
-        else {
-            sidebarName = "Network"
-            title = "Wi-Fi Network"
-            subtitle = "Select a network from the list, or enter a hidden network name manually."
+            ssidLabel = "Netzwerkname (SSID)"
+            statusLabel = "Status"
+            statusDisconnected = "nicht verbunden"
+            statusConnecting = "verbinde..."
+            statusConnected = "verbunden"
+            statusFailed = "Verbindung fehlgeschlagen"
+            secured = "Passwortgeschützt"
+            showPassword = "Passwort anzeigen"
+        } else {
+            eyebrow = "WI-FI"
+            title = "CONNECT TO A NETWORK"
+            subtitle = "The installer downloads the latest packages from the internet. With a cable connection this step is skipped automatically."
             availableNetworks = "Available networks"
             refresh = "Refresh"
+            noNetworks = "No networks found. Click Refresh to search again."
+            selected = "Selected"
+            noSelection = "Select a network from the list"
+            password = "Password"
             connect = "Connect"
-            ssidPlaceholder = "Network name (SSID)"
-            passwordPlaceholder = "Password"
-            showPassword = "Show"
-            hidePassword = "Hide"
-            connected = "Successfully connected!"
-            connecting = "Connecting..."
-            noNetworks = "No networks found.\nClick Refresh to scan."
             hiddenNetwork = "Hidden network"
-            clickNextToContinue = "Click Next to continue."
-            canSkipWithEthernet = "If you have a wired connection, you can skip this step."
+            ssidLabel = "Network name (SSID)"
+            statusLabel = "Status"
+            statusDisconnected = "not connected"
+            statusConnecting = "connecting..."
+            statusConnected = "connected"
+            statusFailed = "connection failed"
+            secured = "Password protected"
+            showPassword = "Show password"
         }
-
-        // ==================
-        // TOVÁBBI NYELVEK IDE
-        // ==================
-        // Példa német nyelv hozzáadása:
-        //
-        // else if (locale.startsWith("de")) {
-        //     title = "WLAN-Netzwerk"
-        //     subtitle = "Wählen Sie ein Netzwerk aus der Liste..."
-        //     // ... stb.
-        // }
     }
 }
diff --git a/raveos-calamares-module/wifi/ui/qmldir b/raveos-calamares-module/wifi/ui/qmldir
index e80b555..6f9105d 100644
--- a/raveos-calamares-module/wifi/ui/qmldir
+++ b/raveos-calamares-module/wifi/ui/qmldir
@@ -1,3 +1,2 @@
 module WifiModule
-singleton Style 1.0 Style.qml
 singleton Translations 1.0 Translations.qml
diff --git a/raveos-calamares-module/wifi/ui/wifi.qml b/raveos-calamares-module/wifi/ui/wifi.qml
index aee3ddc..e3b0b0c 100644
--- a/raveos-calamares-module/wifi/ui/wifi.qml
+++ b/raveos-calamares-module/wifi/ui/wifi.qml
@@ -1,404 +1,405 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
+import RaveOS 1.0
 import "." as WifiModule
 
 Rectangle {
     id: root
-    color: WifiModule.Style.backgroundColor
+    color: Stilus.hatter
 
-    property string selectedSsid: ""
-    property bool showHiddenNetwork: false
-    property bool isConnecting: false
-    property bool showPassword: false
+    readonly property var t: WifiModule.Translations
+    property var kivalasztott: null
+    property bool rejtett: false
+    property bool csatlakozik: false
+    property bool sikertelen: false
+    property bool jelszoLatszik: false
+
+    readonly property string ssid: rejtett ? ssidMezo.text : (kivalasztott ? kivalasztott.ssid : "")
+    readonly property bool jelszoKell: rejtett || (kivalasztott !== null && kivalasztott.secured)
 
-    // Function to update language - called from C++
     function updateLanguage() {
         WifiModule.Translations.setLanguage(systemLocale)
     }
 
-    // Initialize translations on load
-    Component.onCompleted: {
-        WifiModule.Translations.setLanguage(systemLocale)
+    function savok(erosseg) {
+        if (erosseg >= 75) return 4
+        if (erosseg >= 50) return 3
+        if (erosseg >= 25) return 2
+        return 1
     }
 
-    ColumnLayout {
-        anchors.fill: parent
-        anchors.margins: WifiModule.Style.margin
-        spacing: WifiModule.Style.spacing
+    function allapotSzoveg() {
+        if (nm.connected) return t.statusConnected
+        if (csatlakozik) return t.statusConnecting
+        if (sikertelen) return t.statusFailed
+        return t.statusDisconnected
+    }
+
+    Component.onCompleted: WifiModule.Translations.setLanguage(systemLocale)
 
-        // Header
-        Label {
-            text: WifiModule.Translations.title
-            font.pixelSize: WifiModule.Style.fontSizeTitle
-            font.bold: true
-            color: WifiModule.Style.textColor
-            Layout.alignment: Qt.AlignHCenter
+    Connections {
+        target: nm
+        function onConnectionChanged() {
+            if (nm.connected)
+                root.csatlakozik = false
+        }
+        function onConnectionFailed(error) {
+            root.csatlakozik = false
+            root.sikertelen = true
         }
+    }
 
-        Label {
-            text: WifiModule.Translations.subtitle
-            font.pixelSize: WifiModule.Style.fontSizeSubtitle
-            color: WifiModule.Style.textSecondaryColor
-            wrapMode: Text.WordWrap
-            Layout.fillWidth: true
-            Layout.alignment: Qt.AlignHCenter
-            horizontalAlignment: Text.AlignHCenter
+    Timer {
+        interval: 30000
+        running: root.csatlakozik
+        onTriggered: {
+            if (!nm.connected) {
+                root.csatlakozik = false
+                root.sikertelen = true
+            }
         }
+    }
 
-        // Connection status banner
-        Rectangle {
-            Layout.fillWidth: true
-            height: 40
-            radius: WifiModule.Style.borderRadius
-            color: nm.connected ? WifiModule.Style.successColor : WifiModule.Style.progressColor
-            visible: nm.connected || isConnecting
+    component SzovegLink: Text {
+        signal kattint()
+        color: linkHover.hovered ? Stilus.zoldHover : Stilus.zold
+        font.family: Stilus.font
+        font.pixelSize: 13
+        font.weight: Font.DemiBold
 
-            RowLayout {
-                anchors.centerIn: parent
-                spacing: 10
+        HoverHandler {
+            id: linkHover
+            cursorShape: Qt.PointingHandCursor
+        }
 
-                BusyIndicator {
-                    running: isConnecting && !nm.connected
-                    visible: isConnecting && !nm.connected
-                    Layout.preferredWidth: 24
-                    Layout.preferredHeight: 24
-                }
+        TapHandler {
+            onTapped: parent.kattint()
+        }
+    }
 
-                Label {
-                    text: nm.connected ? WifiModule.Translations.connected : WifiModule.Translations.connecting
-                    color: WifiModule.Style.textColor
-                    font.pixelSize: WifiModule.Style.fontSizeNormal
-                    font.bold: true
-                }
+    ColumnLayout {
+        anchors.fill: parent
+        anchors.topMargin: 40
+        anchors.bottomMargin: 32
+        anchors.leftMargin: 56
+        anchors.rightMargin: 56
+        spacing: 20
+
+        ColumnLayout {
+            Layout.fillWidth: true
+            spacing: 10
+
+            Fejlec {
+                Layout.fillWidth: true
+                felirat: root.t.eyebrow
+                cim: root.t.title
+            }
+
+            Text {
+                Layout.fillWidth: true
+                text: root.t.subtitle
+                wrapMode: Text.WordWrap
+                color: Stilus.szovegMasodlagos
+                font.family: Stilus.font
+                font.pixelSize: 14
             }
         }
 
-        // Network list
-        Rectangle {
+        RowLayout {
             Layout.fillWidth: true
             Layout.fillHeight: true
-            color: WifiModule.Style.listBackgroundColor
-            radius: WifiModule.Style.borderRadiusLarge
-            border.color: WifiModule.Style.borderColor
-            border.width: 1
+            spacing: 24
 
             ColumnLayout {
-                anchors.fill: parent
-                anchors.margins: 1
-                spacing: 0
+                Layout.fillWidth: true
+                Layout.fillHeight: true
+                spacing: 8
 
-                // List header with refresh button
-                Rectangle {
+                RowLayout {
                     Layout.fillWidth: true
-                    height: 44
-                    color: WifiModule.Style.listHeaderColor
-                    radius: WifiModule.Style.borderRadiusLarge
 
-                    Rectangle {
-                        anchors.bottom: parent.bottom
-                        anchors.left: parent.left
-                        anchors.right: parent.right
-                        height: 8
-                        color: parent.color
+                    Text {
+                        Layout.fillWidth: true
+                        text: root.t.availableNetworks
+                        color: Stilus.szovegHalvany
+                        font.family: Stilus.font
+                        font.pixelSize: 12
+                        font.weight: Font.Medium
+                        font.letterSpacing: 1
+                        font.capitalization: Font.AllUppercase
                     }
 
-                    RowLayout {
-                        anchors.fill: parent
-                        anchors.leftMargin: 12
-                        anchors.rightMargin: 8
+                    SzovegLink {
+                        text: root.t.refresh
+                        onKattint: nm.scan()
+                    }
+                }
 
-                        Label {
-                            text: WifiModule.Translations.availableNetworks
-                            color: WifiModule.Style.textColor
-                            font.pixelSize: WifiModule.Style.fontSizeSmall
-                            font.bold: true
-                        }
+                Rectangle {
+                    Layout.fillWidth: true
+                    Layout.fillHeight: true
+                    color: Stilus.felulet
+                    border.width: 1
+                    border.color: Stilus.keret
 
-                        Item { Layout.fillWidth: true }
+                    ListView {
+                        id: lista
+                        anchors.fill: parent
+                        anchors.margins: 1
+                        clip: true
+                        model: nm.accessPoints
+                        boundsBehavior: Flickable.StopAtBounds
+                        ScrollBar.vertical: Gorgeto {}
 
-                        Button {
-                            text: WifiModule.Translations.refresh
-                            Layout.preferredHeight: 32
-                            onClicked: nm.scan()
+                        delegate: Rectangle {
+                            id: sor
+                            readonly property bool kijelolt: !root.rejtett && root.kivalasztott !== null && root.kivalasztott.ssid === modelData.ssid
+                            width: lista.width
+                            height: 48
+                            color: kijelolt ? Stilus.aktiv : (sorHover.hovered ? Stilus.aktiv : "transparent")
 
-                            background: Rectangle {
-                                color: parent.hovered ? WifiModule.Style.buttonSecondaryHoverColor : WifiModule.Style.buttonSecondaryColor
-                                radius: 4
+                            Rectangle {
+                                anchors.left: parent.left
+                                anchors.right: parent.right
+                                anchors.bottom: parent.bottom
+                                height: 1
+                                color: Stilus.aktiv
                             }
 
-                            contentItem: Label {
-                                text: parent.text
-                                color: WifiModule.Style.textColor
-                                font.pixelSize: WifiModule.Style.fontSizeSmall
-                                horizontalAlignment: Text.AlignHCenter
-                                verticalAlignment: Text.AlignVCenter
+                            Rectangle {
+                                visible: sor.kijelolt
+                                anchors.left: parent.left
+                                anchors.top: parent.top
+                                anchors.bottom: parent.bottom
+                                width: 2
+                                color: Stilus.zold
                             }
-                        }
-                    }
-                }
 
-                // WiFi list
-                ListView {
-                    id: networkList
-                    Layout.fillWidth: true
-                    Layout.fillHeight: true
-                    clip: true
-                    model: nm.networks
+                            RowLayout {
+                                anchors.fill: parent
+                                anchors.leftMargin: 14
+                                anchors.rightMargin: 14
+                                spacing: 12
 
-                    delegate: Rectangle {
-                        width: networkList.width
-                        height: WifiModule.Style.listItemHeight
-                        color: modelData === selectedSsid ? WifiModule.Style.itemSelectedColor :
-                               (mouseArea.containsMouse ? WifiModule.Style.itemHoverColor : "transparent")
+                                Row {
+                                    Layout.alignment: Qt.AlignVCenter
+                                    spacing: 2
+                                    height: 14
 
-                        RowLayout {
-                            anchors.fill: parent
-                            anchors.leftMargin: 16
-                            anchors.rightMargin: 16
-                            spacing: 12
+                                    Repeater {
+                                        model: 4
+                                        Rectangle {
+                                            anchors.bottom: parent.bottom
+                                            width: 3
+                                            height: 4 + index * 3.3
+                                            color: index < root.savok(modelData.strength)
+                                                ? (sor.kijelolt ? Stilus.zold : Stilus.szoveg)
+                                                : Stilus.keretErosebb
+                                        }
+                                    }
+                                }
 
-                            Label {
-                                text: ""
-                                font.pixelSize: 18
-                            }
+                                Text {
+                                    Layout.fillWidth: true
+                                    text: modelData.ssid
+                                    elide: Text.ElideRight
+                                    color: Stilus.szoveg
+                                    font.family: Stilus.font
+                                    font.pixelSize: 14
+                                    font.weight: sor.kijelolt ? Font.DemiBold : Font.Normal
+                                }
 
-                            Label {
-                                text: modelData
-                                color: WifiModule.Style.textColor
-                                font.pixelSize: WifiModule.Style.fontSizeNormal
-                                Layout.fillWidth: true
-                                elide: Text.ElideRight
-                            }
+                                Canvas {
+                                    visible: modelData.secured
+                                    Layout.preferredWidth: 14
+                                    Layout.preferredHeight: 14
+                                    Accessible.name: root.t.secured
+                                    onPaint: {
+                                        var c = getContext("2d")
+                                        c.reset()
+                                        c.strokeStyle = Stilus.szovegHalvany
+                                        c.lineWidth = 1.5
+                                        c.strokeRect(3, 6.5, 8, 6)
+                                        c.beginPath()
+                                        c.moveTo(4.5, 6.5)
+                                        c.lineTo(4.5, 4.5)
+                                        c.arc(7, 4.5, 2.5, Math.PI, 0)
+                                        c.lineTo(9.5, 6.5)
+                                        c.stroke()
+                                    }
+                                }
 
-                            Label {
-                                text: modelData === selectedSsid ? "✓" : ""
-                                color: WifiModule.Style.successCheckColor
-                                font.pixelSize: 16
-                                font.bold: true
+                                Text {
+                                    Layout.preferredWidth: 52
+                                    horizontalAlignment: Text.AlignRight
+                                    text: modelData.band
+                                    color: Stilus.szovegHalvany
+                                    font.family: Stilus.mono
+                                    font.pixelSize: 11
+                                }
                             }
-                        }
 
-                        MouseArea {
-                            id: mouseArea
-                            anchors.fill: parent
-                            hoverEnabled: true
-                            onClicked: {
-                                selectedSsid = modelData
-                                showHiddenNetwork = false
-                                ssidField.text = modelData
+                            HoverHandler { id: sorHover }
+
+                            TapHandler {
+                                onTapped: {
+                                    root.rejtett = false
+                                    root.sikertelen = false
+                                    root.kivalasztott = modelData
+                                    jelszoMezo.text = ""
+                                }
                             }
                         }
 
-                        Rectangle {
-                            anchors.bottom: parent.bottom
-                            anchors.left: parent.left
-                            anchors.right: parent.right
-                            anchors.leftMargin: 16
-                            anchors.rightMargin: 16
-                            height: 1
-                            color: WifiModule.Style.separatorColor
+                        Text {
+                            anchors.centerIn: parent
+                            width: parent.width - 40
+                            visible: lista.count === 0
+                            text: root.t.noNetworks
+                            horizontalAlignment: Text.AlignHCenter
+                            wrapMode: Text.WordWrap
+                            color: Stilus.szovegHalvany
+                            font.family: Stilus.font
+                            font.pixelSize: 13
                         }
                     }
-
-                    Label {
-                        anchors.centerIn: parent
-                        text: WifiModule.Translations.noNetworks
-                        color: WifiModule.Style.textMutedColor
-                        font.pixelSize: WifiModule.Style.fontSizeSmall
-                        horizontalAlignment: Text.AlignHCenter
-                        visible: nm.networks.length === 0
-                    }
                 }
-            }
-        }
 
-        // Hidden network toggle
-        Rectangle {
-            Layout.fillWidth: true
-            height: WifiModule.Style.inputHeight
-            color: "#3d7839"
-            radius: WifiModule.Style.borderRadius
-
-            MouseArea {
-                anchors.fill: parent
-                onClicked: {
-                    showHiddenNetwork = !showHiddenNetwork
-                    if (showHiddenNetwork) {
-                        selectedSsid = ""
-                        ssidField.text = ""
-                        ssidField.focus = true
+                SzovegLink {
+                    text: root.t.hiddenNetwork
+                    onKattint: {
+                        root.rejtett = true
+                        root.kivalasztott = null
+                        root.sikertelen = false
                     }
                 }
             }
 
-            RowLayout {
-                anchors.fill: parent
-                anchors.leftMargin: 16
-                anchors.rightMargin: 16
-
-                Label {
-                    text: WifiModule.Translations.hiddenNetwork
-                    color: WifiModule.Style.textColor
-                    font.pixelSize: WifiModule.Style.fontSizeNormal
-                }
-
-                Item { Layout.fillWidth: true }
+            Rectangle {
+                Layout.preferredWidth: 300
+                Layout.alignment: Qt.AlignTop
+                implicitHeight: panel.implicitHeight + 36
+                color: Stilus.felulet
+                border.width: 1
+                border.color: Stilus.keret
 
-                Rectangle {
-                    width: 44
-                    height: 24
-                    radius: 12
-                    color: showHiddenNetwork ? WifiModule.Style.toggleOnColor : WifiModule.Style.toggleOffColor
+                ColumnLayout {
+                    id: panel
+                    x: 18
+                    y: 18
+                    width: parent.width - 36
+                    spacing: 14
 
-                    Rectangle {
-                        width: 20
-                        height: 20
-                        radius: 10
-                        color: WifiModule.Style.textColor
-                        x: showHiddenNetwork ? 22 : 2
-                        anchors.verticalCenter: parent.verticalCenter
+                    Text {
+                        text: root.t.selected
+                        color: Stilus.szovegHalvany
+                        font.family: Stilus.font
+                        font.pixelSize: 12
+                        font.letterSpacing: 1
+                        font.capitalization: Font.AllUppercase
+                    }
 
-                        Behavior on x {
-                            NumberAnimation { duration: 150 }
-                        }
+                    Text {
+                        visible: !root.rejtett
+                        Layout.fillWidth: true
+                        text: root.kivalasztott ? root.kivalasztott.ssid : root.t.noSelection
+                        elide: Text.ElideRight
+                        color: root.kivalasztott ? Stilus.szoveg : Stilus.szovegHalvany
+                        font.family: Stilus.font
+                        font.pixelSize: root.kivalasztott ? 16 : 13
+                        font.weight: root.kivalasztott ? Font.DemiBold : Font.Normal
                     }
-                }
-            }
-        }
 
-        // SSID field (for hidden networks)
-        TextField {
-            id: ssidField
-            Layout.fillWidth: true
-            placeholderText: WifiModule.Translations.ssidPlaceholder
-            visible: showHiddenNetwork
-            color: WifiModule.Style.textColor
-            placeholderTextColor: WifiModule.Style.inputPlaceholderColor
-            font.pixelSize: WifiModule.Style.fontSizeNormal
+                    ColumnLayout {
+                        visible: root.rejtett
+                        Layout.fillWidth: true
+                        spacing: 6
 
-            background: Rectangle {
-                color: WifiModule.Style.inputBackgroundColor
-                radius: WifiModule.Style.borderRadius
-                border.color: ssidField.focus ? WifiModule.Style.inputFocusBorderColor : WifiModule.Style.inputBorderColor
-                border.width: 1
-            }
-        }
+                        Text {
+                            text: root.t.ssidLabel
+                            color: Stilus.szovegHalvany
+                            font.family: Stilus.font
+                            font.pixelSize: 12
+                        }
 
-        // Password field with show/hide toggle
-        Item {
-            Layout.fillWidth: true
-            Layout.preferredHeight: WifiModule.Style.inputHeight
+                        TextField {
+                            id: ssidMezo
+                            Layout.fillWidth: true
+                            implicitHeight: 44
+                            leftPadding: 12
+                            color: Stilus.szoveg
+                            font.family: Stilus.font
+                            font.pixelSize: 14
+                            background: Rectangle {
+                                color: Stilus.hatter
+                                border.width: 1
+                                border.color: ssidMezo.activeFocus ? Stilus.zold : Stilus.keretErosebb
+                            }
+                        }
+                    }
 
-            TextField {
-                id: passField
-                anchors.fill: parent
-                rightPadding: showPasswordButton.width + 16
-                placeholderText: WifiModule.Translations.passwordPlaceholder
-                echoMode: showPassword ? TextInput.Normal : TextInput.Password
-                color: WifiModule.Style.textColor
-                placeholderTextColor: WifiModule.Style.inputPlaceholderColor
-                font.pixelSize: WifiModule.Style.fontSizeNormal
-                enabled: selectedSsid !== "" || showHiddenNetwork
-                opacity: 1
+                    ColumnLayout {
+                        visible: root.jelszoKell
+                        Layout.fillWidth: true
+                        spacing: 6
 
-                background: Rectangle {
-                    color: passField.enabled ? WifiModule.Style.inputBackgroundColor : WifiModule.Style.inputDisabledColor
-                    radius: WifiModule.Style.borderRadius
-                    border.color: passField.focus ? WifiModule.Style.inputFocusBorderColor : WifiModule.Style.inputBorderColor
-                    border.width: 1
-                }
-            }
+                        Text {
+                            text: root.t.password
+                            color: Stilus.szovegHalvany
+                            font.family: Stilus.font
+                            font.pixelSize: 12
+                        }
 
-            Button {
-                id: showPasswordButton
-                anchors.right: parent.right
-                anchors.rightMargin: 8
-                anchors.verticalCenter: parent.verticalCenter
-                height: 32
-                text: showPassword ? WifiModule.Translations.hidePassword : WifiModule.Translations.showPassword
-                enabled: passField.enabled
-                onClicked: showPassword = !showPassword
+                        JelszoMezo {
+                            id: jelszoMezo
+                            Layout.fillWidth: true
+                            reveal: root.jelszoLatszik
+                            revealName: root.t.showPassword
+                            onRevealClicked: root.jelszoLatszik = !root.jelszoLatszik
+                            onAccepted: csatlakozGomb.clicked()
+                        }
+                    }
 
-                background: Rectangle {
-                    color: parent.hovered ? WifiModule.Style.buttonSecondaryHoverColor : WifiModule.Style.buttonSecondaryColor
-                    radius: 4
-                }
+                    Button {
+                        id: csatlakozGomb
+                        Layout.fillWidth: true
+                        implicitHeight: 44
+                        text: root.t.connect
+                        enabled: root.ssid !== "" && (!root.jelszoKell || jelszoMezo.text !== "") && !root.csatlakozik
+                        onClicked: {
+                            if (!enabled)
+                                return
+                            root.sikertelen = false
+                            root.csatlakozik = true
+                            nm.connectTo(root.ssid, root.jelszoKell ? jelszoMezo.text : "")
+                        }
+                        background: Rectangle {
+                            color: !csatlakozGomb.enabled ? "transparent" : (csatlakozGomb.hovered ? Stilus.zoldHover : Stilus.zold)
+                            border.width: csatlakozGomb.enabled ? 0 : 1
+                            border.color: Stilus.keret
+                        }
+                        contentItem: Text {
+                            text: csatlakozGomb.text
+                            color: csatlakozGomb.enabled ? Stilus.zoldonSzoveg : Stilus.szovegHalvany
+                            font.family: Stilus.font
+                            font.pixelSize: 14
+                            font.weight: Font.DemiBold
+                            horizontalAlignment: Text.AlignHCenter
+                            verticalAlignment: Text.AlignVCenter
+                        }
+                    }
 
-                contentItem: Label {
-                    text: parent.text
-                    color: parent.enabled ? WifiModule.Style.textColor : WifiModule.Style.textDisabledColor
-                    font.pixelSize: WifiModule.Style.fontSizeSmall
-                    horizontalAlignment: Text.AlignHCenter
-                    verticalAlignment: Text.AlignVCenter
+                    Text {
+                        Layout.fillWidth: true
+                        text: root.t.statusLabel + ": " + root.allapotSzoveg()
+                        wrapMode: Text.WordWrap
+                        color: nm.connected ? Stilus.zold : (root.sikertelen ? Stilus.sarga : Stilus.szovegHalvany)
+                        font.family: Stilus.mono
+                        font.pixelSize: 12
+                    }
                 }
             }
         }
-
-        // Connect button
-        Button {
-            Layout.fillWidth: true
-            Layout.preferredHeight: WifiModule.Style.buttonHeight
-            text: WifiModule.Translations.connect
-            enabled: (selectedSsid !== "" || (showHiddenNetwork && ssidField.text !== "")) &&
-                     passField.text !== "" && !isConnecting && !nm.connected
-
-            onClicked: {
-                isConnecting = true
-                var ssid = showHiddenNetwork ? ssidField.text : selectedSsid
-                nm.connectTo(ssid, passField.text)
-            }
-
-            background: Rectangle {
-                color: parent.enabled ? (parent.hovered ? WifiModule.Style.buttonPrimaryHoverColor : WifiModule.Style.buttonPrimaryColor) : WifiModule.Style.buttonDisabledColor
-                radius: WifiModule.Style.borderRadius
-            }
-
-            contentItem: Label {
-                text: parent.text
-                color: parent.enabled ? WifiModule.Style.textColor : WifiModule.Style.textDisabledColor
-                font.pixelSize: 15
-                font.bold: true
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
-            }
-        }
-
-        // Skip info
-        Label {
-            text: nm.connected ?
-                  WifiModule.Translations.clickNextToContinue :
-                  WifiModule.Translations.canSkipWithEthernet
-            color: WifiModule.Style.textMutedColor
-            font.pixelSize: WifiModule.Style.fontSizeTiny
-            Layout.alignment: Qt.AlignHCenter
-            horizontalAlignment: Text.AlignHCenter
-        }
-    }
-
-    // Connection state change handler
-    Connections {
-        target: nm
-        function onConnectionChanged() {
-            if (nm.connected) {
-                isConnecting = false
-            }
-        }
-        function onConnectionFailed(error) {
-            isConnecting = false
-            console.log("Connection failed: " + error)
-        }
-    }
-
-    // Timer to reset connecting state if it takes too long
-    Timer {
-        id: connectTimeout
-        interval: 30000
-        running: isConnecting
-        onTriggered: {
-            if (!nm.connected) {
-                isConnecting = false
-            }
-        }
     }
-}
\ No newline at end of file
+}