From 0effe6d6ea1030d92bc16f472c466ee16d78fd47 Mon Sep 17 00:00:00 2001
From: Ximi1970 <ximi.github@gmail.com>
Date: Sun, 10 Oct 2021 17:52:32 +0200
Subject: [PATCH] Revert "Use buttonbox in preferences dialog"

This reverts commit 0694b83505b3fb6f3847b12d8a6e1801c69e80bb.
---
 .../SysTray-X-app/languages/SysTray-X.bg.ts   | 12 ++++----
 .../SysTray-X-app/languages/SysTray-X.de.ts   | 12 ++++----
 .../SysTray-X-app/languages/SysTray-X.el.ts   | 12 ++++----
 .../languages/SysTray-X.en-US.ts              | 12 ++++----
 .../languages/SysTray-X.es-AR.ts              | 12 ++++----
 .../SysTray-X-app/languages/SysTray-X.fr.ts   | 12 ++++----
 .../SysTray-X-app/languages/SysTray-X.hr.ts   | 12 ++++----
 .../SysTray-X-app/languages/SysTray-X.it.ts   | 12 ++++----
 .../SysTray-X-app/languages/SysTray-X.nl.ts   | 12 ++++----
 .../SysTray-X-app/languages/SysTray-X.pl.ts   | 12 ++++----
 .../languages/SysTray-X.pt-BR.ts              | 12 ++++----
 .../SysTray-X-app/languages/SysTray-X.ru.ts   | 12 ++++----
 .../SysTray-X-app/languages/SysTray-X.sk.ts   | 12 ++++----
 .../SysTray-X-app/languages/SysTray-X.uk.ts   | 12 ++++----
 .../languages/SysTray-X.zh-CN.ts              | 12 ++++----
 .../languages/SysTray-X.zh-TW.ts              | 12 ++++----
 app/SysTray-X/SysTray-X-app/preferences.ui    | 29 +++++++++++++------
 .../SysTray-X-app/preferencesdialog.cpp       | 10 ++-----
 18 files changed, 118 insertions(+), 113 deletions(-)

diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.bg.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.bg.ts
index 2968399..575bf8d 100644
--- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.bg.ts
+++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.bg.ts
@@ -340,24 +340,24 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="145"/>
+        <location filename="../preferencesdialog.cpp" line="161"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="146"/>
+        <location filename="../preferencesdialog.cpp" line="162"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Open Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.de.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.de.ts
index ed5c0e9..4c2e09f 100644
--- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.de.ts
+++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.de.ts
@@ -343,12 +343,12 @@
         <translation>Debug-Fenster anzeigen</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="145"/>
+        <location filename="../preferencesdialog.cpp" line="161"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="146"/>
+        <location filename="../preferencesdialog.cpp" line="162"/>
         <source>Cancel</source>
         <translation>Annullieren</translation>
     </message>
@@ -358,14 +358,14 @@
         <translation>Hauptfenster minimieren</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Open Image</source>
         <translation>Bild öffnen</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Bilddateien (*.png *.jpg *.bmp)</translation>
     </message>
diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.el.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.el.ts
index 1122da2..82606e0 100644
--- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.el.ts
+++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.el.ts
@@ -344,24 +344,24 @@
         <translation>Ελαχιστοποίηση στην περιοχή ειδοποιήσεων</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="145"/>
+        <location filename="../preferencesdialog.cpp" line="161"/>
         <source>Save</source>
         <translation>Αποθήκευση</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="146"/>
+        <location filename="../preferencesdialog.cpp" line="162"/>
         <source>Cancel</source>
         <translation>Άκυρο</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Open Image</source>
         <translation>Άνοιγμα εικόνας</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Αρχεία εικόνας (*.png *.jpg *.bmp)</translation>
     </message>
diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.en-US.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.en-US.ts
index 5bce5bc..4ee34d7 100644
--- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.en-US.ts
+++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.en-US.ts
@@ -348,12 +348,12 @@
         <translation>Display debug window</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="145"/>
+        <location filename="../preferencesdialog.cpp" line="161"/>
         <source>Save</source>
         <translation>Save</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="146"/>
+        <location filename="../preferencesdialog.cpp" line="162"/>
         <source>Cancel</source>
         <translation>Cancel</translation>
     </message>
@@ -363,14 +363,14 @@
         <translation>Minimize to tray</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Open Image</source>
         <translation>Open Image</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Image Files (*.png *.jpg *.bmp)</translation>
     </message>
diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.es-AR.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.es-AR.ts
index 4a10dcd..00304d9 100644
--- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.es-AR.ts
+++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.es-AR.ts
@@ -340,24 +340,24 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="145"/>
+        <location filename="../preferencesdialog.cpp" line="161"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="146"/>
+        <location filename="../preferencesdialog.cpp" line="162"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Open Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.fr.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.fr.ts
index e1d0477..0aa9bcc 100644
--- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.fr.ts
+++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.fr.ts
@@ -340,24 +340,24 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="145"/>
+        <location filename="../preferencesdialog.cpp" line="161"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="146"/>
+        <location filename="../preferencesdialog.cpp" line="162"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Open Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.hr.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.hr.ts
index ea1e983..514247b 100644
--- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.hr.ts
+++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.hr.ts
@@ -340,24 +340,24 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="145"/>
+        <location filename="../preferencesdialog.cpp" line="161"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="146"/>
+        <location filename="../preferencesdialog.cpp" line="162"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Open Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.it.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.it.ts
index 0cc37ad..9fc3ae2 100644
--- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.it.ts
+++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.it.ts
@@ -345,24 +345,24 @@
         <translation>Minimizza nel vassoio</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="145"/>
+        <location filename="../preferencesdialog.cpp" line="161"/>
         <source>Save</source>
         <translation>Salva</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="146"/>
+        <location filename="../preferencesdialog.cpp" line="162"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Open Image</source>
         <translation>Apri immagine</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>File immagine (*.png *.jpg *.bmp)</translation>
     </message>
diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.nl.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.nl.ts
index 5adec97..7fc4985 100644
--- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.nl.ts
+++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.nl.ts
@@ -347,12 +347,12 @@
         <translation>Toon debug venster</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="145"/>
+        <location filename="../preferencesdialog.cpp" line="161"/>
         <source>Save</source>
         <translation>Bewaren</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="146"/>
+        <location filename="../preferencesdialog.cpp" line="162"/>
         <source>Cancel</source>
         <translation>Annnuleren</translation>
     </message>
@@ -362,14 +362,14 @@
         <translation>Minimaliseer naar systeemvak</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Open Image</source>
         <translation>Open afbeelding</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Afbeeldingsbestanden (*.png *.jpg *.bmp)</translation>
     </message>
diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.pl.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.pl.ts
index 5d0d5d5..a630c3a 100644
--- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.pl.ts
+++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.pl.ts
@@ -340,24 +340,24 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="145"/>
+        <location filename="../preferencesdialog.cpp" line="161"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="146"/>
+        <location filename="../preferencesdialog.cpp" line="162"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Open Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.pt-BR.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.pt-BR.ts
index 372bb5a..74f00f1 100644
--- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.pt-BR.ts
+++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.pt-BR.ts
@@ -347,12 +347,12 @@
         <translation>Mostrar janela de depuração</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="145"/>
+        <location filename="../preferencesdialog.cpp" line="161"/>
         <source>Save</source>
         <translation>Salvar</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="146"/>
+        <location filename="../preferencesdialog.cpp" line="162"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
@@ -362,14 +362,14 @@
         <translation>Minimizar para a tray</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Open Image</source>
         <translation>Abrir imagem</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Arquivo de imagem (*.png *.jpg *.bmp)</translation>
     </message>
diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.ru.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.ru.ts
index 4239c66..162b43c 100644
--- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.ru.ts
+++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.ru.ts
@@ -344,12 +344,12 @@
         <translation>Показывать окно отладки</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="145"/>
+        <location filename="../preferencesdialog.cpp" line="161"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="146"/>
+        <location filename="../preferencesdialog.cpp" line="162"/>
         <source>Cancel</source>
         <translation>Отменить</translation>
     </message>
@@ -359,14 +359,14 @@
         <translation>Свернуть в трей</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Open Image</source>
         <translation>Открыть изображение</translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Файлы изображений (*.png *.jpg *.bmp)</translation>
     </message>
diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.sk.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.sk.ts
index 803d43e..ea7d1f3 100644
--- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.sk.ts
+++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.sk.ts
@@ -340,24 +340,24 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="145"/>
+        <location filename="../preferencesdialog.cpp" line="161"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="146"/>
+        <location filename="../preferencesdialog.cpp" line="162"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Open Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.uk.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.uk.ts
index f3fe31c..e3b4c7d 100644
--- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.uk.ts
+++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.uk.ts
@@ -340,24 +340,24 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="145"/>
+        <location filename="../preferencesdialog.cpp" line="161"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="146"/>
+        <location filename="../preferencesdialog.cpp" line="162"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Open Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.zh-CN.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.zh-CN.ts
index 118e971..f1b8f0d 100644
--- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.zh-CN.ts
+++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.zh-CN.ts
@@ -340,24 +340,24 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="145"/>
+        <location filename="../preferencesdialog.cpp" line="161"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="146"/>
+        <location filename="../preferencesdialog.cpp" line="162"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Open Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.zh-TW.ts b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.zh-TW.ts
index 7570d77..89946f4 100644
--- a/app/SysTray-X/SysTray-X-app/languages/SysTray-X.zh-TW.ts
+++ b/app/SysTray-X/SysTray-X-app/languages/SysTray-X.zh-TW.ts
@@ -340,24 +340,24 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="145"/>
+        <location filename="../preferencesdialog.cpp" line="161"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="146"/>
+        <location filename="../preferencesdialog.cpp" line="162"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Open Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../preferencesdialog.cpp" line="505"/>
-        <location filename="../preferencesdialog.cpp" line="529"/>
+        <location filename="../preferencesdialog.cpp" line="516"/>
+        <location filename="../preferencesdialog.cpp" line="540"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/app/SysTray-X/SysTray-X-app/preferences.ui b/app/SysTray-X/SysTray-X-app/preferences.ui
index 6b0fa37..ea3c08e 100644
--- a/app/SysTray-X/SysTray-X-app/preferences.ui
+++ b/app/SysTray-X/SysTray-X-app/preferences.ui
@@ -21,7 +21,7 @@
    <item row="0" column="0">
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="tabWindows">
       <attribute name="title">
@@ -846,11 +846,22 @@
       </spacer>
      </item>
      <item>
-      <widget class="QDialogButtonBox" name="buttonBox">
-       <property name="standardButtons">
-        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Save</set>
-       </property>
-      </widget>
+      <layout class="QHBoxLayout" name="horizontalLayout_7">
+       <item>
+        <widget class="QPushButton" name="cancelPushButton">
+         <property name="text">
+          <string>Cancel</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="savePushButton">
+         <property name="text">
+          <string>Save</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
     </layout>
    </item>
@@ -861,11 +872,11 @@
  </resources>
  <connections/>
  <buttongroups>
-  <buttongroup name="minimizeTypeGroup"/>
   <buttongroup name="iconTypeGroup"/>
-  <buttongroup name="countTypeGroup"/>
+  <buttongroup name="closeTypeGroup"/>
   <buttongroup name="themeGroup"/>
   <buttongroup name="defaultIconTypeGroup"/>
-  <buttongroup name="closeTypeGroup"/>
+  <buttongroup name="minimizeTypeGroup"/>
+  <buttongroup name="countTypeGroup"/>
  </buttongroups>
 </ui>
diff --git a/app/SysTray-X/SysTray-X-app/preferencesdialog.cpp b/app/SysTray-X/SysTray-X-app/preferencesdialog.cpp
index c8b1f56..16c1dc9 100644
--- a/app/SysTray-X/SysTray-X-app/preferencesdialog.cpp
+++ b/app/SysTray-X/SysTray-X-app/preferencesdialog.cpp
@@ -105,8 +105,8 @@ PreferencesDialog::PreferencesDialog( SysTrayXLink *link, Preferences *pref, QWi
     connect( m_ui->chooseCustomButton, &QPushButton::clicked, this, &PreferencesDialog::slotFileSelect );
     connect( m_ui->numberColorPushButton, &QPushButton::clicked, this, &PreferencesDialog::slotColorSelect );
 
-    connect( m_ui->buttonBox, &QDialogButtonBox::accepted, this, &PreferencesDialog::slotAccept);
-    connect( m_ui->buttonBox, &QDialogButtonBox::rejected, this, &PreferencesDialog::slotReject);
+    connect( m_ui->savePushButton, &QPushButton::clicked, this, &PreferencesDialog::slotAccept);
+    connect( m_ui->cancelPushButton, &QPushButton::clicked, this, &PreferencesDialog::slotReject);
 
     /*
      *  Set number color
@@ -139,12 +139,6 @@ PreferencesDialog::PreferencesDialog( SysTrayXLink *link, Preferences *pref, QWi
      */
     setNumberMargins( m_pref->getNumberMargins() );
 
-    /*
-     *  Translate buttons
-     */
-    m_ui->buttonBox->button( QDialogButtonBox::Save )->setText( tr( "Save" ) );
-    m_ui->buttonBox->button( QDialogButtonBox::Cancel )->setText( tr( "Cancel" ) );
-
     /*
      *  Dialog on top
      */