Fixes and improvements in whiteboard application (#96)

.gitsubprojects

@@ -1,5 +1,5 @@
 # -*- mode: cmake -*-
 git_subproject(ZeroEQ https://github.com/HBPVIS/ZeroEQ.git 1019277)
-git_subproject(Deflect https://github.com/BlueBrain/Deflect.git 7d2918e)
+git_subproject(Deflect https://github.com/BlueBrain/Deflect.git d937377)
 git_subproject(TUIO https://github.com/BlueBrain/TUIO.git fdf5cf7)
 git_subproject(VirtualKeyboard https://github.com/rdumusc/QtFreeVirtualKeyboard.git e3ee94d)

apps/Launcher/CMakeLists.txt

@@ -4,7 +4,6 @@
 #                     Raphael Dumusc <raphael.dumusc@epfl.ch>
 
 set(TIDELAUNCHER_HEADERS
-  FileInfoHelper.h
   Launcher.h
 )
 

apps/Launcher/Launcher.h

@@ -41,7 +41,7 @@
 #ifndef LAUNCHER_H
 #define LAUNCHER_H
 
-#include "FileInfoHelper.h"
+#include "tide/master/FileInfoHelper.h"
 
 #include <deflect/qt/QmlStreamer.h>
 

apps/Whiteboard/Whiteboard.cpp

@@ -43,6 +43,8 @@
 #include "tide/master/localstreamer/QmlKeyInjector.h"
 #include "tide/master/MasterConfiguration.h"
 
+#include <QQmlContext>
+
 namespace
 {
 const std::string deflectHost( "localhost" );
@@ -67,6 +69,8 @@ Whiteboard::Whiteboard( int& argc, char* argv[] )
     auto item = _qmlStreamer->getRootItem();
     item->setProperty( "saveURL", config.getWhiteboardSaveFolder() );
 
+    QQmlEngine* engine = _qmlStreamer->getQmlEngine();
+    engine->rootContext()->setContextProperty( "fileInfo", &_fileInfoHelper );
 }
 
 bool Whiteboard::event( QEvent* event_ )

apps/Whiteboard/Whiteboard.h

@@ -40,7 +40,7 @@
 #ifndef WHITEBOARD_H
 #define WHITEBOARD_H
 
-#include <memory>
+#include "tide/master/FileInfoHelper.h"
 
 #include <QGuiApplication>
 #include <deflect/qt/QmlStreamer.h>
@@ -59,6 +59,7 @@ class Whiteboard : public QGuiApplication
     std::unique_ptr<deflect::qt::QmlStreamer> _qmlStreamer;
 
     bool event( QEvent* event ) final;
+    FileInfoHelper _fileInfoHelper;
 };
 
 #endif

apps/Whiteboard/main.cpp

@@ -46,6 +46,9 @@ int main( int argc, char** argv )
     logger_id = "whiteboard";
     qInstallMessageHandler( qtMessageLogger );
 
+    // Load virtualkeyboard input context plugin
+    qputenv( "QT_IM_MODULE", QByteArray( "virtualkeyboard" ));
+
     std::unique_ptr<Whiteboard> whiteboard;
     try
     {