backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-07-05 19:36:16 +08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v1.7.4-stable'

Browse Source
This commit is contained in:
Jerry (Xinyu Hou)
2015-06-30 15:43:39 -07:00
parent 673fba5846 44fa44fd1b
commit 8a026e06bd
13 changed files with 40 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/res/SettingsDialogBase.ui
View File

@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>368</width>
<height>377</height>
<height>439</height>
</rect>
</property>
<property name="windowTitle">
@@ -208,11 +208,6 @@
</item>
<item row="0" column="1" colspan="2">
<widget class="QComboBox" name="m_pComboLogLevel">
<item>
<property name="text">
<string>Notify</string>
</property>
</item>
<item>
<property name="text">
<string>Info</string>

5
src/gui/src/AppConfig.cpp
View File

@@ -37,7 +37,6 @@ const char AppConfig::m_SynergyLogDir[] = "/var/log/";
static const char* logLevelNames[] =
{
"NOTIFY",
"INFO",
"DEBUG",
"DEBUG1",
@@ -117,7 +116,7 @@ void AppConfig::loadSettings()
m_ScreenName = settings().value("screenName", QHostInfo::localHostName()).toString();
m_Port = settings().value("port", 24800).toInt();
m_Interface = settings().value("interface").toString();
m_LogLevel = settings().value("logLevel", 1).toInt(); // level 1: INFO
m_LogLevel = settings().value("logLevel", 0).toInt(); // level 0: INFO
m_LogToFile = settings().value("logToFile", false).toBool();
m_LogFilename = settings().value("logFilename", synergyLogDir() + "synergy.log").toString();
m_WizardLastRun = settings().value("wizardLastRun", 0).toInt();
@@ -134,7 +133,7 @@ void AppConfig::loadSettings()
m_ResetLogLevel = settings().value("resetLogLevel", true).toBool();
if (m_ResetLogLevel) {
m_LogLevel = 1;
m_LogLevel = 0;
m_ResetLogLevel = false;
}
}

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

@@ -368,13 +368,13 @@ 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::appendLogDebug(const QString& text) {
if (appConfig().logLevel() >= 2) {
if (appConfig().logLevel() >= 1) {
appendLogRaw("DEBUG: " + text);
}
}
@@ -468,26 +468,15 @@ 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);
}
// NOTIFY: Title: Detail
int p1 = line.indexOf(':');
if (p1 > 0) {
int p2 = line.indexOf(':', p1 + 1);
if (p2 > 0) {
QString title = line.mid(p1 + 2, p2 - p1 - 2);
QString detail = line.mid(p2 + 2);
m_pTrayIcon->showMessage(title, detail);
}
}
}
}
}
@@ -587,20 +576,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(" ")));
if (appConfig().logLevel() >= 1) {
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)
{
@@ -781,7 +770,7 @@ void MainWindow::stopDesktop()
return;
}
appendLogNote("stopping synergy desktop process");
appendLogInfo("stopping synergy desktop process");
if (synergyProcess()->isOpen())
synergyProcess()->close();
@@ -1122,7 +1111,7 @@ bool MainWindow::isServiceRunning(QString name)
SC_HANDLE hSCManager;
hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT);
if (hSCManager == NULL) {
appendLogNote("failed to open a service controller manager, error: " +
appendLogError("failed to open a service controller manager, error: " +
GetLastError());
return false;
}
@@ -1175,11 +1164,11 @@ void MainWindow::downloadBonjour()
int arch = getProcessorArch();
if (arch == kProcessorArchWin32) {
url.setUrl(bonjourBaseUrl + bonjourFilename32);
appendLogNote("downloading 32-bit Bonjour");
appendLogInfo("downloading 32-bit Bonjour");
}
else if (arch == kProcessorArchWin64) {
url.setUrl(bonjourBaseUrl + bonjourFilename64);
appendLogNote("downloading 64-bit Bonjour");
appendLogInfo("downloading 64-bit Bonjour");
}
else {
QMessageBox::critical(
@@ -1332,7 +1321,7 @@ void MainWindow::on_m_pCheckBoxAutoConfig_toggled(bool checked)
void MainWindow::bonjourInstallFinished()
{
appendLogNote("Bonjour install finished");
appendLogInfo("Bonjour install finished");
m_pCheckBoxAutoConfig->setChecked(true);
}

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

@@ -113,7 +113,7 @@ 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 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);
}