|
|
@ -949,17 +949,17 @@ void MainWindow::notifyOfUpdate(QString) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// Toggle Main window visibility
|
|
|
|
// Toggle Main window visibility
|
|
|
|
void MainWindow::toggleVisibility(QSystemTrayIcon::ActivationReason e) |
|
|
|
void MainWindow::toggleVisibility(const QSystemTrayIcon::ActivationReason reason) |
|
|
|
{ |
|
|
|
{ |
|
|
|
if ((e == QSystemTrayIcon::Trigger) || (e == QSystemTrayIcon::DoubleClick)) { |
|
|
|
switch (reason) { |
|
|
|
|
|
|
|
case QSystemTrayIcon::Trigger: { |
|
|
|
if (isHidden()) { |
|
|
|
if (isHidden()) { |
|
|
|
if (m_uiLocked) { |
|
|
|
if (m_uiLocked && !unlockUI()) // Ask for UI lock password
|
|
|
|
// Ask for UI lock password
|
|
|
|
return; |
|
|
|
if (!unlockUI()) |
|
|
|
|
|
|
|
return; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
// Make sure the window is not minimized
|
|
|
|
// Make sure the window is not minimized
|
|
|
|
setWindowState((windowState() & ~Qt::WindowMinimized) | Qt::WindowActive); |
|
|
|
setWindowState((windowState() & ~Qt::WindowMinimized) | Qt::WindowActive); |
|
|
|
|
|
|
|
|
|
|
|
// Then show it
|
|
|
|
// Then show it
|
|
|
|
show(); |
|
|
|
show(); |
|
|
|
raise(); |
|
|
|
raise(); |
|
|
@ -968,6 +968,12 @@ void MainWindow::toggleVisibility(QSystemTrayIcon::ActivationReason e) |
|
|
|
else { |
|
|
|
else { |
|
|
|
hide(); |
|
|
|
hide(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
break; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
default: |
|
|
|
|
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|