Nemcio/SysTray-X
1
0
Fork 0
mirror of https://github.com/Ximi1970/systray-x.git synced 2026-07-05 11:07:32 +02:00
Code Issues Packages Projects Releases Activity

Revert "Use buttonbox in preferences dialog"

Browse Source 
This reverts commit 0694b83505.
This commit is contained in:
Ximi1970
2021-10-10 17:52:32 +02:00
parent 11ac0812cf
commit 0effe6d6ea
18 changed files with 118 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/SysTray-X/SysTray-X-app/languages/SysTray-X.bg.ts
View File

@@ -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>

12
app/SysTray-X/SysTray-X-app/languages/SysTray-X.de.ts
View File

@@ -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>

12
app/SysTray-X/SysTray-X-app/languages/SysTray-X.el.ts
View File

@@ -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>

12
app/SysTray-X/SysTray-X-app/languages/SysTray-X.en-US.ts
View File

@@ -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>

12
app/SysTray-X/SysTray-X-app/languages/SysTray-X.es-AR.ts
View File

@@ -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>

12
app/SysTray-X/SysTray-X-app/languages/SysTray-X.fr.ts
View File

@@ -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>

12
app/SysTray-X/SysTray-X-app/languages/SysTray-X.hr.ts
View File

@@ -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>

12
app/SysTray-X/SysTray-X-app/languages/SysTray-X.it.ts
View File

@@ -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>

12
app/SysTray-X/SysTray-X-app/languages/SysTray-X.nl.ts
View File

@@ -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>

12
app/SysTray-X/SysTray-X-app/languages/SysTray-X.pl.ts
View File

@@ -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>

12
app/SysTray-X/SysTray-X-app/languages/SysTray-X.pt-BR.ts
View File

@@ -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>

12
app/SysTray-X/SysTray-X-app/languages/SysTray-X.ru.ts
View File

@@ -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>

12
app/SysTray-X/SysTray-X-app/languages/SysTray-X.sk.ts
View File

@@ -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>

12
app/SysTray-X/SysTray-X-app/languages/SysTray-X.uk.ts
View File

@@ -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>

12
app/SysTray-X/SysTray-X-app/languages/SysTray-X.zh-CN.ts
View File

@@ -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>

12
app/SysTray-X/SysTray-X-app/languages/SysTray-X.zh-TW.ts
View File

@@ -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>

29
app/SysTray-X/SysTray-X-app/preferences.ui
View File

@@ -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>

10
app/SysTray-X/SysTray-X-app/preferencesdialog.cpp
View File

@@ -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
*/