Merged develop into feature

--HG--
branch : feature

ChangeLog.txt

@@ -49,6 +49,7 @@
 - [#516] Valentina crashes when use "Point intersect line and axis" instrument.
 - [#483] File lost.
 - Fixed Bisector tool bug. The tool created internal variable for wrong segment.  
+- [#526] Dialog Detail is not on top after selection second object on Mac.
 
 # Version 0.4.4 April 12, 2016
 - Updated measurement templates with all measurements. Added new template Aldrich/Women measurements.

dist/SlackBuild/valentina/README

@@ -0,0 +1,5 @@
+Valentina is a cross-platform patternmaking program which allows designers 
+to create and model patterns of clothing. This software allows pattern 
+creation, using either standard sizing tables or an individual’s set of 
+measurements. It blends new technologies with traditional methods to create 
+a unique pattern making tool.

dist/SlackBuild/valentina/doinst.sh

@@ -0,0 +1,13 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi

dist/SlackBuild/valentina/slack-desc

@@ -0,0 +1,21 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+          |-----handy-ruler------------------------------------------------------|
+valentina: valentina (Cross-Platform patternmaking program)
+valentina:
+valentina: Valentina is a cross-platform patternmaking program which allows 
+valentina: designers to create and model patterns of clothing. This software 
+valentina: allows pattern creation, using either standard sizing tables or an 
+valentina: individual’s set of measurements. It blends new technologies with 
+valentina: traditional methods to create a unique pattern making tool.
+valentina:
+valentina: Homepage: http://www.valentina-project.org/
+valentina:
+valentina:
+valentina:
+valentina:

dist/SlackBuild/valentina/valentina.SlackBuild

@@ -0,0 +1,117 @@
+#!/bin/sh
+
+# Slackware build script for valentina
+
+# Copyright 2016 Roman Telezhynskyi <dismine@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=valentina
+VERSION=${VERSION:-0.4.4}
+BUILD=${BUILD:-1}
+TAG=${TAG:-dismine}
+COMMIT=610ac13345d7
+
+# Use parallel building if possible
+if [ -z "$NUMJOBS" ]; then
+  NUMJOBS=$(nproc)
+fi
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e # Exit on most errors
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf dismine-$PRGNAM-$COMMIT
+tar xvf $CWD/v$VERSION.tar.gz
+cd dismine-$PRGNAM-$COMMIT
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+qmake-qt5 Valentina.pro \
+  QMAKE_CXXFLAGS="$SLKCFLAGS" \
+  PREFIX=/usr \
+  PREFIX_LIB=${LIBDIRSUFFIX} \
+  "CONFIG += noTests noRunPath no_ccache noDebugSymbols"
+
+make -j${NUMJOBS}
+make install INSTALL_ROOT=$PKG
+
+# Strip binaries
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# Install all the needed stuff to the package dir
+mkdir -p $PKG/usr/man/man1
+install -m 644 dist/debian/valentina.1 $PKG/usr/man/man1/
+install -m 644 dist/debian/tape.1 $PKG/usr/man/man1/
+
+# Compress man pages
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+# Copy icon, desktop file and mime info
+mkdir -p $PKG/usr/share/mime/packages
+cat dist/debian/valentina.sharedmimeinfo > $PKG/usr/share/mime/packages/$PRGNAM.xml
+
+# Copy program documentation into the package
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE_GPL.txt README.txt ChangeLog.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh  > $PKG/install/doinst.sh
+
+# Make the package
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}

dist/SlackBuild/valentina/valentina.info

@@ -0,0 +1,10 @@
+PRGNAM="valentina"
+VERSION="0.4.4"
+HOMEPAGE="http://www.valentina-project.org/"
+DOWNLOAD="https://bitbucket.org/dismine/valentina/get/v0.4.4.tar.gz"
+MD5SUM="4d2d030e7251bd5b2ca34d3e629831e3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="qt5"
+MAINTAINER="Roman Telezhynskyi"
+EMAIL="dismine@gmail.com"

src/app/valentina/mainwindow.cpp

@@ -3099,6 +3099,8 @@ void MainWindow::ActionHistory(bool checked)
         dialogHistory->setWindowFlags(Qt::Window);
         connect(this, &MainWindow::RefreshHistory, dialogHistory.data(), &DialogHistory::UpdateHistory);
         connect(dialogHistory.data(), &DialogHistory::DialogClosed, this, &MainWindow::ClosedActionHistory);
+        // Fix issue #526. Dialog Detail is not on top after selection second object on Mac.
+        dialogHistory->setWindowFlags(dialogHistory->windowFlags() | Qt::WindowStaysOnTopHint);
         dialogHistory->show();
     }
     else

src/libs/vtools/dialogs/tools/dialogdetail.cpp

@@ -144,6 +144,8 @@ void DialogDetail::ChosenObject(quint32 id, const SceneObject &type)
         }
 
         ValidObjects(DetailIsValid());
+        // Fix issue #526. Dialog Detail is not on top after selection second object on Mac.
+        setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
         this->show();
     }
 }