#6523 The auto hide feature was hidden, so this restores it
This commit is contained in:
parent
a33c2cb2b4
commit
629ed12885
|
@ -207,7 +207,9 @@ void MainWindow::open()
|
||||||
{
|
{
|
||||||
createTrayIcon();
|
createTrayIcon();
|
||||||
|
|
||||||
if (!autoHide()) {
|
if (appConfig().getAutoHide()) {
|
||||||
|
hide();
|
||||||
|
} else {
|
||||||
showNormal();
|
showNormal();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -539,24 +541,12 @@ void MainWindow::checkFingerprint(const QString& line)
|
||||||
|
|
||||||
void MainWindow::checkSecureSocket(const QString& line)
|
void MainWindow::checkSecureSocket(const QString& line)
|
||||||
{
|
{
|
||||||
// obviously not very secure, since this can be tricked by injecting something
|
// obviously not very secure, since this can be tricked by injecting something
|
||||||
// into the log. however, since we don't have IPC between core and GUI... patches welcome.
|
// into the log. however, since we don't have IPC between core and GUI... patches welcome.
|
||||||
if (line.contains(tlsCheckString)) {
|
if (line.contains(tlsCheckString)) {
|
||||||
secureSocket(true);
|
secureSocket(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool MainWindow::autoHide()
|
|
||||||
{
|
|
||||||
if ((appConfig().processMode() == Desktop) &&
|
|
||||||
appConfig().getAutoHide()) {
|
|
||||||
hide();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
QString MainWindow::getTimeStamp()
|
QString MainWindow::getTimeStamp()
|
||||||
{
|
{
|
||||||
QDateTime current = QDateTime::currentDateTime();
|
QDateTime current = QDateTime::currentDateTime();
|
||||||
|
|
|
@ -196,7 +196,6 @@ public slots:
|
||||||
#ifndef SYNERGY_ENTERPRISE
|
#ifndef SYNERGY_ENTERPRISE
|
||||||
void checkLicense(const QString& line);
|
void checkLicense(const QString& line);
|
||||||
#endif
|
#endif
|
||||||
bool autoHide();
|
|
||||||
QString getTimeStamp();
|
QString getTimeStamp();
|
||||||
void restartSynergy();
|
void restartSynergy();
|
||||||
void proofreadInfo();
|
void proofreadInfo();
|
||||||
|
|
Loading…
Reference in New Issue