Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix Auto-Type locale source strings

Browse Source
This commit is contained in:
Janek Bevendorff 2018-01-20 14:16:17 +01:00
parent 7a4e74950c
commit 0c0c558ff7
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/autotype/AutoType.cpp
View File

@ -328,7 +328,7 @@ bool AutoType::parseActions(const QString& sequence, const Entry* entry, QList<A
for (const QChar& ch : sequence) { for (const QChar& ch : sequence) {
if (inTmpl) { if (inTmpl) {
if (ch == '{') { if (ch == '{') {
qWarning("Syntax error in auto-type sequence."); qWarning("Syntax error in Auto-Type sequence.");
return false; return false;
} else if (ch == '}') { } else if (ch == '}') {
QList<AutoTypeAction*> autoType = createActionFromTemplate(tmpl, entry); QList<AutoTypeAction*> autoType = createActionFromTemplate(tmpl, entry);
@ -343,7 +343,7 @@ bool AutoType::parseActions(const QString& sequence, const Entry* entry, QList<A
} else if (ch == '{') { } else if (ch == '{') {
inTmpl = true; inTmpl = true;
} else if (ch == '}') { } else if (ch == '}') {
qWarning("Syntax error in auto-type sequence."); qWarning("Syntax error in Auto-Type sequence.");
return false; return false;
} else { } else {
actions.append(new AutoTypeChar(ch)); actions.append(new AutoTypeChar(ch));
@ -662,29 +662,28 @@ bool AutoType::verifyAutoTypeSyntax(const QString& sequence)
{ {
if (!AutoType::checkSyntax(sequence)) { if (!AutoType::checkSyntax(sequence)) {
QMessageBox messageBox; QMessageBox messageBox;
messageBox.critical(0, tr("Auto-Type"), tr("The Syntax of your AutoType statement is incorrect!")); messageBox.critical(nullptr, tr("Auto-Type"), tr("The Syntax of your Auto-Type statement is incorrect!"));
return false; return false;
} else if (AutoType::checkHighDelay(sequence)) { } else if (AutoType::checkHighDelay(sequence)) {
QMessageBox::StandardButton reply; QMessageBox::StandardButton reply;
reply = QMessageBox::question(0, tr("Auto-Type"), reply = QMessageBox::question(nullptr, tr("Auto-Type"),
tr("This AutoType command contains a very long delay. Do you really want to proceed?")); tr("This Auto-Type command contains a very long delay. Do you really want to proceed?"));
if (reply == QMessageBox::No) { if (reply == QMessageBox::No) {
return false; return false;
} }
} else if (AutoType::checkSlowKeypress(sequence)) { } else if (AutoType::checkSlowKeypress(sequence)) {
QMessageBox::StandardButton reply; QMessageBox::StandardButton reply;
reply = QMessageBox::question(0, tr("Auto-Type"), reply = QMessageBox::question(nullptr, tr("Auto-Type"),
tr("This AutoType command contains very slow key-press. Do you really want to proceed?")); tr("This Auto-Type command contains very slow key presses. Do you really want to proceed?"));
if (reply == QMessageBox::No) { if (reply == QMessageBox::No) {
return false; return false;
} }
} else if (AutoType::checkHighRepetition(sequence)) { } else if (AutoType::checkHighRepetition(sequence)) {
QMessageBox::StandardButton reply; QMessageBox::StandardButton reply;
reply = QMessageBox::question(0, tr("Auto-Type"), reply = QMessageBox::question(nullptr, tr("Auto-Type"),
tr("This AutoType command contains arguments which are " tr("This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?"));
"repeated very often. Do you really want to proceed?"));
if (reply == QMessageBox::No) { if (reply == QMessageBox::No) {
return false; return false;

3
src/sshagent/AgentSettingsWidget.ui
View File

@ -10,9 +10,6 @@
<height>300</height> <height>300</height>
</rect> </rect>
</property> </property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_3">
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>