diff --git a/app/SysTray-X/languages/SysTray-X.bg.ts b/app/SysTray-X/languages/SysTray-X.bg.ts index c86960f..613812f 100644 --- a/app/SysTray-X/languages/SysTray-X.bg.ts +++ b/app/SysTray-X/languages/SysTray-X.bg.ts @@ -167,11 +167,6 @@ Default minimize - - - Minimize to tray, method 1 - - Minimize to tray, method 2 @@ -238,30 +233,31 @@ - - + + + Minimize to tray - + Save - + Cancel - - + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -269,27 +265,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/languages/SysTray-X.de.qm b/app/SysTray-X/languages/SysTray-X.de.qm index 9813ee0..8326d5a 100644 Binary files a/app/SysTray-X/languages/SysTray-X.de.qm and b/app/SysTray-X/languages/SysTray-X.de.qm differ diff --git a/app/SysTray-X/languages/SysTray-X.de.ts b/app/SysTray-X/languages/SysTray-X.de.ts index b58bc5e..5e8b7fc 100644 --- a/app/SysTray-X/languages/SysTray-X.de.ts +++ b/app/SysTray-X/languages/SysTray-X.de.ts @@ -168,9 +168,8 @@ Standard Minimieren - Minimize to tray, method 1 - In Systemleiste verbergen, Methode 1 + In Systemleiste verbergen, Methode 1 @@ -242,30 +241,31 @@ Debug-Fenster anzeigen - + Save Speichern - + Cancel Annullieren - - + + + Minimize to tray Hauptfenster minimieren - - + + Open Image Bild öffnen - - + + Image Files (*.png *.jpg *.bmp) Bilddateien (*.png *.jpg *.bmp) @@ -273,27 +273,27 @@ SysTrayX - + &Show/Hide &Anzeigen/Verbergen - + &Preferences &Einstellungen - + &About &Über - + &Quit &Beenden - + Close Schließen diff --git a/app/SysTray-X/languages/SysTray-X.el.qm b/app/SysTray-X/languages/SysTray-X.el.qm index 6ff7fa1..af4a695 100644 Binary files a/app/SysTray-X/languages/SysTray-X.el.qm and b/app/SysTray-X/languages/SysTray-X.el.qm differ diff --git a/app/SysTray-X/languages/SysTray-X.el.ts b/app/SysTray-X/languages/SysTray-X.el.ts index 860c6db..000d148 100644 --- a/app/SysTray-X/languages/SysTray-X.el.ts +++ b/app/SysTray-X/languages/SysTray-X.el.ts @@ -163,9 +163,8 @@ Προεπιλεγμένη ελαχιστοποίηση - Minimize to tray, method 1 - Μέθοδος 1 + Μέθοδος 1 @@ -238,30 +237,31 @@ Προβολή παραθύρου αποσφαλμάτωσης - - + + + Minimize to tray Ελαχιστοποίηση στην περιοχή ειδοποιήσεων - + Save Αποθήκευση - + Cancel Άκυρο - - + + Open Image Άνοιγμα εικόνας - - + + Image Files (*.png *.jpg *.bmp) Αρχεία εικόνας (*.png *.jpg *.bmp) @@ -269,27 +269,27 @@ SysTrayX - + &Show/Hide &Εμφάνιση/Απόκρυψη - + &Preferences &Προτιμήσεις - + &About &Σχετικά - + &Quit &Έξοδος - + Close Κλείσιμο diff --git a/app/SysTray-X/languages/SysTray-X.en-US.qm b/app/SysTray-X/languages/SysTray-X.en-US.qm index ee83c9d..85a0cd1 100644 Binary files a/app/SysTray-X/languages/SysTray-X.en-US.qm and b/app/SysTray-X/languages/SysTray-X.en-US.qm differ diff --git a/app/SysTray-X/languages/SysTray-X.en-US.ts b/app/SysTray-X/languages/SysTray-X.en-US.ts index 7b5470e..9e2160e 100644 --- a/app/SysTray-X/languages/SysTray-X.en-US.ts +++ b/app/SysTray-X/languages/SysTray-X.en-US.ts @@ -172,9 +172,8 @@ Default minimize - Minimize to tray, method 1 - Minimize to tray, method 1 + Minimize to tray, method 1 @@ -246,30 +245,31 @@ Display debug window - + Save Save - + Cancel Cancel - - + + + Minimize to tray Minimize to tray - - + + Open Image Open Image - - + + Image Files (*.png *.jpg *.bmp) Image Files (*.png *.jpg *.bmp) @@ -277,27 +277,27 @@ SysTrayX - + &Show/Hide &Show/Hide - + &Preferences &Preferences - + &About &About - + &Quit &Quit - + Close Close diff --git a/app/SysTray-X/languages/SysTray-X.es-AR.ts b/app/SysTray-X/languages/SysTray-X.es-AR.ts index a07c022..d8b1924 100644 --- a/app/SysTray-X/languages/SysTray-X.es-AR.ts +++ b/app/SysTray-X/languages/SysTray-X.es-AR.ts @@ -167,11 +167,6 @@ Default minimize - - - Minimize to tray, method 1 - - Minimize to tray, method 2 @@ -238,30 +233,31 @@ - - + + + Minimize to tray - + Save - + Cancel - - + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -269,27 +265,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/languages/SysTray-X.fr.ts b/app/SysTray-X/languages/SysTray-X.fr.ts index fd00627..f390b42 100644 --- a/app/SysTray-X/languages/SysTray-X.fr.ts +++ b/app/SysTray-X/languages/SysTray-X.fr.ts @@ -167,11 +167,6 @@ Default minimize - - - Minimize to tray, method 1 - - Minimize to tray, method 2 @@ -238,30 +233,31 @@ - - + + + Minimize to tray - + Save - + Cancel - - + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -269,27 +265,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/languages/SysTray-X.hr.ts b/app/SysTray-X/languages/SysTray-X.hr.ts index c9def59..46ebf1b 100644 --- a/app/SysTray-X/languages/SysTray-X.hr.ts +++ b/app/SysTray-X/languages/SysTray-X.hr.ts @@ -167,11 +167,6 @@ Default minimize - - - Minimize to tray, method 1 - - Minimize to tray, method 2 @@ -238,30 +233,31 @@ - - + + + Minimize to tray - + Save - + Cancel - - + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -269,27 +265,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/languages/SysTray-X.it.qm b/app/SysTray-X/languages/SysTray-X.it.qm index a6fce1d..8da60c6 100644 Binary files a/app/SysTray-X/languages/SysTray-X.it.qm and b/app/SysTray-X/languages/SysTray-X.it.qm differ diff --git a/app/SysTray-X/languages/SysTray-X.it.ts b/app/SysTray-X/languages/SysTray-X.it.ts index 4c4601a..1e326b9 100644 --- a/app/SysTray-X/languages/SysTray-X.it.ts +++ b/app/SysTray-X/languages/SysTray-X.it.ts @@ -169,9 +169,8 @@ Minimizzazione predefinita - Minimize to tray, method 1 - Minimizza nel vassoio, metodo 1 + Minimizza nel vassoio, metodo 1 @@ -239,30 +238,31 @@ Mostra finestra di debug - - + + + Minimize to tray Minimizza nel vassoio - + Save Salva - + Cancel Annulla - - + + Open Image Apri immagine - - + + Image Files (*.png *.jpg *.bmp) File immagine (*.png *.jpg *.bmp) @@ -270,27 +270,27 @@ SysTrayX - + &Show/Hide &Mostra/Nascondi - + &Preferences &Preferenze - + &About &Informazioni - + &Quit &Esci - + Close Chiudi diff --git a/app/SysTray-X/languages/SysTray-X.nl.qm b/app/SysTray-X/languages/SysTray-X.nl.qm index 88ff0a1..ed5853d 100644 Binary files a/app/SysTray-X/languages/SysTray-X.nl.qm and b/app/SysTray-X/languages/SysTray-X.nl.qm differ diff --git a/app/SysTray-X/languages/SysTray-X.nl.ts b/app/SysTray-X/languages/SysTray-X.nl.ts index ed6005f..03d1146 100644 --- a/app/SysTray-X/languages/SysTray-X.nl.ts +++ b/app/SysTray-X/languages/SysTray-X.nl.ts @@ -172,9 +172,8 @@ Standaard minimalisatie - Minimize to tray, method 1 - Minimaliseer naar systeemvak, methode 1 + Minimaliseer naar systeemvak, methode 1 @@ -246,30 +245,31 @@ Toon debug venster - + Save Bewaren - + Cancel Annnuleren - - + + + Minimize to tray Minimaliseer naar systeemvak - - + + Open Image Open afbeelding - - + + Image Files (*.png *.jpg *.bmp) Afbeeldingsbestanden (*.png *.jpg *.bmp) @@ -277,27 +277,27 @@ SysTrayX - + &Show/Hide &Tonen/Verbergen - + &Preferences &Opties - + &About O&ver - + &Quit &Afsluiten - + Close Sluiten diff --git a/app/SysTray-X/languages/SysTray-X.pl.ts b/app/SysTray-X/languages/SysTray-X.pl.ts index 3f5502f..8f872b7 100644 --- a/app/SysTray-X/languages/SysTray-X.pl.ts +++ b/app/SysTray-X/languages/SysTray-X.pl.ts @@ -167,11 +167,6 @@ Default minimize - - - Minimize to tray, method 1 - - Minimize to tray, method 2 @@ -238,30 +233,31 @@ - - + + + Minimize to tray - + Save - + Cancel - - + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -269,27 +265,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/languages/SysTray-X.pt-BR.qm b/app/SysTray-X/languages/SysTray-X.pt-BR.qm index ca8babf..b7aeab4 100644 Binary files a/app/SysTray-X/languages/SysTray-X.pt-BR.qm and b/app/SysTray-X/languages/SysTray-X.pt-BR.qm differ diff --git a/app/SysTray-X/languages/SysTray-X.pt-BR.ts b/app/SysTray-X/languages/SysTray-X.pt-BR.ts index 2be05a0..2de63a1 100644 --- a/app/SysTray-X/languages/SysTray-X.pt-BR.ts +++ b/app/SysTray-X/languages/SysTray-X.pt-BR.ts @@ -170,10 +170,9 @@ Comportamento padrão - Minimize to tray, method 1 Minimizar para à área de notificações? (muito grande) - Minimizar para a tray, método 1 + Minimizar para a tray, método 1 @@ -246,30 +245,31 @@ Mostrar janela de depuração - + Save Salvar - + Cancel Cancelar - - + + + Minimize to tray - - + + Open Image Abrir imagem - - + + Image Files (*.png *.jpg *.bmp) Arquivo de imagem (*.png *.jpg *.bmp) @@ -277,27 +277,27 @@ SysTrayX - + &Show/Hide &Exibir/Ocultar - + &Preferences &Preferências - + &About &Sobre - + &Quit &Sair - + Close Fechar diff --git a/app/SysTray-X/languages/SysTray-X.ru.qm b/app/SysTray-X/languages/SysTray-X.ru.qm index 7c296bc..79b9034 100644 Binary files a/app/SysTray-X/languages/SysTray-X.ru.qm and b/app/SysTray-X/languages/SysTray-X.ru.qm differ diff --git a/app/SysTray-X/languages/SysTray-X.ru.ts b/app/SysTray-X/languages/SysTray-X.ru.ts index 66e618d..3956051 100644 --- a/app/SysTray-X/languages/SysTray-X.ru.ts +++ b/app/SysTray-X/languages/SysTray-X.ru.ts @@ -170,9 +170,8 @@ Свернуть окно - Minimize to tray, method 1 - Свернуть в трей, вариант 1 + Свернуть в трей, вариант 1 @@ -244,30 +243,31 @@ Показать окно отладки - + Save Сохранить - + Cancel Отменить - - + + + Minimize to tray Свернуть в трей - - + + Open Image Открыть изображение - - + + Image Files (*.png *.jpg *.bmp) Файлы изображений (*.png *.jpg *.bmp @@ -275,28 +275,28 @@ SysTrayX - + &Show/Hide Not sure how hotkeys work Показать/Скр&ыть - + &Preferences Настройки - + &About О приложении - + &Quit Выход - + Close Закрыть diff --git a/app/SysTray-X/languages/SysTray-X.sk.ts b/app/SysTray-X/languages/SysTray-X.sk.ts index 4d8c2b8..be33da3 100644 --- a/app/SysTray-X/languages/SysTray-X.sk.ts +++ b/app/SysTray-X/languages/SysTray-X.sk.ts @@ -167,11 +167,6 @@ Default minimize - - - Minimize to tray, method 1 - - Minimize to tray, method 2 @@ -238,30 +233,31 @@ - - + + + Minimize to tray - + Save - + Cancel - - + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -269,27 +265,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/languages/SysTray-X.uk.ts b/app/SysTray-X/languages/SysTray-X.uk.ts index 3853cfb..d9089c2 100644 --- a/app/SysTray-X/languages/SysTray-X.uk.ts +++ b/app/SysTray-X/languages/SysTray-X.uk.ts @@ -167,11 +167,6 @@ Default minimize - - - Minimize to tray, method 1 - - Minimize to tray, method 2 @@ -238,30 +233,31 @@ - - + + + Minimize to tray - + Save - + Cancel - - + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -269,27 +265,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/languages/SysTray-X.zh-CN.ts b/app/SysTray-X/languages/SysTray-X.zh-CN.ts index 7cb667c..0b3ae67 100644 --- a/app/SysTray-X/languages/SysTray-X.zh-CN.ts +++ b/app/SysTray-X/languages/SysTray-X.zh-CN.ts @@ -167,11 +167,6 @@ Default minimize - - - Minimize to tray, method 1 - - Minimize to tray, method 2 @@ -238,30 +233,31 @@ - - + + + Minimize to tray - + Save - + Cancel - - + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -269,27 +265,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/languages/SysTray-X.zh-TW.ts b/app/SysTray-X/languages/SysTray-X.zh-TW.ts index 183e96a..699fe39 100644 --- a/app/SysTray-X/languages/SysTray-X.zh-TW.ts +++ b/app/SysTray-X/languages/SysTray-X.zh-TW.ts @@ -167,11 +167,6 @@ Default minimize - - - Minimize to tray, method 1 - - Minimize to tray, method 2 @@ -238,30 +233,31 @@ - - + + + Minimize to tray - + Save - + Cancel - - + + Open Image - - + + Image Files (*.png *.jpg *.bmp) @@ -269,27 +265,27 @@ SysTrayX - + &Show/Hide - + &Preferences - + &About - + &Quit - + Close diff --git a/app/SysTray-X/preferences.ui b/app/SysTray-X/preferences.ui index 3280d86..25a5564 100644 --- a/app/SysTray-X/preferences.ui +++ b/app/SysTray-X/preferences.ui @@ -6,8 +6,8 @@ 0 0 - 511 - 666 + 541 + 664 @@ -524,12 +524,29 @@ - + Qt::Horizontal - - QDialogButtonBox::Cancel|QDialogButtonBox::Save + + + 40 + 20 + + + + + + + + Save + + + + + + + Cancel @@ -540,28 +557,11 @@ - - - buttonBox - rejected() - PreferencesDialog - reject() - - - 316 - 260 - - - 286 - 274 - - - - + + - diff --git a/app/SysTray-X/preferencesdialog.cpp b/app/SysTray-X/preferencesdialog.cpp index b835943..256ae63 100644 --- a/app/SysTray-X/preferencesdialog.cpp +++ b/app/SysTray-X/preferencesdialog.cpp @@ -106,12 +106,6 @@ PreferencesDialog::PreferencesDialog( SysTrayXLink *link, Preferences *pref, QWi m_ui->defaultIconTypeGroup->setId( m_ui->lookThroughDefaultIconRadioButton, Preferences::PREF_DEFAULT_ICON_HIDE ); m_ui->defaultIconTypeGroup->setId( m_ui->customDefaultIconRadioButton, Preferences::PREF_DEFAULT_ICON_CUSTOM ); - /* - * Translate the buttonbox - */ - m_ui->buttonBox->button( QDialogButtonBox::Save )->setText( tr( "Save" ) ); - m_ui->buttonBox->button( QDialogButtonBox::Cancel )->setText( tr( "Cancel" ) ); - /* * Set icon type defaults */ @@ -123,10 +117,11 @@ PreferencesDialog::PreferencesDialog( SysTrayXLink *link, Preferences *pref, QWi */ connect( m_ui->chooseCustomDefaultIconButton, &QPushButton::clicked, this, &PreferencesDialog::slotDefaultFileSelect ); connect( m_ui->chooseCustomButton, &QPushButton::clicked, this, &PreferencesDialog::slotFileSelect ); - connect( m_ui->buttonBox, &QDialogButtonBox::accepted, this, &PreferencesDialog::slotAccept ); - connect( m_ui->buttonBox, &QDialogButtonBox::rejected, this, &PreferencesDialog::slotReject ); connect( m_ui->numberColorPushButton, &QPushButton::clicked, this, &PreferencesDialog::slotColorSelect ); + connect( m_ui->savePushButton, &QPushButton::clicked, this, &PreferencesDialog::slotAccept); + connect( m_ui->cancelPushButton, &QPushButton::clicked, this, &PreferencesDialog::slotReject); + /* * Set number color */