mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2025-01-21 04:01:03 -05:00
b9daed2055
The GUI features depend on windowing system used, not just OS. There is an issue with the WM sometimes producing an event that keepassxc interprets as request to hide the main window just after it is shown. A workaround with immediately firing a timer was implemented. However, there is no guarantee on execution ordering of the timer callback and other application code. Remove the timer and override show() and hide() on main window to only hide if the window has not been shown recently. The user can set an option to hide window instead of minimizing when tray icon is enabled. This is not honored in most places where the main windows is minimized. Fix it. This also allows using the tray icon as a workaround for minimization not working under some circumstances in X11. Signed-off-by: Michal Suchanek <msuchanek@suse.de>
116 lines
2.8 KiB
C++
116 lines
2.8 KiB
C++
/*
|
|
* Copyright (C) 2018 KeePassXC Team <team@keepassxc.org>
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 2 or (at your option)
|
|
* version 3 of the License.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#include "Clock.h"
|
|
|
|
QSharedPointer<Clock> Clock::m_instance;
|
|
|
|
QDateTime Clock::currentDateTimeUtc()
|
|
{
|
|
return instance().currentDateTimeUtcImpl();
|
|
}
|
|
|
|
QDateTime Clock::currentDateTime()
|
|
{
|
|
return instance().currentDateTimeImpl();
|
|
}
|
|
|
|
uint Clock::currentSecondsSinceEpoch()
|
|
{
|
|
// TODO: change to toSecsSinceEpoch() when min Qt >= 5.8
|
|
return instance().currentDateTimeImpl().toTime_t();
|
|
}
|
|
|
|
qint64 Clock::currentMilliSecondsSinceEpoch()
|
|
{
|
|
return instance().currentDateTimeImpl().toMSecsSinceEpoch();
|
|
}
|
|
|
|
QDateTime Clock::serialized(const QDateTime& dateTime)
|
|
{
|
|
auto time = dateTime.time();
|
|
if (time.isValid() && time.msec() != 0) {
|
|
return dateTime.addMSecs(-time.msec());
|
|
}
|
|
return dateTime;
|
|
}
|
|
|
|
QDateTime Clock::datetimeUtc(int year, int month, int day, int hour, int min, int second)
|
|
{
|
|
return QDateTime(QDate(year, month, day), QTime(hour, min, second), Qt::UTC);
|
|
}
|
|
|
|
QDateTime Clock::datetime(int year, int month, int day, int hour, int min, int second)
|
|
{
|
|
return QDateTime(QDate(year, month, day), QTime(hour, min, second), Qt::LocalTime);
|
|
}
|
|
|
|
QDateTime Clock::datetimeUtc(qint64 msecSinceEpoch)
|
|
{
|
|
return QDateTime::fromMSecsSinceEpoch(msecSinceEpoch, Qt::UTC);
|
|
}
|
|
|
|
QDateTime Clock::datetime(qint64 msecSinceEpoch)
|
|
{
|
|
return QDateTime::fromMSecsSinceEpoch(msecSinceEpoch, Qt::LocalTime);
|
|
}
|
|
|
|
QDateTime Clock::parse(const QString& text, Qt::DateFormat format)
|
|
{
|
|
return QDateTime::fromString(text, format);
|
|
}
|
|
|
|
QDateTime Clock::parse(const QString& text, const QString& format)
|
|
{
|
|
return QDateTime::fromString(text, format);
|
|
}
|
|
|
|
Clock::~Clock()
|
|
{
|
|
}
|
|
|
|
Clock::Clock()
|
|
{
|
|
}
|
|
|
|
QDateTime Clock::currentDateTimeUtcImpl() const
|
|
{
|
|
return QDateTime::currentDateTimeUtc();
|
|
}
|
|
|
|
QDateTime Clock::currentDateTimeImpl() const
|
|
{
|
|
return QDateTime::currentDateTime();
|
|
}
|
|
|
|
void Clock::resetInstance()
|
|
{
|
|
m_instance.reset();
|
|
}
|
|
|
|
void Clock::setInstance(Clock* clock)
|
|
{
|
|
m_instance = QSharedPointer<Clock>(clock);
|
|
}
|
|
|
|
const Clock& Clock::instance()
|
|
{
|
|
if (!m_instance) {
|
|
m_instance = QSharedPointer<Clock>(new Clock());
|
|
}
|
|
return *m_instance;
|
|
}
|