Merge pull request #159 from SCIInstitute/fix_for_240

Fix for 2.4.0

Author: krismz

src/CMake/Modules/MacOSXBundleInfo.plist.in

@@ -33,7 +33,7 @@
   <key>NSHumanReadableCopyright</key>
   <string>${MACOSX_BUNDLE_COPYRIGHT}</string>
   <key>NSHighResolutionCapable</key>
-  <true/>
+  <false/>
   <key>CFBundleDocumentTypes</key>
   <array>
     <dict>

src/Core/TextRenderer/TextRenderer.cc

@@ -72,13 +72,21 @@ TextRenderer::TextRenderer() :
 
     if (! boost::filesystem::exists(font_path) )
     {
-      // TODO: would it make sense to throw an exception here?
-      // object will be incompletely constructed if font path cannot be found
-      //
-      // alternatively, configure location of font path on program startup, so this check
-      // does not have to be run every time the object is constructed? (AYK)
-      CORE_LOG_ERROR( "Unable to locate FreeSerif.ttf in /usr/share/fonts/truetype/freefont or /usr/share/fonts/truetype." );
-      return;
+
+      // alternative path to freefont paths on some other linux distros (CentOS for example)
+      font_path = "/usr/share/fonts/gnu-free/FreeSerif.ttf";
+
+      if (! boost::filesystem::exists(font_path) )
+      {
+
+        // TODO: would it make sense to throw an exception here?
+        // object will be incompletely constructed if font path cannot be found
+        //
+        // alternatively, configure location of font path on program startup, so this check
+        // does not have to be run every time the object is constructed? (AYK)
+        CORE_LOG_ERROR( "Unable to locate FreeSerif.ttf in /usr/share/fonts/truetype/freefont or /usr/share/fonts/truetype or /usr/share/fonts/gnu-free." );
+        return;
+      }
     }
   }
   this->font_file_.assign( font_path );

src/Interface/Application/GroupButtonMenu.cc

@@ -237,8 +237,7 @@ void GroupButtonMenu::prep_for_animation( bool move_time )
   if( move_time )
   {
     this->private_->ui_.facade_->setMinimumSize( this->private_->ui_.group_tools_->size() );
-    this->private_->ui_.facade_->setPixmap( 
-      QPixmap::grabWidget( this->private_->ui_.group_tools_ ) );
+    this->private_->ui_.facade_->setPixmap( this->private_->ui_.group_tools_->grab() );
     this->private_->ui_.group_tools_->hide();
     this->private_->ui_.facade_->show();
   }

src/Interface/Application/LayerWidget.cc

@@ -1242,7 +1242,7 @@ void LayerWidget::prep_for_animation( bool move_time )
   if( move_time )
   {
     this->private_->ui_.facade_widget_->setMinimumSize( this->private_->ui_.base_->size() );
-    this->private_->ui_.facade_widget_->setPixmap( QPixmap::grabWidget( this ) );
+    this->private_->ui_.facade_widget_->setPixmap( this->grab() );
     this->private_->ui_.base_->hide();
     this->private_->ui_.facade_widget_->show();
   }

src/Interface/Application/StyleSheet.cc

@@ -111,6 +111,7 @@ namespace Seg3D
   " border: none;"
   "}"
   "QDockWidget{"
+  " background-color: rgb( " BACKGROUND_COLOR ") ;"
   " color: rgb( " FONT_COLOR ") ;"
   " titlebar-close-icon: url(:/General_Icons/exit.png);"
   " titlebar-normal-icon: url(:/General_Icons/maximize.png);"

src/QtUtils/Utils/QtApplication.cc

@@ -80,10 +80,6 @@ class QtWin32ApplicationEventFilter : public QAbstractNativeEventFilter
   virtual bool nativeEventFilter(const QByteArray &eventType, void *message, long *) Q_DECL_OVERRIDE
   {
 #ifdef _WIN32
-// test
-// should be "windows_generic_MSG" (http://doc.qt.io/qt-5/qwidget.html#nativeEvent)?
-std::cerr << "Event type: " << eventType.constData() << std::endl;
-// test
 
     MSG* msg = reinterpret_cast< MSG* >( message );
     if ( msg->message == WM_ENTERSIZEMOVE )