Merged develop into feature

--HG--
branch : feature

ChangeLog.txt

@@ -45,6 +45,7 @@
 - [#501] Rename Window->Close Window to Window->Close pattern.
 - [#515] Seam allowance wrong way.
 - [#494] Printing is not working.
+- [#516] Valentina crashes when use "Point intersect line and axis" instrument.
 
 # Version 0.4.4 April 12, 2016
 - Updated measurement templates with all measurements. Added new template Aldrich/Women measurements.

scripts/fix_png.sh

@@ -9,6 +9,7 @@
 # -ow will overwrite the input file
 # -rem allb will remove all ancillary chunks except tRNS and gAMA
 # -reduce does lossless color-type or bit-depth reduction
+# -brute — attempt all optimization methods 
 
 #In the console output you should see "Removed the sRGB chunk.", and possibly more messages about chunk removals. 
 #You will end up with a smaller, optimized png file. As the command will overwrite the original file, make 
@@ -19,4 +20,7 @@
 # usage:
 # $ ./fix_png.sh
 
-find .. -type f -iname '*.png' -exec pngcrush -ow -rem allb -reduce {} \;
+# IMPORTANT!!! Use version 1.8.1 or higher.
+
+find .. -type f -iname '*.png' -exec pngcrush -ow -rem allb -brute -reduce {} \;
+

src/app/translations.pri

@@ -61,8 +61,8 @@ for(_translation_name, INSTALL_TRANSLATIONS) {
             }
             system(rm -fv $${OUT_PWD}/$$DESTDIR/translations/*.qm)
         }
-        QMAKE_CLEAN += $$shell_path($$_translation_name)
     }
+    QMAKE_CLEAN += $$shell_path($$_translation_name)
 }
 
 # Make possible run program even you do not install it. Seek files in local directory.

src/app/valentina/mainwindow.cpp

@@ -124,7 +124,8 @@ MainWindow::MainWindow(QWidget *parent)
       toolOptions(nullptr),
       groupsWidget(nullptr),
       detailsWidget(nullptr),
-      lock(nullptr)
+      lock(nullptr),
+      toolButtonPointerList()
 {
     for (int i = 0; i < MaxRecentFiles; ++i)
     {
@@ -1736,6 +1737,18 @@ void MainWindow::ToolBarTools()
 //---------------------------------------------------------------------------------------------------------------------
 void MainWindow::InitToolButtons()
 {
+    toolButtonPointerList.append(ui->toolButtonPointerPoint);
+    toolButtonPointerList.append(ui->toolButtonPointerLine);
+    toolButtonPointerList.append(ui->toolButtonPointerCurve);
+    toolButtonPointerList.append(ui->toolButtonPointerArc);
+    toolButtonPointerList.append(ui->toolButtonPointerDetail);
+    toolButtonPointerList.append(ui->toolButtonPointerOperations);
+
+    for (auto pointer : toolButtonPointerList)
+    {
+        connect(pointer, &QToolButton::clicked, this, &MainWindow::ArrowTool);
+    }
+
     connect(ui->toolButtonEndLine, &QToolButton::clicked, this, &MainWindow::ToolEndLine);
     connect(ui->toolButtonLine, &QToolButton::clicked, this, &MainWindow::ToolLine);
     connect(ui->toolButtonAlongLine, &QToolButton::clicked, this, &MainWindow::ToolAlongLine);
@@ -1827,7 +1840,10 @@ void MainWindow::CancelTool()
     switch ( currentTool )
     {
         case Tool::Arrow:
-            ui->actionArrowTool->setChecked(false);
+            for (auto pointer : toolButtonPointerList)
+            {
+                pointer->setChecked(false);
+            }
             helpLabel->setText("");
             ui->actionStopTool->setEnabled(true);
 
@@ -1974,7 +1990,10 @@ void  MainWindow::ArrowTool()
 {
     qCDebug(vMainWindow, "Arrow tool.");
     CancelTool();
-    ui->actionArrowTool->setChecked(true);
+    for (auto pointer : toolButtonPointerList)
+    {
+        pointer->setChecked(true);
+    }
     ui->actionStopTool->setEnabled(false);
     currentTool = Tool::Arrow;
     emit EnableItemMove(true);
@@ -3161,6 +3180,12 @@ void MainWindow::SetEnableTool(bool enable)
 
     ui->actionLast_tool->setEnabled(drawTools);
 
+    for (auto pointer : toolButtonPointerList)
+    {
+        pointer->setEnabled(drawTools || modelingTools);
+        pointer->setChecked(drawTools || modelingTools);
+    }
+
     //Modeling Tools
     ui->toolButtonUnionDetails->setEnabled(modelingTools);
 
@@ -3444,7 +3469,10 @@ void MainWindow::LastUsedTool()
     switch ( lastUsedTool )
     {
         case Tool::Arrow:
-            ui->actionArrowTool->setChecked(true);
+            for (auto pointer : toolButtonPointerList)
+            {
+                pointer->setChecked(true);
+            }
             ArrowTool();
             break;
         case Tool::BasePoint:
@@ -3985,7 +4013,6 @@ void MainWindow::WindowsLocale()
 //---------------------------------------------------------------------------------------------------------------------
 void MainWindow::ToolBarStyles()
 {
-    ToolBarStyle(ui->toolBarArrows);
     ToolBarStyle(ui->toolBarDraws);
     ToolBarStyle(ui->toolBarOption);
     ToolBarStyle(ui->toolBarStages);

src/app/valentina/mainwindow.h

@@ -50,6 +50,7 @@ class DialogTool;
 class DialogHistory;
 class VWidgetGroups;
 class VWidgetDetails;
+class QToolButton;
 
 /**
  * @brief The MainWindow class main windows.
@@ -280,6 +281,8 @@ private:
     VWidgetDetails *detailsWidget;
     std::shared_ptr<VLockGuard<char>> lock;
 
+    QList<QToolButton*> toolButtonPointerList;
+
     void               SetDefaultHeight();
     void               SetDefaultSize();
 

src/app/valentina/mainwindow.ui

@@ -48,15 +48,15 @@
        <string>Tools</string>
       </property>
       <property name="currentIndex">
-       <number>0</number>
+       <number>4</number>
       </property>
       <widget class="QWidget" name="page">
        <property name="geometry">
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>130</width>
+         <width>117</width>
-         <height>318</height>
+         <height>358</height>
         </rect>
        </property>
        <property name="sizePolicy">
@@ -82,32 +82,6 @@
         <property name="fieldGrowthPolicy">
          <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
         </property>
-        <item row="2" column="0">
-         <widget class="QToolButton" name="toolButtonEndLine">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="toolTip">
-           <string>Point at distance and angle</string>
-          </property>
-          <property name="text">
-           <string notr="true">...</string>
-          </property>
-          <property name="icon">
-           <iconset resource="share/resources/toolicon.qrc">
-            <normaloff>:/toolicon/32x32/segment.png</normaloff>:/toolicon/32x32/segment.png</iconset>
-          </property>
-          <property name="iconSize">
-           <size>
-            <width>32</width>
-            <height>32</height>
-           </size>
-          </property>
-          <property name="checkable">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
         <item row="2" column="1">
          <widget class="QToolButton" name="toolButtonAlongLine">
           <property name="enabled">
@@ -368,6 +342,32 @@
           </property>
          </widget>
         </item>
+        <item row="0" column="0">
+         <widget class="QToolButton" name="toolButtonPointerPoint">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="toolTip">
+           <string>Tool pointer</string>
+          </property>
+          <property name="text">
+           <string notr="true">...</string>
+          </property>
+          <property name="icon">
+           <iconset resource="../../libs/vmisc/share/resources/icon.qrc">
+            <normaloff>:/icon/32x32/arrow_cursor.png</normaloff>:/icon/32x32/arrow_cursor.png</iconset>
+          </property>
+          <property name="iconSize">
+           <size>
+            <width>32</width>
+            <height>32</height>
+           </size>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
         <item row="10" column="1">
          <widget class="QToolButton" name="toolButtonMidpoint">
           <property name="enabled">
@@ -394,6 +394,32 @@
           </property>
          </widget>
         </item>
+        <item row="2" column="0">
+         <widget class="QToolButton" name="toolButtonEndLine">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="toolTip">
+           <string>Point at distance and angle</string>
+          </property>
+          <property name="text">
+           <string notr="true">...</string>
+          </property>
+          <property name="icon">
+           <iconset resource="share/resources/toolicon.qrc">
+            <normaloff>:/toolicon/32x32/segment.png</normaloff>:/toolicon/32x32/segment.png</iconset>
+          </property>
+          <property name="iconSize">
+           <size>
+            <width>32</width>
+            <height>32</height>
+           </size>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
       <widget class="QWidget" name="page_2">
@@ -402,7 +428,7 @@
          <x>0</x>
          <y>0</y>
          <width>130</width>
-         <height>58</height>
+         <height>110</height>
         </rect>
        </property>
        <property name="sizePolicy">
@@ -425,10 +451,33 @@
         <string>Line</string>
        </attribute>
        <layout class="QFormLayout" name="formLayout_2">
-        <property name="fieldGrowthPolicy">
-         <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-        </property>
         <item row="0" column="0">
+         <widget class="QToolButton" name="toolButtonPointerLine">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="toolTip">
+           <string>Tool pointer</string>
+          </property>
+          <property name="text">
+           <string notr="true">...</string>
+          </property>
+          <property name="icon">
+           <iconset resource="../../libs/vmisc/share/resources/icon.qrc">
+            <normaloff>:/icon/32x32/arrow_cursor.png</normaloff>:/icon/32x32/arrow_cursor.png</iconset>
+          </property>
+          <property name="iconSize">
+           <size>
+            <width>32</width>
+            <height>32</height>
+           </size>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0">
          <widget class="QToolButton" name="toolButtonLine">
           <property name="enabled">
            <bool>false</bool>
@@ -454,7 +503,7 @@
           </property>
          </widget>
         </item>
-        <item row="0" column="1">
+        <item row="2" column="1">
          <widget class="QToolButton" name="toolButtonLineIntersect">
           <property name="enabled">
            <bool>false</bool>
@@ -488,7 +537,7 @@
          <x>0</x>
          <y>0</y>
          <width>130</width>
-         <height>196</height>
+         <height>248</height>
         </rect>
        </property>
        <property name="sizePolicy">
@@ -511,36 +560,7 @@
         <string>Curve</string>
        </attribute>
        <layout class="QFormLayout" name="formLayout_3">
-        <property name="fieldGrowthPolicy">
+        <item row="1" column="1">
-         <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-        </property>
-        <item row="0" column="0">
-         <widget class="QToolButton" name="toolButtonSpline">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="toolTip">
-           <string>Simple curve</string>
-          </property>
-          <property name="text">
-           <string notr="true">...</string>
-          </property>
-          <property name="icon">
-           <iconset resource="share/resources/toolicon.qrc">
-            <normaloff>:/toolicon/32x32/spline.png</normaloff>:/toolicon/32x32/spline.png</iconset>
-          </property>
-          <property name="iconSize">
-           <size>
-            <width>32</width>
-            <height>32</height>
-           </size>
-          </property>
-          <property name="checkable">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
          <widget class="QToolButton" name="toolButtonSplineCutPoint">
           <property name="enabled">
            <bool>false</bool>
@@ -566,7 +586,7 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="0">
+        <item row="3" column="0">
          <widget class="QToolButton" name="toolButtonCubicBezier">
           <property name="enabled">
            <bool>false</bool>
@@ -592,7 +612,7 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="1">
+        <item row="3" column="1">
          <widget class="QToolButton" name="toolButtonSplinePath">
           <property name="enabled">
            <bool>false</bool>
@@ -618,7 +638,7 @@
           </property>
          </widget>
         </item>
-        <item row="2" column="0">
+        <item row="4" column="0">
          <widget class="QToolButton" name="toolButtonSplinePathCutPoint">
           <property name="enabled">
            <bool>false</bool>
@@ -644,7 +664,30 @@
           </property>
          </widget>
         </item>
-        <item row="3" column="0">
+        <item row="4" column="1">
+         <widget class="QToolButton" name="toolButtonCubicBezierPath">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string notr="true">...</string>
+          </property>
+          <property name="icon">
+           <iconset resource="share/resources/toolicon.qrc">
+            <normaloff>:/toolicon/32x32/cubic_bezier_path.png</normaloff>:/toolicon/32x32/cubic_bezier_path.png</iconset>
+          </property>
+          <property name="iconSize">
+           <size>
+            <width>32</width>
+            <height>32</height>
+           </size>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="5" column="0">
          <widget class="QToolButton" name="toolButtonIntersectionCurves">
           <property name="enabled">
            <bool>false</bool>
@@ -670,7 +713,7 @@
           </property>
          </widget>
         </item>
-        <item row="3" column="1">
+        <item row="5" column="1">
          <widget class="QToolButton" name="toolButtonCurveIntersectAxis">
           <property name="enabled">
            <bool>false</bool>
@@ -696,17 +739,46 @@
           </property>
          </widget>
         </item>
-        <item row="2" column="1">
+        <item row="0" column="0">
-         <widget class="QToolButton" name="toolButtonCubicBezierPath">
+         <widget class="QToolButton" name="toolButtonPointerCurve">
           <property name="enabled">
            <bool>false</bool>
           </property>
+          <property name="toolTip">
+           <string>Tool pointer</string>
+          </property>
+          <property name="text">
+           <string notr="true">...</string>
+          </property>
+          <property name="icon">
+           <iconset resource="../../libs/vmisc/share/resources/icon.qrc">
+            <normaloff>:/icon/32x32/arrow_cursor.png</normaloff>:/icon/32x32/arrow_cursor.png</iconset>
+          </property>
+          <property name="iconSize">
+           <size>
+            <width>32</width>
+            <height>32</height>
+           </size>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QToolButton" name="toolButtonSpline">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="toolTip">
+           <string>Simple curve</string>
+          </property>
           <property name="text">
            <string notr="true">...</string>
           </property>
           <property name="icon">
            <iconset resource="share/resources/toolicon.qrc">
-            <normaloff>:/toolicon/32x32/cubic_bezier_path.png</normaloff>:/toolicon/32x32/cubic_bezier_path.png</iconset>
+            <normaloff>:/toolicon/32x32/spline.png</normaloff>:/toolicon/32x32/spline.png</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -727,7 +799,7 @@
          <x>0</x>
          <y>0</y>
          <width>130</width>
-         <height>196</height>
+         <height>248</height>
         </rect>
        </property>
        <property name="sizePolicy">
@@ -750,10 +822,7 @@
         <string>Arc</string>
        </attribute>
        <layout class="QFormLayout" name="formLayout_4">
-        <property name="fieldGrowthPolicy">
+        <item row="2" column="0">
-         <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-        </property>
-        <item row="0" column="0">
          <widget class="QToolButton" name="toolButtonArc">
           <property name="enabled">
            <bool>false</bool>
@@ -779,7 +848,7 @@
           </property>
          </widget>
         </item>
-        <item row="0" column="1">
+        <item row="2" column="1">
          <widget class="QToolButton" name="toolButtonArcCutPoint">
           <property name="enabled">
            <bool>false</bool>
@@ -805,7 +874,7 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="0">
+        <item row="3" column="0">
          <widget class="QToolButton" name="toolButtonArcIntersectAxis">
           <property name="enabled">
            <bool>false</bool>
@@ -831,7 +900,7 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="1">
+        <item row="3" column="1">
          <widget class="QToolButton" name="toolButtonPointOfIntersectionArcs">
           <property name="enabled">
            <bool>false</bool>
@@ -857,7 +926,7 @@
           </property>
          </widget>
         </item>
-        <item row="2" column="0">
+        <item row="4" column="0">
          <widget class="QToolButton" name="toolButtonPointOfIntersectionCircles">
           <property name="enabled">
            <bool>false</bool>
@@ -883,7 +952,7 @@
           </property>
          </widget>
         </item>
-        <item row="2" column="1">
+        <item row="4" column="1">
          <widget class="QToolButton" name="toolButtonPointFromCircleAndTangent">
           <property name="enabled">
            <bool>false</bool>
@@ -909,7 +978,7 @@
           </property>
          </widget>
         </item>
-        <item row="3" column="0">
+        <item row="5" column="0">
          <widget class="QToolButton" name="toolButtonPointFromArcAndTangent">
           <property name="enabled">
            <bool>false</bool>
@@ -935,7 +1004,7 @@
           </property>
          </widget>
         </item>
-        <item row="3" column="1">
+        <item row="5" column="1">
          <widget class="QToolButton" name="toolButtonArcWithLength">
           <property name="enabled">
            <bool>false</bool>
@@ -961,6 +1030,32 @@
           </property>
          </widget>
         </item>
+        <item row="0" column="0">
+         <widget class="QToolButton" name="toolButtonPointerArc">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="toolTip">
+           <string>Tool pointer</string>
+          </property>
+          <property name="text">
+           <string notr="true">...</string>
+          </property>
+          <property name="icon">
+           <iconset resource="../../libs/vmisc/share/resources/icon.qrc">
+            <normaloff>:/icon/32x32/arrow_cursor.png</normaloff>:/icon/32x32/arrow_cursor.png</iconset>
+          </property>
+          <property name="iconSize">
+           <size>
+            <width>32</width>
+            <height>32</height>
+           </size>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
       <widget class="QWidget" name="page_7">
@@ -984,6 +1079,32 @@
        </attribute>
        <layout class="QFormLayout" name="formLayout_7">
         <item row="0" column="0">
+         <widget class="QToolButton" name="toolButtonPointerOperations">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="toolTip">
+           <string>Tool pointer</string>
+          </property>
+          <property name="text">
+           <string notr="true">...</string>
+          </property>
+          <property name="icon">
+           <iconset resource="../../libs/vmisc/share/resources/icon.qrc">
+            <normaloff>:/icon/32x32/arrow_cursor.png</normaloff>:/icon/32x32/arrow_cursor.png</iconset>
+          </property>
+          <property name="iconSize">
+           <size>
+            <width>32</width>
+            <height>32</height>
+           </size>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
          <widget class="QToolButton" name="toolButtonGroup">
           <property name="enabled">
            <bool>false</bool>
@@ -1009,7 +1130,7 @@
           </property>
          </widget>
         </item>
-        <item row="0" column="1">
+        <item row="1" column="1">
          <widget class="QToolButton" name="toolButtonRotation">
           <property name="enabled">
            <bool>false</bool>
@@ -1043,7 +1164,7 @@
          <x>0</x>
          <y>0</y>
          <width>130</width>
-         <height>58</height>
+         <height>104</height>
         </rect>
        </property>
        <property name="sizePolicy">
@@ -1066,10 +1187,33 @@
         <string>Detail</string>
        </attribute>
        <layout class="QFormLayout" name="formLayout_5">
-        <property name="fieldGrowthPolicy">
-         <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-        </property>
         <item row="0" column="0">
+         <widget class="QToolButton" name="toolButtonPointerDetail">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="toolTip">
+           <string>Tool pointer</string>
+          </property>
+          <property name="text">
+           <string notr="true">...</string>
+          </property>
+          <property name="icon">
+           <iconset resource="../../libs/vmisc/share/resources/icon.qrc">
+            <normaloff>:/icon/32x32/arrow_cursor.png</normaloff>:/icon/32x32/arrow_cursor.png</iconset>
+          </property>
+          <property name="iconSize">
+           <size>
+            <width>32</width>
+            <height>32</height>
+           </size>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
          <widget class="QToolButton" name="toolButtonNewDetail">
           <property name="enabled">
            <bool>false</bool>
@@ -1095,7 +1239,7 @@
           </property>
          </widget>
         </item>
-        <item row="0" column="1">
+        <item row="1" column="1">
          <widget class="QToolButton" name="toolButtonUnionDetails">
           <property name="enabled">
            <bool>false</bool>
@@ -1433,26 +1577,6 @@
    </attribute>
    <widget class="QWidget" name="dockWidgetContents_10"/>
   </widget>
-  <widget class="QToolBar" name="toolBarArrows">
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="windowTitle">
-    <string>Toolbar pointer</string>
-   </property>
-   <property name="toolButtonStyle">
-    <enum>Qt::ToolButtonTextUnderIcon</enum>
-   </property>
-   <attribute name="toolBarArea">
-    <enum>TopToolBarArea</enum>
-   </attribute>
-   <attribute name="toolBarBreak">
-    <bool>false</bool>
-   </attribute>
-   <addaction name="actionArrowTool"/>
-  </widget>
   <widget class="QDockWidget" name="dockWidgetLayoutPages">
    <property name="features">
     <set>QDockWidget::NoDockWidgetFeatures</set>