Some work toward Issue 27 and Issue 319

This commit is contained in:
Nick Bolton
2010-05-31 21:30:29 +00:00
parent fea12827d4
commit f974d8d680
74 changed files with 4057 additions and 3756 deletions

View File

@@ -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

View File

@@ -1 +1 @@
IDI_ICON1 ICON DISCARDABLE "res\win\QSynergy.ico"
IDI_ICON1 ICON DISCARDABLE "res\\win\\QSynergy.ico"

View File

@@ -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";

View File

@@ -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;

View File

@@ -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;
}