diff options
| author | Alex Borisov <borisov.alexandr@rambler.ru> | 2011-11-09 01:54:13 +0200 |
|---|---|---|
| committer | Alex Borisov <borisov.alexandr@rambler.ru> | 2011-11-09 01:54:13 +0200 |
| commit | eafceb72d288068cdef79c3c4e63e54978d0ae50 (patch) | |
| tree | da64dd4060086b80265f596df1259dfe2afa337d | |
| parent | 76bee6ee8fcd00811753e427c526b06ef456b6cd (diff) | |
Move tray icon to resources. Debug regime wo SSL verification
| -rwxr-xr-x | client/ProxyClientApp.cpp | 5 | ||||
| -rw-r--r-- | client/SslClient.cpp | 2 | ||||
| -rw-r--r-- | client/client.qrc | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/client/ProxyClientApp.cpp b/client/ProxyClientApp.cpp index bbdce0f..8f06473 100755 --- a/client/ProxyClientApp.cpp +++ b/client/ProxyClientApp.cpp @@ -25,9 +25,8 @@ ProxyClientApp::ProxyClientApp(int &argc, char *argv[]): QApplication(argc, argv trayMenu->addAction(showAction); trayMenu->addAction(quitAction); -// QIcon *icon = new QIcon(QCoreApplication::applicationDirPath() + "/icon.png"); //does not work %) - QIcon *icon = new QIcon(this_app->applicationDirPath() + "/icon.png"); - trayIcon = new QSystemTrayIcon(*icon); + QIcon *icon = new QIcon(":/icon.png"); + trayIcon = new QSystemTrayIcon(*icon); connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(trayActivated(QSystemTrayIcon::ActivationReason))); trayIcon->setContextMenu(trayMenu); diff --git a/client/SslClient.cpp b/client/SslClient.cpp index 729daaa..831a1f3 100644 --- a/client/SslClient.cpp +++ b/client/SslClient.cpp @@ -38,7 +38,7 @@ SslClient::SslClient(QString addr): port(13666) sslSocket.setLocalCertificate(cert); sslSocket.setPrivateKey(key); sslSocket.setCaCertificates(ca_certs); - sslSocket.setPeerVerifyMode(QSslSocket::VerifyPeer); + sslSocket.setPeerVerifyMode(QSslSocket::VerifyNone); sslSocket.setProtocol(QSsl::SslV3); /* setup signal handlers */ diff --git a/client/client.qrc b/client/client.qrc index f8f8486..145a45c 100644 --- a/client/client.qrc +++ b/client/client.qrc @@ -3,5 +3,6 @@ <file>client.key</file> <file>client.crt</file> <file>ca.crt</file> + <file>icon.png</file> </qresource> </RCC> |