Your trial has " "expired. Buy now!" "
") @@ -77,7 +77,7 @@ void ActivationDialog::accept() } catch (std::exception& e) { message.critical(this, "Unknown Error", - tr("An error occurred while trying to activate Synergy. " + tr("An error occurred while trying to activate Barrier. " "Please contact the helpdesk, and provide the " "following information:\n\n%1").arg(e.what())); refreshSerialKey(); diff --git a/src/gui/src/ActivationDialog.ui b/src/gui/src/ActivationDialog.ui index 86fea30d..6d33eddf 100644 --- a/src/gui/src/ActivationDialog.ui +++ b/src/gui/src/ActivationDialog.ui @@ -11,7 +11,7 @@Your version of Synergy is out of date. " + tr("
Your version of Barrier is out of date. " "Version %1 is now available to " "download.
") .arg(version).arg(DOWNLOAD_URL)); @@ -441,13 +441,13 @@ void MainWindow::checkConnected(const QString& line) line.contains("connected to server") || line.contains("watchdog status: ok")) { - setSynergyState(synergyConnected); + setBarrierState(barrierConnected); if (!appConfig().startedBefore() && isVisible()) { QMessageBox::information( - this, "Synergy", - tr("Synergy is now connected. You can close the " - "config window and Synergy will remain connected in " + this, "Barrier", + tr("Barrier is now connected. You can close the " + "config window and Barrier will remain connected in " "the background.")); appConfig().setStartedBefore(true); @@ -479,7 +479,7 @@ void MainWindow::checkFingerprint(const QString& line) static bool messageBoxAlreadyShown = false; if (!messageBoxAlreadyShown) { - stopSynergy(); + stopBarrier(); messageBoxAlreadyShown = true; QMessageBox::StandardButton fingerprintReply = @@ -500,7 +500,7 @@ void MainWindow::checkFingerprint(const QString& line) if (fingerprintReply == QMessageBox::Yes) { // restart core process after trusting fingerprint. Fingerprint::trustedServers().trust(fingerprint); - startSynergy(); + startBarrier(); } messageBoxAlreadyShown = false; @@ -524,19 +524,19 @@ QString MainWindow::getTimeStamp() return '[' + current.toString(Qt::ISODate) + ']'; } -void MainWindow::restartSynergy() +void MainWindow::restartBarrier() { - stopSynergy(); - startSynergy(); + stopBarrier(); + startBarrier(); } void MainWindow::proofreadInfo() { setEdition(m_AppConfig->edition()); // Why is this here? - int oldState = m_SynergyState; - m_SynergyState = synergyDisconnected; - setSynergyState((qSynergyState)oldState); + int oldState = m_BarrierState; + m_BarrierState = barrierDisconnected; + setBarrierState((qBarrierState)oldState); } void MainWindow::showEvent(QShowEvent* event) @@ -550,7 +550,7 @@ void MainWindow::clearLog() m_pLogOutput->clear(); } -void MainWindow::startSynergy() +void MainWindow::startBarrier() { SerialKey serialKey = m_LicenseManager->serialKey(); time_t currentTime = ::time(0); @@ -565,7 +565,7 @@ void MainWindow::startSynergy() appendLogDebug("starting process"); m_ExpectedRunningState = kStarted; - setSynergyState(synergyConnecting); + setBarrierState(barrierConnecting); QString app; QStringList args; @@ -577,7 +577,7 @@ void MainWindow::startSynergy() if (desktopMode) { - setSynergyProcess(new QProcess(this)); + setBarrierProcess(new QProcess(this)); } else { @@ -589,9 +589,9 @@ void MainWindow::startSynergy() // is switched; this is because we may need to elevate or not // based on which desk the user is in (login always needs // elevation, where as default desk does not). - // Note that this is only enabled when synergy is set to elevate + // Note that this is only enabled when barrier is set to elevate // 'as needed' (e.g. on a UAC dialog popup) in order to prevent - // unnecessary restarts when synergy was started elevated or + // unnecessary restarts when barrier was started elevated or // when it is not allowed to elevate. In these cases restarting // the server is fruitless. if (appConfig().elevateMode() == ElevateAsNeeded) { @@ -620,25 +620,25 @@ void MainWindow::startSynergy() args << "--profile-dir" << getProfileRootForArg(); #endif - if ((synergyType() == synergyClient && !clientArgs(args, app)) - || (synergyType() == synergyServer && !serverArgs(args, app))) + if ((barrierType() == barrierClient && !clientArgs(args, app)) + || (barrierType() == barrierServer && !serverArgs(args, app))) { - stopSynergy(); + stopBarrier(); return; } if (desktopMode) { - connect(synergyProcess(), SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(synergyFinished(int, QProcess::ExitStatus))); - connect(synergyProcess(), SIGNAL(readyReadStandardOutput()), this, SLOT(logOutput())); - connect(synergyProcess(), SIGNAL(readyReadStandardError()), this, SLOT(logError())); + connect(barrierProcess(), SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(barrierFinished(int, QProcess::ExitStatus))); + connect(barrierProcess(), SIGNAL(readyReadStandardOutput()), this, SLOT(logOutput())); + connect(barrierProcess(), SIGNAL(readyReadStandardError()), this, SLOT(logError())); } // put a space between last log output and new instance. if (!m_pLogOutput->toPlainText().isEmpty()) appendLogRaw(""); - appendLogInfo("starting " + QString(synergyType() == synergyServer ? "server" : "client")); + appendLogInfo("starting " + QString(barrierType() == barrierServer ? "server" : "client")); qDebug() << args; @@ -655,8 +655,8 @@ void MainWindow::startSynergy() if (desktopMode) { - synergyProcess()->start(app, args); - if (!synergyProcess()->waitForStarted()) + barrierProcess()->start(app, args); + if (!barrierProcess()->waitForStarted()) { show(); QMessageBox::warning(this, tr("Program can not be started"), QString(tr("The executable%1 day%3 of " "your %2 trial remain%5. " + "\"https://symless.com/barrier/trial/thanks?id=%4\">" "Buy now!" "
"); @@ -1096,7 +1096,7 @@ void MainWindow::endTrial(bool isExpired) if (isExpired) { QString expiredNotice ( "Your %1 trial has expired. " + "\"https://symless.com/barrier/trial/thanks?id=%2\">" "" "Buy now!
" ); @@ -1108,7 +1108,7 @@ void MainWindow::endTrial(bool isExpired) this->m_trialLabel->setText(expiredNotice); this->m_trialWidget->show(); - stopSynergy(); + stopBarrier(); m_AppConfig->activationHasRun(false); } else { this->m_trialWidget->hide(); @@ -1153,7 +1153,7 @@ void MainWindow::on_m_pGroupServer_toggled(bool on) bool MainWindow::on_m_pButtonBrowseConfigFile_clicked() { - QString fileName = QFileDialog::getOpenFileName(this, tr("Browse for a synergys config file"), QString(), synergyConfigFilter); + QString fileName = QFileDialog::getOpenFileName(this, tr("Browse for a barriers config file"), QString(), barrierConfigFilter); if (!fileName.isEmpty()) { @@ -1179,7 +1179,7 @@ bool MainWindow::on_m_pActionSave_triggered() void MainWindow::on_m_pActionAbout_triggered() { - AboutDialog dlg(this, appPath(appConfig().synergycName())); + AboutDialog dlg(this, appPath(appConfig().barriercName())); dlg.exec(); } @@ -1225,7 +1225,7 @@ void MainWindow::autoAddScreen(const QString name) } } else { - restartSynergy(); + restartBarrier(); } } } @@ -1249,7 +1249,7 @@ void MainWindow::on_m_pActivate_triggered() void MainWindow::on_m_pButtonApply_clicked() { - restartSynergy(); + restartBarrier(); } #if defined(Q_OS_WIN) @@ -1312,7 +1312,7 @@ void MainWindow::downloadBonjour() } else { QMessageBox::critical( - this, tr("Synergy"), + this, tr("Barrier"), tr("Failed to detect system architecture.")); return; } @@ -1326,7 +1326,7 @@ void MainWindow::downloadBonjour() if (m_DownloadMessageBox == NULL) { m_DownloadMessageBox = new QMessageBox(this); - m_DownloadMessageBox->setWindowTitle("Synergy"); + m_DownloadMessageBox->setWindowTitle("Barrier"); m_DownloadMessageBox->setIcon(QMessageBox::Information); m_DownloadMessageBox->setText("Installing Bonjour, please wait..."); m_DownloadMessageBox->setStandardButtons(0); @@ -1358,7 +1358,7 @@ void MainWindow::installBonjour() m_DownloadMessageBox->hide(); QMessageBox::warning( - this, "Synergy", + this, "Barrier", tr("Failed to download Bonjour installer to location: %1") .arg(tempLocation)); return; @@ -1395,7 +1395,7 @@ void MainWindow::promptAutoConfig() { if (!isBonjourRunning()) { int r = QMessageBox::question( - this, tr("Synergy"), + this, tr("Barrier"), tr("Do you want to enable auto config and install Bonjour?\n\n" "This feature helps you establish the connection."), QMessageBox::Yes | QMessageBox::No); @@ -1416,7 +1416,7 @@ void MainWindow::promptAutoConfig() void MainWindow::on_m_pComboServerList_currentIndexChanged(QString ) { if (m_pComboServerList->count() != 0) { - restartSynergy(); + restartBarrier(); } } @@ -1425,7 +1425,7 @@ void MainWindow::on_m_pCheckBoxAutoConfig_toggled(bool checked) if (!isBonjourRunning() && checked) { if (!m_SuppressAutoConfigWarning) { int r = QMessageBox::information( - this, tr("Synergy"), + this, tr("Barrier"), tr("Auto config feature requires Bonjour.\n\n" "Do you want to install Bonjour?"), QMessageBox::Yes | QMessageBox::No); @@ -1475,7 +1475,7 @@ int MainWindow::raiseActivationDialog() m_PendingClientNames.clear(); } if (result == QDialog::Accepted) { - restartSynergy(); + restartBarrier(); } return result; } @@ -1497,9 +1497,9 @@ QString MainWindow::getProfileRootForArg() // HACK: strip our app name since we're returning the root dir. #if defined(Q_OS_WIN) - dir.replace("\\Synergy", ""); + dir.replace("\\Barrier", ""); #else - dir.replace("/.synergy", ""); + dir.replace("/.barrier", ""); #endif return QString("\"%1\"").arg(dir); diff --git a/src/gui/src/MainWindow.h b/src/gui/src/MainWindow.h index 75920caa..def85fe3 100644 --- a/src/gui/src/MainWindow.h +++ b/src/gui/src/MainWindow.h @@ -1,5 +1,5 @@ /* - * synergy -- mouse and keyboard sharing utility + * barrier -- mouse and keyboard sharing utility * Copyright (C) 2012-2016 Symless Ltd. * Copyright (C) 2008 Volker Lanz (vl@fidra.de) * @@ -52,7 +52,7 @@ class QMessageBox; class QAbstractButton; class LogDialog; -class QSynergyApplication; +class QBarrierApplication; class SetupWizard; class ZeroconfService; class DataDownloader; @@ -64,24 +64,24 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase { Q_OBJECT - friend class QSynergyApplication; + friend class QBarrierApplication; friend class SetupWizard; friend class ActivationDialog; friend class SettingsDialog; public: - enum qSynergyState + enum qBarrierState { - synergyDisconnected, - synergyConnecting, - synergyConnected, - synergyTransfering + barrierDisconnected, + barrierConnecting, + barrierConnected, + barrierTransfering }; - enum qSynergyType + enum qBarrierType { - synergyClient, - synergyServer + barrierClient, + barrierServer }; enum qLevel { @@ -101,8 +101,8 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase public: void setVisible(bool visible); - int synergyType() const { return m_pGroupClient->isChecked() ? synergyClient : synergyServer; } - int synergyState() const { return m_SynergyState; } + int barrierType() const { return m_pGroupClient->isChecked() ? barrierClient : barrierServer; } + int barrierState() const { return m_BarrierState; } QString hostname() const { return m_pLineEditHostname->text(); } QString configFilename(); QString address(); @@ -130,7 +130,7 @@ public slots: void appendLogInfo(const QString& text); void appendLogDebug(const QString& text); void appendLogError(const QString& text); - void startSynergy(); + void startBarrier(); protected slots: void sslToggled(bool enabled); @@ -142,9 +142,9 @@ public slots: void on_m_pActionAbout_triggered(); void on_m_pActionSettings_triggered(); void on_m_pActivate_triggered(); - void synergyFinished(int exitCode, QProcess::ExitStatus); + void barrierFinished(int exitCode, QProcess::ExitStatus); void trayActivated(QSystemTrayIcon::ActivationReason reason); - void stopSynergy(); + void stopBarrier(); void logOutput(); void logError(); void updateFound(const QString& version); @@ -153,16 +153,16 @@ public slots: protected: QSettings& settings() { return m_Settings; } AppConfig& appConfig() { return *m_AppConfig; } - QProcess* synergyProcess() { return m_pSynergy; } - void setSynergyProcess(QProcess* p) { m_pSynergy = p; } + QProcess* barrierProcess() { return m_pBarrier; } + void setBarrierProcess(QProcess* p) { m_pBarrier = p; } void initConnections(); void createMenuBar(); void createStatusBar(); void createTrayIcon(); void loadSettings(); void saveSettings(); - void setIcon(qSynergyState state); - void setSynergyState(qSynergyState state); + void setIcon(qBarrierState state); + void setBarrierState(qBarrierState state); bool checkForApp(int which, QString& app); bool clientArgs(QStringList& args, QString& app); bool serverArgs(QStringList& args, QString& app); @@ -189,7 +189,7 @@ public slots: void checkFingerprint(const QString& line); bool autoHide(); QString getTimeStamp(); - void restartSynergy(); + void restartBarrier(); void proofreadInfo(); void showEvent (QShowEvent*); @@ -198,8 +198,8 @@ public slots: QSettings& m_Settings; AppConfig* m_AppConfig; LicenseManager* m_LicenseManager; - QProcess* m_pSynergy; - int m_SynergyState; + QProcess* m_pBarrier; + int m_BarrierState; ServerConfig m_ServerConfig; QTemporaryFile* m_pTempConfigFile; QSystemTrayIcon* m_pTrayIcon; diff --git a/src/gui/src/MainWindowBase.ui b/src/gui/src/MainWindowBase.ui index 7069b8b2..36a93d24 100644 --- a/src/gui/src/MainWindowBase.ui +++ b/src/gui/src/MainWindowBase.ui @@ -23,7 +23,7 @@