mirror of
https://github.com/debauchee/barrier.git
synced 2026-05-11 00:58:14 +08:00
Some work toward Issue 27 and Issue 319
This commit is contained in:
@@ -83,3 +83,5 @@ release {
|
||||
RCC_DIR = tmp/release
|
||||
}
|
||||
|
||||
Debug:DESTDIR = ../bin/Debug
|
||||
Release:DESTDIR = ../bin/Release
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 8.3 KiB After Width: | Height: | Size: 281 KiB |
@@ -1 +1 @@
|
||||
IDI_ICON1 ICON DISCARDABLE "res\win\QSynergy.ico"
|
||||
IDI_ICON1 ICON DISCARDABLE "res\\win\\QSynergy.ico"
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#if defined(Q_OS_WIN)
|
||||
const char AppConfig::m_SynergysName[] = "synergys.exe";
|
||||
const char AppConfig::m_SynergycName[] = "synergyc.exe";
|
||||
const char AppConfig::m_SynergyProgramDir[] = "c:/program files/synergy/";
|
||||
const char AppConfig::m_SynergyProgramDir[] = "./";
|
||||
#else
|
||||
const char AppConfig::m_SynergysName[] = "synergys";
|
||||
const char AppConfig::m_SynergycName[] = "synergyc";
|
||||
|
||||
@@ -224,7 +224,7 @@ void MainWindow::startSynergy()
|
||||
setSynergyProcess(new QProcess(this));
|
||||
|
||||
if ((synergyType() == synergyClient && !clientArgs(args, app))
|
||||
|| synergyType() == synergyServer && !serverArgs(args, app))
|
||||
|| (synergyType() == synergyServer && !serverArgs(args, app)))
|
||||
{
|
||||
stopSynergy();
|
||||
return;
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
QCoreApplication::setOrganizationName("Fidra");
|
||||
QCoreApplication::setOrganizationDomain("www.fidra.de");
|
||||
QCoreApplication::setApplicationName("QSynergy");
|
||||
QCoreApplication::setOrganizationName("The Synergy+ Project");
|
||||
QCoreApplication::setOrganizationDomain("http://code.google.com/p/synergy-plus/");
|
||||
QCoreApplication::setApplicationName("Synergy+");
|
||||
|
||||
QSynergyApplication app(argc, argv);
|
||||
|
||||
#if !defined(Q_OS_MAC)
|
||||
if (!QSystemTrayIcon::isSystemTrayAvailable())
|
||||
{
|
||||
QMessageBox::critical(NULL, "QSynergy", QObject::tr("There doesn't seem to be a system tray available. Quitting."));
|
||||
QMessageBox::critical(NULL, "Synergy+", QObject::tr("There doesn't seem to be a system tray available. Quitting."));
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user