backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-06-30 17:06:29 +08:00
Code Issues Projects Releases Wiki Activity

Made log consistent #4745

Browse Source
This commit is contained in:
Xinyu Hou
2015-06-30 03:37:36 +01:00
parent 6d5f997a1e
commit 85dc7a566e
11 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/gui/src/MainWindow.cpp
View File

@@ -368,9 +368,14 @@ void MainWindow::updateFound(const QString &version)
.arg(version).arg(DOWNLOAD_URL));
}
void MainWindow::appendLogNote(const QString& text)
void MainWindow::appendLogInfo(const QString& text)
{
appendLogRaw("NOTE: " + text);
appendLogRaw("INFO: " + text);
}
void MainWindow::appendLogNotify(const QString& text)
{
appendLogRaw("NOTIFY: " + text);
}
void MainWindow::appendLogDebug(const QString& text) {
@@ -468,13 +473,13 @@ void MainWindow::checkFingerprint(const QString& line)
void MainWindow::checkTransmission(const QString& line)
{
if (appConfig().logLevel() >= 2) {
if (line.contains("Transmission")) {
if (line.contains("Started")) {
if (line.contains("transmission")) {
if (line.contains("started")) {
setSynergyState(synergyTransfering);
}
else if (line.contains("Failed") ||
line.contains("Complete") ||
line.contains("Interrupted")) {
else if (line.contains("failed") ||
line.contains("complete") ||
line.contains("interrupted")) {
setSynergyState(synergyConnected);
}
}
@@ -576,20 +581,20 @@ void MainWindow::startSynergy()
if (!m_pLogOutput->toPlainText().isEmpty())
appendLogRaw("");
appendLogNote("starting " + QString(synergyType() == synergyServer ? "server" : "client"));
appendLogInfo("starting " + QString(synergyType() == synergyServer ? "server" : "client"));
qDebug() << args;
// show command if debug log level...
if (appConfig().logLevel() >= 2) {
appendLogNote(QString("command: %1 %2").arg(app, args.join(" ")));
appendLogInfo(QString("command: %1 %2").arg(app, args.join(" ")));
}
appendLogNote("config file: " + configFilename());
appendLogNote("log level: " + appConfig().logLevelText());
appendLogInfo("config file: " + configFilename());
appendLogInfo("log level: " + appConfig().logLevelText());
if (appConfig().logToFile())
appendLogNote("log file: " + appConfig().logFilename());
appendLogInfo("log file: " + appConfig().logFilename());
if (desktopMode)
{
@@ -770,7 +775,7 @@ void MainWindow::stopDesktop()
return;
}
appendLogNote("stopping synergy desktop process");
appendLogInfo("stopping synergy desktop process");
if (synergyProcess()->isOpen())
synergyProcess()->close();
@@ -1321,7 +1326,7 @@ void MainWindow::on_m_pCheckBoxAutoConfig_toggled(bool checked)
void MainWindow::bonjourInstallFinished()
{
appendLogNote("Bonjour install finished");
appendLogInfo("Bonjour install finished");
m_pCheckBoxAutoConfig->setChecked(true);
}

3
src/gui/src/MainWindow.h
View File

@@ -111,7 +111,8 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
public slots:
void appendLogRaw(const QString& text);
void appendLogNote(const QString& text);
void appendLogInfo(const QString& text);
void appendLogNotify(const QString& text);
void appendLogDebug(const QString& text);
void appendLogError(const QString& text);
void startSynergy();

4
src/gui/src/ZeroconfService.cpp
View File

@@ -79,7 +79,7 @@ void ZeroconfService::serverDetected(const QList<ZeroconfRecord>& list)
{
foreach (ZeroconfRecord record, list) {
registerService(false);
m_pMainWindow->appendLogNote(tr("zeroconf server detected: %1").arg(
m_pMainWindow->appendLogInfo(tr("zeroconf server detected: %1").arg(
record.serviceName));
m_pMainWindow->serverDetected(record.serviceName);
}
@@ -88,7 +88,7 @@ void ZeroconfService::serverDetected(const QList<ZeroconfRecord>& list)
void ZeroconfService::clientDetected(const QList<ZeroconfRecord>& list)
{
foreach (ZeroconfRecord record, list) {
m_pMainWindow->appendLogNote(tr("zeroconf client detected: %1").arg(
m_pMainWindow->appendLogInfo(tr("zeroconf client detected: %1").arg(
record.serviceName));
m_pMainWindow->autoAddScreen(record.serviceName);
}