aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move Seam Allowance tool's dialog.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2017-03-16 14:49:40 +02:00
parent 4241f9976c
commit abd10d8f56
6 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/vtools/dialogs/dialogs.pri
View File

@ -42,7 +42,7 @@ HEADERS += \
$$PWD/tools/dialogflippingbyaxis.h \ $$PWD/tools/dialogflippingbyaxis.h \
$$PWD/tools/dialogmove.h \ $$PWD/tools/dialogmove.h \
$$PWD/tools/dialogellipticalarc.h \ $$PWD/tools/dialogellipticalarc.h \
$$PWD/tools/dialogseamallowance.h \ $$PWD/tools/piece/dialogseamallowance.h \
$$PWD/tools/dialogpiecepath.h \ $$PWD/tools/dialogpiecepath.h \
$$PWD/tools/dialogpin.h $$PWD/tools/dialogpin.h
@ -86,7 +86,7 @@ SOURCES += \
$$PWD/tools/dialogflippingbyaxis.cpp \ $$PWD/tools/dialogflippingbyaxis.cpp \
$$PWD/tools/dialogmove.cpp \ $$PWD/tools/dialogmove.cpp \
$$PWD/tools/dialogellipticalarc.cpp \ $$PWD/tools/dialogellipticalarc.cpp \
$$PWD/tools/dialogseamallowance.cpp \ $$PWD/tools/piece/dialogseamallowance.cpp \
$$PWD/tools/dialogpiecepath.cpp \ $$PWD/tools/dialogpiecepath.cpp \
$$PWD/tools/dialogpin.cpp $$PWD/tools/dialogpin.cpp
@ -129,6 +129,6 @@ FORMS += \
$$PWD/tools/dialogflippingbyaxis.ui \ $$PWD/tools/dialogflippingbyaxis.ui \
$$PWD/tools/dialogmove.ui \ $$PWD/tools/dialogmove.ui \
$$PWD/tools/dialogellipticalarc.ui \ $$PWD/tools/dialogellipticalarc.ui \
$$PWD/tools/dialogseamallowance.ui \ $$PWD/tools/piece/dialogseamallowance.ui \
$$PWD/tools/dialogpiecepath.ui \ $$PWD/tools/dialogpiecepath.ui \
$$PWD/tools/dialogpin.ui $$PWD/tools/dialogpin.ui

2
src/libs/vtools/dialogs/tooldialogs.h
View File

@ -33,7 +33,7 @@
#include "tools/dialogarc.h" #include "tools/dialogarc.h"
#include "tools/dialogarcwithlength.h" #include "tools/dialogarcwithlength.h"
#include "tools/dialogbisector.h" #include "tools/dialogbisector.h"
#include "tools/dialogseamallowance.h" #include "tools/piece/dialogseamallowance.h"
#include "tools/dialogendline.h" #include "tools/dialogendline.h"
#include "tools/dialogline.h" #include "tools/dialogline.h"
#include "tools/dialoglineintersect.h" #include "tools/dialoglineintersect.h"

6
src/libs/vtools/dialogs/tools/dialogseamallowance.cpp → src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp
View File

@ -33,9 +33,9 @@
#include "../vpatterndb/calculator.h" #include "../vpatterndb/calculator.h"
#include "visualization/path/vistoolpiece.h" #include "visualization/path/vistoolpiece.h"
#include "visualization/path/vispiecepins.h" #include "visualization/path/vispiecepins.h"
#include "dialogpiecepath.h" #include "../dialogpiecepath.h"
#include "../../undocommands/savepiecepathoptions.h" #include "../../../undocommands/savepiecepathoptions.h"
#include "../support/dialogeditwrongformula.h" #include "../../support/dialogeditwrongformula.h"
#include <QMenu> #include <QMenu>
#include <QTimer> #include <QTimer>

2
src/libs/vtools/dialogs/tools/dialogseamallowance.h → src/libs/vtools/dialogs/tools/piece/dialogseamallowance.h
View File

@ -29,7 +29,7 @@
#ifndef DIALOGSEAMALLOWANCE_H #ifndef DIALOGSEAMALLOWANCE_H
#define DIALOGSEAMALLOWANCE_H #define DIALOGSEAMALLOWANCE_H
#include "dialogtool.h" #include "../dialogtool.h"
#include "../vpatterndb/vpiece.h" #include "../vpatterndb/vpiece.h"
#include "../vpatterndb/floatItemData/vpatternlabeldata.h" #include "../vpatterndb/floatItemData/vpatternlabeldata.h"
#include "../vpatterndb/floatItemData/vpiecelabeldata.h" #include "../vpatterndb/floatItemData/vpiecelabeldata.h"

52
src/libs/vtools/dialogs/tools/dialogseamallowance.ui → src/libs/vtools/dialogs/tools/piece/dialogseamallowance.ui
View File

@ -14,14 +14,14 @@
<string>Seam allowance tool</string> <string>Seam allowance tool</string>
</property> </property>
<property name="windowIcon"> <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> <normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>5</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="tabMainPath"> <widget class="QWidget" name="tabMainPath">
<attribute name="title"> <attribute name="title">
@ -42,7 +42,7 @@
<string/> <string/>
</property> </property>
<property name="pixmap"> <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> </property>
</widget> </widget>
</item> </item>
@ -197,7 +197,7 @@
<string notr="true">...</string> <string notr="true">...</string>
</property> </property>
<property name="icon"> <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> <normaloff>:/icon/24x24/fx.png</normaloff>:/icon/24x24/fx.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -214,7 +214,7 @@
<string/> <string/>
</property> </property>
<property name="pixmap"> <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> </property>
</widget> </widget>
</item> </item>
@ -436,7 +436,7 @@
<string notr="true">...</string> <string notr="true">...</string>
</property> </property>
<property name="icon"> <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> <normaloff>:/icon/24x24/fx.png</normaloff>:/icon/24x24/fx.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -453,7 +453,7 @@
<string/> <string/>
</property> </property>
<property name="pixmap"> <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> </property>
</widget> </widget>
</item> </item>
@ -626,7 +626,7 @@
<string notr="true">...</string> <string notr="true">...</string>
</property> </property>
<property name="icon"> <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> <normaloff>:/icon/24x24/fx.png</normaloff>:/icon/24x24/fx.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -643,7 +643,7 @@
<string/> <string/>
</property> </property>
<property name="pixmap"> <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> </property>
</widget> </widget>
</item> </item>
@ -1157,7 +1157,7 @@
<string notr="true">...</string> <string notr="true">...</string>
</property> </property>
<property name="icon"> <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> <normaloff>:/icon/24x24/fx.png</normaloff>:/icon/24x24/fx.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -1174,7 +1174,7 @@
<string/> <string/>
</property> </property>
<property name="pixmap"> <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> </property>
</widget> </widget>
</item> </item>
@ -1359,7 +1359,7 @@
<string notr="true">...</string> <string notr="true">...</string>
</property> </property>
<property name="icon"> <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> <normaloff>:/icon/24x24/fx.png</normaloff>:/icon/24x24/fx.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -1376,7 +1376,7 @@
<string/> <string/>
</property> </property>
<property name="pixmap"> <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> </property>
</widget> </widget>
</item> </item>
@ -1645,7 +1645,7 @@
<string notr="true">...</string> <string notr="true">...</string>
</property> </property>
<property name="icon"> <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> <normaloff>:/icon/24x24/fx.png</normaloff>:/icon/24x24/fx.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -1662,7 +1662,7 @@
<string/> <string/>
</property> </property>
<property name="pixmap"> <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> </property>
</widget> </widget>
</item> </item>
@ -1863,7 +1863,7 @@
<string notr="true">...</string> <string notr="true">...</string>
</property> </property>
<property name="icon"> <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> <normaloff>:/icon/24x24/fx.png</normaloff>:/icon/24x24/fx.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -1880,7 +1880,7 @@
<string/> <string/>
</property> </property>
<property name="pixmap"> <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> </property>
</widget> </widget>
</item> </item>
@ -2065,7 +2065,7 @@
<string notr="true">...</string> <string notr="true">...</string>
</property> </property>
<property name="icon"> <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> <normaloff>:/icon/24x24/fx.png</normaloff>:/icon/24x24/fx.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -2082,7 +2082,7 @@
<string/> <string/>
</property> </property>
<property name="pixmap"> <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> </property>
</widget> </widget>
</item> </item>
@ -2351,7 +2351,7 @@
<string notr="true">...</string> <string notr="true">...</string>
</property> </property>
<property name="icon"> <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> <normaloff>:/icon/24x24/fx.png</normaloff>:/icon/24x24/fx.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -2368,7 +2368,7 @@
<string/> <string/>
</property> </property>
<property name="pixmap"> <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> </property>
</widget> </widget>
</item> </item>
@ -2576,7 +2576,7 @@
<string notr="true">...</string> <string notr="true">...</string>
</property> </property>
<property name="icon"> <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> <normaloff>:/icon/24x24/fx.png</normaloff>:/icon/24x24/fx.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -2593,7 +2593,7 @@
<string/> <string/>
</property> </property>
<property name="pixmap"> <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> </property>
</widget> </widget>
</item> </item>
@ -2765,7 +2765,7 @@
<string notr="true">...</string> <string notr="true">...</string>
</property> </property>
<property name="icon"> <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> <normaloff>:/icon/24x24/fx.png</normaloff>:/icon/24x24/fx.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -2782,7 +2782,7 @@
<string/> <string/>
</property> </property>
<property name="pixmap"> <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> </property>
</widget> </widget>
</item> </item>
@ -3008,7 +3008,7 @@
</layout> </layout>
</widget> </widget>
<resources> <resources>
<include location="../../../vmisc/share/resources/icon.qrc"/> <include location="../../../../vmisc/share/resources/icon.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>

2
src/libs/vtools/tools/vtoolseamallowance.cpp
View File

@ -27,7 +27,7 @@
*************************************************************************/ *************************************************************************/
#include "vtoolseamallowance.h" #include "vtoolseamallowance.h"
#include "../dialogs/tools/dialogseamallowance.h" #include "../dialogs/tools/piece/dialogseamallowance.h"
#include "../vpatterndb/vpiecenode.h" #include "../vpatterndb/vpiecenode.h"
#include "../vpatterndb/vpiecepath.h" #include "../vpatterndb/vpiecepath.h"
#include "../vpatterndb/calculator.h" #include "../vpatterndb/calculator.h"