summaryrefslogtreecommitdiff
path: root/client/ProxyClientApp.h
diff options
context:
space:
mode:
authorGluzskiy Alexandr <sss@sss.chaoslab.ru>2012-03-24 09:21:01 +0200
committerGluzskiy Alexandr <sss@sss.chaoslab.ru>2012-03-24 09:21:01 +0200
commita1bb0a81f13df7868fcec2c00ff58a123fcd37b4 (patch)
tree6cf6ca00aadc1da507b957eb46c4b87285a3c107 /client/ProxyClientApp.h
parent1a0baf7f15d744103674f594343eb74c778dcf4d (diff)
parent23f69b08e46c6101cbcba2f8c9592aa14bf1dccd (diff)
Merge branch 'master' of ssh://sss.chaoslab.ru//home/private_git/proxy_ui
Diffstat (limited to 'client/ProxyClientApp.h')
-rw-r--r--client/ProxyClientApp.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/client/ProxyClientApp.h b/client/ProxyClientApp.h
index 3901adb..60b8de6 100644
--- a/client/ProxyClientApp.h
+++ b/client/ProxyClientApp.h
@@ -5,6 +5,7 @@
#include <QSystemTrayIcon>
#include <QApplication>
+#include "Dialog.h"
#include "FileOpThread.h"
@@ -21,12 +22,13 @@ public:
private slots:
void trayActivated(QSystemTrayIcon::ActivationReason reason);
- void showProxyDialog();
- void configUpdated();
+ void showProxyDialog();
+ void configUpdated();
void quitApp();
private:
QSystemTrayIcon *trayIcon;
+ ProxyDialog *dialog;
FileOpThread fileOpThread;
};