From 770021d5892ab07359b706ff76f9e297ebc5c7ab Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 19 Jun 2015 14:21:46 +0300 Subject: [PATCH] Move app's dialogs. --HG-- branch : develop --- src/app/dialogs/{app => }/configdialog.cpp | 2 +- src/app/dialogs/{app => }/configdialog.h | 0 .../{app => }/configpages/communitypage.cpp | 7 +- .../{app => }/configpages/communitypage.h | 0 .../configpages/configurationpage.cpp | 6 +- .../{app => }/configpages/configurationpage.h | 0 src/app/dialogs/{app => }/configpages/pages.h | 0 .../{app => }/configpages/pathpage.cpp | 6 +- .../dialogs/{app => }/configpages/pathpage.h | 0 .../{app => }/configpages/patternpage.cpp | 8 +- .../{app => }/configpages/patternpage.h | 0 src/app/dialogs/{app => }/dialogaboutapp.cpp | 6 +- src/app/dialogs/{app => }/dialogaboutapp.h | 0 src/app/dialogs/{app => }/dialogaboutapp.ui | 6 +- src/app/dialogs/{app => }/dialoghistory.cpp | 2 +- src/app/dialogs/{app => }/dialoghistory.h | 0 src/app/dialogs/{app => }/dialoghistory.ui | 6 +- .../dialogs/{app => }/dialogincrements.cpp | 4 +- src/app/dialogs/{app => }/dialogincrements.h | 2 +- src/app/dialogs/{app => }/dialogincrements.ui | 8 +- .../dialogindividualmeasurements.cpp | 4 +- .../{app => }/dialogindividualmeasurements.h | 0 .../{app => }/dialogindividualmeasurements.ui | 4 +- .../{app => }/dialoglayoutprogress.cpp | 4 +- .../dialogs/{app => }/dialoglayoutprogress.h | 0 .../dialogs/{app => }/dialoglayoutprogress.ui | 4 +- .../{app => }/dialoglayoutsettings.cpp | 2 +- .../dialogs/{app => }/dialoglayoutsettings.h | 0 .../dialogs/{app => }/dialoglayoutsettings.ui | 10 +-- .../dialogs/{app => }/dialogmeasurements.cpp | 2 +- .../dialogs/{app => }/dialogmeasurements.h | 2 +- .../dialogs/{app => }/dialogmeasurements.ui | 8 +- .../{app => }/dialogpatternproperties.cpp | 4 +- .../{app => }/dialogpatternproperties.h | 2 +- .../{app => }/dialogpatternproperties.ui | 4 +- .../{app => }/dialogpatternxmledit.cpp | 2 +- .../dialogs/{app => }/dialogpatternxmledit.h | 2 +- .../dialogs/{app => }/dialogpatternxmledit.ui | 4 +- src/app/dialogs/dialogs.h | 18 ++-- src/app/dialogs/dialogs.pri | 88 +++++++++---------- .../dialogs/{app => }/dialogsavelayout.cpp | 4 +- src/app/dialogs/{app => }/dialogsavelayout.h | 0 src/app/dialogs/{app => }/dialogsavelayout.ui | 4 +- .../{app => }/dialogstandardmeasurements.cpp | 4 +- .../{app => }/dialogstandardmeasurements.h | 0 .../{app => }/dialogstandardmeasurements.ui | 4 +- src/app/mainwindowsnogui.cpp | 6 +- 47 files changed, 124 insertions(+), 125 deletions(-) rename src/app/dialogs/{app => }/configdialog.cpp (99%) rename src/app/dialogs/{app => }/configdialog.h (100%) rename src/app/dialogs/{app => }/configpages/communitypage.cpp (98%) rename src/app/dialogs/{app => }/configpages/communitypage.h (100%) rename src/app/dialogs/{app => }/configpages/configurationpage.cpp (99%) rename src/app/dialogs/{app => }/configpages/configurationpage.h (100%) rename src/app/dialogs/{app => }/configpages/pages.h (100%) rename src/app/dialogs/{app => }/configpages/pathpage.cpp (98%) rename src/app/dialogs/{app => }/configpages/pathpage.h (100%) rename src/app/dialogs/{app => }/configpages/patternpage.cpp (96%) rename src/app/dialogs/{app => }/configpages/patternpage.h (100%) rename src/app/dialogs/{app => }/dialogaboutapp.cpp (97%) rename src/app/dialogs/{app => }/dialogaboutapp.h (100%) rename src/app/dialogs/{app => }/dialogaboutapp.ui (94%) rename src/app/dialogs/{app => }/dialoghistory.cpp (99%) rename src/app/dialogs/{app => }/dialoghistory.h (100%) rename src/app/dialogs/{app => }/dialoghistory.ui (95%) rename src/app/dialogs/{app => }/dialogincrements.cpp (99%) rename src/app/dialogs/{app => }/dialogincrements.h (99%) rename src/app/dialogs/{app => }/dialogincrements.ui (99%) rename src/app/dialogs/{app => }/dialogindividualmeasurements.cpp (99%) rename src/app/dialogs/{app => }/dialogindividualmeasurements.h (100%) rename src/app/dialogs/{app => }/dialogindividualmeasurements.ui (98%) rename src/app/dialogs/{app => }/dialoglayoutprogress.cpp (98%) rename src/app/dialogs/{app => }/dialoglayoutprogress.h (100%) rename src/app/dialogs/{app => }/dialoglayoutprogress.ui (95%) rename src/app/dialogs/{app => }/dialoglayoutsettings.cpp (99%) rename src/app/dialogs/{app => }/dialoglayoutsettings.h (100%) rename src/app/dialogs/{app => }/dialoglayoutsettings.ui (98%) rename src/app/dialogs/{app => }/dialogmeasurements.cpp (98%) rename src/app/dialogs/{app => }/dialogmeasurements.h (98%) rename src/app/dialogs/{app => }/dialogmeasurements.ui (95%) rename src/app/dialogs/{app => }/dialogpatternproperties.cpp (99%) rename src/app/dialogs/{app => }/dialogpatternproperties.h (99%) rename src/app/dialogs/{app => }/dialogpatternproperties.ui (99%) rename src/app/dialogs/{app => }/dialogpatternxmledit.cpp (99%) rename src/app/dialogs/{app => }/dialogpatternxmledit.h (99%) rename src/app/dialogs/{app => }/dialogpatternxmledit.ui (96%) rename src/app/dialogs/{app => }/dialogsavelayout.cpp (98%) rename src/app/dialogs/{app => }/dialogsavelayout.h (100%) rename src/app/dialogs/{app => }/dialogsavelayout.ui (97%) rename src/app/dialogs/{app => }/dialogstandardmeasurements.cpp (98%) rename src/app/dialogs/{app => }/dialogstandardmeasurements.h (100%) rename src/app/dialogs/{app => }/dialogstandardmeasurements.ui (97%) diff --git a/src/app/dialogs/app/configdialog.cpp b/src/app/dialogs/configdialog.cpp similarity index 99% rename from src/app/dialogs/app/configdialog.cpp rename to src/app/dialogs/configdialog.cpp index 92efb2fcb..77c25891c 100644 --- a/src/app/dialogs/app/configdialog.cpp +++ b/src/app/dialogs/configdialog.cpp @@ -33,7 +33,7 @@ #include #include #include -#include "../../core/vapplication.h" +#include "../core/vapplication.h" //--------------------------------------------------------------------------------------------------------------------- ConfigDialog::ConfigDialog(QWidget *parent) : diff --git a/src/app/dialogs/app/configdialog.h b/src/app/dialogs/configdialog.h similarity index 100% rename from src/app/dialogs/app/configdialog.h rename to src/app/dialogs/configdialog.h diff --git a/src/app/dialogs/app/configpages/communitypage.cpp b/src/app/dialogs/configpages/communitypage.cpp similarity index 98% rename from src/app/dialogs/app/configpages/communitypage.cpp rename to src/app/dialogs/configpages/communitypage.cpp index abfe41366..c7e20a98a 100644 --- a/src/app/dialogs/app/configpages/communitypage.cpp +++ b/src/app/dialogs/configpages/communitypage.cpp @@ -27,16 +27,15 @@ *************************************************************************/ #include "communitypage.h" -#include "../../../options.h" -#include "../../../core/vapplication.h" -#include "../../../../libs/vmisc/vsettings.h" +#include "../../options.h" +#include "../../core/vapplication.h" +#include "../../../libs/vmisc/vsettings.h" #include #include #include #include #include - //--------------------------------------------------------------------------------------------------------------------- CommunityPage::CommunityPage(QWidget *parent): QWidget(parent), server(nullptr), secureComm(nullptr), useProxy(nullptr), proxyAddress(nullptr), diff --git a/src/app/dialogs/app/configpages/communitypage.h b/src/app/dialogs/configpages/communitypage.h similarity index 100% rename from src/app/dialogs/app/configpages/communitypage.h rename to src/app/dialogs/configpages/communitypage.h diff --git a/src/app/dialogs/app/configpages/configurationpage.cpp b/src/app/dialogs/configpages/configurationpage.cpp similarity index 99% rename from src/app/dialogs/app/configpages/configurationpage.cpp rename to src/app/dialogs/configpages/configurationpage.cpp index 284c1ec17..3a4e7a694 100644 --- a/src/app/dialogs/app/configpages/configurationpage.cpp +++ b/src/app/dialogs/configpages/configurationpage.cpp @@ -27,9 +27,9 @@ *************************************************************************/ #include "configurationpage.h" -#include "../../../options.h" -#include "../../../core/vapplication.h" -#include "../../../../libs/vmisc/vsettings.h" +#include "../../options.h" +#include "../../core/vapplication.h" +#include "../../../libs/vmisc/vsettings.h" #include #include #include diff --git a/src/app/dialogs/app/configpages/configurationpage.h b/src/app/dialogs/configpages/configurationpage.h similarity index 100% rename from src/app/dialogs/app/configpages/configurationpage.h rename to src/app/dialogs/configpages/configurationpage.h diff --git a/src/app/dialogs/app/configpages/pages.h b/src/app/dialogs/configpages/pages.h similarity index 100% rename from src/app/dialogs/app/configpages/pages.h rename to src/app/dialogs/configpages/pages.h diff --git a/src/app/dialogs/app/configpages/pathpage.cpp b/src/app/dialogs/configpages/pathpage.cpp similarity index 98% rename from src/app/dialogs/app/configpages/pathpage.cpp rename to src/app/dialogs/configpages/pathpage.cpp index b08012b92..6b27c6c6a 100644 --- a/src/app/dialogs/app/configpages/pathpage.cpp +++ b/src/app/dialogs/configpages/pathpage.cpp @@ -27,9 +27,9 @@ *************************************************************************/ #include "pathpage.h" -#include "../../../options.h" -#include "../../../core/vapplication.h" -#include "../../../../libs/vmisc/vsettings.h" +#include "../../options.h" +#include "../../core/vapplication.h" +#include "../../../libs/vmisc/vsettings.h" #include #include #include diff --git a/src/app/dialogs/app/configpages/pathpage.h b/src/app/dialogs/configpages/pathpage.h similarity index 100% rename from src/app/dialogs/app/configpages/pathpage.h rename to src/app/dialogs/configpages/pathpage.h diff --git a/src/app/dialogs/app/configpages/patternpage.cpp b/src/app/dialogs/configpages/patternpage.cpp similarity index 96% rename from src/app/dialogs/app/configpages/patternpage.cpp rename to src/app/dialogs/configpages/patternpage.cpp index 43dd141ee..f9d59e30d 100644 --- a/src/app/dialogs/app/configpages/patternpage.cpp +++ b/src/app/dialogs/configpages/patternpage.cpp @@ -27,10 +27,10 @@ *************************************************************************/ #include "patternpage.h" -#include "../../../options.h" -#include "../../../core/vapplication.h" -#include "../../../../libs/vmisc/vsettings.h" -#include "../../../../libs/vwidgets/vmaingraphicsview.h" +#include "../../options.h" +#include "../../core/vapplication.h" +#include "../../../libs/vmisc/vsettings.h" +#include "../../../libs/vwidgets/vmaingraphicsview.h" #include #include #include diff --git a/src/app/dialogs/app/configpages/patternpage.h b/src/app/dialogs/configpages/patternpage.h similarity index 100% rename from src/app/dialogs/app/configpages/patternpage.h rename to src/app/dialogs/configpages/patternpage.h diff --git a/src/app/dialogs/app/dialogaboutapp.cpp b/src/app/dialogs/dialogaboutapp.cpp similarity index 97% rename from src/app/dialogs/app/dialogaboutapp.cpp rename to src/app/dialogs/dialogaboutapp.cpp index 133341bef..847d14572 100644 --- a/src/app/dialogs/app/dialogaboutapp.cpp +++ b/src/app/dialogs/dialogaboutapp.cpp @@ -28,12 +28,12 @@ #include "dialogaboutapp.h" #include "ui_dialogaboutapp.h" -#include "../../version.h" +#include "../version.h" #include #include #include -#include "../../options.h" -#include "../../core/vapplication.h" +#include "../options.h" +#include "../core/vapplication.h" //--------------------------------------------------------------------------------------------------------------------- DialogAboutApp::DialogAboutApp(QWidget *parent) : diff --git a/src/app/dialogs/app/dialogaboutapp.h b/src/app/dialogs/dialogaboutapp.h similarity index 100% rename from src/app/dialogs/app/dialogaboutapp.h rename to src/app/dialogs/dialogaboutapp.h diff --git a/src/app/dialogs/app/dialogaboutapp.ui b/src/app/dialogs/dialogaboutapp.ui similarity index 94% rename from src/app/dialogs/app/dialogaboutapp.ui rename to src/app/dialogs/dialogaboutapp.ui index 576b39522..4f41da7c4 100644 --- a/src/app/dialogs/app/dialogaboutapp.ui +++ b/src/app/dialogs/dialogaboutapp.ui @@ -41,7 +41,7 @@ About Valentina - + :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png @@ -74,7 +74,7 @@ - :/icon/64x64/icon64x64.png + :/icon/64x64/icon64x64.png Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop @@ -315,7 +315,7 @@ Felix Ulber - + diff --git a/src/app/dialogs/app/dialoghistory.cpp b/src/app/dialogs/dialoghistory.cpp similarity index 99% rename from src/app/dialogs/app/dialoghistory.cpp rename to src/app/dialogs/dialoghistory.cpp index 7aaa5cbee..527a319f0 100644 --- a/src/app/dialogs/app/dialoghistory.cpp +++ b/src/app/dialogs/dialoghistory.cpp @@ -35,7 +35,7 @@ #include "../../libs/vtools/tools/drawTools/vtoolcutspline.h" #include "../../libs/vtools/tools/drawTools/vtoolcutsplinepath.h" #include "../../libs/vtools/tools/drawTools/vtoolcutarc.h" -#include "../../xml/vpattern.h" +#include "../xml/vpattern.h" //--------------------------------------------------------------------------------------------------------------------- /** diff --git a/src/app/dialogs/app/dialoghistory.h b/src/app/dialogs/dialoghistory.h similarity index 100% rename from src/app/dialogs/app/dialoghistory.h rename to src/app/dialogs/dialoghistory.h diff --git a/src/app/dialogs/app/dialoghistory.ui b/src/app/dialogs/dialoghistory.ui similarity index 95% rename from src/app/dialogs/app/dialoghistory.ui rename to src/app/dialogs/dialoghistory.ui index 1b7cb38bc..5ef406637 100644 --- a/src/app/dialogs/app/dialoghistory.ui +++ b/src/app/dialogs/dialoghistory.ui @@ -17,7 +17,7 @@ History - + :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png @@ -30,7 +30,7 @@ true - true + false false @@ -73,7 +73,7 @@ buttonBox - + diff --git a/src/app/dialogs/app/dialogincrements.cpp b/src/app/dialogs/dialogincrements.cpp similarity index 99% rename from src/app/dialogs/app/dialogincrements.cpp rename to src/app/dialogs/dialogincrements.cpp index ee6cb8fe1..5b9fc373b 100644 --- a/src/app/dialogs/app/dialogincrements.cpp +++ b/src/app/dialogs/dialogincrements.cpp @@ -31,8 +31,8 @@ #include "../../libs/vwidgets/doubledelegate.h" #include "../../libs/vwidgets/textdelegate.h" #include "../../libs/vwidgets/vwidgetpopup.h" -#include "../../xml/vstandardmeasurements.h" -#include "../../xml/vindividualmeasurements.h" +#include "../xml/vstandardmeasurements.h" +#include "../xml/vindividualmeasurements.h" #include "../../libs/vmisc/vsettings.h" #include "../../libs/qmuparser/qmudef.h" #include "../../libs/vpatterndb/vtranslatevars.h" diff --git a/src/app/dialogs/app/dialogincrements.h b/src/app/dialogs/dialogincrements.h similarity index 99% rename from src/app/dialogs/app/dialogincrements.h rename to src/app/dialogs/dialogincrements.h index 69e6917d5..38adff800 100644 --- a/src/app/dialogs/app/dialogincrements.h +++ b/src/app/dialogs/dialogincrements.h @@ -30,7 +30,7 @@ #define DIALOGINCREMENTS_H #include "../../libs/vtools/dialogs/tools/dialogtool.h" -#include "../../xml/vpattern.h" +#include "../xml/vpattern.h" class VIndividualMeasurements; class QTableWidget; diff --git a/src/app/dialogs/app/dialogincrements.ui b/src/app/dialogs/dialogincrements.ui similarity index 99% rename from src/app/dialogs/app/dialogincrements.ui rename to src/app/dialogs/dialogincrements.ui index 6079d708f..c0ae1cc73 100644 --- a/src/app/dialogs/app/dialogincrements.ui +++ b/src/app/dialogs/dialogincrements.ui @@ -20,7 +20,7 @@ Tables of Variables - + :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png @@ -123,7 +123,7 @@ - + :/icon/16x16/info.png:/icon/16x16/info.png @@ -283,7 +283,7 @@ - + :/icon/16x16/measurement.png:/icon/16x16/measurement.png @@ -796,7 +796,7 @@ tableWidgetArcs - + diff --git a/src/app/dialogs/app/dialogindividualmeasurements.cpp b/src/app/dialogs/dialogindividualmeasurements.cpp similarity index 99% rename from src/app/dialogs/app/dialogindividualmeasurements.cpp rename to src/app/dialogs/dialogindividualmeasurements.cpp index 0f55478ac..962c53020 100644 --- a/src/app/dialogs/app/dialogindividualmeasurements.cpp +++ b/src/app/dialogs/dialogindividualmeasurements.cpp @@ -28,8 +28,8 @@ #include "dialogindividualmeasurements.h" #include "ui_dialogindividualmeasurements.h" -#include "../../xml/vindividualmeasurements.h" -#include "../../core/vapplication.h" +#include "../xml/vindividualmeasurements.h" +#include "../core/vapplication.h" #include "../../libs/vmisc/vsettings.h" #include "../../libs/vpatterndb/vcontainer.h" diff --git a/src/app/dialogs/app/dialogindividualmeasurements.h b/src/app/dialogs/dialogindividualmeasurements.h similarity index 100% rename from src/app/dialogs/app/dialogindividualmeasurements.h rename to src/app/dialogs/dialogindividualmeasurements.h diff --git a/src/app/dialogs/app/dialogindividualmeasurements.ui b/src/app/dialogs/dialogindividualmeasurements.ui similarity index 98% rename from src/app/dialogs/app/dialogindividualmeasurements.ui rename to src/app/dialogs/dialogindividualmeasurements.ui index 0cf76a26a..2eb9260b5 100644 --- a/src/app/dialogs/app/dialogindividualmeasurements.ui +++ b/src/app/dialogs/dialogindividualmeasurements.ui @@ -29,7 +29,7 @@ Individual measurements - + :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png @@ -258,7 +258,7 @@ - + diff --git a/src/app/dialogs/app/dialoglayoutprogress.cpp b/src/app/dialogs/dialoglayoutprogress.cpp similarity index 98% rename from src/app/dialogs/app/dialoglayoutprogress.cpp rename to src/app/dialogs/dialoglayoutprogress.cpp index 3e1a21977..758b7c6d5 100644 --- a/src/app/dialogs/app/dialoglayoutprogress.cpp +++ b/src/app/dialogs/dialoglayoutprogress.cpp @@ -28,8 +28,8 @@ #include "dialoglayoutprogress.h" #include "ui_dialoglayoutprogress.h" -#include "../../options.h" -#include "../../core/vapplication.h" +#include "../options.h" +#include "../core/vapplication.h" #include #include diff --git a/src/app/dialogs/app/dialoglayoutprogress.h b/src/app/dialogs/dialoglayoutprogress.h similarity index 100% rename from src/app/dialogs/app/dialoglayoutprogress.h rename to src/app/dialogs/dialoglayoutprogress.h diff --git a/src/app/dialogs/app/dialoglayoutprogress.ui b/src/app/dialogs/dialoglayoutprogress.ui similarity index 95% rename from src/app/dialogs/app/dialoglayoutprogress.ui rename to src/app/dialogs/dialoglayoutprogress.ui index ee6d5fa3c..1c018562a 100644 --- a/src/app/dialogs/app/dialoglayoutprogress.ui +++ b/src/app/dialogs/dialoglayoutprogress.ui @@ -29,7 +29,7 @@ Create a Layout - + :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png @@ -90,7 +90,7 @@ - + diff --git a/src/app/dialogs/app/dialoglayoutsettings.cpp b/src/app/dialogs/dialoglayoutsettings.cpp similarity index 99% rename from src/app/dialogs/app/dialoglayoutsettings.cpp rename to src/app/dialogs/dialoglayoutsettings.cpp index da245ed6c..eac924fa9 100644 --- a/src/app/dialogs/app/dialoglayoutsettings.cpp +++ b/src/app/dialogs/dialoglayoutsettings.cpp @@ -28,7 +28,7 @@ #include "dialoglayoutsettings.h" #include "ui_dialoglayoutsettings.h" -#include "../../core/vapplication.h" +#include "../core/vapplication.h" #include "../../libs/ifc/xml/vdomdocument.h" #include "../../libs/vmisc/vsettings.h" #include "../../libs/vlayout/vlayoutgenerator.h" diff --git a/src/app/dialogs/app/dialoglayoutsettings.h b/src/app/dialogs/dialoglayoutsettings.h similarity index 100% rename from src/app/dialogs/app/dialoglayoutsettings.h rename to src/app/dialogs/dialoglayoutsettings.h diff --git a/src/app/dialogs/app/dialoglayoutsettings.ui b/src/app/dialogs/dialoglayoutsettings.ui similarity index 98% rename from src/app/dialogs/app/dialoglayoutsettings.ui rename to src/app/dialogs/dialoglayoutsettings.ui index 3e834a942..99a45aaa2 100644 --- a/src/app/dialogs/app/dialoglayoutsettings.ui +++ b/src/app/dialogs/dialoglayoutsettings.ui @@ -26,7 +26,7 @@ Create a layout - + :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png @@ -166,7 +166,7 @@ ... - + :/icon/16x16/portrait.png:/icon/16x16/portrait.png @@ -189,7 +189,7 @@ ... - + :/icon/16x16/landscape.png:/icon/16x16/landscape.png @@ -521,7 +521,7 @@ - + @@ -558,7 +558,7 @@ - + diff --git a/src/app/dialogs/app/dialogmeasurements.cpp b/src/app/dialogs/dialogmeasurements.cpp similarity index 98% rename from src/app/dialogs/app/dialogmeasurements.cpp rename to src/app/dialogs/dialogmeasurements.cpp index f68ce2b68..a59560b67 100644 --- a/src/app/dialogs/app/dialogmeasurements.cpp +++ b/src/app/dialogs/dialogmeasurements.cpp @@ -28,7 +28,7 @@ #include "dialogmeasurements.h" #include "ui_dialogmeasurements.h" -#include "../../core/vapplication.h" +#include "../core/vapplication.h" //--------------------------------------------------------------------------------------------------------------------- DialogMeasurements::DialogMeasurements(QWidget *parent) : diff --git a/src/app/dialogs/app/dialogmeasurements.h b/src/app/dialogs/dialogmeasurements.h similarity index 98% rename from src/app/dialogs/app/dialogmeasurements.h rename to src/app/dialogs/dialogmeasurements.h index b5396b7d2..d0004bc47 100644 --- a/src/app/dialogs/app/dialogmeasurements.h +++ b/src/app/dialogs/dialogmeasurements.h @@ -30,7 +30,7 @@ #define DIALOGMEASUREMENTS_H #include -#include "../../options.h" +#include "../options.h" namespace Ui { diff --git a/src/app/dialogs/app/dialogmeasurements.ui b/src/app/dialogs/dialogmeasurements.ui similarity index 95% rename from src/app/dialogs/app/dialogmeasurements.ui rename to src/app/dialogs/dialogmeasurements.ui index 7b8f3df0f..6ef210151 100644 --- a/src/app/dialogs/app/dialogmeasurements.ui +++ b/src/app/dialogs/dialogmeasurements.ui @@ -29,7 +29,7 @@ Measurements - + :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png @@ -76,7 +76,7 @@ Graduation - + :/icon/Graduation.png:/icon/Graduation.png @@ -125,7 +125,7 @@ Individual - + :/icon/individual.png:/icon/individual.png @@ -164,7 +164,7 @@ toolButtonStandard - + diff --git a/src/app/dialogs/app/dialogpatternproperties.cpp b/src/app/dialogs/dialogpatternproperties.cpp similarity index 99% rename from src/app/dialogs/app/dialogpatternproperties.cpp rename to src/app/dialogs/dialogpatternproperties.cpp index c696e4e40..ad734f559 100644 --- a/src/app/dialogs/app/dialogpatternproperties.cpp +++ b/src/app/dialogs/dialogpatternproperties.cpp @@ -29,8 +29,8 @@ #include "dialogpatternproperties.h" #include "ui_dialogpatternproperties.h" #include -#include "../../xml/vpattern.h" -#include "../../core/vapplication.h" +#include "../xml/vpattern.h" +#include "../core/vapplication.h" #define MAX_HEIGHTS 18 #define MAX_SIZES 18 diff --git a/src/app/dialogs/app/dialogpatternproperties.h b/src/app/dialogs/dialogpatternproperties.h similarity index 99% rename from src/app/dialogs/app/dialogpatternproperties.h rename to src/app/dialogs/dialogpatternproperties.h index 102b598cd..3e19d6d43 100644 --- a/src/app/dialogs/app/dialogpatternproperties.h +++ b/src/app/dialogs/dialogpatternproperties.h @@ -30,7 +30,7 @@ #define DIALOGPATTERNPROPERTIES_H #include -#include "../../options.h" +#include "../options.h" #include class VPattern; diff --git a/src/app/dialogs/app/dialogpatternproperties.ui b/src/app/dialogs/dialogpatternproperties.ui similarity index 99% rename from src/app/dialogs/app/dialogpatternproperties.ui rename to src/app/dialogs/dialogpatternproperties.ui index b4c3a339b..410184abf 100644 --- a/src/app/dialogs/app/dialogpatternproperties.ui +++ b/src/app/dialogs/dialogpatternproperties.ui @@ -26,7 +26,7 @@ Pattern properties - + :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png @@ -859,7 +859,7 @@ - + diff --git a/src/app/dialogs/app/dialogpatternxmledit.cpp b/src/app/dialogs/dialogpatternxmledit.cpp similarity index 99% rename from src/app/dialogs/app/dialogpatternxmledit.cpp rename to src/app/dialogs/dialogpatternxmledit.cpp index a0bebec2b..21ac3d392 100644 --- a/src/app/dialogs/app/dialogpatternxmledit.cpp +++ b/src/app/dialogs/dialogpatternxmledit.cpp @@ -28,7 +28,7 @@ #include "dialogpatternxmledit.h" #include "ui_dialogpatternxmledit.h" -#include "../../core/vapplication.h" +#include "../core/vapplication.h" #include #include diff --git a/src/app/dialogs/app/dialogpatternxmledit.h b/src/app/dialogs/dialogpatternxmledit.h similarity index 99% rename from src/app/dialogs/app/dialogpatternxmledit.h rename to src/app/dialogs/dialogpatternxmledit.h index 5c6a8f4a4..204eff6df 100644 --- a/src/app/dialogs/app/dialogpatternxmledit.h +++ b/src/app/dialogs/dialogpatternxmledit.h @@ -31,7 +31,7 @@ #include #include -#include "../../xml/vpattern.h" +#include "../xml/vpattern.h" //******************************************************************************************** /** diff --git a/src/app/dialogs/app/dialogpatternxmledit.ui b/src/app/dialogs/dialogpatternxmledit.ui similarity index 96% rename from src/app/dialogs/app/dialogpatternxmledit.ui rename to src/app/dialogs/dialogpatternxmledit.ui index a23c06ed5..447d2f331 100644 --- a/src/app/dialogs/app/dialogpatternxmledit.ui +++ b/src/app/dialogs/dialogpatternxmledit.ui @@ -35,7 +35,7 @@ XML Editor - + :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png @@ -350,7 +350,7 @@ - + diff --git a/src/app/dialogs/dialogs.h b/src/app/dialogs/dialogs.h index 9ed30f866..5b5480f6a 100644 --- a/src/app/dialogs/dialogs.h +++ b/src/app/dialogs/dialogs.h @@ -29,14 +29,14 @@ #ifndef DIALOGS_H #define DIALOGS_H -#include "app/dialoghistory.h" -#include "app/dialogincrements.h" -#include "app/configdialog.h" -#include "app/dialogpatternproperties.h" -#include "app/dialogmeasurements.h" -#include "app/dialogindividualmeasurements.h" -#include "app/dialogstandardmeasurements.h" -#include "app/dialogaboutapp.h" -#include "app/dialogpatternxmledit.h" +#include "dialoghistory.h" +#include "dialogincrements.h" +#include "configdialog.h" +#include "dialogpatternproperties.h" +#include "dialogmeasurements.h" +#include "dialogindividualmeasurements.h" +#include "dialogstandardmeasurements.h" +#include "dialogaboutapp.h" +#include "dialogpatternxmledit.h" #endif // DIALOGS_H diff --git a/src/app/dialogs/dialogs.pri b/src/app/dialogs/dialogs.pri index a761da7ad..685d578f5 100644 --- a/src/app/dialogs/dialogs.pri +++ b/src/app/dialogs/dialogs.pri @@ -3,51 +3,51 @@ HEADERS += \ $$PWD/dialogs.h \ - $$PWD/app/dialogincrements.h \ - $$PWD/app/dialoghistory.h \ - $$PWD/app/configdialog.h \ - $$PWD/app/configpages/pages.h \ - $$PWD/app/dialogpatternproperties.h \ - $$PWD/app/dialogmeasurements.h \ - $$PWD/app/dialogstandardmeasurements.h \ - $$PWD/app/dialogindividualmeasurements.h \ - $$PWD/app/dialogaboutapp.h \ - $$PWD/app/dialogpatternxmledit.h \ - $$PWD/app/configpages/configurationpage.h \ - $$PWD/app/configpages/patternpage.h \ - $$PWD/app/configpages/communitypage.h \ - $$PWD/app/configpages/pathpage.h \ - $$PWD/app/dialoglayoutsettings.h \ - $$PWD/app/dialoglayoutprogress.h \ - $$PWD/app/dialogsavelayout.h + $$PWD/dialogincrements.h \ + $$PWD/dialoghistory.h \ + $$PWD/configdialog.h \ + $$PWD/configpages/pages.h \ + $$PWD/dialogpatternproperties.h \ + $$PWD/dialogmeasurements.h \ + $$PWD/dialogstandardmeasurements.h \ + $$PWD/dialogindividualmeasurements.h \ + $$PWD/dialogaboutapp.h \ + $$PWD/dialogpatternxmledit.h \ + $$PWD/configpages/configurationpage.h \ + $$PWD/configpages/patternpage.h \ + $$PWD/configpages/communitypage.h \ + $$PWD/configpages/pathpage.h \ + $$PWD/dialoglayoutsettings.h \ + $$PWD/dialoglayoutprogress.h \ + $$PWD/dialogsavelayout.h SOURCES += \ - $$PWD/app/dialogincrements.cpp \ - $$PWD/app/dialoghistory.cpp \ - $$PWD/app/configdialog.cpp \ - $$PWD/app/dialogpatternproperties.cpp \ - $$PWD/app/dialogmeasurements.cpp \ - $$PWD/app/dialogstandardmeasurements.cpp \ - $$PWD/app/dialogindividualmeasurements.cpp \ - $$PWD/app/dialogaboutapp.cpp \ - $$PWD/app/dialogpatternxmledit.cpp \ - $$PWD/app/configpages/configurationpage.cpp \ - $$PWD/app/configpages/patternpage.cpp \ - $$PWD/app/configpages/communitypage.cpp \ - $$PWD/app/configpages/pathpage.cpp \ - $$PWD/app/dialoglayoutsettings.cpp \ - $$PWD/app/dialoglayoutprogress.cpp \ - $$PWD/app/dialogsavelayout.cpp + $$PWD/dialogincrements.cpp \ + $$PWD/dialoghistory.cpp \ + $$PWD/configdialog.cpp \ + $$PWD/dialogpatternproperties.cpp \ + $$PWD/dialogmeasurements.cpp \ + $$PWD/dialogstandardmeasurements.cpp \ + $$PWD/dialogindividualmeasurements.cpp \ + $$PWD/dialogaboutapp.cpp \ + $$PWD/dialogpatternxmledit.cpp \ + $$PWD/configpages/configurationpage.cpp \ + $$PWD/configpages/patternpage.cpp \ + $$PWD/configpages/communitypage.cpp \ + $$PWD/configpages/pathpage.cpp \ + $$PWD/dialoglayoutsettings.cpp \ + $$PWD/dialoglayoutprogress.cpp \ + $$PWD/dialogsavelayout.cpp FORMS += \ - $$PWD/app/dialogincrements.ui \ - $$PWD/app/dialoghistory.ui \ - $$PWD/app/dialogpatternproperties.ui \ - $$PWD/app/dialogmeasurements.ui \ - $$PWD/app/dialogstandardmeasurements.ui \ - $$PWD/app/dialogindividualmeasurements.ui \ - $$PWD/app/dialogaboutapp.ui \ - $$PWD/app/dialogpatternxmledit.ui \ - $$PWD/app/dialoglayoutsettings.ui \ - $$PWD/app/dialoglayoutprogress.ui \ - $$PWD/app/dialogsavelayout.ui + $$PWD/dialogincrements.ui \ + $$PWD/dialoghistory.ui \ + $$PWD/dialogpatternproperties.ui \ + $$PWD/dialogmeasurements.ui \ + $$PWD/dialogstandardmeasurements.ui \ + $$PWD/dialogindividualmeasurements.ui \ + $$PWD/dialogaboutapp.ui \ + $$PWD/dialogpatternxmledit.ui \ + $$PWD/dialoglayoutsettings.ui \ + $$PWD/dialoglayoutprogress.ui \ + $$PWD/dialogsavelayout.ui diff --git a/src/app/dialogs/app/dialogsavelayout.cpp b/src/app/dialogs/dialogsavelayout.cpp similarity index 98% rename from src/app/dialogs/app/dialogsavelayout.cpp rename to src/app/dialogs/dialogsavelayout.cpp index 41259902c..929ad7491 100644 --- a/src/app/dialogs/app/dialogsavelayout.cpp +++ b/src/app/dialogs/dialogsavelayout.cpp @@ -28,8 +28,8 @@ #include "dialogsavelayout.h" #include "ui_dialogsavelayout.h" -#include "../../options.h" -#include "../../core/vapplication.h" +#include "../options.h" +#include "../core/vapplication.h" #include "../../libs/vmisc/vsettings.h" #include diff --git a/src/app/dialogs/app/dialogsavelayout.h b/src/app/dialogs/dialogsavelayout.h similarity index 100% rename from src/app/dialogs/app/dialogsavelayout.h rename to src/app/dialogs/dialogsavelayout.h diff --git a/src/app/dialogs/app/dialogsavelayout.ui b/src/app/dialogs/dialogsavelayout.ui similarity index 97% rename from src/app/dialogs/app/dialogsavelayout.ui rename to src/app/dialogs/dialogsavelayout.ui index 9f7f90d32..4931d5ac2 100644 --- a/src/app/dialogs/app/dialogsavelayout.ui +++ b/src/app/dialogs/dialogsavelayout.ui @@ -26,7 +26,7 @@ Save Layout - + :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png @@ -113,7 +113,7 @@ - + diff --git a/src/app/dialogs/app/dialogstandardmeasurements.cpp b/src/app/dialogs/dialogstandardmeasurements.cpp similarity index 98% rename from src/app/dialogs/app/dialogstandardmeasurements.cpp rename to src/app/dialogs/dialogstandardmeasurements.cpp index 233beb747..6c2c01cd4 100644 --- a/src/app/dialogs/app/dialogstandardmeasurements.cpp +++ b/src/app/dialogs/dialogstandardmeasurements.cpp @@ -28,8 +28,8 @@ #include "dialogstandardmeasurements.h" #include "ui_dialogstandardmeasurements.h" -#include "../../xml/vstandardmeasurements.h" -#include "../../core/vapplication.h" +#include "../xml/vstandardmeasurements.h" +#include "../core/vapplication.h" #include "../../libs/vmisc/vsettings.h" #include "../../libs/vpatterndb/vcontainer.h" #include "../vmisc/logging.h" diff --git a/src/app/dialogs/app/dialogstandardmeasurements.h b/src/app/dialogs/dialogstandardmeasurements.h similarity index 100% rename from src/app/dialogs/app/dialogstandardmeasurements.h rename to src/app/dialogs/dialogstandardmeasurements.h diff --git a/src/app/dialogs/app/dialogstandardmeasurements.ui b/src/app/dialogs/dialogstandardmeasurements.ui similarity index 97% rename from src/app/dialogs/app/dialogstandardmeasurements.ui rename to src/app/dialogs/dialogstandardmeasurements.ui index ae83dae55..2fdbc5757 100644 --- a/src/app/dialogs/app/dialogstandardmeasurements.ui +++ b/src/app/dialogs/dialogstandardmeasurements.ui @@ -23,7 +23,7 @@ Standard table - + :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png @@ -102,7 +102,7 @@ - + diff --git a/src/app/mainwindowsnogui.cpp b/src/app/mainwindowsnogui.cpp index 5ed8ca531..e9ed3107a 100644 --- a/src/app/mainwindowsnogui.cpp +++ b/src/app/mainwindowsnogui.cpp @@ -30,10 +30,10 @@ #include "core/vapplication.h" #include "../libs/vpatterndb/vcontainer.h" #include "../libs/vobj/vobjpaintdevice.h" -#include "dialogs/app/dialoglayoutsettings.h" +#include "dialogs/dialoglayoutsettings.h" #include "../libs/vlayout/vlayoutgenerator.h" -#include "dialogs/app/dialoglayoutprogress.h" -#include "dialogs/app/dialogsavelayout.h" +#include "dialogs/dialoglayoutprogress.h" +#include "dialogs/dialogsavelayout.h" #include "../libs/vlayout/vposter.h" #include