Merge branch 'develop' into ldt

Conflicts:
	modules/gui/src/panels/panel_bar.cc

modules/gui/src/panels/panel_bar.cc

@@ -41,7 +41,7 @@ PanelBar::PanelBar(QWidget* parent) :
   view_mode_menu_(new QMenu("View Mode",this)),
   current_view_mode_(NULL),
   widget_states_(),
-  drop_box_(new DropBox(this)),
+  drop_box_(new DropBox), // DropBox having no parent is done on purpose (otherwise it will not hide properly)
   show_action_(new QAction(this))
 {
   connect(view_mode_menu_,SIGNAL(triggered(QAction*)),this,SLOT(ChangeViewMode(QAction*)));
@@ -60,6 +60,14 @@ PanelBar::PanelBar(QWidget* parent) :
   connect(show_action_, SIGNAL(triggered(bool)), this,
           SLOT(ShowActionTrigger()));
   this->addAction(show_action_);
+<<<<<<< HEAD
+=======
+}
+
+PanelBar::~PanelBar()
+{
+  delete drop_box_; // manually destroy drop_box_ widget, as it has no parent.
+>>>>>>> develop
 }
 
 void PanelBar::AddWidget(Widget* widget, bool is_hidden)

modules/gui/src/panels/panel_bar.hh

@@ -54,6 +54,7 @@ class DLLEXPORT_OST_GUI PanelBar : public Widget {
   Q_OBJECT
 public:
   PanelBar(QWidget* parent);
+  virtual ~PanelBar();
 
   virtual bool Save(const QString& prefix);
   virtual bool Restore(const QString& prefix);

scripts/CMakeLists.txt

-set(SUBST_DICT BUILD_TYPE=${CMAKE_BUILD_TYPE} PYTHON_BINARY=${PYTHON_BINARY} LIBDIR=${LIB_DIR} LIBEXEC_PATH=${LIBEXEC_PATH})
+set(SUBST_DICT BUILD_TYPE=${CMAKE_BUILD_TYPE} PYTHON_BINARY=${PYTHON_BINARY}
+PYTHON_VERSION=${PYTHON_VERSION} LIBDIR=${LIB_DIR} LIBEXEC_PATH=${LIBEXEC_PATH})
 message("${BUILD_TYPE}")
 add_custom_target(ost_scripts ALL)
 

scripts/ost_config.in

@@ -26,15 +26,13 @@ export DNG_BINDIR="$DNG_ROOT/bin"
 export DNG_LIBDIR="$DNG_ROOT/@LIBDIR@"
 export DNG_INITDIR="$DNG_LIBDIR/openstructure"
 
-export PATH="$DNG_BINDIR:$PATH"
-export DYLD_FRAMEWORK_PATH="$BIN_LIBDIR:${DYLD_FRAMEWORK_PATH}"
-export DYLD_LIBRARY_PATH="$BIN_LIBDIR:${DYLD_LIBRARY_PATH}"
-export LD_LIBRARY_PATH="$DNG_LIBDIR:$LD_LIBRARY_PATH"
-# set QT_PLUGIN_PATH PYTHONHOME and PYTHONPATH for bundle (commented except in linux bundles)
-# set QT_PLUGIN_PATH and pythonpath for bundle (commented except in linux bundles)
-#export QT_PLUGIN_PATH="$BIN_DIR/plugins"
-#export PYTHONPATH="$DNG_ROOT/@LIBDIR@/python2.6:$OST_ADDITIONAL_PYTHONPATH"
+export PATH="$DNG_BINDIR:${PATH}"
+export DYLD_FRAMEWORK_PATH="$DNG_LIBDIR:${DYLD_FRAMEWORK_PATH}"
+export DYLD_LIBRARY_PATH="$DNG_LIBDIR:${DYLD_LIBRARY_PATH}"
+export LD_LIBRARY_PATH="$DNG_LIBDIR:${LD_LIBRARY_PATH}"
+# set QT_PLUGIN_PATH and PYTHONPATH for bundle (commented except in linux bundles)
 #export QT_PLUGIN_PATH="$BIN_DIR/plugins"
+#export PYTHONPATH="$DNG_ROOT/@LIBDIR@/python@PYTHON_VERSION@:$OST_ADDITIONAL_PYTHONPATH"
 
 # retrieve absolute path to python executable
 pyexec="@PYTHON_BINARY@"