[win] online-installer: enhancement

win-linux/extras/online-installer/OnlineInstaller.pro

@@ -27,7 +27,19 @@ ENV_URL_INSTALL_X86_XP = $$(DESKTOP_URL_INSTALL_CHANNEL_X86_XP)
     DEFINES += URL_INSTALL_X86_XP=\\\"$${ENV_URL_INSTALL_X86_XP}\\\"
 }
 
+ENV_URL_INSTALL_X64_MSI = $$(DESKTOP_URL_INSTALL_CHANNEL_X64_MSI)
+!isEmpty(ENV_URL_INSTALL_X64_MSI) {
+    DEFINES += URL_INSTALL_X64_MSI=\\\"$${ENV_URL_INSTALL_X64_MSI}\\\"
+}
+
+ENV_URL_INSTALL_X86_MSI = $$(DESKTOP_URL_INSTALL_CHANNEL_X86_MSI)
+!isEmpty(ENV_URL_INSTALL_X86_MSI) {
+    DEFINES += URL_INSTALL_X86_MSI=\\\"$${ENV_URL_INSTALL_X86_MSI}\\\"
+}
+
 message(install x64 url: \\\"$$ENV_URL_INSTALL_X64\\\")
 message(install x86 url: \\\"$$ENV_URL_INSTALL_X86\\\")
 message(install x64 xp url: \\\"$$ENV_URL_INSTALL_X64_XP\\\")
 message(install x86 xp url: \\\"$$ENV_URL_INSTALL_X86_XP\\\")
+message(install x64 msi url: \\\"$$ENV_URL_INSTALL_X64_MSI\\\")
+message(install x86 msi url: \\\"$$ENV_URL_INSTALL_X86_MSI\\\")

win-linux/extras/online-installer/common.pri

@@ -8,25 +8,70 @@ CONFIG  -= debug_and_release debug_and_release_target
 TEMPLATE = app
 
 CORE_ROOT_DIR = $$PWD/../../../../core
+UICLASSES = $$PWD/src/uiclasses
 
 CONFIG += core_no_dst
 include($$CORE_ROOT_DIR/Common/base.pri)
 
-INCLUDEPATH += $$PWD/src
+INCLUDEPATH += $$PWD/src \
+               $$UICLASSES
 INCLUDEPATH += $$PWD/../../src/prop
 
 HEADERS += $$PWD/src/version.h \
            $$PWD/src/resource.h \
+           $$PWD/src/mainwindow.h \
            $$PWD/src/cdownloader.h \
            $$PWD/src/translator.h \
-           $$PWD/src/utils.h
+           $$PWD/src/utils.h \
+           $$UICLASSES/commondefines.h \
+           $$UICLASSES/baseutils.h \
+           $$UICLASSES/common.h \
+           $$UICLASSES/metrics.h \
+           $$UICLASSES/palette.h \
+           $$UICLASSES/drawningengine.h \
+           $$UICLASSES/drawingsurface.h \
+           $$UICLASSES/object.h \
+           $$UICLASSES/application.h \
+           $$UICLASSES/window.h \
+           $$UICLASSES/widget.h \
+           $$UICLASSES/label.h \
+           $$UICLASSES/caption.h \
+           $$UICLASSES/abstractbutton.h \
+           $$UICLASSES/button.h \
+           $$UICLASSES/checkbox.h \
+           $$UICLASSES/radiobutton.h \
+           $$UICLASSES/progressbar.h \
+           $$UICLASSES/layoutitem.h \
+           $$UICLASSES/layout.h \
+           $$UICLASSES/boxlayout.h
 
 SOURCES += $$PWD/src/main.cpp \
+           $$PWD/src/mainwindow.cpp \
            $$PWD/src/cdownloader.cpp \
            $$PWD/src/translator.cpp \
-           $$PWD/src/utils.cpp
-
-OTHER_FILES += $$PWD/res/dialog.rc \
+           $$PWD/src/utils.cpp \
+           $$UICLASSES/baseutils.cpp \
+           $$UICLASSES/common.cpp \
+           $$UICLASSES/metrics.cpp \
+           $$UICLASSES/palette.cpp \
+           $$UICLASSES/drawningengine.cpp \
+           $$UICLASSES/drawingsurface.cpp \
+           $$UICLASSES/object.cpp \
+           $$UICLASSES/application.cpp \
+           $$UICLASSES/window.cpp \
+           $$UICLASSES/widget.cpp \
+           $$UICLASSES/label.cpp \
+           $$UICLASSES/caption.cpp \
+           $$UICLASSES/abstractbutton.cpp \
+           $$UICLASSES/button.cpp \
+           $$UICLASSES/checkbox.cpp \
+           $$UICLASSES/radiobutton.cpp \
+           $$UICLASSES/progressbar.cpp \
+           $$UICLASSES/layoutitem.cpp \
+           $$UICLASSES/layout.cpp \
+           $$UICLASSES/boxlayout.cpp
+
+OTHER_FILES += $$PWD/res/version.rc \
                $$PWD/res/manifest/online-installer.exe.manifest
 
 ENV_PRODUCT_VERSION = $$(PRODUCT_VERSION)
@@ -37,7 +82,8 @@ ENV_PRODUCT_VERSION = $$(PRODUCT_VERSION)
 }
 
 CONFIG -= embed_manifest_exe
-RC_FILE = $$PWD/res/dialog.rc
+RC_FILE = $$PWD/res/version.rc
+QMAKE_CXXFLAGS += -D_UNICODE
 
 contains(QMAKE_TARGET.arch, x86_64):{
     QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS,5.02
@@ -59,10 +105,19 @@ build_xp {
     DEFINES += __OS_WIN_XP
 }
 
+DEFINES -= NOMINMAX
+
 LIBS += -luser32 \
         -lshell32 \
+        -lshlwapi \
         -lwinhttp \
         -lwintrust \
+        -lgdi32 \
+        -lgdiplus \
+        -ladvapi32 \
+        -lrpcrt4 \
+        -lole32 \
+        -lmsi \
         -lcomctl32
 
 OBJECTS_DIR = $$DESTDIR/obj