Move app's dialogs.

--HG--
branch : develop

src/app/dialogs/configdialog.cpp

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

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 <QGroupBox>
 #include <QLabel>
 #include <QSettings>
 #include <QCheckBox>
 #include <QLineEdit>
 
-
 //---------------------------------------------------------------------------------------------------------------------
 CommunityPage::CommunityPage(QWidget *parent):
     QWidget(parent), server(nullptr), secureComm(nullptr), useProxy(nullptr), proxyAddress(nullptr),

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 <QDir>
 #include <QGroupBox>
 #include <QLabel>

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 <QDir>
 #include <QGroupBox>
 #include <QLabel>

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 <QGroupBox>
 #include <QLabel>
 #include <QSettings>

src/app/dialogs/dialogaboutapp.cpp

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

src/app/dialogs/dialogaboutapp.ui

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

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"
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/app/dialogs/dialoghistory.ui

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

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"

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;

src/app/dialogs/dialogincrements.ui

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

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"
 

src/app/dialogs/dialogindividualmeasurements.ui

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

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 <QMessageBox>
 #include <QPushButton>

src/app/dialogs/dialoglayoutprogress.ui

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

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"

src/app/dialogs/dialoglayoutsettings.ui

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

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) :

src/app/dialogs/dialogmeasurements.h

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

src/app/dialogs/dialogmeasurements.ui

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

src/app/dialogs/dialogpatternproperties.cpp

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

src/app/dialogs/dialogpatternproperties.h

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

src/app/dialogs/dialogpatternproperties.ui

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

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 <QInputDialog>
 #include <QMessageBox>

src/app/dialogs/dialogpatternxmledit.h

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

src/app/dialogs/dialogpatternxmledit.ui

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

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

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

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 <QDir>

src/app/dialogs/dialogsavelayout.ui

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

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"

src/app/dialogs/dialogstandardmeasurements.ui

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

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 <QFileDialog>