mirror of
https://github.com/debauchee/barrier.git
synced 2026-05-08 06:31:50 +08:00
normalised line endings - replaced \r\n with \n
This commit is contained in:
@@ -1,148 +1,148 @@
|
||||
/*
|
||||
* synergy-plus -- mouse and keyboard sharing utility
|
||||
* Copyright (C) 2009 The Synergy+ Project
|
||||
* Copyright (C) 2008 Volker Lanz (vl@fidra.de)
|
||||
*
|
||||
* This package is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* found in the file COPYING that should have accompanied this file.
|
||||
*
|
||||
* This package is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "WindowsServices.h"
|
||||
#include "AppConfig.h"
|
||||
#include "MainWindow.h"
|
||||
#include "LogDialog.h"
|
||||
|
||||
#include <QWidget>
|
||||
#include <QProcess>
|
||||
#include <QMessageBox>
|
||||
#include <QPushButton>
|
||||
|
||||
WindowsServices::WindowsServices(QWidget* parent, AppConfig& appConfig) :
|
||||
QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
|
||||
Ui::WindowsServicesBase(),
|
||||
m_appConfig(appConfig),
|
||||
m_log(new LogDialog(this, process()))
|
||||
{
|
||||
setupUi(this);
|
||||
}
|
||||
|
||||
void WindowsServices::runProc(const QString& app, const QStringList& args, QPushButton* button)
|
||||
{
|
||||
// disable until we know we've finished
|
||||
button->setEnabled(false);
|
||||
|
||||
// clear contents so user doesn't get confused by previous messages
|
||||
m_log->clear();
|
||||
|
||||
// deleted at end of function
|
||||
QProcess proc(this);
|
||||
m_process = &proc;
|
||||
|
||||
// send output to log window
|
||||
connect(m_process, SIGNAL(readyReadStandardOutput()), m_log, SLOT(readSynergyOutput()));
|
||||
connect(m_process, SIGNAL(readyReadStandardError()), m_log, SLOT(readSynergyOutput()));
|
||||
|
||||
m_process->start(app, args);
|
||||
m_log->show();
|
||||
|
||||
// service management should be instant
|
||||
m_process->waitForFinished();
|
||||
|
||||
if (m_process->exitCode() == 0)
|
||||
{
|
||||
QMessageBox::information(m_log, "Service manager", "Completed successfully.");
|
||||
}
|
||||
else
|
||||
{
|
||||
QMessageBox::critical(
|
||||
m_log, "Service manager error",
|
||||
QString("Unable to install or uninstall service. Error code: " +
|
||||
QString::number(m_process->exitCode())));
|
||||
}
|
||||
|
||||
disconnect(m_process, SIGNAL(readyReadStandardOutput()), m_log, SLOT(readSynergyOutput()));
|
||||
disconnect(m_process, SIGNAL(readyReadStandardError()), m_log, SLOT(readSynergyOutput()));
|
||||
|
||||
button->setEnabled(true);
|
||||
}
|
||||
|
||||
void WindowsServices::on_m_pInstallServer_clicked()
|
||||
{
|
||||
QString app = mainWindow()->appPath(
|
||||
appConfig().synergysName(), appConfig().synergys());
|
||||
|
||||
QStringList args;
|
||||
args <<
|
||||
"--service" << "install" <<
|
||||
"--relaunch" <<
|
||||
"--debug" << appConfig().logLevelText() <<
|
||||
"-c" << mainWindow()->configFilename() <<
|
||||
"--address" << mainWindow()->address();
|
||||
|
||||
if (appConfig().logToFile())
|
||||
{
|
||||
appConfig().persistLogDir();
|
||||
args << "--log" << appConfig().logFilename();
|
||||
}
|
||||
|
||||
runProc(app, args, m_pInstallServer);
|
||||
}
|
||||
|
||||
void WindowsServices::on_m_pUninstallServer_clicked()
|
||||
{
|
||||
QString app = mainWindow()->appPath(
|
||||
appConfig().synergysName(), appConfig().synergys());
|
||||
|
||||
QStringList args;
|
||||
args << "--service" << "uninstall";
|
||||
runProc(app, args, m_pInstallServer);
|
||||
}
|
||||
|
||||
void WindowsServices::on_m_pInstallClient_clicked()
|
||||
{
|
||||
if (mainWindow()->hostname().isEmpty())
|
||||
{
|
||||
QMessageBox::critical(
|
||||
this, "Service manager error", "Hostname was not specified on main screen.");
|
||||
return;
|
||||
}
|
||||
|
||||
QString app = mainWindow()->appPath(
|
||||
appConfig().synergycName(), appConfig().synergyc());
|
||||
|
||||
QStringList args;
|
||||
args <<
|
||||
"--service" << "install" <<
|
||||
"--relaunch" <<
|
||||
"--debug" << appConfig().logLevelText();
|
||||
|
||||
if (appConfig().logToFile())
|
||||
{
|
||||
appConfig().persistLogDir();
|
||||
args << "--log" << appConfig().logFilename();
|
||||
}
|
||||
|
||||
// hostname must come last to be a valid arg
|
||||
args << mainWindow()->hostname();
|
||||
|
||||
runProc(app, args, m_pInstallServer);
|
||||
}
|
||||
|
||||
void WindowsServices::on_m_pUninstallClient_clicked()
|
||||
{
|
||||
QString app = mainWindow()->appPath(
|
||||
appConfig().synergycName(), appConfig().synergyc());
|
||||
|
||||
QStringList args;
|
||||
args << "--service" << "uninstall";
|
||||
runProc(app, args, m_pInstallServer);
|
||||
}
|
||||
/*
|
||||
* synergy-plus -- mouse and keyboard sharing utility
|
||||
* Copyright (C) 2009 The Synergy+ Project
|
||||
* Copyright (C) 2008 Volker Lanz (vl@fidra.de)
|
||||
*
|
||||
* This package is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* found in the file COPYING that should have accompanied this file.
|
||||
*
|
||||
* This package is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "WindowsServices.h"
|
||||
#include "AppConfig.h"
|
||||
#include "MainWindow.h"
|
||||
#include "LogDialog.h"
|
||||
|
||||
#include <QWidget>
|
||||
#include <QProcess>
|
||||
#include <QMessageBox>
|
||||
#include <QPushButton>
|
||||
|
||||
WindowsServices::WindowsServices(QWidget* parent, AppConfig& appConfig) :
|
||||
QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
|
||||
Ui::WindowsServicesBase(),
|
||||
m_appConfig(appConfig),
|
||||
m_log(new LogDialog(this, process()))
|
||||
{
|
||||
setupUi(this);
|
||||
}
|
||||
|
||||
void WindowsServices::runProc(const QString& app, const QStringList& args, QPushButton* button)
|
||||
{
|
||||
// disable until we know we've finished
|
||||
button->setEnabled(false);
|
||||
|
||||
// clear contents so user doesn't get confused by previous messages
|
||||
m_log->clear();
|
||||
|
||||
// deleted at end of function
|
||||
QProcess proc(this);
|
||||
m_process = &proc;
|
||||
|
||||
// send output to log window
|
||||
connect(m_process, SIGNAL(readyReadStandardOutput()), m_log, SLOT(readSynergyOutput()));
|
||||
connect(m_process, SIGNAL(readyReadStandardError()), m_log, SLOT(readSynergyOutput()));
|
||||
|
||||
m_process->start(app, args);
|
||||
m_log->show();
|
||||
|
||||
// service management should be instant
|
||||
m_process->waitForFinished();
|
||||
|
||||
if (m_process->exitCode() == 0)
|
||||
{
|
||||
QMessageBox::information(m_log, "Service manager", "Completed successfully.");
|
||||
}
|
||||
else
|
||||
{
|
||||
QMessageBox::critical(
|
||||
m_log, "Service manager error",
|
||||
QString("Unable to install or uninstall service. Error code: " +
|
||||
QString::number(m_process->exitCode())));
|
||||
}
|
||||
|
||||
disconnect(m_process, SIGNAL(readyReadStandardOutput()), m_log, SLOT(readSynergyOutput()));
|
||||
disconnect(m_process, SIGNAL(readyReadStandardError()), m_log, SLOT(readSynergyOutput()));
|
||||
|
||||
button->setEnabled(true);
|
||||
}
|
||||
|
||||
void WindowsServices::on_m_pInstallServer_clicked()
|
||||
{
|
||||
QString app = mainWindow()->appPath(
|
||||
appConfig().synergysName(), appConfig().synergys());
|
||||
|
||||
QStringList args;
|
||||
args <<
|
||||
"--service" << "install" <<
|
||||
"--relaunch" <<
|
||||
"--debug" << appConfig().logLevelText() <<
|
||||
"-c" << mainWindow()->configFilename() <<
|
||||
"--address" << mainWindow()->address();
|
||||
|
||||
if (appConfig().logToFile())
|
||||
{
|
||||
appConfig().persistLogDir();
|
||||
args << "--log" << appConfig().logFilename();
|
||||
}
|
||||
|
||||
runProc(app, args, m_pInstallServer);
|
||||
}
|
||||
|
||||
void WindowsServices::on_m_pUninstallServer_clicked()
|
||||
{
|
||||
QString app = mainWindow()->appPath(
|
||||
appConfig().synergysName(), appConfig().synergys());
|
||||
|
||||
QStringList args;
|
||||
args << "--service" << "uninstall";
|
||||
runProc(app, args, m_pInstallServer);
|
||||
}
|
||||
|
||||
void WindowsServices::on_m_pInstallClient_clicked()
|
||||
{
|
||||
if (mainWindow()->hostname().isEmpty())
|
||||
{
|
||||
QMessageBox::critical(
|
||||
this, "Service manager error", "Hostname was not specified on main screen.");
|
||||
return;
|
||||
}
|
||||
|
||||
QString app = mainWindow()->appPath(
|
||||
appConfig().synergycName(), appConfig().synergyc());
|
||||
|
||||
QStringList args;
|
||||
args <<
|
||||
"--service" << "install" <<
|
||||
"--relaunch" <<
|
||||
"--debug" << appConfig().logLevelText();
|
||||
|
||||
if (appConfig().logToFile())
|
||||
{
|
||||
appConfig().persistLogDir();
|
||||
args << "--log" << appConfig().logFilename();
|
||||
}
|
||||
|
||||
// hostname must come last to be a valid arg
|
||||
args << mainWindow()->hostname();
|
||||
|
||||
runProc(app, args, m_pInstallServer);
|
||||
}
|
||||
|
||||
void WindowsServices::on_m_pUninstallClient_clicked()
|
||||
{
|
||||
QString app = mainWindow()->appPath(
|
||||
appConfig().synergycName(), appConfig().synergyc());
|
||||
|
||||
QStringList args;
|
||||
args << "--service" << "uninstall";
|
||||
runProc(app, args, m_pInstallServer);
|
||||
}
|
||||
|
||||
@@ -1,59 +1,59 @@
|
||||
/*
|
||||
* synergy-plus -- mouse and keyboard sharing utility
|
||||
* Copyright (C) 2009 The Synergy+ Project
|
||||
* Copyright (C) 2008 Volker Lanz (vl@fidra.de)
|
||||
*
|
||||
* This package is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* found in the file COPYING that should have accompanied this file.
|
||||
*
|
||||
* This package is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef WINDOWSSERVICES_H
|
||||
#define WINDOWSSERVICES_H
|
||||
|
||||
#include "ui_WindowsServicesBase.h"
|
||||
|
||||
class QWidget;
|
||||
class QProcess;
|
||||
class QPushButton;
|
||||
class QProcess;
|
||||
|
||||
class AppConfig;
|
||||
class MainWindow;
|
||||
class LogDialog;
|
||||
|
||||
class WindowsServices : public QDialog, public Ui::WindowsServicesBase
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
WindowsServices(QWidget* parent, AppConfig& appConfig);
|
||||
|
||||
protected:
|
||||
AppConfig &appConfig() const { return m_appConfig; }
|
||||
MainWindow* mainWindow() const { return (MainWindow*)parent(); }
|
||||
QProcess*& process() { return m_process; }
|
||||
void runProc(const QString& app, const QStringList& args, QPushButton* button);
|
||||
|
||||
private:
|
||||
QString m_app;
|
||||
AppConfig &m_appConfig;
|
||||
QProcess* m_process;
|
||||
LogDialog* m_log;
|
||||
|
||||
private slots:
|
||||
void on_m_pUninstallClient_clicked();
|
||||
void on_m_pInstallClient_clicked();
|
||||
void on_m_pUninstallServer_clicked();
|
||||
void on_m_pInstallServer_clicked();
|
||||
};
|
||||
|
||||
#endif // WINDOWSSERVICES_H
|
||||
/*
|
||||
* synergy-plus -- mouse and keyboard sharing utility
|
||||
* Copyright (C) 2009 The Synergy+ Project
|
||||
* Copyright (C) 2008 Volker Lanz (vl@fidra.de)
|
||||
*
|
||||
* This package is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* found in the file COPYING that should have accompanied this file.
|
||||
*
|
||||
* This package is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef WINDOWSSERVICES_H
|
||||
#define WINDOWSSERVICES_H
|
||||
|
||||
#include "ui_WindowsServicesBase.h"
|
||||
|
||||
class QWidget;
|
||||
class QProcess;
|
||||
class QPushButton;
|
||||
class QProcess;
|
||||
|
||||
class AppConfig;
|
||||
class MainWindow;
|
||||
class LogDialog;
|
||||
|
||||
class WindowsServices : public QDialog, public Ui::WindowsServicesBase
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
WindowsServices(QWidget* parent, AppConfig& appConfig);
|
||||
|
||||
protected:
|
||||
AppConfig &appConfig() const { return m_appConfig; }
|
||||
MainWindow* mainWindow() const { return (MainWindow*)parent(); }
|
||||
QProcess*& process() { return m_process; }
|
||||
void runProc(const QString& app, const QStringList& args, QPushButton* button);
|
||||
|
||||
private:
|
||||
QString m_app;
|
||||
AppConfig &m_appConfig;
|
||||
QProcess* m_process;
|
||||
LogDialog* m_log;
|
||||
|
||||
private slots:
|
||||
void on_m_pUninstallClient_clicked();
|
||||
void on_m_pInstallClient_clicked();
|
||||
void on_m_pUninstallServer_clicked();
|
||||
void on_m_pInstallServer_clicked();
|
||||
};
|
||||
|
||||
#endif // WINDOWSSERVICES_H
|
||||
|
||||
Reference in New Issue
Block a user