Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-26 15:59:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Improve legacy browser settings message

Browse Source
This commit is contained in:
Jonathan White 2019-03-19 08:30:49 -04:00
parent 37b18a532c
commit fb5746e4f7
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/browser/BrowserService.cpp
View File

@ -1072,9 +1072,9 @@ bool BrowserService::checkLegacySettings()
auto dialogResult = MessageBox::warning(nullptr, auto dialogResult = MessageBox::warning(nullptr,
tr("KeePassXC: Legacy browser integration settings detected"), tr("KeePassXC: Legacy browser integration settings detected"),
tr("Legacy browser integration settings have been detected.\n" tr("Your KeePassXC-Browser settings need to be moved into the database settings.\n"
"Do you want to upgrade the settings to the latest standard?\n" "This is necessary to maintain your current browser connections.\n"
"This is necessary to maintain compatibility with the browser plugin."), "Would you like to migrate your existing settings now?"),
MessageBox::Yes | MessageBox::No); MessageBox::Yes | MessageBox::No);
return dialogResult == MessageBox::Yes; return dialogResult == MessageBox::Yes;
@ -1108,6 +1108,8 @@ void BrowserService::raiseWindow(const bool force)
m_prevWindowState = WindowState::Minimized; m_prevWindowState = WindowState::Minimized;
} }
#ifdef Q_OS_MACOS #ifdef Q_OS_MACOS
Q_UNUSED(force);
if (macUtils()->isHidden()) { if (macUtils()->isHidden()) {
m_prevWindowState = WindowState::Hidden; m_prevWindowState = WindowState::Hidden;
} }