From c232f3558aa29c69c7e48a8188c2a6268fe8f084 Mon Sep 17 00:00:00 2001 From: Stefan Scheler Date: Sat, 30 Jul 2022 09:01:39 +0200 Subject: [PATCH] translation fine tuning --- assets/translations/bosskey_de.qm | Bin 4451 -> 5153 bytes assets/translations/bosskey_de.ts | 72 +++++++++++---- assets/translations/bosskey_en.qm | Bin 409 -> 621 bytes assets/translations/bosskey_en.ts | 70 ++++++++++---- src/ui/bosskeydialog.ui | 148 +++++++++++++++--------------- src/widgets/fileselector.cpp | 36 +++++++- src/widgets/fileselector.h | 5 + src/widgets/fileselector.ui | 6 +- 8 files changed, 226 insertions(+), 111 deletions(-) diff --git a/assets/translations/bosskey_de.qm b/assets/translations/bosskey_de.qm index badb8ac5682321f3981f23fe38104650e14973a0..939ca2e22b3167eb260f02e30f5265d0a84c6022 100644 GIT binary patch delta 995 zcmb7CTSydP6#jO1cAVXv-BA-OsdezBb)|VID3kEEDOOOSCRiBkWz@ypo!FiA7NHPC zMrO8zLDI$Ahk|-&$x5FxDY{@pLHUwF^{@{SJ`@BJotdqr&>rIFpL726pYxsX`_FtR zx#BwG+;#%y>I7gbhx-Ks;29=b#(|9jTonP%>lw2Q?e}ys{pl*;h8}y?MaC(RO_LB*_@F zovQytjlS^W>^mZA`g2>imuwM=7C1k{3Xdp5;b8W_K{Ucc$6YxT3XBnHze|U^^@jn`6}ILzMrxJ zD9v^(&OC_M7m{P5%Pq;hvgnq4UX{N7aG*2?+Fw*349QJ$NcO8r)L^1_%>PBH2OssB z(935b*-R!?u2AU24xNoQz~7@<3B;BG5!-{IW_e|(HOo1WKw4QQmJEm_Ny`vYtk7os E3Ft568UO$Q delta 339 zcmZ3e@mOhsTzvootHWdl1};tpt@A7l3=F3k7KKe`U|@T~@F)Ez0|R3yV?GZ^-jOM< zsF;C)HIb>!0Z212FfE^U1W3g)tf1xVd)R1j_&8Zrj}jbkSDs9=E4J8#8$nj@$#< z#Kg0k5$Hm08J^uvt_%$Pb9g?A*fB70T;cgv3RKUXz$;g~73h*cUXPXQfabFEZWHSR zy67Mu%eKu78Vo$U_#Q+8y~ebZUr+uk(10NRY*}ZZ0h9SB+Qcz1uq@343clF9hB1|O T^JjJ==EX(ateZ~?Mlb;YcYj*F diff --git a/assets/translations/bosskey_de.ts b/assets/translations/bosskey_de.ts index fdc3a1f..711e8fe 100644 --- a/assets/translations/bosskey_de.ts +++ b/assets/translations/bosskey_de.ts @@ -86,14 +86,24 @@ Benachrichtigungsfeld - + Hide Systray icon BossKey Icon im Benachrichtungsfeld verbergen - + + Execute on hide: + Befehl beim Verbergen ausführen: + + + + Execute on show: + Befehl beim Anzeigen ausführen: + + + Hide windows in systray - Icons im Benachrichtigungsfeld verbergen + Icons im Benachrichtigungsfeld verbergen @@ -102,76 +112,81 @@ + Hotkey Commands + Hotkey Befehle + + + Misc Sonstiges - + Auto-Hide on inactivity after Fenster bei Inaktivität automatisch verbergen nach - + seconds Sekunden - + Language Sprache - + &Close &Schließen - + &Exit &Beenden - + &Preferences... &Einstellungen... - + &About &Über - + Hide Windows Fenster verbergen - + Show windows Fenster anzeigen - + Hidden windows Verborgene Fenster - + If this software is useful to you, please consider making a donation. Bitte denken Sie über eine Spende nach, wenn Ihnen dieses Programm gefällt. - + All rights reserved. Alle Rechte vorbehalten. - + Visit bosskey website BossKey Webseite besuchen - + About bosskey Über BossKey @@ -181,6 +196,29 @@ %1 verborgene Fenster + + FileSelector + + + Select file + Datei auswählen + + + + Executables (*.exe *.bat *.cmd) + Ausführbare Programme (*.exe *.bat *.cmd) + + + + Select + Auswählen + + + + Select... + Auswählen... + + KeySequenceWidget diff --git a/assets/translations/bosskey_en.qm b/assets/translations/bosskey_en.qm index 001395b13a9af1c68c9cfbbe683b02ee50017df0..1cc09f910470b2015fc83e91738874a80c555922 100644 GIT binary patch delta 214 zcmbQq{FY^coSp{DxtA{)7#R0*EpV=4U|^WSwLL!yNPpw?Sh)@;9>G7+CJxAF$Yfw( zlA35U!`pztm7#(ml_8m-l%WJjD*##f47os<$dJd70_5idX$6K1pq3P%ycGvXI~x!S qxK^YlmzJa| - + Hide Systray icon Hide BossKey systray icon - + + Execute on hide: + Execute command on hide: + + + + Execute on show: + Execute command on show: + + + Hide windows in systray Hide systray icons @@ -102,76 +112,81 @@ + Hotkey Commands + + + + Misc - + Auto-Hide on inactivity after - + seconds - + Language - + &Close - + &Exit - + &Preferences... - + &About - + Hide Windows - + Show windows - + Hidden windows - + If this software is useful to you, please consider making a donation. - + All rights reserved. - + Visit bosskey website - + About bosskey @@ -181,6 +196,29 @@ + + FileSelector + + + Select file + + + + + Executables (*.exe *.bat *.cmd) + + + + + Select + + + + + Select... + + + KeySequenceWidget diff --git a/src/ui/bosskeydialog.ui b/src/ui/bosskeydialog.ui index a630917..cb4022b 100644 --- a/src/ui/bosskeydialog.ui +++ b/src/ui/bosskeydialog.ui @@ -550,22 +550,22 @@ QTabBar::tab { height: 35px; } - + - Command Hooks + Hotkey Commands - On hide script: + Execute on hide: - On show script: + Execute on show: @@ -573,85 +573,89 @@ QTabBar::tab { height: 35px; } - - - Misc - - - - + + + + + Misc + + - - - Auto-Hide on inactivity after - - + + + + + Auto-Hide on inactivity after + + + + + + + + 40 + 16777215 + + + + 5 + + + 4 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + seconds + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Language + + - + - 40 + 120 16777215 - - 5 - - - 4 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - - - - - seconds - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - Language - - - - - - - 120 - 16777215 - - - - - - + + + diff --git a/src/widgets/fileselector.cpp b/src/widgets/fileselector.cpp index 3273549..02cc3a2 100644 --- a/src/widgets/fileselector.cpp +++ b/src/widgets/fileselector.cpp @@ -37,15 +37,17 @@ FileSelector::~FileSelector() void FileSelector::openFileDialog() { - QFileDialog dialog(this); + QFileDialog dialog(this, tr("Select file")); + dialog.setFileMode(QFileDialog::ExistingFile); - dialog.setDirectory(QStandardPaths::standardLocations(QStandardPaths::DesktopLocation).first()); + dialog.setDirectory(getStartDirectory()); dialog.setNameFilter(tr("Executables (*.exe *.bat *.cmd)")); dialog.setViewMode(QFileDialog::Detail); + dialog.setLabelText(QFileDialog::Accept, tr("Select")); QString filename; if (dialog.exec() == QDialog::Accepted) { - filename = dialog.selectedUrls().value(0).toLocalFile(); + filename = QDir::toNativeSeparators(dialog.selectedUrls().value(0).toLocalFile()); } ui_->filenameEdit->setText(filename); @@ -71,4 +73,32 @@ QString FileSelector::filename() const return ui_->filenameEdit->text(); } +QString FileSelector::getStartDirectory() const +{ + QString directory = QStandardPaths::standardLocations(QStandardPaths::DesktopLocation).first(); + + QFileInfo fileInfo(ui_->filenameEdit->text()); + + if (fileInfo.exists()) { + directory = fileInfo.dir().absolutePath(); + } + + qDebug() << directory; + + return directory; +} + +bool FileSelector::event(QEvent *event) +{ + switch(event->type()) { + case QEvent::LanguageChange: + ui_->retranslateUi(this); + break; + default: + break; + } + + return QObject::event(event); +} + // EOF diff --git a/src/widgets/fileselector.h b/src/widgets/fileselector.h index 1434dbc..b49a7b9 100644 --- a/src/widgets/fileselector.h +++ b/src/widgets/fileselector.h @@ -22,9 +22,14 @@ class FileSelector : public QWidget void setLabel(const QString& text); QString label() const; + bool event(QEvent *event) override; + public slots: void openFileDialog(); +private: + QString getStartDirectory() const; + private: Ui::FileSelector *ui_; }; diff --git a/src/widgets/fileselector.ui b/src/widgets/fileselector.ui index a038c31..3d742b2 100644 --- a/src/widgets/fileselector.ui +++ b/src/widgets/fileselector.ui @@ -7,11 +7,11 @@ 0 0 496 - 44 + 55 - Form + Form @@ -57,7 +57,7 @@ - Browse... + Select... false