rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

changed gui "info" messages to "note" and made ipc windows only.

This commit is contained in:
Nick Bolton 2012-07-14 17:01:29 +00:00
parent 3e0f062df0
commit 1613e6ca79
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,11 +79,13 @@ MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig) :
m_SetupWizard = new SetupWizard(*this, false); m_SetupWizard = new SetupWizard(*this, false);
connect(m_SetupWizard, SIGNAL(finished(int)), this, SLOT(wizardFinished())); connect(m_SetupWizard, SIGNAL(finished(int)), this, SLOT(wizardFinished()));
#if defined(Q_OS_WIN)
// ipc must always be enabled, so that we can disable command when switching to desktop mode. // ipc must always be enabled, so that we can disable command when switching to desktop mode.
connect(&m_IpcClient, SIGNAL(readLogLine(const QString&)), this, SLOT(appendLogRaw(const QString&))); connect(&m_IpcClient, SIGNAL(readLogLine(const QString&)), this, SLOT(appendLogRaw(const QString&)));
connect(&m_IpcClient, SIGNAL(errorMessage(const QString&)), this, SLOT(appendLogError(const QString&))); connect(&m_IpcClient, SIGNAL(errorMessage(const QString&)), this, SLOT(appendLogError(const QString&)));
connect(&m_IpcClient, SIGNAL(infoMessage(const QString&)), this, SLOT(appendLogInfo(const QString&))); connect(&m_IpcClient, SIGNAL(infoMessage(const QString&)), this, SLOT(appendLogNote(const QString&)));
m_IpcClient.connectToHost(); m_IpcClient.connectToHost();
#endif
} }
MainWindow::~MainWindow() MainWindow::~MainWindow()
@ -319,9 +321,9 @@ void MainWindow::updateFound(const QString &version)
.arg(version).arg("http://synergy-foss.org")); .arg(version).arg("http://synergy-foss.org"));
} }
void MainWindow::appendLogInfo(const QString& text) void MainWindow::appendLogNote(const QString& text)
{ {
appendLogRaw("INFO: " + text); appendLogRaw("NOTE: " + text);
} }
void MainWindow::appendLogError(const QString& text) void MainWindow::appendLogError(const QString& text)
@ -416,24 +418,24 @@ void MainWindow::startSynergy()
if (desktopMode) if (desktopMode)
{ {
appendLogInfo("starting " + QString(synergyType() == synergyServer ? "server" : "client")); appendLogNote("starting " + QString(synergyType() == synergyServer ? "server" : "client"));
} }
if (serviceMode) if (serviceMode)
{ {
appendLogInfo("applying service mode: " + QString(synergyType() == synergyServer ? "server" : "client")); appendLogNote("applying service mode: " + QString(synergyType() == synergyServer ? "server" : "client"));
} }
// show command if debug log level... // show command if debug log level...
if (appConfig().logLevel() >= 4) { if (appConfig().logLevel() >= 4) {
appendLogInfo(QString("command: %1 %2").arg(app, args.join(" "))); appendLogNote(QString("command: %1 %2").arg(app, args.join(" ")));
} }
appendLogInfo("config file: " + configFilename()); appendLogNote("config file: " + configFilename());
appendLogInfo("log level: " + appConfig().logLevelText()); appendLogNote("log level: " + appConfig().logLevelText());
if (appConfig().logToFile()) if (appConfig().logToFile())
appendLogInfo("log file: " + appConfig().logFilename()); appendLogNote("log file: " + appConfig().logFilename());
if (desktopMode) if (desktopMode)
{ {
@ -556,7 +558,7 @@ void MainWindow::stopSynergy()
{ {
if (synergyProcess()) if (synergyProcess())
{ {
appendLogInfo("stopping synergy"); appendLogNote("stopping synergy");
if (synergyProcess()->isOpen()) if (synergyProcess()->isOpen())
synergyProcess()->close(); synergyProcess()->close();

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

@ -92,7 +92,7 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
public slots: public slots:
void appendLogRaw(const QString& text); void appendLogRaw(const QString& text);
void appendLogInfo(const QString& text); void appendLogNote(const QString& text);
void appendLogError(const QString& text); void appendLogError(const QString& text);
protected slots: protected slots: