From abd10d8f561d9f983bd3efb5b7abcc2640ff59e1 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Thu, 16 Mar 2017 14:49:40 +0200
Subject: [PATCH] Move Seam Allowance tool's dialog.

--HG--
branch : feature
---
 src/libs/vtools/dialogs/dialogs.pri           |  6 +--
 src/libs/vtools/dialogs/tooldialogs.h         |  2 +-
 .../tools/{ => piece}/dialogseamallowance.cpp |  6 +--
 .../tools/{ => piece}/dialogseamallowance.h   |  2 +-
 .../tools/{ => piece}/dialogseamallowance.ui  | 52 +++++++++----------
 src/libs/vtools/tools/vtoolseamallowance.cpp  |  2 +-
 6 files changed, 35 insertions(+), 35 deletions(-)
 rename src/libs/vtools/dialogs/tools/{ => piece}/dialogseamallowance.cpp (99%)
 rename src/libs/vtools/dialogs/tools/{ => piece}/dialogseamallowance.h (99%)
 rename src/libs/vtools/dialogs/tools/{ => piece}/dialogseamallowance.ui (97%)

diff --git a/src/libs/vtools/dialogs/dialogs.pri b/src/libs/vtools/dialogs/dialogs.pri
index 135de7182..d6ccebae2 100644
--- a/src/libs/vtools/dialogs/dialogs.pri
+++ b/src/libs/vtools/dialogs/dialogs.pri
@@ -42,7 +42,7 @@ HEADERS += \
     $$PWD/tools/dialogflippingbyaxis.h \
     $$PWD/tools/dialogmove.h \
     $$PWD/tools/dialogellipticalarc.h \
-    $$PWD/tools/dialogseamallowance.h \
+    $$PWD/tools/piece/dialogseamallowance.h \
     $$PWD/tools/dialogpiecepath.h \
     $$PWD/tools/dialogpin.h
 
@@ -86,7 +86,7 @@ SOURCES += \
     $$PWD/tools/dialogflippingbyaxis.cpp \
     $$PWD/tools/dialogmove.cpp \
     $$PWD/tools/dialogellipticalarc.cpp \
-    $$PWD/tools/dialogseamallowance.cpp \
+    $$PWD/tools/piece/dialogseamallowance.cpp \
     $$PWD/tools/dialogpiecepath.cpp \
     $$PWD/tools/dialogpin.cpp
 
@@ -129,6 +129,6 @@ FORMS += \
     $$PWD/tools/dialogflippingbyaxis.ui \
     $$PWD/tools/dialogmove.ui \
     $$PWD/tools/dialogellipticalarc.ui \
-    $$PWD/tools/dialogseamallowance.ui \
+    $$PWD/tools/piece/dialogseamallowance.ui \
     $$PWD/tools/dialogpiecepath.ui \
     $$PWD/tools/dialogpin.ui
diff --git a/src/libs/vtools/dialogs/tooldialogs.h b/src/libs/vtools/dialogs/tooldialogs.h
index a98fe7402..8bd6558ac 100644
--- a/src/libs/vtools/dialogs/tooldialogs.h
+++ b/src/libs/vtools/dialogs/tooldialogs.h
@@ -33,7 +33,7 @@
 #include "tools/dialogarc.h"
 #include "tools/dialogarcwithlength.h"
 #include "tools/dialogbisector.h"
-#include "tools/dialogseamallowance.h"
+#include "tools/piece/dialogseamallowance.h"
 #include "tools/dialogendline.h"
 #include "tools/dialogline.h"
 #include "tools/dialoglineintersect.h"
diff --git a/src/libs/vtools/dialogs/tools/dialogseamallowance.cpp b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp
similarity index 99%
rename from src/libs/vtools/dialogs/tools/dialogseamallowance.cpp
rename to src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp
index 5d1b63e6f..b6ea33bff 100644
--- a/src/libs/vtools/dialogs/tools/dialogseamallowance.cpp
+++ b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp
@@ -33,9 +33,9 @@
 #include "../vpatterndb/calculator.h"
 #include "visualization/path/vistoolpiece.h"
 #include "visualization/path/vispiecepins.h"
-#include "dialogpiecepath.h"
-#include "../../undocommands/savepiecepathoptions.h"
-#include "../support/dialogeditwrongformula.h"
+#include "../dialogpiecepath.h"
+#include "../../../undocommands/savepiecepathoptions.h"
+#include "../../support/dialogeditwrongformula.h"
 
 #include <QMenu>
 #include <QTimer>
diff --git a/src/libs/vtools/dialogs/tools/dialogseamallowance.h b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.h
similarity index 99%
rename from src/libs/vtools/dialogs/tools/dialogseamallowance.h
rename to src/libs/vtools/dialogs/tools/piece/dialogseamallowance.h
index c3c2237d7..ac7116854 100644
--- a/src/libs/vtools/dialogs/tools/dialogseamallowance.h
+++ b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.h
@@ -29,7 +29,7 @@
 #ifndef DIALOGSEAMALLOWANCE_H
 #define DIALOGSEAMALLOWANCE_H
 
-#include "dialogtool.h"
+#include "../dialogtool.h"
 #include "../vpatterndb/vpiece.h"
 #include "../vpatterndb/floatItemData/vpatternlabeldata.h"
 #include "../vpatterndb/floatItemData/vpiecelabeldata.h"
diff --git a/src/libs/vtools/dialogs/tools/dialogseamallowance.ui b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.ui
similarity index 97%
rename from src/libs/vtools/dialogs/tools/dialogseamallowance.ui
rename to src/libs/vtools/dialogs/tools/piece/dialogseamallowance.ui
index b59cf9ca6..9419c2de4 100644
--- a/src/libs/vtools/dialogs/tools/dialogseamallowance.ui
+++ b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.ui
@@ -14,14 +14,14 @@
    <string>Seam allowance tool</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../../vmisc/share/resources/icon.qrc">
+   <iconset resource="../../../../vmisc/share/resources/icon.qrc">
     <normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>5</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="tabMainPath">
       <attribute name="title">
@@ -42,7 +42,7 @@
             <string/>
            </property>
            <property name="pixmap">
-            <pixmap resource="../../../vmisc/share/resources/icon.qrc">:/icon/32x32/clockwise.png</pixmap>
+            <pixmap resource="../../../../vmisc/share/resources/icon.qrc">:/icon/32x32/clockwise.png</pixmap>
            </property>
           </widget>
          </item>
@@ -197,7 +197,7 @@
                <string notr="true">...</string>
               </property>
               <property name="icon">
-               <iconset resource="../../../vmisc/share/resources/icon.qrc">
+               <iconset resource="../../../../vmisc/share/resources/icon.qrc">
                 <normaloff>:/icon/24x24/fx.png</normaloff>:/icon/24x24/fx.png</iconset>
               </property>
               <property name="iconSize">
@@ -214,7 +214,7 @@
                <string/>
               </property>
               <property name="pixmap">
-               <pixmap resource="../../../vmisc/share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
+               <pixmap resource="../../../../vmisc/share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
               </property>
              </widget>
             </item>
@@ -436,7 +436,7 @@
                   <string notr="true">...</string>
                  </property>
                  <property name="icon">
-                  <iconset resource="../../../vmisc/share/resources/icon.qrc">
+                  <iconset resource="../../../../vmisc/share/resources/icon.qrc">
                    <normaloff>:/icon/24x24/fx.png</normaloff>:/icon/24x24/fx.png</iconset>
                  </property>
                  <property name="iconSize">
@@ -453,7 +453,7 @@
                   <string/>
                  </property>
                  <property name="pixmap">
-                  <pixmap resource="../../../vmisc/share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
+                  <pixmap resource="../../../../vmisc/share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
                  </property>
                 </widget>
                </item>
@@ -626,7 +626,7 @@
                   <string notr="true">...</string>
                  </property>
                  <property name="icon">
-                  <iconset resource="../../../vmisc/share/resources/icon.qrc">
+                  <iconset resource="../../../../vmisc/share/resources/icon.qrc">
                    <normaloff>:/icon/24x24/fx.png</normaloff>:/icon/24x24/fx.png</iconset>
                  </property>
                  <property name="iconSize">
@@ -643,7 +643,7 @@
                   <string/>
                  </property>
                  <property name="pixmap">
-                  <pixmap resource="../../../vmisc/share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
+                  <pixmap resource="../../../../vmisc/share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
                  </property>
                 </widget>
                </item>
@@ -1157,7 +1157,7 @@
                 <string notr="true">...</string>
                </property>
                <property name="icon">
-                <iconset resource="../../../vmisc/share/resources/icon.qrc">
+                <iconset resource="../../../../vmisc/share/resources/icon.qrc">
                  <normaloff>:/icon/24x24/fx.png</normaloff>:/icon/24x24/fx.png</iconset>
                </property>
                <property name="iconSize">
@@ -1174,7 +1174,7 @@
                 <string/>
                </property>
                <property name="pixmap">
-                <pixmap resource="../../../vmisc/share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
+                <pixmap resource="../../../../vmisc/share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
                </property>
               </widget>
              </item>
@@ -1359,7 +1359,7 @@
                 <string notr="true">...</string>
                </property>
                <property name="icon">
-                <iconset resource="../../../vmisc/share/resources/icon.qrc">
+                <iconset resource="../../../../vmisc/share/resources/icon.qrc">
                  <normaloff>:/icon/24x24/fx.png</normaloff>:/icon/24x24/fx.png</iconset>
                </property>
                <property name="iconSize">
@@ -1376,7 +1376,7 @@
                 <string/>
                </property>
                <property name="pixmap">
-                <pixmap resource="../../../vmisc/share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
+                <pixmap resource="../../../../vmisc/share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
                </property>
               </widget>
              </item>
@@ -1645,7 +1645,7 @@
                 <string notr="true">...</string>
                </property>
                <property name="icon">
-                <iconset resource="../../../vmisc/share/resources/icon.qrc">
+                <iconset resource="../../../../vmisc/share/resources/icon.qrc">
                  <normaloff>:/icon/24x24/fx.png</normaloff>:/icon/24x24/fx.png</iconset>
                </property>
                <property name="iconSize">
@@ -1662,7 +1662,7 @@
                 <string/>
                </property>
                <property name="pixmap">
-                <pixmap resource="../../../vmisc/share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
+                <pixmap resource="../../../../vmisc/share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
                </property>
               </widget>
              </item>
@@ -1863,7 +1863,7 @@
                 <string notr="true">...</string>
                </property>
                <property name="icon">
-                <iconset resource="../../../vmisc/share/resources/icon.qrc">
+                <iconset resource="../../../../vmisc/share/resources/icon.qrc">
                  <normaloff>:/icon/24x24/fx.png</normaloff>:/icon/24x24/fx.png</iconset>
                </property>
                <property name="iconSize">
@@ -1880,7 +1880,7 @@
                 <string/>
                </property>
                <property name="pixmap">
-                <pixmap resource="../../../vmisc/share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
+                <pixmap resource="../../../../vmisc/share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
                </property>
               </widget>
              </item>
@@ -2065,7 +2065,7 @@
                 <string notr="true">...</string>
                </property>
                <property name="icon">
-                <iconset resource="../../../vmisc/share/resources/icon.qrc">
+                <iconset resource="../../../../vmisc/share/resources/icon.qrc">
                  <normaloff>:/icon/24x24/fx.png</normaloff>:/icon/24x24/fx.png</iconset>
                </property>
                <property name="iconSize">
@@ -2082,7 +2082,7 @@
                 <string/>
                </property>
                <property name="pixmap">
-                <pixmap resource="../../../vmisc/share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
+                <pixmap resource="../../../../vmisc/share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
                </property>
               </widget>
              </item>
@@ -2351,7 +2351,7 @@
                 <string notr="true">...</string>
                </property>
                <property name="icon">
-                <iconset resource="../../../vmisc/share/resources/icon.qrc">
+                <iconset resource="../../../../vmisc/share/resources/icon.qrc">
                  <normaloff>:/icon/24x24/fx.png</normaloff>:/icon/24x24/fx.png</iconset>
                </property>
                <property name="iconSize">
@@ -2368,7 +2368,7 @@
                 <string/>
                </property>
                <property name="pixmap">
-                <pixmap resource="../../../vmisc/share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
+                <pixmap resource="../../../../vmisc/share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
                </property>
               </widget>
              </item>
@@ -2576,7 +2576,7 @@
                <string notr="true">...</string>
               </property>
               <property name="icon">
-               <iconset resource="../../../vmisc/share/resources/icon.qrc">
+               <iconset resource="../../../../vmisc/share/resources/icon.qrc">
                 <normaloff>:/icon/24x24/fx.png</normaloff>:/icon/24x24/fx.png</iconset>
               </property>
               <property name="iconSize">
@@ -2593,7 +2593,7 @@
                <string/>
               </property>
               <property name="pixmap">
-               <pixmap resource="../../../vmisc/share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
+               <pixmap resource="../../../../vmisc/share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
               </property>
              </widget>
             </item>
@@ -2765,7 +2765,7 @@
                <string notr="true">...</string>
               </property>
               <property name="icon">
-               <iconset resource="../../../vmisc/share/resources/icon.qrc">
+               <iconset resource="../../../../vmisc/share/resources/icon.qrc">
                 <normaloff>:/icon/24x24/fx.png</normaloff>:/icon/24x24/fx.png</iconset>
               </property>
               <property name="iconSize">
@@ -2782,7 +2782,7 @@
                <string/>
               </property>
               <property name="pixmap">
-               <pixmap resource="../../../vmisc/share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
+               <pixmap resource="../../../../vmisc/share/resources/icon.qrc">:/icon/24x24/equal.png</pixmap>
               </property>
              </widget>
             </item>
@@ -3008,7 +3008,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../../../vmisc/share/resources/icon.qrc"/>
+  <include location="../../../../vmisc/share/resources/icon.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/src/libs/vtools/tools/vtoolseamallowance.cpp b/src/libs/vtools/tools/vtoolseamallowance.cpp
index 4bce8e9e2..dece7bca2 100644
--- a/src/libs/vtools/tools/vtoolseamallowance.cpp
+++ b/src/libs/vtools/tools/vtoolseamallowance.cpp
@@ -27,7 +27,7 @@
  *************************************************************************/
 
 #include "vtoolseamallowance.h"
-#include "../dialogs/tools/dialogseamallowance.h"
+#include "../dialogs/tools/piece/dialogseamallowance.h"
 #include "../vpatterndb/vpiecenode.h"
 #include "../vpatterndb/vpiecepath.h"
 #include "../vpatterndb/calculator.h"