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

Move app's dialogs.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-06-19 14:21:46 +03:00
parent cf7971ecac
commit 770021d589
47 changed files with 124 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/dialogs/app/configdialog.cpp → src/app/dialogs/configdialog.cpp
View File

@ -33,7 +33,7 @@
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QStackedWidget> #include <QStackedWidget>
#include <QCloseEvent> #include <QCloseEvent>
#include "../../core/vapplication.h" #include "../core/vapplication.h"
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
ConfigDialog::ConfigDialog(QWidget *parent) : ConfigDialog::ConfigDialog(QWidget *parent) :

0
src/app/dialogs/app/configdialog.h → src/app/dialogs/configdialog.h
View File

7
src/app/dialogs/app/configpages/communitypage.cpp → src/app/dialogs/configpages/communitypage.cpp
View File

@ -27,16 +27,15 @@
*************************************************************************/ *************************************************************************/
#include "communitypage.h" #include "communitypage.h"
#include "../../../options.h" #include "../../options.h"
#include "../../../core/vapplication.h" #include "../../core/vapplication.h"
#include "../../../../libs/vmisc/vsettings.h" #include "../../../libs/vmisc/vsettings.h"
#include <QGroupBox> #include <QGroupBox>
#include <QLabel> #include <QLabel>
#include <QSettings> #include <QSettings>
#include <QCheckBox> #include <QCheckBox>
#include <QLineEdit> #include <QLineEdit>
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
CommunityPage::CommunityPage(QWidget *parent): CommunityPage::CommunityPage(QWidget *parent):
QWidget(parent), server(nullptr), secureComm(nullptr), useProxy(nullptr), proxyAddress(nullptr), QWidget(parent), server(nullptr), secureComm(nullptr), useProxy(nullptr), proxyAddress(nullptr),

0
src/app/dialogs/app/configpages/communitypage.h → src/app/dialogs/configpages/communitypage.h
View File

6
src/app/dialogs/app/configpages/configurationpage.cpp → src/app/dialogs/configpages/configurationpage.cpp
View File

@ -27,9 +27,9 @@
*************************************************************************/ *************************************************************************/
#include "configurationpage.h" #include "configurationpage.h"
#include "../../../options.h" #include "../../options.h"
#include "../../../core/vapplication.h" #include "../../core/vapplication.h"
#include "../../../../libs/vmisc/vsettings.h" #include "../../../libs/vmisc/vsettings.h"
#include <QDir> #include <QDir>
#include <QGroupBox> #include <QGroupBox>
#include <QLabel> #include <QLabel>

0
src/app/dialogs/app/configpages/configurationpage.h → src/app/dialogs/configpages/configurationpage.h
View File

0
src/app/dialogs/app/configpages/pages.h → src/app/dialogs/configpages/pages.h
View File

6
src/app/dialogs/app/configpages/pathpage.cpp → src/app/dialogs/configpages/pathpage.cpp
View File

@ -27,9 +27,9 @@
*************************************************************************/ *************************************************************************/
#include "pathpage.h" #include "pathpage.h"
#include "../../../options.h" #include "../../options.h"
#include "../../../core/vapplication.h" #include "../../core/vapplication.h"
#include "../../../../libs/vmisc/vsettings.h" #include "../../../libs/vmisc/vsettings.h"
#include <QDir> #include <QDir>
#include <QGroupBox> #include <QGroupBox>
#include <QLabel> #include <QLabel>

0
src/app/dialogs/app/configpages/pathpage.h → src/app/dialogs/configpages/pathpage.h
View File

8
src/app/dialogs/app/configpages/patternpage.cpp → src/app/dialogs/configpages/patternpage.cpp
View File

@ -27,10 +27,10 @@
*************************************************************************/ *************************************************************************/
#include "patternpage.h" #include "patternpage.h"
#include "../../../options.h" #include "../../options.h"
#include "../../../core/vapplication.h" #include "../../core/vapplication.h"
#include "../../../../libs/vmisc/vsettings.h" #include "../../../libs/vmisc/vsettings.h"
#include "../../../../libs/vwidgets/vmaingraphicsview.h" #include "../../../libs/vwidgets/vmaingraphicsview.h"
#include <QGroupBox> #include <QGroupBox>
#include <QLabel> #include <QLabel>
#include <QSettings> #include <QSettings>

0
src/app/dialogs/app/configpages/patternpage.h → src/app/dialogs/configpages/patternpage.h
View File

6
src/app/dialogs/app/dialogaboutapp.cpp → src/app/dialogs/dialogaboutapp.cpp
View File

@ -28,12 +28,12 @@
#include "dialogaboutapp.h" #include "dialogaboutapp.h"
#include "ui_dialogaboutapp.h" #include "ui_dialogaboutapp.h"
#include "../../version.h" #include "../version.h"
#include <QDate> #include <QDate>
#include <QDesktopServices> #include <QDesktopServices>
#include <QMessageBox> #include <QMessageBox>
#include "../../options.h" #include "../options.h"
#include "../../core/vapplication.h" #include "../core/vapplication.h"
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
DialogAboutApp::DialogAboutApp(QWidget *parent) : DialogAboutApp::DialogAboutApp(QWidget *parent) :

0
src/app/dialogs/app/dialogaboutapp.h → src/app/dialogs/dialogaboutapp.h
View File

6
src/app/dialogs/app/dialogaboutapp.ui → src/app/dialogs/dialogaboutapp.ui
View File

@ -41,7 +41,7 @@
<string>About Valentina</string> <string>About Valentina</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../../share/resources/icon.qrc"> <iconset resource="../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>
<property name="locale"> <property name="locale">
@ -74,7 +74,7 @@
<string/> <string/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="../../share/resources/icon.qrc">:/icon/64x64/icon64x64.png</pixmap> <pixmap resource="../share/resources/icon.qrc">:/icon/64x64/icon64x64.png</pixmap>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@ -315,7 +315,7 @@ Felix Ulber </string>
</layout> </layout>
</widget> </widget>
<resources> <resources>
<include location="../../share/resources/icon.qrc"/> <include location="../share/resources/icon.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>

2
src/app/dialogs/app/dialoghistory.cpp → src/app/dialogs/dialoghistory.cpp
View File

@ -35,7 +35,7 @@
#include "../../libs/vtools/tools/drawTools/vtoolcutspline.h" #include "../../libs/vtools/tools/drawTools/vtoolcutspline.h"
#include "../../libs/vtools/tools/drawTools/vtoolcutsplinepath.h" #include "../../libs/vtools/tools/drawTools/vtoolcutsplinepath.h"
#include "../../libs/vtools/tools/drawTools/vtoolcutarc.h" #include "../../libs/vtools/tools/drawTools/vtoolcutarc.h"
#include "../../xml/vpattern.h" #include "../xml/vpattern.h"
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
/** /**

0
src/app/dialogs/app/dialoghistory.h → src/app/dialogs/dialoghistory.h
View File

6
src/app/dialogs/app/dialoghistory.ui → src/app/dialogs/dialoghistory.ui
View File

@ -17,7 +17,7 @@
<string>History</string> <string>History</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../../share/resources/icon.qrc"> <iconset resource="../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>
<property name="locale"> <property name="locale">
@ -30,7 +30,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<attribute name="horizontalHeaderVisible"> <attribute name="horizontalHeaderVisible">
<bool>true</bool> <bool>false</bool>
</attribute> </attribute>
<attribute name="horizontalHeaderHighlightSections"> <attribute name="horizontalHeaderHighlightSections">
<bool>false</bool> <bool>false</bool>
@ -73,7 +73,7 @@
<tabstop>buttonBox</tabstop> <tabstop>buttonBox</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="../../share/resources/icon.qrc"/> <include location="../share/resources/icon.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>

4
src/app/dialogs/app/dialogincrements.cpp → src/app/dialogs/dialogincrements.cpp
View File

@ -31,8 +31,8 @@
#include "../../libs/vwidgets/doubledelegate.h" #include "../../libs/vwidgets/doubledelegate.h"
#include "../../libs/vwidgets/textdelegate.h" #include "../../libs/vwidgets/textdelegate.h"
#include "../../libs/vwidgets/vwidgetpopup.h" #include "../../libs/vwidgets/vwidgetpopup.h"
#include "../../xml/vstandardmeasurements.h" #include "../xml/vstandardmeasurements.h"
#include "../../xml/vindividualmeasurements.h" #include "../xml/vindividualmeasurements.h"
#include "../../libs/vmisc/vsettings.h" #include "../../libs/vmisc/vsettings.h"
#include "../../libs/qmuparser/qmudef.h" #include "../../libs/qmuparser/qmudef.h"
#include "../../libs/vpatterndb/vtranslatevars.h" #include "../../libs/vpatterndb/vtranslatevars.h"

2
src/app/dialogs/app/dialogincrements.h → src/app/dialogs/dialogincrements.h
View File

@ -30,7 +30,7 @@
#define DIALOGINCREMENTS_H #define DIALOGINCREMENTS_H
#include "../../libs/vtools/dialogs/tools/dialogtool.h" #include "../../libs/vtools/dialogs/tools/dialogtool.h"
#include "../../xml/vpattern.h" #include "../xml/vpattern.h"
class VIndividualMeasurements; class VIndividualMeasurements;
class QTableWidget; class QTableWidget;

8
src/app/dialogs/app/dialogincrements.ui → src/app/dialogs/dialogincrements.ui
View File

@ -20,7 +20,7 @@
<string>Tables of Variables</string> <string>Tables of Variables</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../../share/resources/icon.qrc"> <iconset resource="../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>
<property name="locale"> <property name="locale">
@ -123,7 +123,7 @@
</rect> </rect>
</property> </property>
<attribute name="icon"> <attribute name="icon">
<iconset resource="../../share/resources/icon.qrc"> <iconset resource="../share/resources/icon.qrc">
<normaloff>:/icon/16x16/info.png</normaloff>:/icon/16x16/info.png</iconset> <normaloff>:/icon/16x16/info.png</normaloff>:/icon/16x16/info.png</iconset>
</attribute> </attribute>
<attribute name="label"> <attribute name="label">
@ -283,7 +283,7 @@
</rect> </rect>
</property> </property>
<attribute name="icon"> <attribute name="icon">
<iconset resource="../../share/resources/icon.qrc"> <iconset resource="../share/resources/icon.qrc">
<normaloff>:/icon/16x16/measurement.png</normaloff>:/icon/16x16/measurement.png</iconset> <normaloff>:/icon/16x16/measurement.png</normaloff>:/icon/16x16/measurement.png</iconset>
</attribute> </attribute>
<attribute name="label"> <attribute name="label">
@ -796,7 +796,7 @@
<tabstop>tableWidgetArcs</tabstop> <tabstop>tableWidgetArcs</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="../../share/resources/icon.qrc"/> <include location="../share/resources/icon.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

4
src/app/dialogs/app/dialogindividualmeasurements.cpp → src/app/dialogs/dialogindividualmeasurements.cpp
View File

@ -28,8 +28,8 @@
#include "dialogindividualmeasurements.h" #include "dialogindividualmeasurements.h"
#include "ui_dialogindividualmeasurements.h" #include "ui_dialogindividualmeasurements.h"
#include "../../xml/vindividualmeasurements.h" #include "../xml/vindividualmeasurements.h"
#include "../../core/vapplication.h" #include "../core/vapplication.h"
#include "../../libs/vmisc/vsettings.h" #include "../../libs/vmisc/vsettings.h"
#include "../../libs/vpatterndb/vcontainer.h" #include "../../libs/vpatterndb/vcontainer.h"

0
src/app/dialogs/app/dialogindividualmeasurements.h → src/app/dialogs/dialogindividualmeasurements.h
View File

4
src/app/dialogs/app/dialogindividualmeasurements.ui → src/app/dialogs/dialogindividualmeasurements.ui
View File

@ -29,7 +29,7 @@
<string>Individual measurements</string> <string>Individual measurements</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../../share/resources/icon.qrc"> <iconset resource="../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>
<property name="modal"> <property name="modal">
@ -258,7 +258,7 @@
</layout> </layout>
</widget> </widget>
<resources> <resources>
<include location="../../share/resources/icon.qrc"/> <include location="../share/resources/icon.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>

4
src/app/dialogs/app/dialoglayoutprogress.cpp → src/app/dialogs/dialoglayoutprogress.cpp
View File

@ -28,8 +28,8 @@
#include "dialoglayoutprogress.h" #include "dialoglayoutprogress.h"
#include "ui_dialoglayoutprogress.h" #include "ui_dialoglayoutprogress.h"
#include "../../options.h" #include "../options.h"
#include "../../core/vapplication.h" #include "../core/vapplication.h"
#include <QMessageBox> #include <QMessageBox>
#include <QPushButton> #include <QPushButton>

0
src/app/dialogs/app/dialoglayoutprogress.h → src/app/dialogs/dialoglayoutprogress.h
View File

4
src/app/dialogs/app/dialoglayoutprogress.ui → src/app/dialogs/dialoglayoutprogress.ui
View File

@ -29,7 +29,7 @@
<string>Create a Layout</string> <string>Create a Layout</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../../share/resources/icon.qrc"> <iconset resource="../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>
<property name="modal"> <property name="modal">
@ -90,7 +90,7 @@
</layout> </layout>
</widget> </widget>
<resources> <resources>
<include location="../../share/resources/icon.qrc"/> <include location="../share/resources/icon.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

2
src/app/dialogs/app/dialoglayoutsettings.cpp → src/app/dialogs/dialoglayoutsettings.cpp
View File

@ -28,7 +28,7 @@
#include "dialoglayoutsettings.h" #include "dialoglayoutsettings.h"
#include "ui_dialoglayoutsettings.h" #include "ui_dialoglayoutsettings.h"
#include "../../core/vapplication.h" #include "../core/vapplication.h"
#include "../../libs/ifc/xml/vdomdocument.h" #include "../../libs/ifc/xml/vdomdocument.h"
#include "../../libs/vmisc/vsettings.h" #include "../../libs/vmisc/vsettings.h"
#include "../../libs/vlayout/vlayoutgenerator.h" #include "../../libs/vlayout/vlayoutgenerator.h"

0
src/app/dialogs/app/dialoglayoutsettings.h → src/app/dialogs/dialoglayoutsettings.h
View File

10
src/app/dialogs/app/dialoglayoutsettings.ui → src/app/dialogs/dialoglayoutsettings.ui
View File

@ -26,7 +26,7 @@
<string>Create a layout</string> <string>Create a layout</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../../share/resources/icon.qrc"> <iconset resource="../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_6"> <layout class="QVBoxLayout" name="verticalLayout_6">
@ -166,7 +166,7 @@
<string notr="true">...</string> <string notr="true">...</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../../share/resources/icon.qrc"> <iconset resource="../share/resources/icon.qrc">
<normaloff>:/icon/16x16/portrait.png</normaloff>:/icon/16x16/portrait.png</iconset> <normaloff>:/icon/16x16/portrait.png</normaloff>:/icon/16x16/portrait.png</iconset>
</property> </property>
<property name="checkable"> <property name="checkable">
@ -189,7 +189,7 @@
<string notr="true">...</string> <string notr="true">...</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../../share/resources/icon.qrc"> <iconset resource="../share/resources/icon.qrc">
<normaloff>:/icon/16x16/landscape.png</normaloff>:/icon/16x16/landscape.png</iconset> <normaloff>:/icon/16x16/landscape.png</normaloff>:/icon/16x16/landscape.png</iconset>
</property> </property>
<property name="checkable"> <property name="checkable">
@ -521,7 +521,7 @@
</layout> </layout>
</widget> </widget>
<resources> <resources>
<include location="../../share/resources/icon.qrc"/> <include location="../share/resources/icon.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>
@ -558,7 +558,7 @@
</connection> </connection>
</connections> </connections>
<buttongroups> <buttongroups>
<buttongroup name="buttonGroupPrinciple"/>
<buttongroup name="buttonGroup"/> <buttongroup name="buttonGroup"/>
<buttongroup name="buttonGroupPrinciple"/>
</buttongroups> </buttongroups>
</ui> </ui>

2
src/app/dialogs/app/dialogmeasurements.cpp → src/app/dialogs/dialogmeasurements.cpp
View File

@ -28,7 +28,7 @@
#include "dialogmeasurements.h" #include "dialogmeasurements.h"
#include "ui_dialogmeasurements.h" #include "ui_dialogmeasurements.h"
#include "../../core/vapplication.h" #include "../core/vapplication.h"
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
DialogMeasurements::DialogMeasurements(QWidget *parent) : DialogMeasurements::DialogMeasurements(QWidget *parent) :

2
src/app/dialogs/app/dialogmeasurements.h → src/app/dialogs/dialogmeasurements.h
View File

@ -30,7 +30,7 @@
#define DIALOGMEASUREMENTS_H #define DIALOGMEASUREMENTS_H
#include <QDialog> #include <QDialog>
#include "../../options.h" #include "../options.h"
namespace Ui namespace Ui
{ {

8
src/app/dialogs/app/dialogmeasurements.ui → src/app/dialogs/dialogmeasurements.ui
View File

@ -29,7 +29,7 @@
<string>Measurements</string> <string>Measurements</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../../share/resources/icon.qrc"> <iconset resource="../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>
<property name="modal"> <property name="modal">
@ -76,7 +76,7 @@
<string>Graduation</string> <string>Graduation</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../../share/resources/icon.qrc"> <iconset resource="../share/resources/icon.qrc">
<normaloff>:/icon/Graduation.png</normaloff>:/icon/Graduation.png</iconset> <normaloff>:/icon/Graduation.png</normaloff>:/icon/Graduation.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -125,7 +125,7 @@
<string>Individual</string> <string>Individual</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../../share/resources/icon.qrc"> <iconset resource="../share/resources/icon.qrc">
<normaloff>:/icon/individual.png</normaloff>:/icon/individual.png</iconset> <normaloff>:/icon/individual.png</normaloff>:/icon/individual.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -164,7 +164,7 @@
<tabstop>toolButtonStandard</tabstop> <tabstop>toolButtonStandard</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="../../share/resources/icon.qrc"/> <include location="../share/resources/icon.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

4
src/app/dialogs/app/dialogpatternproperties.cpp → src/app/dialogs/dialogpatternproperties.cpp
View File

@ -29,8 +29,8 @@
#include "dialogpatternproperties.h" #include "dialogpatternproperties.h"
#include "ui_dialogpatternproperties.h" #include "ui_dialogpatternproperties.h"
#include <QPushButton> #include <QPushButton>
#include "../../xml/vpattern.h" #include "../xml/vpattern.h"
#include "../../core/vapplication.h" #include "../core/vapplication.h"
#define MAX_HEIGHTS 18 #define MAX_HEIGHTS 18
#define MAX_SIZES 18 #define MAX_SIZES 18

2
src/app/dialogs/app/dialogpatternproperties.h → src/app/dialogs/dialogpatternproperties.h
View File

@ -30,7 +30,7 @@
#define DIALOGPATTERNPROPERTIES_H #define DIALOGPATTERNPROPERTIES_H
#include <QDialog> #include <QDialog>
#include "../../options.h" #include "../options.h"
#include <QMap> #include <QMap>
class VPattern; class VPattern;

4
src/app/dialogs/app/dialogpatternproperties.ui → src/app/dialogs/dialogpatternproperties.ui
View File

@ -26,7 +26,7 @@
<string>Pattern properties</string> <string>Pattern properties</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../../share/resources/icon.qrc"> <iconset resource="../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_4"> <layout class="QVBoxLayout" name="verticalLayout_4">
@ -859,7 +859,7 @@
</layout> </layout>
</widget> </widget>
<resources> <resources>
<include location="../../share/resources/icon.qrc"/> <include location="../share/resources/icon.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>

2
src/app/dialogs/app/dialogpatternxmledit.cpp → src/app/dialogs/dialogpatternxmledit.cpp
View File

@ -28,7 +28,7 @@
#include "dialogpatternxmledit.h" #include "dialogpatternxmledit.h"
#include "ui_dialogpatternxmledit.h" #include "ui_dialogpatternxmledit.h"
#include "../../core/vapplication.h" #include "../core/vapplication.h"
#include <QInputDialog> #include <QInputDialog>
#include <QMessageBox> #include <QMessageBox>

2
src/app/dialogs/app/dialogpatternxmledit.h → src/app/dialogs/dialogpatternxmledit.h
View File

@ -31,7 +31,7 @@
#include <QDialog> #include <QDialog>
#include <QStandardItemModel> #include <QStandardItemModel>
#include "../../xml/vpattern.h" #include "../xml/vpattern.h"
//******************************************************************************************** //********************************************************************************************
/** /**

4
src/app/dialogs/app/dialogpatternxmledit.ui → src/app/dialogs/dialogpatternxmledit.ui
View File

@ -35,7 +35,7 @@
<string>XML Editor</string> <string>XML Editor</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../../share/resources/icon.qrc"> <iconset resource="../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>
<property name="autoFillBackground"> <property name="autoFillBackground">
@ -350,7 +350,7 @@
</layout> </layout>
</widget> </widget>
<resources> <resources>
<include location="../../share/resources/icon.qrc"/> <include location="../share/resources/icon.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>

18
src/app/dialogs/dialogs.h
View File

@ -29,14 +29,14 @@
#ifndef DIALOGS_H #ifndef DIALOGS_H
#define DIALOGS_H #define DIALOGS_H
#include "app/dialoghistory.h" #include "dialoghistory.h"
#include "app/dialogincrements.h" #include "dialogincrements.h"
#include "app/configdialog.h" #include "configdialog.h"
#include "app/dialogpatternproperties.h" #include "dialogpatternproperties.h"
#include "app/dialogmeasurements.h" #include "dialogmeasurements.h"
#include "app/dialogindividualmeasurements.h" #include "dialogindividualmeasurements.h"
#include "app/dialogstandardmeasurements.h" #include "dialogstandardmeasurements.h"
#include "app/dialogaboutapp.h" #include "dialogaboutapp.h"
#include "app/dialogpatternxmledit.h" #include "dialogpatternxmledit.h"
#endif // DIALOGS_H #endif // DIALOGS_H

88
src/app/dialogs/dialogs.pri
View File

@ -3,51 +3,51 @@
HEADERS += \ HEADERS += \
$$PWD/dialogs.h \ $$PWD/dialogs.h \
$$PWD/app/dialogincrements.h \ $$PWD/dialogincrements.h \
$$PWD/app/dialoghistory.h \ $$PWD/dialoghistory.h \
$$PWD/app/configdialog.h \ $$PWD/configdialog.h \
$$PWD/app/configpages/pages.h \ $$PWD/configpages/pages.h \
$$PWD/app/dialogpatternproperties.h \ $$PWD/dialogpatternproperties.h \
$$PWD/app/dialogmeasurements.h \ $$PWD/dialogmeasurements.h \
$$PWD/app/dialogstandardmeasurements.h \ $$PWD/dialogstandardmeasurements.h \
$$PWD/app/dialogindividualmeasurements.h \ $$PWD/dialogindividualmeasurements.h \
$$PWD/app/dialogaboutapp.h \ $$PWD/dialogaboutapp.h \
$$PWD/app/dialogpatternxmledit.h \ $$PWD/dialogpatternxmledit.h \
$$PWD/app/configpages/configurationpage.h \ $$PWD/configpages/configurationpage.h \
$$PWD/app/configpages/patternpage.h \ $$PWD/configpages/patternpage.h \
$$PWD/app/configpages/communitypage.h \ $$PWD/configpages/communitypage.h \
$$PWD/app/configpages/pathpage.h \ $$PWD/configpages/pathpage.h \
$$PWD/app/dialoglayoutsettings.h \ $$PWD/dialoglayoutsettings.h \
$$PWD/app/dialoglayoutprogress.h \ $$PWD/dialoglayoutprogress.h \
$$PWD/app/dialogsavelayout.h $$PWD/dialogsavelayout.h
SOURCES += \ SOURCES += \
$$PWD/app/dialogincrements.cpp \ $$PWD/dialogincrements.cpp \
$$PWD/app/dialoghistory.cpp \ $$PWD/dialoghistory.cpp \
$$PWD/app/configdialog.cpp \ $$PWD/configdialog.cpp \
$$PWD/app/dialogpatternproperties.cpp \ $$PWD/dialogpatternproperties.cpp \
$$PWD/app/dialogmeasurements.cpp \ $$PWD/dialogmeasurements.cpp \
$$PWD/app/dialogstandardmeasurements.cpp \ $$PWD/dialogstandardmeasurements.cpp \
$$PWD/app/dialogindividualmeasurements.cpp \ $$PWD/dialogindividualmeasurements.cpp \
$$PWD/app/dialogaboutapp.cpp \ $$PWD/dialogaboutapp.cpp \
$$PWD/app/dialogpatternxmledit.cpp \ $$PWD/dialogpatternxmledit.cpp \
$$PWD/app/configpages/configurationpage.cpp \ $$PWD/configpages/configurationpage.cpp \
$$PWD/app/configpages/patternpage.cpp \ $$PWD/configpages/patternpage.cpp \
$$PWD/app/configpages/communitypage.cpp \ $$PWD/configpages/communitypage.cpp \
$$PWD/app/configpages/pathpage.cpp \ $$PWD/configpages/pathpage.cpp \
$$PWD/app/dialoglayoutsettings.cpp \ $$PWD/dialoglayoutsettings.cpp \
$$PWD/app/dialoglayoutprogress.cpp \ $$PWD/dialoglayoutprogress.cpp \
$$PWD/app/dialogsavelayout.cpp $$PWD/dialogsavelayout.cpp
FORMS += \ FORMS += \
$$PWD/app/dialogincrements.ui \ $$PWD/dialogincrements.ui \
$$PWD/app/dialoghistory.ui \ $$PWD/dialoghistory.ui \
$$PWD/app/dialogpatternproperties.ui \ $$PWD/dialogpatternproperties.ui \
$$PWD/app/dialogmeasurements.ui \ $$PWD/dialogmeasurements.ui \
$$PWD/app/dialogstandardmeasurements.ui \ $$PWD/dialogstandardmeasurements.ui \
$$PWD/app/dialogindividualmeasurements.ui \ $$PWD/dialogindividualmeasurements.ui \
$$PWD/app/dialogaboutapp.ui \ $$PWD/dialogaboutapp.ui \
$$PWD/app/dialogpatternxmledit.ui \ $$PWD/dialogpatternxmledit.ui \
$$PWD/app/dialoglayoutsettings.ui \ $$PWD/dialoglayoutsettings.ui \
$$PWD/app/dialoglayoutprogress.ui \ $$PWD/dialoglayoutprogress.ui \
$$PWD/app/dialogsavelayout.ui $$PWD/dialogsavelayout.ui

4
src/app/dialogs/app/dialogsavelayout.cpp → src/app/dialogs/dialogsavelayout.cpp
View File

@ -28,8 +28,8 @@
#include "dialogsavelayout.h" #include "dialogsavelayout.h"
#include "ui_dialogsavelayout.h" #include "ui_dialogsavelayout.h"
#include "../../options.h" #include "../options.h"
#include "../../core/vapplication.h" #include "../core/vapplication.h"
#include "../../libs/vmisc/vsettings.h" #include "../../libs/vmisc/vsettings.h"
#include <QDir> #include <QDir>

0
src/app/dialogs/app/dialogsavelayout.h → src/app/dialogs/dialogsavelayout.h
View File

4
src/app/dialogs/app/dialogsavelayout.ui → src/app/dialogs/dialogsavelayout.ui
View File

@ -26,7 +26,7 @@
<string>Save Layout</string> <string>Save Layout</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../../share/resources/icon.qrc"> <iconset resource="../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">
@ -113,7 +113,7 @@
</layout> </layout>
</widget> </widget>
<resources> <resources>
<include location="../../share/resources/icon.qrc"/> <include location="../share/resources/icon.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>

4
src/app/dialogs/app/dialogstandardmeasurements.cpp → src/app/dialogs/dialogstandardmeasurements.cpp
View File

@ -28,8 +28,8 @@
#include "dialogstandardmeasurements.h" #include "dialogstandardmeasurements.h"
#include "ui_dialogstandardmeasurements.h" #include "ui_dialogstandardmeasurements.h"
#include "../../xml/vstandardmeasurements.h" #include "../xml/vstandardmeasurements.h"
#include "../../core/vapplication.h" #include "../core/vapplication.h"
#include "../../libs/vmisc/vsettings.h" #include "../../libs/vmisc/vsettings.h"
#include "../../libs/vpatterndb/vcontainer.h" #include "../../libs/vpatterndb/vcontainer.h"
#include "../vmisc/logging.h" #include "../vmisc/logging.h"

0
src/app/dialogs/app/dialogstandardmeasurements.h → src/app/dialogs/dialogstandardmeasurements.h
View File

4
src/app/dialogs/app/dialogstandardmeasurements.ui → src/app/dialogs/dialogstandardmeasurements.ui
View File

@ -23,7 +23,7 @@
<string>Standard table</string> <string>Standard table</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../../share/resources/icon.qrc"> <iconset resource="../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>
<property name="modal"> <property name="modal">
@ -102,7 +102,7 @@
</layout> </layout>
</widget> </widget>
<resources> <resources>
<include location="../../share/resources/icon.qrc"/> <include location="../share/resources/icon.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>

6
src/app/mainwindowsnogui.cpp
View File

@ -30,10 +30,10 @@
#include "core/vapplication.h" #include "core/vapplication.h"
#include "../libs/vpatterndb/vcontainer.h" #include "../libs/vpatterndb/vcontainer.h"
#include "../libs/vobj/vobjpaintdevice.h" #include "../libs/vobj/vobjpaintdevice.h"
#include "dialogs/app/dialoglayoutsettings.h" #include "dialogs/dialoglayoutsettings.h"
#include "../libs/vlayout/vlayoutgenerator.h" #include "../libs/vlayout/vlayoutgenerator.h"
#include "dialogs/app/dialoglayoutprogress.h" #include "dialogs/dialoglayoutprogress.h"
#include "dialogs/app/dialogsavelayout.h" #include "dialogs/dialogsavelayout.h"
#include "../libs/vlayout/vposter.h" #include "../libs/vlayout/vposter.h"
#include <QFileDialog> #include <QFileDialog>