--- Vago/trunk/Vago/Vago.pro	2016/09/17 13:32:34	1052
+++ s10k/Vago/Vago.pro	2017/12/30 13:57:32	1093
@@ -11,28 +11,29 @@ win32 {
 QT       += winextras
 }
 CONFIG   += c++14
+CONFIG   += quazip
 
-#INCLUDEPATH += ./libs
 INCLUDEPATH += ./packageWizard
 INCLUDEPATH += ./soundWizard
+INCLUDEPATH += ./bgImageWizard
+INCLUDEPATH += ./bgImageWizard
+INCLUDEPATH += ./xmlToolsInterface
+INCLUDEPATH += ./windowMessagesWizard
+
+include(../CommonUtils/CommonUtils.pri)
+include(../CommonLibs/CommonLibs.pri)
 
 # Used this great tutorial to build zlib and quazip:
 # http://www.antonioborondo.com/2014/10/22/zipping-and-unzipping-files-with-qt/
-INCLUDEPATH += ../Libs/zlib-1.2.8
-LIBS += -L../Libs/zlib-1.2.8 -lz
-INCLUDEPATH += ../Libs/quazip-0.7.2/quazip
-win32 {
-LIBS += -L../Libs/quazip-0.7.2/quazip/release -lquazip
-}
-macx {
-LIBS += -L../Libs/quazip-0.7.2/quazip -lquazip
-}
 
 macx {
 LIBS += -lz # for mac support zipping (thanks edt!)
 ICON = vago_icon.icns # mac os icon
 }
 
+INCLUDEPATH += ./libs/DropTableWidget
+INCLUDEPATH += ./libs/DropLineEdit
+
 win32 {
 RC_FILE = icon_resource.rc #for windows explorer icon
 }
@@ -41,13 +42,10 @@ TARGET = Vago
 TEMPLATE = app
 
 SOURCES += \
-    util.cpp \
     preferences.cpp \
     manualcommands.cpp \
     mainwindow.cpp \
     main.cpp \
-    logger.cpp \
-    droptablewidget.cpp \
     converter.cpp \
     about.cpp \
     packageWizard/packagewizard.cpp \
@@ -58,19 +56,31 @@ SOURCES += \
     soundWizard/soundpage2.cpp \
     soundWizard/soundpage3.cpp \
     soundWizard/soundpage4.cpp \
+    soundWizard/soundpage5.cpp \
     soundWizard/soundpagefinal.cpp \
     soundWizard/soundwizard.cpp \
+    bgImageWizard/bgimagepage2.cpp \
     xmlprocessor.cpp \
-    libs/pugixml/pugixml.cpp \
-    utilvago.cpp
+    utilvago.cpp \
+    bgImageWizard/bgimagewizard.cpp \
+    bgImageWizard/bgimagepage3.cpp \
+    bgImageWizard/bgimagepagefinal.cpp \
+    xmlToolsInterface/xmltoolsinterface.cpp \
+    xmlToolsInterface/xmltoolsinterfacecommandpreview.cpp \
+    abstractwizard.cpp \
+    windowMessagesWizard/wmsetuppage.cpp \
+    windowMessagesWizard/wmformatpage.cpp \
+    windowMessagesWizard/wmpage.cpp \
+    windowMessagesWizard/wmwizard.cpp \
+    windowMessagesWizard/wmfinalpage.cpp \
+    ./libs/DropTableWidget/droptablewidget.cpp \
+    ./libs/DropLineEdit/droplineedit.cpp \
+    xmlParsers/projectfilevago.cpp
 
 HEADERS  += \
-    util.h \
     preferences.h \
     manualcommands.h \
     mainwindow.h \
-    logger.h \
-    droptablewidget.h \
     converter.h \
     about.h \
     packageWizard/packagewizard.h \
@@ -81,11 +91,27 @@ HEADERS  += \
     soundWizard/soundpage2.h \
     soundWizard/soundpage3.h \
     soundWizard/soundpage4.h \
+    soundWizard/soundpage5.h \
     soundWizard/soundpagefinal.h \
     soundWizard/soundwizard.h \
+    bgImageWizard/bgimagepage2.h \
     xmlprocessor.h \
-    libs/pugixml/pugixml.hpp \
-    utilvago.h
+    utilvago.h \
+    bgImageWizard/bgimagewizard.h \
+    bgImageWizard/bgimagepage3.h \
+    bgImageWizard/bgimagepagefinal.h \
+    xmlToolsInterface/xmltoolsinterface.h \
+    xmlToolsInterface/xmltoolsinterfacecommandpreview.h \
+    wizardfactory.h \
+    abstractwizard.h \
+    windowMessagesWizard/wmsetuppage.h \
+    windowMessagesWizard/wmformatpage.h \
+    windowMessagesWizard/wmpage.h \
+    windowMessagesWizard/wmwizard.h \
+    windowMessagesWizard/wmfinalpage.h \
+    ./libs/DropTableWidget/droptablewidget.h \
+    ./libs/DropLineEdit/droplineedit.h \
+    xmlParsers/projectfilevago.h
 
 FORMS    += \
     mainwindow.ui \
@@ -99,7 +125,16 @@ FORMS    += \
     soundWizard/soundpage2.ui \
     soundWizard/soundpage3.ui \
     soundWizard/soundpage4.ui \
-    soundWizard/soundpagefinal.ui
+    soundWizard/soundpage5.ui \
+    soundWizard/soundpagefinal.ui \
+    bgImageWizard/bgimagepage2.ui \
+    bgImageWizard/bgimagepage3.ui \
+    bgImageWizard/bgimagepagefinal.ui \
+    xmlToolsInterface/xmltoolsinterface.ui \
+    xmlToolsInterface/xmltoolsinterfacecommandpreview.ui \
+    windowMessagesWizard/wmsetuppage.ui \
+    windowMessagesWizard/wmformatpage.ui \
+    windowMessagesWizard/wmfinalpage.ui
 
 RESOURCES += \
     resources.qrc \