fix autohide on windows and correct a typo in settings ui
This commit is contained in:
parent
cda6933f10
commit
ccb02372bf
|
@ -168,7 +168,9 @@ void MainWindow::open()
|
||||||
{
|
{
|
||||||
createTrayIcon();
|
createTrayIcon();
|
||||||
|
|
||||||
if (!autoHide()) {
|
if (appConfig().getAutoHide()) {
|
||||||
|
hide();
|
||||||
|
} else {
|
||||||
showNormal();
|
showNormal();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -470,17 +472,6 @@ void MainWindow::checkFingerprint(const QString& line)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
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();
|
||||||
|
|
|
@ -175,7 +175,6 @@ public slots:
|
||||||
QString getProfileRootForArg();
|
QString getProfileRootForArg();
|
||||||
void checkConnected(const QString& line);
|
void checkConnected(const QString& line);
|
||||||
void checkFingerprint(const QString& line);
|
void checkFingerprint(const QString& line);
|
||||||
bool autoHide();
|
|
||||||
QString getTimeStamp();
|
QString getTimeStamp();
|
||||||
void restartBarrier();
|
void restartBarrier();
|
||||||
void proofreadInfo();
|
void proofreadInfo();
|
||||||
|
|
|
@ -184,7 +184,7 @@
|
||||||
<item row="2" column="0">
|
<item row="2" column="0">
|
||||||
<widget class="QCheckBox" name="m_pCheckBoxEnableCrypto">
|
<widget class="QCheckBox" name="m_pCheckBoxEnableCrypto">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Use Enable &SSL</string>
|
<string>Enable &SSL</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
|
Loading…
Reference in New Issue