Merge pull request #3365 from cold-brewed/network-driver-update

Update network drivers to provide error message
2023-05-23 21:13:16 +02:00
parent 152c66e398 ef34e81cd1
commit 255bd3cb20
51 changed files with 230 additions and 34 deletions
--- a/src/qt/languages/cs-CZ.po
+++ b/src/qt/languages/cs-CZ.po
@@ -1219,3 +1219,9 @@ msgstr "2% pod dokonalými ot./m"
 msgid "(System Default)"
 msgstr "(Výchozí nastavení systému)"

+msgid "Failed to initialize network driver"
+msgstr "Failed to initialize network driver"
+
+msgid "The network configuration will be switched to the null driver"
+msgstr "The network configuration will be switched to the null driver"
+
--- a/src/qt/languages/de-DE.po
+++ b/src/qt/languages/de-DE.po
@@ -1219,3 +1219,9 @@ msgstr "2% unterhalb der perfekten Drehzahl"
 msgid "(System Default)"
 msgstr "(Systemstandard)"

+msgid "Failed to initialize network driver"
+msgstr "Failed to initialize network driver"
+
+msgid "The network configuration will be switched to the null driver"
+msgstr "The network configuration will be switched to the null driver"
+
--- a/src/qt/languages/en-GB.po
+++ b/src/qt/languages/en-GB.po
@@ -1219,3 +1219,9 @@ msgstr "2% below perfect RPM"
 msgid "(System Default)"
 msgstr "(System Default)"

+msgid "Failed to initialize network driver"
+msgstr "Failed to initialize network driver"
+
+msgid "The network configuration will be switched to the null driver"
+msgstr "The network configuration will be switched to the null driver"
+
--- a/src/qt/languages/en-US.po
+++ b/src/qt/languages/en-US.po
@@ -1219,3 +1219,9 @@ msgstr "2% below perfect RPM"
 msgid "(System Default)"
 msgstr "(System Default)"

+msgid "Failed to initialize network driver"
+msgstr "Failed to initialize network driver"
+
+msgid "The network configuration will be switched to the null driver"
+msgstr "The network configuration will be switched to the null driver"
+
--- a/src/qt/languages/es-ES.po
+++ b/src/qt/languages/es-ES.po
@@ -1219,3 +1219,9 @@ msgstr "2% por debajo de RPM perfectas"
 msgid "(System Default)"
 msgstr "(Por defecto del sistema)"

+msgid "Failed to initialize network driver"
+msgstr "Failed to initialize network driver"
+
+msgid "The network configuration will be switched to the null driver"
+msgstr "The network configuration will be switched to the null driver"
+
--- a/src/qt/languages/fi-FI.po
+++ b/src/qt/languages/fi-FI.po
@@ -1219,3 +1219,10 @@ msgstr "2% alle täydellisen RPM:n"
 msgid "(System Default)"
 msgstr "(Järjestelmän oletus)"

+msgid "Failed to initialize network driver"
+msgstr "Failed to initialize network driver"
+
+msgid "The network configuration will be switched to the null driver"
+msgstr "The network configuration will be switched to the null driver"
+
+
--- a/src/qt/languages/fr-FR.po
+++ b/src/qt/languages/fr-FR.po
@@ -1219,3 +1219,9 @@ msgstr "Précision RPM de moins 2%"
 msgid "(System Default)"
 msgstr "(Défaut du système)"

+msgid "Failed to initialize network driver"
+msgstr "Failed to initialize network driver"
+
+msgid "The network configuration will be switched to the null driver"
+msgstr "The network configuration will be switched to the null driver"
+
--- a/src/qt/languages/hr-HR.po
+++ b/src/qt/languages/hr-HR.po
@@ -1219,3 +1219,9 @@ msgstr "2% ispod savršenog broja okretaja"
 msgid "(System Default)"
 msgstr "(Zadana postavka operativnog sustava)"

+msgid "Failed to initialize network driver"
+msgstr "Failed to initialize network driver"
+
+msgid "The network configuration will be switched to the null driver"
+msgstr "The network configuration will be switched to the null driver"
+
--- a/src/qt/languages/hu-HU.po
+++ b/src/qt/languages/hu-HU.po
@@ -1219,3 +1219,9 @@ msgstr "2%-kal a tökéletes RPM alatt"
 msgid "(System Default)"
 msgstr "(A rendszer nyelve)"

+msgid "Failed to initialize network driver"
+msgstr "Failed to initialize network driver"
+
+msgid "The network configuration will be switched to the null driver"
+msgstr "The network configuration will be switched to the null driver"
+
--- a/src/qt/languages/it-IT.po
+++ b/src/qt/languages/it-IT.po
@@ -1219,3 +1219,9 @@ msgstr "RPM 2% sotto perfezione"
 msgid "(System Default)"
 msgstr "(Predefinito del sistema)"

+msgid "Failed to initialize network driver"
+msgstr "Failed to initialize network driver"
+
+msgid "The network configuration will be switched to the null driver"
+msgstr "The network configuration will be switched to the null driver"
+
--- a/src/qt/languages/ja-JP.po
+++ b/src/qt/languages/ja-JP.po
@@ -1219,3 +1219,9 @@ msgstr "2%低い回転数"
 msgid "(System Default)"
 msgstr "(システム既定値)"

+msgid "Failed to initialize network driver"
+msgstr "Failed to initialize network driver"
+
+msgid "The network configuration will be switched to the null driver"
+msgstr "The network configuration will be switched to the null driver"
+
--- a/src/qt/languages/ko-KR.po
+++ b/src/qt/languages/ko-KR.po
@@ -1219,3 +1219,9 @@ msgstr "2% 낮은 회전수"
 msgid "(System Default)"
 msgstr "(시스템 기본값)"

+msgid "Failed to initialize network driver"
+msgstr "Failed to initialize network driver"
+
+msgid "The network configuration will be switched to the null driver"
+msgstr "The network configuration will be switched to the null driver"
+
--- a/src/qt/languages/pl-PL.po
+++ b/src/qt/languages/pl-PL.po
@@ -1219,3 +1219,9 @@ msgstr "2% poniżej idealnych obrotów"
 msgid "(System Default)"
 msgstr "(Domyślne ustawienie systemowe)"

+msgid "Failed to initialize network driver"
+msgstr "Failed to initialize network driver"
+
+msgid "The network configuration will be switched to the null driver"
+msgstr "The network configuration will be switched to the null driver"
+
--- a/src/qt/languages/pt-BR.po
+++ b/src/qt/languages/pt-BR.po
@@ -1219,3 +1219,9 @@ msgstr "2% abaixo das RPM perfeita"
 msgid "(System Default)"
 msgstr "(Padrão do sistema)"

+msgid "Failed to initialize network driver"
+msgstr "Failed to initialize network driver"
+
+msgid "The network configuration will be switched to the null driver"
+msgstr "The network configuration will be switched to the null driver"
+
--- a/src/qt/languages/pt-PT.po
+++ b/src/qt/languages/pt-PT.po
@@ -1219,3 +1219,9 @@ msgstr "RPM 2% abaixo do RPM perfeito"
 msgid "(System Default)"
 msgstr "(Padrão do sistema)"

+msgid "Failed to initialize network driver"
+msgstr "Failed to initialize network driver"
+
+msgid "The network configuration will be switched to the null driver"
+msgstr "The network configuration will be switched to the null driver"
+
--- a/src/qt/languages/ru-RU.po
+++ b/src/qt/languages/ru-RU.po
@@ -1219,3 +1219,9 @@ msgstr "На 2% медленнее точного RPM"
 msgid "(System Default)"
 msgstr "(Системный)"

+msgid "Failed to initialize network driver"
+msgstr "Failed to initialize network driver"
+
+msgid "The network configuration will be switched to the null driver"
+msgstr "The network configuration will be switched to the null driver"
+
--- a/src/qt/languages/sl-SI.po
+++ b/src/qt/languages/sl-SI.po
@@ -1219,3 +1219,9 @@ msgstr "2% pod popolnimi obrati"
 msgid "(System Default)"
 msgstr "(Sistemsko privzeto)"

+msgid "Failed to initialize network driver"
+msgstr "Failed to initialize network driver"
+
+msgid "The network configuration will be switched to the null driver"
+msgstr "The network configuration will be switched to the null driver"
+
--- a/src/qt/languages/tr-TR.po
+++ b/src/qt/languages/tr-TR.po
@@ -1219,3 +1219,9 @@ msgstr "mükemmel RPM değerinin 2% altı"
 msgid "(System Default)"
 msgstr "(Sistem Varsayılanı)"

+msgid "Failed to initialize network driver"
+msgstr "Failed to initialize network driver"
+
+msgid "The network configuration will be switched to the null driver"
+msgstr "The network configuration will be switched to the null driver"
+
--- a/src/qt/languages/uk-UA.po
+++ b/src/qt/languages/uk-UA.po
@@ -1219,3 +1219,9 @@ msgstr "На 2% повільніше точного RPM"
 msgid "(System Default)"
 msgstr "(Системний)"

+msgid "Failed to initialize network driver"
+msgstr "Failed to initialize network driver"
+
+msgid "The network configuration will be switched to the null driver"
+msgstr "The network configuration will be switched to the null driver"
+
--- a/src/qt/languages/zh-CN.po
+++ b/src/qt/languages/zh-CN.po
@@ -1219,3 +1219,9 @@ msgstr "低于标准转速的 2%"
 msgid "(System Default)"
 msgstr "(系统默认)"

+msgid "Failed to initialize network driver"
+msgstr "Failed to initialize network driver"
+
+msgid "The network configuration will be switched to the null driver"
+msgstr "The network configuration will be switched to the null driver"
+
--- a/src/qt/languages/zh-TW.po
+++ b/src/qt/languages/zh-TW.po
@@ -1218,3 +1218,10 @@ msgstr "低於標準轉速的 2%"

 msgid "(System Default)"
 msgstr "(系統預設)"
+
+msgid "Failed to initialize network driver"
+msgstr "Failed to initialize network driver"
+
+msgid "The network configuration will be switched to the null driver"
+msgstr "The network configuration will be switched to the null driver"
+
--- a/src/qt/qt_platform.cpp
+++ b/src/qt/qt_platform.cpp
@@ -602,6 +602,8 @@ ProgSettings::reloadStrings()
    translatedstrings[IDS_2143] = QCoreApplication::translate("", "Monitor in sleep mode").toStdWString();
    translatedstrings[IDS_2121] = QCoreApplication::translate("", "No ROMs found").toStdWString();
    translatedstrings[IDS_2056] = QCoreApplication::translate("", "86Box could not find any usable ROM images.\n\nPlease <a href=\"https://github.com/86Box/roms/releases/latest\">download</a> a ROM set and extract it into the \"roms\" directory.").toStdWString();
+    translatedstrings[IDS_2167] = QCoreApplication::translate("", "Failed to initialize network driver").toStdWString();
+    translatedstrings[IDS_2168] = QCoreApplication::translate("", "The network configuration will be switched to the null driver").toStdWString();

    auto flsynthstr = QCoreApplication::translate("", " is required for FluidSynth MIDI output.");
    if (flsynthstr.contains("libfluidsynth")) {
--- a/src/qt/qt_settingsnetwork.cpp
+++ b/src/qt/qt_settingsnetwork.cpp
@@ -90,8 +90,7 @@ SettingsNetwork::save()
        if (net_cards_conf[i].net_type == NET_TYPE_PCAP) {
            strncpy(net_cards_conf[i].host_dev_name, network_devs[cbox->currentData().toInt()].device, sizeof(net_cards_conf[i].host_dev_name) - 1);
        } else if (net_cards_conf[i].net_type == NET_TYPE_VDE) {
-            const char *str_socket = socket_line->text().toStdString().c_str();
-            strncpy(net_cards_conf[i].host_dev_name, str_socket, strlen(str_socket));
+            strncpy(net_cards_conf[i].host_dev_name, socket_line->text().toUtf8().constData(), sizeof(net_cards_conf[i].host_dev_name));
        }
    }
 }