diff --git a/src/86box.c b/src/86box.c
index 0b5a26131..d242b40b9 100644
--- a/src/86box.c
+++ b/src/86box.c
@@ -230,6 +230,7 @@ int other_scsi_present = 0; /* SCSI contro
int is_pcjr = 0; /* The current machine is PCjr. */
int portable_mode = 0; /* We are running in portable mode
(global dirs = exe path) */
+int global_cfg_overridden = 0; /* Global config file was overriden on command line */
int monitor_edid = 0; /* (C) Which EDID to use. 0=default, 1=custom. */
char monitor_edid_path[1024] = { 0 }; /* (C) Path to custom EDID */
@@ -852,6 +853,7 @@ usage:
if ((c + 1) == argc || plat_dir_check(argv[c + 1]))
goto usage;
+ global_cfg_overridden = 1;
global = argv[++c];
} else if (!strcasecmp(argv[c], "--image") || !strcasecmp(argv[c], "-I")) {
if ((c + 1) == argc)
diff --git a/src/include/86box/86box.h b/src/include/86box/86box.h
index ce39652bc..33749d440 100644
--- a/src/include/86box/86box.h
+++ b/src/include/86box/86box.h
@@ -202,6 +202,7 @@ extern char vmm_path[1024]; /* VM Manager path to scan */
extern int start_vmm; /* the current execution will start the manager */
extern int portable_mode; /* we are running in portable mode
(global dirs = exe path) */
+extern int global_cfg_overridden; /* global config file was overriden on command line */
extern int monitor_edid; /* (C) Which EDID to use. 0=default, 1=custom. */
extern char monitor_edid_path[1024]; /* (C) Path to custom EDID */
diff --git a/src/qt/languages/86box.pot b/src/qt/languages/86box.pot
index df6f01f3c..41b84f5b0 100644
--- a/src/qt/languages/86box.pot
+++ b/src/qt/languages/86box.pot
@@ -15,7 +15,7 @@ msgstr ""
msgid "&Right CTRL is left ALT"
msgstr ""
-msgid "&Hard Reset..."
+msgid "&Hard reset"
msgstr ""
msgid "&Ctrl+Alt+Del"
@@ -51,6 +51,9 @@ msgstr ""
msgid "R&emember size && position"
msgstr ""
+msgid "Remember size && position"
+msgstr ""
+
msgid "Re&nderer"
msgstr ""
@@ -1074,6 +1077,12 @@ msgstr ""
msgid "Start"
msgstr ""
+msgid "&Force shutdown"
+msgstr ""
+
+msgid "&Start"
+msgstr ""
+
msgid "Not running"
msgstr ""
diff --git a/src/qt/languages/cs-CZ.po b/src/qt/languages/cs-CZ.po
index 6cef7611c..9e74cdef9 100644
--- a/src/qt/languages/cs-CZ.po
+++ b/src/qt/languages/cs-CZ.po
@@ -15,7 +15,7 @@ msgstr "&Klávesnice vyžaduje záběr myši"
msgid "&Right CTRL is left ALT"
msgstr "&Pravý Ctrl je levý Alt"
-msgid "&Hard Reset..."
+msgid "&Hard reset"
msgstr "&Resetovat"
msgid "&Ctrl+Alt+Del"
@@ -51,6 +51,9 @@ msgstr "&Měnitelná velikost okna"
msgid "R&emember size && position"
msgstr "&Pamatovat velikost a pozici"
+msgid "Remember size && position"
+msgstr "Pamatovat velikost a pozici"
+
msgid "Re&nderer"
msgstr "&Renderer"
@@ -1074,6 +1077,12 @@ msgstr "Vynutit vypnutí"
msgid "Start"
msgstr "Spustit"
+msgid "&Force shutdown"
+msgstr "&Vynutit vypnutí"
+
+msgid "&Start"
+msgstr "&Spustit"
+
msgid "Not running"
msgstr "Neběží"
diff --git a/src/qt/languages/de-DE.po b/src/qt/languages/de-DE.po
index 3b92f7ec3..4984af9fd 100644
--- a/src/qt/languages/de-DE.po
+++ b/src/qt/languages/de-DE.po
@@ -15,8 +15,8 @@ msgstr "&Tastatur benötigt das Einfangen des Mauszeigers"
msgid "&Right CTRL is left ALT"
msgstr "&Die rechte Strg-Taste ist die linke Alt-Taste"
-msgid "&Hard Reset..."
-msgstr "&Kaltstart..."
+msgid "&Hard reset"
+msgstr "&Kaltstart"
msgid "&Ctrl+Alt+Del"
msgstr "&Strg+Alt+Entf"
@@ -51,6 +51,9 @@ msgstr "G&rößenverstellbares Fenster"
msgid "R&emember size && position"
msgstr "Größe && &Position merken"
+msgid "Remember size && position"
+msgstr "Größe && Position merken"
+
msgid "Re&nderer"
msgstr "Re&nderer"
@@ -1074,6 +1077,12 @@ msgstr "Abschaltung erzwingen"
msgid "Start"
msgstr "Einschalten"
+msgid "&Force shutdown"
+msgstr "&Abschaltung erzwingen"
+
+msgid "&Start"
+msgstr "&Einschalten"
+
msgid "Not running"
msgstr "Läuft nicht"
diff --git a/src/qt/languages/es-ES.po b/src/qt/languages/es-ES.po
index 46bd759fe..5516b7b6d 100644
--- a/src/qt/languages/es-ES.po
+++ b/src/qt/languages/es-ES.po
@@ -15,8 +15,8 @@ msgstr "&Teclado requiere captura"
msgid "&Right CTRL is left ALT"
msgstr "CTRL &derecho es ALT izquierdo"
-msgid "&Hard Reset..."
-msgstr "&Hard Reset..."
+msgid "&Hard reset"
+msgstr "&Hard reset"
msgid "&Ctrl+Alt+Del"
msgstr "&Ctrl+Alt+Del"
@@ -51,6 +51,9 @@ msgstr "Ven&tana redimensionable"
msgid "R&emember size && position"
msgstr "&Recordar tamaño y posición"
+msgid "Remember size && position"
+msgstr "Recordar tamaño y posición"
+
msgid "Re&nderer"
msgstr "Re&nderizador"
@@ -1074,6 +1077,12 @@ msgstr "Apagqar forzadamente"
msgid "Start"
msgstr "Iniciar"
+msgid "&Force shutdown"
+msgstr "&Apagqar forzadamente"
+
+msgid "&Start"
+msgstr "&Iniciar"
+
msgid "Not running"
msgstr "No en ejecución"
diff --git a/src/qt/languages/fi-FI.po b/src/qt/languages/fi-FI.po
index 11e1c795f..996762a2d 100644
--- a/src/qt/languages/fi-FI.po
+++ b/src/qt/languages/fi-FI.po
@@ -15,8 +15,8 @@ msgstr "&Vaadi näppäimistön kaappaus"
msgid "&Right CTRL is left ALT"
msgstr "&Oikea CTRL on vasen ALT"
-msgid "&Hard Reset..."
-msgstr "&Uudelleenkäynnistys (kylmä)..."
+msgid "&Hard reset"
+msgstr "&Uudelleenkäynnistys (kylmä)"
msgid "&Ctrl+Alt+Del"
msgstr "&Ctrl+Alt+Del"
@@ -51,6 +51,9 @@ msgstr "&Salli koon muuttaminen"
msgid "R&emember size && position"
msgstr "&Muista koko ja sijainti"
+msgid "Remember size && position"
+msgstr "Muista koko ja sijainti"
+
msgid "Re&nderer"
msgstr "&Renderöijä"
@@ -1074,6 +1077,12 @@ msgstr "Pakota sammutus"
msgid "Start"
msgstr "Käynnistä"
+msgid "&Force shutdown"
+msgstr "&Pakota sammutus"
+
+msgid "&Start"
+msgstr "&Käynnistä"
+
msgid "Not running"
msgstr "Ei käynnissä"
diff --git a/src/qt/languages/fr-FR.po b/src/qt/languages/fr-FR.po
index c31b4c8a6..17fdcb1be 100644
--- a/src/qt/languages/fr-FR.po
+++ b/src/qt/languages/fr-FR.po
@@ -15,8 +15,8 @@ msgstr "C&apturer le clavier"
msgid "&Right CTRL is left ALT"
msgstr "CTRL &Droite devient ALT Gauche"
-msgid "&Hard Reset..."
-msgstr "&Hard Reset..."
+msgid "&Hard reset"
+msgstr "&Hard reset"
msgid "&Ctrl+Alt+Del"
msgstr "&Ctrl+Alt+Suppr"
@@ -51,6 +51,9 @@ msgstr "Fenêtre &redimensionnable"
msgid "R&emember size && position"
msgstr "S&auvegarder taille && position"
+msgid "Remember size && position"
+msgstr "Sauvegarder taille && position"
+
msgid "Re&nderer"
msgstr "Moteur de re&ndu vidéo"
@@ -1074,6 +1077,12 @@ msgstr "Arrêt forcé"
msgid "Start"
msgstr "Démarrer"
+msgid "&Force shutdown"
+msgstr "&Arrêt forcé"
+
+msgid "&Start"
+msgstr "&Démarrer"
+
msgid "Not running"
msgstr "Inactive"
diff --git a/src/qt/languages/hr-HR.po b/src/qt/languages/hr-HR.po
index 4f2d8ee93..3a2c239b2 100644
--- a/src/qt/languages/hr-HR.po
+++ b/src/qt/languages/hr-HR.po
@@ -15,8 +15,8 @@ msgstr "&Tipkovnica zahtijeva hvatanje miša"
msgid "&Right CTRL is left ALT"
msgstr "&Desni CTRL je lijevi ALT"
-msgid "&Hard Reset..."
-msgstr "&Ponovno pokretanje..."
+msgid "&Hard reset"
+msgstr "&Ponovno pokretanje"
msgid "&Ctrl+Alt+Del"
msgstr "&Ctrl+Alt+Del"
@@ -51,6 +51,9 @@ msgstr "&Prozor s promjenjivim veličinama"
msgid "R&emember size && position"
msgstr "&Zapamtite veličinu i položaj"
+msgid "Remember size && position"
+msgstr "Zapamtite veličinu i položaj"
+
msgid "Re&nderer"
msgstr "&Renderer"
@@ -1074,6 +1077,12 @@ msgstr "Prisilno isključi"
msgid "Start"
msgstr "Pokreni"
+msgid "&Force shutdown"
+msgstr "Prisilno &isključi"
+
+msgid "&Start"
+msgstr "&Pokreni"
+
msgid "Not running"
msgstr "Se ne pokreće"
diff --git a/src/qt/languages/it-IT.po b/src/qt/languages/it-IT.po
index 4c0a6722a..65c4d83dd 100644
--- a/src/qt/languages/it-IT.po
+++ b/src/qt/languages/it-IT.po
@@ -15,8 +15,8 @@ msgstr "&Tastiera richiede la cattura"
msgid "&Right CTRL is left ALT"
msgstr "CTRL &destro è ALT sinistro"
-msgid "&Hard Reset..."
-msgstr "&Riavvia..."
+msgid "&Hard reset"
+msgstr "&Riavvia"
msgid "&Ctrl+Alt+Del"
msgstr "&Ctrl+Alt+Canc"
@@ -51,6 +51,9 @@ msgstr "&Finestra ridimensionabile"
msgid "R&emember size && position"
msgstr "R&icorda dimensioni e posizione"
+msgid "Remember size && position"
+msgstr "Ricorda dimensioni e posizione"
+
msgid "Re&nderer"
msgstr "Re&nderizzatore"
@@ -1074,6 +1077,12 @@ msgstr "Forza arresto"
msgid "Start"
msgstr "Avvia"
+msgid "&Force shutdown"
+msgstr "&Forza arresto"
+
+msgid "&Start"
+msgstr "&Avvia"
+
msgid "Not running"
msgstr "Inattivo"
diff --git a/src/qt/languages/ja-JP.po b/src/qt/languages/ja-JP.po
index 2fb7da257..5c1973295 100644
--- a/src/qt/languages/ja-JP.po
+++ b/src/qt/languages/ja-JP.po
@@ -15,8 +15,8 @@ msgstr "キーボードはキャプチャが必要(&K)"
msgid "&Right CTRL is left ALT"
msgstr "右CTRLを左ALTへ変換(&R)"
-msgid "&Hard Reset..."
-msgstr "ハード リセット(&H)..."
+msgid "&Hard reset"
+msgstr "ハード リセット(&H)"
msgid "&Ctrl+Alt+Del"
msgstr "Ctrl+Alt+Del(&C)"
@@ -51,6 +51,9 @@ msgstr "ウィンドウのサイズを変更可能(&R)"
msgid "R&emember size && position"
msgstr "ウィンドウのサイズと位置を保存(&E)"
+msgid "Remember size && position"
+msgstr "ウィンドウのサイズと位置を保存"
+
msgid "Re&nderer"
msgstr "レンダラー(&N)"
@@ -1074,6 +1077,12 @@ msgstr "強制終了"
msgid "Start"
msgstr "スタート"
+msgid "&Force shutdown"
+msgstr "強制終了(&F)"
+
+msgid "&Start"
+msgstr "スタート(&S)"
+
msgid "Not running"
msgstr "停止した"
diff --git a/src/qt/languages/ko-KR.po b/src/qt/languages/ko-KR.po
index a9fa55f5b..caa87823a 100644
--- a/src/qt/languages/ko-KR.po
+++ b/src/qt/languages/ko-KR.po
@@ -15,8 +15,8 @@ msgstr "키보드는 캡쳐가 필요함(&K)"
msgid "&Right CTRL is left ALT"
msgstr "우측CTRL로 좌측ALT 입력(&R)"
-msgid "&Hard Reset..."
-msgstr "재시작(&H)..."
+msgid "&Hard reset"
+msgstr "재시작(&H)"
msgid "&Ctrl+Alt+Del"
msgstr "Ctrl+Alt+Del(&C)"
@@ -51,6 +51,9 @@ msgstr "창 크기 조절 가능하게 하기(&R)"
msgid "R&emember size && position"
msgstr "창 크기와 위치를 기억하기(&E)"
+msgid "Remember size && position"
+msgstr "창 크기와 위치를 기억하기"
+
msgid "Re&nderer"
msgstr "렌더러(&N)"
@@ -1074,6 +1077,12 @@ msgstr "강제 종료"
msgid "Start"
msgstr "시작"
+msgid "&Force shutdown"
+msgstr "강제 종료(&F)"
+
+msgid "&Start"
+msgstr "시작(&S)"
+
msgid "Not running"
msgstr "실행 중이 아닙니다"
diff --git a/src/qt/languages/nb-NO.po b/src/qt/languages/nb-NO.po
index 53115d4b1..f883b3fac 100644
--- a/src/qt/languages/nb-NO.po
+++ b/src/qt/languages/nb-NO.po
@@ -15,8 +15,8 @@ msgstr "&Tastatur krever opptak"
msgid "&Right CTRL is left ALT"
msgstr "&Høyre CTRL er venstre ALT"
-msgid "&Hard Reset..."
-msgstr "&Hard tilbakestilling..."
+msgid "&Hard reset"
+msgstr "&Hard tilbakestilling"
msgid "&Ctrl+Alt+Del"
msgstr "&Ctrl+Alt+Del"
@@ -51,6 +51,9 @@ msgstr "&Justerbart vindu"
msgid "R&emember size && position"
msgstr "H&usk størrelse &og plassering"
+msgid "Remember size && position"
+msgstr "Husk størrelse og plassering"
+
msgid "Re&nderer"
msgstr "Re&nderer"
@@ -1074,6 +1077,12 @@ msgstr "Tvangsavslutt"
msgid "Start"
msgstr "Start"
+msgid "&Force shutdown"
+msgstr "&Tvangsavslutt"
+
+msgid "&Start"
+msgstr "&Start"
+
msgid "Not running"
msgstr "Ikke kjørende"
diff --git a/src/qt/languages/nl-NL.po b/src/qt/languages/nl-NL.po
index acc3526ec..763a9192d 100644
--- a/src/qt/languages/nl-NL.po
+++ b/src/qt/languages/nl-NL.po
@@ -15,8 +15,8 @@ msgstr "&Keyboard vereist vastleggen"
msgid "&Right CTRL is left ALT"
msgstr "&Rechtse CTRL is linkse ALT"
-msgid "&Hard Reset..."
-msgstr "&Harde Reset..."
+msgid "&Hard reset"
+msgstr "&Harde reset"
msgid "&Ctrl+Alt+Del"
msgstr "&Ctrl+Alt+Del"
@@ -51,6 +51,9 @@ msgstr "&Venster met aanpasbare grootte"
msgid "R&emember size && position"
msgstr "&Onthoud grootte && positie"
+msgid "Remember size && position"
+msgstr "Onthoud grootte && positie"
+
msgid "Re&nderer"
msgstr "Re&nderer"
@@ -1074,6 +1077,12 @@ msgstr "Forceer afsluiten"
msgid "Start"
msgstr "Start"
+msgid "&Force shutdown"
+msgstr "&Forceer afsluiten"
+
+msgid "&Start"
+msgstr "&Start"
+
msgid "Not running"
msgstr "Niet actied"
diff --git a/src/qt/languages/pl-PL.po b/src/qt/languages/pl-PL.po
index 81bedb546..a46abb6ce 100644
--- a/src/qt/languages/pl-PL.po
+++ b/src/qt/languages/pl-PL.po
@@ -15,8 +15,8 @@ msgstr "&Klawiatura wymaga przechwytu myszy"
msgid "&Right CTRL is left ALT"
msgstr "Prawy C&TRL to lewy ALT"
-msgid "&Hard Reset..."
-msgstr "Twardy &reset..."
+msgid "&Hard reset"
+msgstr "Twardy &reset"
msgid "&Ctrl+Alt+Del"
msgstr "&Ctrl+Alt+Del"
@@ -51,6 +51,9 @@ msgstr "&Okno o zmiennym rozmiarze"
msgid "R&emember size && position"
msgstr "P&amiętaj rozmiar i pozycję"
+msgid "Remember size && position"
+msgstr "Pamiętaj rozmiar i pozycję"
+
msgid "Re&nderer"
msgstr "Re&nderer"
@@ -1074,6 +1077,12 @@ msgstr "Wymuś zamknięcie"
msgid "Start"
msgstr "Uruchom"
+msgid "&Force shutdown"
+msgstr "&Wymuś zamknięcie"
+
+msgid "&Start"
+msgstr "&Uruchom"
+
msgid "Not running"
msgstr "Wyłączona"
diff --git a/src/qt/languages/pt-BR.po b/src/qt/languages/pt-BR.po
index 211d39f16..1a49ace23 100644
--- a/src/qt/languages/pt-BR.po
+++ b/src/qt/languages/pt-BR.po
@@ -15,8 +15,8 @@ msgstr "O &teclado requer captura"
msgid "&Right CTRL is left ALT"
msgstr "CTR&L direito é o ALT esquerdo"
-msgid "&Hard Reset..."
-msgstr "&Reinicialização completa..."
+msgid "&Hard reset"
+msgstr "&Reinicialização completa"
msgid "&Ctrl+Alt+Del"
msgstr "Ctrl+Alt+&Del"
@@ -51,6 +51,9 @@ msgstr "&Janela redimensionável"
msgid "R&emember size && position"
msgstr "&Lembrar tamanho e posição"
+msgid "Remember size && position"
+msgstr "Lembrar tamanho e posição"
+
msgid "Re&nderer"
msgstr "&Renderizador"
@@ -1074,6 +1077,12 @@ msgstr "Forçar desligamento"
msgid "Start"
msgstr "Iniciar"
+msgid "&Force shutdown"
+msgstr "&Forçar desligamento"
+
+msgid "&Start"
+msgstr "&Iniciar"
+
msgid "Not running"
msgstr "Parado"
diff --git a/src/qt/languages/pt-PT.po b/src/qt/languages/pt-PT.po
index bd7894f6e..cdbf065f6 100644
--- a/src/qt/languages/pt-PT.po
+++ b/src/qt/languages/pt-PT.po
@@ -15,8 +15,8 @@ msgstr "&Teclado requere captura"
msgid "&Right CTRL is left ALT"
msgstr "CTRL &direito é ALT esquerdo"
-msgid "&Hard Reset..."
-msgstr "&Reinicialização completa..."
+msgid "&Hard reset"
+msgstr "&Reinicialização completa"
msgid "&Ctrl+Alt+Del"
msgstr "&Ctrl+Alt+Del"
@@ -51,6 +51,9 @@ msgstr "&Janela redimensionável"
msgid "R&emember size && position"
msgstr "&Lembrar tamanho e posição"
+msgid "Remember size && position"
+msgstr "Lembrar tamanho e posição"
+
msgid "Re&nderer"
msgstr "&Renderizador"
@@ -1074,6 +1077,12 @@ msgstr "Desligamento forçado"
msgid "Start"
msgstr "Iniciar"
+msgid "&Force shutdown"
+msgstr "&Desligamento forçado"
+
+msgid "&Start"
+msgstr "&Iniciar"
+
msgid "Not running"
msgstr "Não em execução"
diff --git a/src/qt/languages/ru-RU.po b/src/qt/languages/ru-RU.po
index 6535b6603..20a25371f 100644
--- a/src/qt/languages/ru-RU.po
+++ b/src/qt/languages/ru-RU.po
@@ -15,8 +15,8 @@ msgstr "&Клавиатура требует захвата"
msgid "&Right CTRL is left ALT"
msgstr "&Правый CTRL - это левый ALT"
-msgid "&Hard Reset..."
-msgstr "&Холодная перезагрузка..."
+msgid "&Hard reset"
+msgstr "&Холодная перезагрузка"
msgid "&Ctrl+Alt+Del"
msgstr "&Ctrl+Alt+Del"
@@ -51,6 +51,9 @@ msgstr "&Изменяемый размер окна"
msgid "R&emember size && position"
msgstr "&Запомнить размер и положение"
+msgid "Remember size && position"
+msgstr "Запомнить размер и положение"
+
msgid "Re&nderer"
msgstr "&Рендеринг"
@@ -1074,6 +1077,12 @@ msgstr "Принудительное завершение работы"
msgid "Start"
msgstr "Пуск"
+msgid "&Force shutdown"
+msgstr "Принудительное &завершение работы"
+
+msgid "&Start"
+msgstr "&Пуск"
+
msgid "Not running"
msgstr "Не работает"
diff --git a/src/qt/languages/sk-SK.po b/src/qt/languages/sk-SK.po
index 20f86033c..399bee502 100644
--- a/src/qt/languages/sk-SK.po
+++ b/src/qt/languages/sk-SK.po
@@ -15,7 +15,7 @@ msgstr "&Klávesnica vyžaduje záber"
msgid "&Right CTRL is left ALT"
msgstr "&Pravý Ctrl je ľavý Alt"
-msgid "&Hard Reset..."
+msgid "&Hard reset"
msgstr "&Resetovať"
msgid "&Ctrl+Alt+Del"
@@ -51,6 +51,9 @@ msgstr "&Premenná veľkosť okna"
msgid "R&emember size && position"
msgstr "&Pamätať si veľkosť a polohu"
+msgid "Remember size && position"
+msgstr "Pamätať si veľkosť a polohu"
+
msgid "Re&nderer"
msgstr "&Renderer"
@@ -1074,6 +1077,12 @@ msgstr "Vynútiť vypnutie"
msgid "Start"
msgstr "Spustiť"
+msgid "&Force shutdown"
+msgstr "&Vynútiť vypnutie"
+
+msgid "&Start"
+msgstr "&Spustiť"
+
msgid "Not running"
msgstr "Nebeží"
diff --git a/src/qt/languages/sl-SI.po b/src/qt/languages/sl-SI.po
index 0813e3d83..31cb1e303 100644
--- a/src/qt/languages/sl-SI.po
+++ b/src/qt/languages/sl-SI.po
@@ -15,8 +15,8 @@ msgstr "&Tipkovnica potrebuje zajem"
msgid "&Right CTRL is left ALT"
msgstr "&Desni CTRL je levi ALT"
-msgid "&Hard Reset..."
-msgstr "&Ponovni zagon..."
+msgid "&Hard reset"
+msgstr "&Ponovni zagon"
msgid "&Ctrl+Alt+Del"
msgstr "&Ctrl+Alt+Del"
@@ -51,6 +51,9 @@ msgstr "S&premenljiva velikost okna"
msgid "R&emember size && position"
msgstr "&Zapomni si velikost in položaj"
+msgid "Remember size && position"
+msgstr "Zapomni si velikost in položaj"
+
msgid "Re&nderer"
msgstr "&Upodabljanje"
@@ -1074,6 +1077,12 @@ msgstr "Prisilno prekini"
msgid "Start"
msgstr "Zaženi"
+msgid "&Force shutdown"
+msgstr "&Prisilno prekini"
+
+msgid "&Start"
+msgstr "&Zaženi"
+
msgid "Not running"
msgstr "Se ne izvaja"
diff --git a/src/qt/languages/sv-SE.po b/src/qt/languages/sv-SE.po
index e3db6d3b7..890bc18eb 100644
--- a/src/qt/languages/sv-SE.po
+++ b/src/qt/languages/sv-SE.po
@@ -15,8 +15,8 @@ msgstr "&Tangentbord behöver uppfångas"
msgid "&Right CTRL is left ALT"
msgstr "&Höger CTRL är vänster ALT"
-msgid "&Hard Reset..."
-msgstr "&Hård omstart..."
+msgid "&Hard reset"
+msgstr "&Hård omstart"
msgid "&Ctrl+Alt+Del"
msgstr "&Ctrl+Alt+Del"
@@ -51,6 +51,9 @@ msgstr "&Ändringsbar fönsterstorlek"
msgid "R&emember size && position"
msgstr "K&om ihåg storlek && position"
+msgid "Remember size && position"
+msgstr "Kom ihåg storlek && position"
+
msgid "Re&nderer"
msgstr "Re&nderare"
@@ -1074,6 +1077,12 @@ msgstr "Tvinga avstängning"
msgid "Start"
msgstr "Starta"
+msgid "&Force shutdown"
+msgstr "&Tvinga avstängning"
+
+msgid "&Start"
+msgstr "&Starta"
+
msgid "Not running"
msgstr "Körs ej"
diff --git a/src/qt/languages/tr-TR.po b/src/qt/languages/tr-TR.po
index 65eb47152..3df51363c 100644
--- a/src/qt/languages/tr-TR.po
+++ b/src/qt/languages/tr-TR.po
@@ -15,8 +15,8 @@ msgstr "&Klavye sadece fare yakalandığında çalışsın"
msgid "&Right CTRL is left ALT"
msgstr "&Sağ CTRL tuşunu sol ALT tuşu olarak ayarla"
-msgid "&Hard Reset..."
-msgstr "Yeniden başlamaya &zorla..."
+msgid "&Hard reset"
+msgstr "Yeniden başlamaya &zorla"
msgid "&Ctrl+Alt+Del"
msgstr "&Ctrl+Alt+Del"
@@ -51,6 +51,9 @@ msgstr "&Boyutlandırılabilir pencere"
msgid "R&emember size && position"
msgstr "&Pencere boyut ve pozisyonunu kaydet"
+msgid "Remember size && position"
+msgstr "Pencere boyut ve pozisyonunu kaydet"
+
msgid "Re&nderer"
msgstr "Derley&ici"
@@ -1074,6 +1077,12 @@ msgstr "Kapatmaya zorla"
msgid "Start"
msgstr "Başlat"
+msgid "&Force shutdown"
+msgstr "&Kapatmaya zorla"
+
+msgid "&Start"
+msgstr "&Başlat"
+
msgid "Not running"
msgstr "Çalışmıyor"
diff --git a/src/qt/languages/uk-UA.po b/src/qt/languages/uk-UA.po
index 79f5763c3..5e2dc7a1e 100644
--- a/src/qt/languages/uk-UA.po
+++ b/src/qt/languages/uk-UA.po
@@ -15,8 +15,8 @@ msgstr "&Клавіатура потребує захвату"
msgid "&Right CTRL is left ALT"
msgstr "&Правий CTRL - це лівий ALT"
-msgid "&Hard Reset..."
-msgstr "&Холодне перезавантаження..."
+msgid "&Hard reset"
+msgstr "&Холодне перезавантаження"
msgid "&Ctrl+Alt+Del"
msgstr "&Ctrl+Alt+Del"
@@ -51,6 +51,9 @@ msgstr "&Змінний розмір вікна"
msgid "R&emember size && position"
msgstr "&Запам'ятати розмір і становище"
+msgid "Remember size && position"
+msgstr "Запам'ятати розмір і становище"
+
msgid "Re&nderer"
msgstr "&Рендеринг"
@@ -1074,6 +1077,12 @@ msgstr "Примусове завершення роботи"
msgid "Start"
msgstr "Пуск"
+msgid "&Force shutdown"
+msgstr "Примусове &завершення роботи"
+
+msgid "&Start"
+msgstr "&Пуск"
+
msgid "Not running"
msgstr "Не працює"
diff --git a/src/qt/languages/vi-VN.po b/src/qt/languages/vi-VN.po
index f316c54c2..632c43c12 100644
--- a/src/qt/languages/vi-VN.po
+++ b/src/qt/languages/vi-VN.po
@@ -15,7 +15,7 @@ msgstr "Bàn phím &hoạt động cần 'bắt' chuột"
msgid "&Right CTRL is left ALT"
msgstr "Gắn ALT trái vào CTRL ph&ải"
-msgid "&Hard Reset..."
+msgid "&Hard reset"
msgstr "Buộc khởi độn&g lại"
msgid "&Ctrl+Alt+Del"
@@ -51,6 +51,9 @@ msgstr "Tùy chỉnh cỡ cử&a sổ"
msgid "R&emember size && position"
msgstr "Ghi nhớ vị trí và kíc&h thước cửa sổ"
+msgid "Remember size && position"
+msgstr "Ghi nhớ vị trí và kích thước cửa sổ"
+
msgid "Re&nderer"
msgstr "Re&nderer"
@@ -1074,6 +1077,12 @@ msgstr "Buộc tắt nguồn máy"
msgid "Start"
msgstr "Khởi động"
+msgid "&Force shutdown"
+msgstr "&Buộc tắt nguồn máy"
+
+msgid "&Start"
+msgstr "&Khởi động"
+
msgid "Not running"
msgstr "Đang không chạy"
diff --git a/src/qt/languages/zh-CN.po b/src/qt/languages/zh-CN.po
index 31a34da90..7e92f9aee 100644
--- a/src/qt/languages/zh-CN.po
+++ b/src/qt/languages/zh-CN.po
@@ -15,8 +15,8 @@ msgstr "键盘需要捕捉(&K)"
msgid "&Right CTRL is left ALT"
msgstr "将右 CTRL 键映射为左 ALT 键(&R)"
-msgid "&Hard Reset..."
-msgstr "硬重置(&H)..."
+msgid "&Hard reset"
+msgstr "硬重置(&H)"
msgid "&Ctrl+Alt+Del"
msgstr "Ctrl+Alt+Del(&C)"
@@ -51,6 +51,9 @@ msgstr "窗口大小可调(&R)"
msgid "R&emember size && position"
msgstr "记住窗口大小和位置(&E)"
+msgid "Remember size && position"
+msgstr "记住窗口大小和位置"
+
msgid "Re&nderer"
msgstr "渲染器(&N)"
@@ -1074,6 +1077,12 @@ msgstr "强制关机"
msgid "Start"
msgstr "启动"
+msgid "&Force shutdown"
+msgstr "强制关机(&F)"
+
+msgid "&Start"
+msgstr "启动(&S)"
+
msgid "Not running"
msgstr "未在运行"
diff --git a/src/qt/languages/zh-TW.po b/src/qt/languages/zh-TW.po
index 7dcb3638f..fff385f34 100644
--- a/src/qt/languages/zh-TW.po
+++ b/src/qt/languages/zh-TW.po
@@ -15,8 +15,8 @@ msgstr "鍵盤需要捕捉(&K)"
msgid "&Right CTRL is left ALT"
msgstr "將右 CTRL 鍵映射為左 ALT 鍵(&R)"
-msgid "&Hard Reset..."
-msgstr "硬重設(&H)..."
+msgid "&Hard reset"
+msgstr "硬重設(&H)"
msgid "&Ctrl+Alt+Del"
msgstr "Ctrl+Alt+Del(&C)"
@@ -51,6 +51,9 @@ msgstr "視窗大小可調(&R)"
msgid "R&emember size && position"
msgstr "記住視窗大小和位置(&E)"
+msgid "Remember size && position"
+msgstr "記住視窗大小和位置"
+
msgid "Re&nderer"
msgstr "渲染器(&N)"
@@ -1074,6 +1077,12 @@ msgstr "強制關機"
msgid "Start"
msgstr "開始"
+msgid "&Force shutdown"
+msgstr "強制關機(&F)"
+
+msgid "&Start"
+msgstr "開始(&S)"
+
msgid "Not running"
msgstr "未執行"
diff --git a/src/qt/qt_mainwindow.ui b/src/qt/qt_mainwindow.ui
index 78cb2df98..ca7aca2ca 100644
--- a/src/qt/qt_mainwindow.ui
+++ b/src/qt/qt_mainwindow.ui
@@ -340,7 +340,7 @@
:/menuicons/qt/icons/hard_reset.ico:/menuicons/qt/icons/hard_reset.ico
- &Hard Reset...
+ &Hard reset
false
diff --git a/src/qt/qt_vmmanager_detailsection.cpp b/src/qt/qt_vmmanager_detailsection.cpp
index afb71a5f0..ac321be1e 100644
--- a/src/qt/qt_vmmanager_detailsection.cpp
+++ b/src/qt/qt_vmmanager_detailsection.cpp
@@ -161,7 +161,8 @@ VMManagerDetailSection::setupMainLayout()
void
VMManagerDetailSection::setSections()
{
- int row = 0;
+ int row = 0;
+ bool empty = true;
for (const auto& section : sections) {
QStringList sectionsToAdd = section.value.split(sectionSeparator);
@@ -189,12 +190,13 @@ VMManagerDetailSection::setSections()
const auto hSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
frameGridLayout->addItem(hSpacer, row, 2);
+ empty = false;
row++;
}
}
collapseButton->setContent(ui->detailFrame);
- if (sections.size())
+ if (!empty)
setVisible(true);
}
void
diff --git a/src/qt/qt_vmmanager_main.cpp b/src/qt/qt_vmmanager_main.cpp
index cc3904e97..99c1c9a67 100644
--- a/src/qt/qt_vmmanager_main.cpp
+++ b/src/qt/qt_vmmanager_main.cpp
@@ -109,6 +109,53 @@ VMManagerMain::VMManagerMain(QWidget *parent) :
if (indexAt.isValid()) {
QMenu contextMenu(tr("Context Menu"), ui->listView);
+ QAction startAction(tr("&Start"));
+ contextMenu.addAction(&startAction);
+ connect(&startAction, &QAction::triggered, [this] {
+ selected_sysconfig->startButtonPressed();
+ });
+ startAction.setEnabled(selected_sysconfig->process->state() == QProcess::NotRunning);
+ startAction.setVisible(selected_sysconfig->process->state() == QProcess::NotRunning);
+
+ QAction pauseAction(tr("&Pause"));
+ contextMenu.addAction(&pauseAction);
+ connect(&pauseAction, &QAction::triggered, [this] {
+ selected_sysconfig->pauseButtonPressed();
+ });
+ pauseAction.setEnabled(selected_sysconfig->process->state() == QProcess::Running);
+ pauseAction.setVisible(selected_sysconfig->process->state() == QProcess::Running);
+ if (selected_sysconfig->getProcessStatus() != VMManagerSystem::ProcessStatus::Running)
+ pauseAction.setText(tr("Re&sume"));
+
+ QAction resetAction(tr("&Hard reset"));
+ contextMenu.addAction(&resetAction);
+ connect(&resetAction, &QAction::triggered, [this] {
+ selected_sysconfig->restartButtonPressed();
+ });
+ resetAction.setEnabled(selected_sysconfig->process->state() == QProcess::Running);
+
+ QAction forceShutdownAction(tr("&Force shutdown"));
+ contextMenu.addAction(&forceShutdownAction);
+ connect(&forceShutdownAction, &QAction::triggered, [this] {
+ selected_sysconfig->shutdownForceButtonPressed();
+ });
+ forceShutdownAction.setEnabled(selected_sysconfig->process->state() == QProcess::Running);
+
+ QAction cadAction(tr("&Ctrl+Alt+Del"));
+ contextMenu.addAction(&cadAction);
+ connect(&cadAction, &QAction::triggered, [this] {
+ selected_sysconfig->cadButtonPressed();
+ });
+ cadAction.setEnabled(selected_sysconfig->process->state() == QProcess::Running);
+
+ contextMenu.addSeparator();
+
+ QAction settingsAction(tr("&Settings..."));
+ contextMenu.addAction(&settingsAction);
+ connect(&settingsAction, &QAction::triggered, [this] {
+ selected_sysconfig->launchSettings();
+ });
+
QAction nameChangeAction(tr("Change &display name..."));
contextMenu.addAction(&nameChangeAction);
// Use a lambda to call a function so indexAt can be passed
@@ -740,6 +787,18 @@ VMManagerMain::machineCountString(QString states) const
return tr("VMs: %1").arg(states);
}
+QList
+VMManagerMain::getPaneSizes() const
+{
+ return ui->splitter->sizes();
+}
+
+void
+VMManagerMain::setPaneSizes(const QList &sizes)
+{
+ ui->splitter->setSizes(sizes);
+}
+
void
VMManagerMain::modelDataChange()
{
diff --git a/src/qt/qt_vmmanager_main.hpp b/src/qt/qt_vmmanager_main.hpp
index 070f30398..404a90fc6 100644
--- a/src/qt/qt_vmmanager_main.hpp
+++ b/src/qt/qt_vmmanager_main.hpp
@@ -87,6 +87,9 @@ public slots:
void onConfigUpdated(const QString &uuid);
int getActiveMachineCount();
+ QList getPaneSizes() const;
+ void setPaneSizes(const QList &sizes);
+
private:
Ui::VMManagerMain *ui;
diff --git a/src/qt/qt_vmmanager_mainwindow.cpp b/src/qt/qt_vmmanager_mainwindow.cpp
index f698f1ccd..a4ae61577 100644
--- a/src/qt/qt_vmmanager_mainwindow.cpp
+++ b/src/qt/qt_vmmanager_mainwindow.cpp
@@ -135,26 +135,42 @@ VMManagerMainWindow(QWidget *parent)
{
auto config = new VMManagerConfig(VMManagerConfig::ConfigType::General);
- this->ui->actionRemember_size_and_position->setChecked(!!config->getStringValue("window_remember").toInt());
- if (ui->actionRemember_size_and_position->isChecked()) {
- QStringList list = config->getStringValue("window_coordinates").split(',');
- for (auto& cur : list) {
- cur = cur.trimmed();
- }
- QRect geom;
- geom.setX(list[0].toInt());
- geom.setY(list[1].toInt());
- geom.setWidth(list[2].toInt());
- geom.setHeight(list[3].toInt());
+ if (!!config->getStringValue("window_remember").toInt()) {
+ QString coords = config->getStringValue("window_coordinates");
+ if (!coords.isEmpty()) {
+ QStringList list = coords.split(',');
+ for (auto& cur : list) {
+ cur = cur.trimmed();
+ }
+ QRect geom;
+ geom.setX(list[0].toInt());
+ geom.setY(list[1].toInt());
+ geom.setWidth(list[2].toInt());
+ geom.setHeight(list[3].toInt());
+
+ setGeometry(geom);
+ }
- setGeometry(geom);
if (!!config->getStringValue("window_maximized").toInt()) {
setWindowState(windowState() | Qt::WindowMaximized);
}
+
+ QString splitter = config->getStringValue("window_splitter");
+ if (!splitter.isEmpty()) {
+ QStringList list = splitter.split(',');
+ for (auto& cur : list) {
+ cur = cur.trimmed();
+ }
+ QList paneSizes;
+ paneSizes.append(list[0].toInt());
+ paneSizes.append(list[1].toInt());
+
+ vmm->setPaneSizes(paneSizes);
+ }
} else {
- config->setStringValue("window_remember", "");
config->setStringValue("window_coordinates", "");
config->setStringValue("window_maximized", "");
+ config->setStringValue("window_splitter", "");
}
delete config;
}
@@ -214,14 +230,14 @@ VMManagerMainWindow::saveSettings() const
const auto currentSelection = vmm->getCurrentSelection();
const auto config = new VMManagerConfig(VMManagerConfig::ConfigType::General);
config->setStringValue("last_selection", currentSelection);
- config->setStringValue("window_remember", QString::number(ui->actionRemember_size_and_position->isChecked()));
- if (ui->actionRemember_size_and_position->isChecked()) {
+ if (!!config->getStringValue("window_remember").toInt()) {
config->setStringValue("window_coordinates", QString::asprintf("%i, %i, %i, %i", this->geometry().x(), this->geometry().y(), this->geometry().width(), this->geometry().height()));
config->setStringValue("window_maximized", this->isMaximized() ? "1" : "");
+ config->setStringValue("window_splitter", QString::asprintf("%i, %i", vmm->getPaneSizes()[0], vmm->getPaneSizes()[1]));
} else {
- config->setStringValue("window_remember", "");
config->setStringValue("window_coordinates", "");
config->setStringValue("window_maximized", "");
+ config->setStringValue("window_splitter", "");
}
// Sometimes required to ensure the settings save before the app exits
config->sync();
diff --git a/src/qt/qt_vmmanager_mainwindow.ui b/src/qt/qt_vmmanager_mainwindow.ui
index 15739628d..c45e83741 100644
--- a/src/qt/qt_vmmanager_mainwindow.ui
+++ b/src/qt/qt_vmmanager_mainwindow.ui
@@ -28,7 +28,6 @@
&Tools
-