Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-07-23 06:50:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

Show countdown for clipboard clearing (#6333)

Browse source 
* Closes #1843

Co-authored-by: Jonathan White <support@dmapps.us>
This commit is contained in:
ByteHamster 2021-04-01 05:12:59 +02:00 • committed by GitHub
parent 8c9530e3ec
commit 439c155552
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 67 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/gui/Clipboard.cpp
View file

@ -39,8 +39,7 @@ Clipboard::Clipboard(QObject* parent)
m_pasteboard = new MacPasteboard();
}
#endif
m_timer->setSingleShot(true);
connect(m_timer, SIGNAL(timeout()), SLOT(clearClipboard()));
connect(m_timer, SIGNAL(timeout()), SLOT(countdownTick()));
connect(qApp, SIGNAL(aboutToQuit()), SLOT(clearCopiedText()));
}
@ -77,7 +76,9 @@ void Clipboard::setText(const QString& text, bool clear)
if (config()->get(Config::Security_ClearClipboard).toBool()) {
int timeout = config()->get(Config::Security_ClearClipboardTimeout).toInt();
if (timeout > 0) {
m_timer->start(timeout * 1000);
m_secondsElapsed = -1;
countdownTick();
m_timer->start(1000);
}
}
}
@ -85,15 +86,9 @@ void Clipboard::setText(const QString& text, bool clear)
void Clipboard::clearCopiedText()
{
if (m_timer->isActive()) {
m_timer->stop();
}
m_timer->stop();
emit updateCountdown(-1, "");
clearClipboard();
}
void Clipboard::clearClipboard()
{
auto* clipboard = QApplication::clipboard();
if (!clipboard) {
qWarning("Unable to access the clipboard.");
@ -108,6 +103,19 @@ void Clipboard::clearClipboard()
m_lastCopied.clear();
}
void Clipboard::countdownTick()
{
m_secondsElapsed++;
int timeout = config()->get(Config::Security_ClearClipboardTimeout).toInt();
int timeLeft = timeout - m_secondsElapsed;
if (timeLeft <= 0) {
clearCopiedText();
} else {
emit updateCountdown(100 * timeLeft / timeout,
QObject::tr("Clearing the clipboard in %1 second(s)…", "", timeLeft).arg(timeLeft));
}
}
Clipboard* Clipboard::instance()
{
if (!m_instance) {