diff options
| author | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2011-11-27 23:26:24 +0200 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2011-11-27 23:26:24 +0200 |
| commit | e519093bddf85c9d5721948c0e6fb89b7a7398f1 (patch) | |
| tree | 53fb542a420969f2f5e3da714645a4ce26564b38 /client | |
| parent | 0d96f9d417250b77a6f5366f3b14035c42782d90 (diff) | |
| parent | ee207db191173eb964c50261bc624c1ffcef715b (diff) | |
Merge branch 'master' of ssh://sss.chaoslab.ru//home/private_git/proxy_ui
Diffstat (limited to 'client')
| -rw-r--r-- | client/ProxyClientApp.cpp | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/client/ProxyClientApp.cpp b/client/ProxyClientApp.cpp index 94d8a7c..73df138 100644 --- a/client/ProxyClientApp.cpp +++ b/client/ProxyClientApp.cpp @@ -5,13 +5,17 @@ #include "client.h" #include "Dialog.h" +#include "DownloadClient.h" #include "FileOpThread.h" #include "ProxyClientApp.h" #include "UpdatedConfig.h" +using namespace std; + ProxyClientApp::ProxyClientApp(int &argc, char *argv[]): QApplication(argc, argv) { /* initiates UpdatedConfig singleton that start sending configuration requests */ + /* UpdatedConfig *cfg = UpdatedConfig::CurrentConfig(); connect(cfg, SIGNAL(updated()), this, SLOT(configUpdated())); @@ -24,7 +28,7 @@ ProxyClientApp::ProxyClientApp(int &argc, char *argv[]): QApplication(argc, argv QApplication::setQuitOnLastWindowClosed(false); - /* create system tray menu */ + // create system tray menu QMenu *trayMenu = new QMenu; QAction *showAction = new QAction(tr("&Show"), this); showAction->setStatusTip(tr("Open dialog to choose a proxy")); @@ -66,6 +70,18 @@ ProxyClientApp::ProxyClientApp(int &argc, char *argv[]): QApplication(argc, argv welcomeMsg.setStandardButtons(QMessageBox::Ok); welcomeMsg.setIcon(QMessageBox::Information); welcomeMsg.exec(); + */ + + vector<pair<string, string> > files; + pair<string, string> file; + file = make_pair("server.workspace.session", "70ba1d68907cc9d3"); + files.push_back(file); + file = make_pair("tz/TZ_v.1.2.pdf", "80e28032841aca45"); + files.push_back(file); + + //QString addr = QString::fromLocal8Bit(); + DownloadClient downloadClient("127.0.0.1"); + downloadClient.Download(files); } void ProxyClientApp::trayActivated(QSystemTrayIcon::ActivationReason reason) |