Merge pull request #42 from tribal-tec/master

Add About dialog, fix bundle generation

Author: dnachbaur

.gitexternals

@@ -1,2 +1,2 @@
 # -*- mode: cmake -*-
-# CMake/common https://github.com/Eyescale/CMake.git 46869b7
+# CMake/common https://github.com/Eyescale/CMake.git 69bbc09

CMakeLists.txt

@@ -12,7 +12,7 @@ include(GitExternal)
 
 set(VERSION_MAJOR "0")
 set(VERSION_MINOR "7")
-set(VERSION_PATCH "1")
+set(VERSION_PATCH "2")
 set(VERSION_ABI 1)
 
 set(DEFLECT_DESCRIPTION "A fast C++ library for streaming pixels and events")

apps/DesktopStreamer/MainWindow.cpp

@@ -43,6 +43,7 @@
 
 #include <deflect/Server.h>
 #include <deflect/Stream.h>
+#include <deflect/version.h>
 
 #include <iostream>
 
@@ -181,6 +182,14 @@ void MainWindow::_setupUI()
     toolbar->addAction( _shareDesktopAction );
     toolbar->addAction( _showDesktopSelectionWindowAction );
 
+    // add About dialog
+    QAction* showAboutDialog = new QAction( "About", this );
+    showAboutDialog->setStatusTip( "About DesktopStreamer" );
+    connect( showAboutDialog, &QAction::triggered,
+             this, &MainWindow::_openAboutWidget );
+    QMenu* helpMenu = menuBar()->addMenu( "&Help" );
+    helpMenu->addAction( showAboutDialog );
+
     // Update timer
     connect( &_updateTimer, SIGNAL( timeout( )), this, SLOT( _update( )));
 
@@ -451,6 +460,18 @@ void MainWindow::_onStreamEventsBoxClicked( const bool checked )
 #endif
 }
 
+void MainWindow::_openAboutWidget()
+{
+    const int revision = deflect::Version::getRevision();
+
+    std::ostringstream aboutMsg;
+    aboutMsg << "Current version: " << deflect::Version::getString();
+    aboutMsg << std::endl;
+    aboutMsg << "SCM revision: " << std::hex << revision << std::dec;
+
+    QMessageBox::about( this, "About DesktopStreamer", aboutMsg.str().c_str( ));
+}
+
 #ifdef __APPLE__
 void sendMouseEvent( const CGEventType type, const CGMouseButton button,
                      const CGPoint point )

apps/DesktopStreamer/MainWindow.h

@@ -79,6 +79,7 @@ private slots:
     void _updateCoordinates();
 
     void _onStreamEventsBoxClicked( bool checked );
+    void _openAboutWidget();
 
 private:
     deflect::Stream* _stream;

doc/Changelog.md

@@ -3,6 +3,10 @@ Changelog {#Changelog}
 
 ## Deflect 0.7
 
+### 0.7.2 (03-09-2015)
+* Add 'About' dialog to learn current used version
+* Fix bundle generation on OSX, broken after 0.6.1
+
 ### 0.7.1 (01-09-2015)
 * Fixed rare crash or hang together with stream and interaction