Unifying UI of Whiteboard with Launcher

BlueBrain · Oct 31, 2016 · ac1be94 · ac1be94
1 parent d81a2f2
commit ac1be94
Show file tree

Hide file tree

Showing 16 changed files with 238 additions and 214 deletions.
diff --git a/apps/Launcher/CMakeLists.txt b/apps/Launcher/CMakeLists.txt
@@ -4,7 +4,6 @@
 #                     Raphael Dumusc <raphael.dumusc@epfl.ch>
 
 set(TIDELAUNCHER_HEADERS
-  FileInfoHelper.h
   Launcher.h
 )
 

diff --git a/apps/Launcher/FileInfoHelper.h b/apps/Launcher/FileInfoHelper.h
diff --git a/apps/Launcher/Launcher.h b/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>
 

diff --git a/apps/Whiteboard/Whiteboard.cpp b/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" );
@@ -66,6 +68,9 @@ 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_ )

diff --git a/apps/Whiteboard/Whiteboard.h b/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
diff --git a/apps/Whiteboard/main.cpp b/apps/Whiteboard/main.cpp
@@ -45,6 +45,8 @@ 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