Skip to content

Commit 4df9257

Browse files
Andrii MorozAndrii Moroz
authored andcommitted
Merge branch 'WD_1.X_dev_VNC' into WD_1.X_dev
2 parents 1df13ec + c5b82b6 commit 4df9257

File tree

13 files changed

+923
-3
lines changed

13 files changed

+923
-3
lines changed
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#ifndef EVENTDISPATCHER_H
2+
#define EVENTDISPATCHER_H
3+
4+
#include <QtCore/QEvent>
5+
6+
class EventDispatcher
7+
{
8+
public:
9+
virtual bool dispatch(QEvent *event, bool consumed)=0;
10+
};
11+
12+
#endif // EVENTDISPATCHER_H
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#ifndef VNCEVENTDISPATCHER_H
2+
#define VNCEVENTDISPATCHER_H
3+
4+
#include "event_dispatcher.h"
5+
#include "vnc/vncclient.h"
6+
7+
class VNCEventDispatcher : public EventDispatcher
8+
{
9+
public:
10+
VNCEventDispatcher(VNCClient *client);
11+
virtual ~VNCEventDispatcher();
12+
13+
bool dispatch(QEvent *event, bool consumed);
14+
15+
private:
16+
VNCClient *_vncClient;
17+
};
18+
19+
#endif // VNCEVENTDISPATCHER_H
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#ifndef WDEVENTDISPATCHER_H
2+
#define WDEVENTDISPATCHER_H
3+
4+
#include <QtCore/QVector>
5+
6+
#include "event_dispatcher.h"
7+
8+
class WDEventDispatcher
9+
{
10+
private:
11+
WDEventDispatcher();
12+
virtual ~WDEventDispatcher();
13+
14+
public:
15+
static WDEventDispatcher *getInstance();
16+
void add(EventDispatcher *dispatcher);
17+
QVector<EventDispatcher*>& getDispatchers();
18+
19+
private:
20+
static WDEventDispatcher *_instance;
21+
QVector<EventDispatcher*> _dispatchers;
22+
};
23+
24+
#endif // WDEVENTDISPATCHER_H

src/Test/main.cc

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@
4949
#include "extension_qt/widget_view_creator.h"
5050
#include "extension_qt/widget_view_enumerator.h"
5151
#include "extension_qt/widget_view_executor.h"
52+
#include "extension_qt/wd_event_dispatcher.h"
53+
#include "extension_qt/vnc_event_dispatcher.h"
54+
55+
#include "vnc/vncclient.h"
5256

5357
void setQtSettings();
5458
void PrintVersion();
@@ -127,7 +131,12 @@ int main(int argc, char *argv[])
127131
return 1;
128132
}
129133

130-
setQtSettings();
134+
VNCClient *client = new VNCClient();
135+
client->Init("http://127.0.0.1", 5900);
136+
137+
WDEventDispatcher::getInstance()->add(new VNCEventDispatcher(client));
138+
139+
setQtSettings();
131140
wd_server->Start();
132141

133142
return app.exec();

0 commit comments

Comments
 (0)