diff --git a/applications/Photoframe/Photoframe.pro b/applications/Photoframe/Photoframe.pro index d6018df..b1ab021 100755 --- a/applications/Photoframe/Photoframe.pro +++ b/applications/Photoframe/Photoframe.pro @@ -1,6 +1,6 @@ QT += widgets network multimedia TEMPLATE = app -LIBS += -Llib -lexif +LIBS += -L./install/lib -lexif SOURCES += src/main.cpp \ src/mainmenu.cpp \ src/devicelist.cpp \ @@ -34,17 +34,23 @@ src/stage.h CONFIG += release TRANSLATIONS += i18n/DPF_English.ts i18n/DPF_Japanese.ts i18n/DPF_Korean.ts i18n/DPF_Chinese.ts -INCLUDEPATH = include +INCLUDEPATH = ./install/include -# Copy dlls needed to make it run -QMAKE_POST_LINK += \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Cored.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Guid.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Widgetsd.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Networkd.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Multimediad.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Core.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Gui.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Widgets.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Network.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Multimedia.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) +TARGET = ../install/bin/Photoframe + +win32 { + DEPLOY_COMMAND = $$(QTDIR)\\bin\\windeployqt + TARGET_CUSTOM_EXT = .exe +} +macx { + DEPLOY_COMMAND = $$(QTDIR)/bin/macdeployqt + TARGET_CUSTOM_EXT = .app +} + +CONFIG( debug, debug|release ) { + CONFIG_TYPE=debug +} else { + CONFIG_TYPE=release +} + +QMAKE_POST_LINK = $${DEPLOY_COMMAND} $$shell_quote($$shell_path($${OUT_PWD}/$${CONFIG_TYPE}/$${TARGET}$${TARGET_CUSTOM_EXT})) diff --git a/applications/Photoframe/Photoframe.pro b/applications/Photoframe/Photoframe.pro index d6018df..b1ab021 100755 --- a/applications/Photoframe/Photoframe.pro +++ b/applications/Photoframe/Photoframe.pro @@ -1,6 +1,6 @@ QT += widgets network multimedia TEMPLATE = app -LIBS += -Llib -lexif +LIBS += -L./install/lib -lexif SOURCES += src/main.cpp \ src/mainmenu.cpp \ src/devicelist.cpp \ @@ -34,17 +34,23 @@ src/stage.h CONFIG += release TRANSLATIONS += i18n/DPF_English.ts i18n/DPF_Japanese.ts i18n/DPF_Korean.ts i18n/DPF_Chinese.ts -INCLUDEPATH = include +INCLUDEPATH = ./install/include -# Copy dlls needed to make it run -QMAKE_POST_LINK += \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Cored.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Guid.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Widgetsd.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Networkd.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Multimediad.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Core.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Gui.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Widgets.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Network.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Multimedia.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) +TARGET = ../install/bin/Photoframe + +win32 { + DEPLOY_COMMAND = $$(QTDIR)\\bin\\windeployqt + TARGET_CUSTOM_EXT = .exe +} +macx { + DEPLOY_COMMAND = $$(QTDIR)/bin/macdeployqt + TARGET_CUSTOM_EXT = .app +} + +CONFIG( debug, debug|release ) { + CONFIG_TYPE=debug +} else { + CONFIG_TYPE=release +} + +QMAKE_POST_LINK = $${DEPLOY_COMMAND} $$shell_quote($$shell_path($${OUT_PWD}/$${CONFIG_TYPE}/$${TARGET}$${TARGET_CUSTOM_EXT})) diff --git a/applications/Photoframe/build-libexif.sh b/applications/Photoframe/build-libexif.sh index 35af5dc..1debdb6 100755 --- a/applications/Photoframe/build-libexif.sh +++ b/applications/Photoframe/build-libexif.sh @@ -20,19 +20,19 @@ qmake make -mkdir -p ../bin -mkdir -p ../lib -mkdir -p ../release -mkdir -p ../include/libexif/ +mkdir -p ../install/bin +mkdir -p ../install/lib +mkdir -p ../install/include/libexif/ -cp release/libexif*.dylib ../lib -cp release/libexif*.dylib ../bin -cp release/libexif.a ../lib -cp release/exif.dll ../release -cp release/exif.lib ../lib -cp release/liblibexif.a ../lib -cp release/libexif.dll ../lib -cp release/libexif.dll ../release -cp libexif/*.h ../include/libexif +cp release/exif.lib ../install/lib +cp release/libexif*.dylib ../install/lib +cp release/libexif.a ../install/lib + +cp release/libexif*.dylib ../install/bin +cp release/libexif*.dll ../install/bin +cp release/libexif*.so* ../install/bin +cp release/exif.dll ../install/bin + +cp libexif/*.h ../install/include/libexif cd ../.. diff --git a/applications/Photoframe/Photoframe.pro b/applications/Photoframe/Photoframe.pro index d6018df..b1ab021 100755 --- a/applications/Photoframe/Photoframe.pro +++ b/applications/Photoframe/Photoframe.pro @@ -1,6 +1,6 @@ QT += widgets network multimedia TEMPLATE = app -LIBS += -Llib -lexif +LIBS += -L./install/lib -lexif SOURCES += src/main.cpp \ src/mainmenu.cpp \ src/devicelist.cpp \ @@ -34,17 +34,23 @@ src/stage.h CONFIG += release TRANSLATIONS += i18n/DPF_English.ts i18n/DPF_Japanese.ts i18n/DPF_Korean.ts i18n/DPF_Chinese.ts -INCLUDEPATH = include +INCLUDEPATH = ./install/include -# Copy dlls needed to make it run -QMAKE_POST_LINK += \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Cored.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Guid.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Widgetsd.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Networkd.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Multimediad.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Core.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Gui.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Widgets.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Network.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Multimedia.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) +TARGET = ../install/bin/Photoframe + +win32 { + DEPLOY_COMMAND = $$(QTDIR)\\bin\\windeployqt + TARGET_CUSTOM_EXT = .exe +} +macx { + DEPLOY_COMMAND = $$(QTDIR)/bin/macdeployqt + TARGET_CUSTOM_EXT = .app +} + +CONFIG( debug, debug|release ) { + CONFIG_TYPE=debug +} else { + CONFIG_TYPE=release +} + +QMAKE_POST_LINK = $${DEPLOY_COMMAND} $$shell_quote($$shell_path($${OUT_PWD}/$${CONFIG_TYPE}/$${TARGET}$${TARGET_CUSTOM_EXT})) diff --git a/applications/Photoframe/build-libexif.sh b/applications/Photoframe/build-libexif.sh index 35af5dc..1debdb6 100755 --- a/applications/Photoframe/build-libexif.sh +++ b/applications/Photoframe/build-libexif.sh @@ -20,19 +20,19 @@ qmake make -mkdir -p ../bin -mkdir -p ../lib -mkdir -p ../release -mkdir -p ../include/libexif/ +mkdir -p ../install/bin +mkdir -p ../install/lib +mkdir -p ../install/include/libexif/ -cp release/libexif*.dylib ../lib -cp release/libexif*.dylib ../bin -cp release/libexif.a ../lib -cp release/exif.dll ../release -cp release/exif.lib ../lib -cp release/liblibexif.a ../lib -cp release/libexif.dll ../lib -cp release/libexif.dll ../release -cp libexif/*.h ../include/libexif +cp release/exif.lib ../install/lib +cp release/libexif*.dylib ../install/lib +cp release/libexif.a ../install/lib + +cp release/libexif*.dylib ../install/bin +cp release/libexif*.dll ../install/bin +cp release/libexif*.so* ../install/bin +cp release/exif.dll ../install/bin + +cp libexif/*.h ../install/include/libexif cd ../.. diff --git a/applications/Photoframe/i18n/DPF_Chinese.ts b/applications/Photoframe/i18n/DPF_Chinese.ts index 2820549..f884afd 100755 --- a/applications/Photoframe/i18n/DPF_Chinese.ts +++ b/applications/Photoframe/i18n/DPF_Chinese.ts @@ -121,7 +121,7 @@ - + Settings @@ -141,38 +141,38 @@ - - - IP Mode: - - - - IP: + IP Mode: - Language: + IP: - Font: + Language: - Brightness: + Font: + Brightness: + + + + + Volume: diff --git a/applications/Photoframe/Photoframe.pro b/applications/Photoframe/Photoframe.pro index d6018df..b1ab021 100755 --- a/applications/Photoframe/Photoframe.pro +++ b/applications/Photoframe/Photoframe.pro @@ -1,6 +1,6 @@ QT += widgets network multimedia TEMPLATE = app -LIBS += -Llib -lexif +LIBS += -L./install/lib -lexif SOURCES += src/main.cpp \ src/mainmenu.cpp \ src/devicelist.cpp \ @@ -34,17 +34,23 @@ src/stage.h CONFIG += release TRANSLATIONS += i18n/DPF_English.ts i18n/DPF_Japanese.ts i18n/DPF_Korean.ts i18n/DPF_Chinese.ts -INCLUDEPATH = include +INCLUDEPATH = ./install/include -# Copy dlls needed to make it run -QMAKE_POST_LINK += \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Cored.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Guid.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Widgetsd.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Networkd.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Multimediad.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Core.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Gui.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Widgets.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Network.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Multimedia.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) +TARGET = ../install/bin/Photoframe + +win32 { + DEPLOY_COMMAND = $$(QTDIR)\\bin\\windeployqt + TARGET_CUSTOM_EXT = .exe +} +macx { + DEPLOY_COMMAND = $$(QTDIR)/bin/macdeployqt + TARGET_CUSTOM_EXT = .app +} + +CONFIG( debug, debug|release ) { + CONFIG_TYPE=debug +} else { + CONFIG_TYPE=release +} + +QMAKE_POST_LINK = $${DEPLOY_COMMAND} $$shell_quote($$shell_path($${OUT_PWD}/$${CONFIG_TYPE}/$${TARGET}$${TARGET_CUSTOM_EXT})) diff --git a/applications/Photoframe/build-libexif.sh b/applications/Photoframe/build-libexif.sh index 35af5dc..1debdb6 100755 --- a/applications/Photoframe/build-libexif.sh +++ b/applications/Photoframe/build-libexif.sh @@ -20,19 +20,19 @@ qmake make -mkdir -p ../bin -mkdir -p ../lib -mkdir -p ../release -mkdir -p ../include/libexif/ +mkdir -p ../install/bin +mkdir -p ../install/lib +mkdir -p ../install/include/libexif/ -cp release/libexif*.dylib ../lib -cp release/libexif*.dylib ../bin -cp release/libexif.a ../lib -cp release/exif.dll ../release -cp release/exif.lib ../lib -cp release/liblibexif.a ../lib -cp release/libexif.dll ../lib -cp release/libexif.dll ../release -cp libexif/*.h ../include/libexif +cp release/exif.lib ../install/lib +cp release/libexif*.dylib ../install/lib +cp release/libexif.a ../install/lib + +cp release/libexif*.dylib ../install/bin +cp release/libexif*.dll ../install/bin +cp release/libexif*.so* ../install/bin +cp release/exif.dll ../install/bin + +cp libexif/*.h ../install/include/libexif cd ../.. diff --git a/applications/Photoframe/i18n/DPF_Chinese.ts b/applications/Photoframe/i18n/DPF_Chinese.ts index 2820549..f884afd 100755 --- a/applications/Photoframe/i18n/DPF_Chinese.ts +++ b/applications/Photoframe/i18n/DPF_Chinese.ts @@ -121,7 +121,7 @@ - + Settings @@ -141,38 +141,38 @@ - - - IP Mode: - - - - IP: + IP Mode: - Language: + IP: - Font: + Language: - Brightness: + Font: + Brightness: + + + + + Volume: diff --git a/applications/Photoframe/i18n/DPF_English.ts b/applications/Photoframe/i18n/DPF_English.ts index 0a969cc..f454e5f 100755 --- a/applications/Photoframe/i18n/DPF_English.ts +++ b/applications/Photoframe/i18n/DPF_English.ts @@ -125,7 +125,7 @@ - + Settings Satting @@ -145,38 +145,38 @@ Vadios - - + + IP Mode: IP Made: - - + + IP: IQ: - - + + Language: Longuage: - - + + Font: Fant: - - + + Brightness: Braghtnass: - - + + Volume: Valume: diff --git a/applications/Photoframe/Photoframe.pro b/applications/Photoframe/Photoframe.pro index d6018df..b1ab021 100755 --- a/applications/Photoframe/Photoframe.pro +++ b/applications/Photoframe/Photoframe.pro @@ -1,6 +1,6 @@ QT += widgets network multimedia TEMPLATE = app -LIBS += -Llib -lexif +LIBS += -L./install/lib -lexif SOURCES += src/main.cpp \ src/mainmenu.cpp \ src/devicelist.cpp \ @@ -34,17 +34,23 @@ src/stage.h CONFIG += release TRANSLATIONS += i18n/DPF_English.ts i18n/DPF_Japanese.ts i18n/DPF_Korean.ts i18n/DPF_Chinese.ts -INCLUDEPATH = include +INCLUDEPATH = ./install/include -# Copy dlls needed to make it run -QMAKE_POST_LINK += \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Cored.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Guid.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Widgetsd.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Networkd.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Multimediad.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Core.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Gui.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Widgets.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Network.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Multimedia.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) +TARGET = ../install/bin/Photoframe + +win32 { + DEPLOY_COMMAND = $$(QTDIR)\\bin\\windeployqt + TARGET_CUSTOM_EXT = .exe +} +macx { + DEPLOY_COMMAND = $$(QTDIR)/bin/macdeployqt + TARGET_CUSTOM_EXT = .app +} + +CONFIG( debug, debug|release ) { + CONFIG_TYPE=debug +} else { + CONFIG_TYPE=release +} + +QMAKE_POST_LINK = $${DEPLOY_COMMAND} $$shell_quote($$shell_path($${OUT_PWD}/$${CONFIG_TYPE}/$${TARGET}$${TARGET_CUSTOM_EXT})) diff --git a/applications/Photoframe/build-libexif.sh b/applications/Photoframe/build-libexif.sh index 35af5dc..1debdb6 100755 --- a/applications/Photoframe/build-libexif.sh +++ b/applications/Photoframe/build-libexif.sh @@ -20,19 +20,19 @@ qmake make -mkdir -p ../bin -mkdir -p ../lib -mkdir -p ../release -mkdir -p ../include/libexif/ +mkdir -p ../install/bin +mkdir -p ../install/lib +mkdir -p ../install/include/libexif/ -cp release/libexif*.dylib ../lib -cp release/libexif*.dylib ../bin -cp release/libexif.a ../lib -cp release/exif.dll ../release -cp release/exif.lib ../lib -cp release/liblibexif.a ../lib -cp release/libexif.dll ../lib -cp release/libexif.dll ../release -cp libexif/*.h ../include/libexif +cp release/exif.lib ../install/lib +cp release/libexif*.dylib ../install/lib +cp release/libexif.a ../install/lib + +cp release/libexif*.dylib ../install/bin +cp release/libexif*.dll ../install/bin +cp release/libexif*.so* ../install/bin +cp release/exif.dll ../install/bin + +cp libexif/*.h ../install/include/libexif cd ../.. diff --git a/applications/Photoframe/i18n/DPF_Chinese.ts b/applications/Photoframe/i18n/DPF_Chinese.ts index 2820549..f884afd 100755 --- a/applications/Photoframe/i18n/DPF_Chinese.ts +++ b/applications/Photoframe/i18n/DPF_Chinese.ts @@ -121,7 +121,7 @@ - + Settings @@ -141,38 +141,38 @@ - - - IP Mode: - - - - IP: + IP Mode: - Language: + IP: - Font: + Language: - Brightness: + Font: + Brightness: + + + + + Volume: diff --git a/applications/Photoframe/i18n/DPF_English.ts b/applications/Photoframe/i18n/DPF_English.ts index 0a969cc..f454e5f 100755 --- a/applications/Photoframe/i18n/DPF_English.ts +++ b/applications/Photoframe/i18n/DPF_English.ts @@ -125,7 +125,7 @@ - + Settings Satting @@ -145,38 +145,38 @@ Vadios - - + + IP Mode: IP Made: - - + + IP: IQ: - - + + Language: Longuage: - - + + Font: Fant: - - + + Brightness: Braghtnass: - - + + Volume: Valume: diff --git a/applications/Photoframe/i18n/DPF_Japanese.ts b/applications/Photoframe/i18n/DPF_Japanese.ts index 556ca02..6d827ae 100755 --- a/applications/Photoframe/i18n/DPF_Japanese.ts +++ b/applications/Photoframe/i18n/DPF_Japanese.ts @@ -121,7 +121,7 @@ - + Settings @@ -141,38 +141,38 @@ - - - IP Mode: - - - - IP: + IP Mode: - Language: + IP: - Font: + Language: - Brightness: + Font: + Brightness: + + + + + Volume: diff --git a/applications/Photoframe/Photoframe.pro b/applications/Photoframe/Photoframe.pro index d6018df..b1ab021 100755 --- a/applications/Photoframe/Photoframe.pro +++ b/applications/Photoframe/Photoframe.pro @@ -1,6 +1,6 @@ QT += widgets network multimedia TEMPLATE = app -LIBS += -Llib -lexif +LIBS += -L./install/lib -lexif SOURCES += src/main.cpp \ src/mainmenu.cpp \ src/devicelist.cpp \ @@ -34,17 +34,23 @@ src/stage.h CONFIG += release TRANSLATIONS += i18n/DPF_English.ts i18n/DPF_Japanese.ts i18n/DPF_Korean.ts i18n/DPF_Chinese.ts -INCLUDEPATH = include +INCLUDEPATH = ./install/include -# Copy dlls needed to make it run -QMAKE_POST_LINK += \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Cored.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Guid.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Widgetsd.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Networkd.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Multimediad.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Core.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Gui.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Widgets.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Network.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Multimedia.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) +TARGET = ../install/bin/Photoframe + +win32 { + DEPLOY_COMMAND = $$(QTDIR)\\bin\\windeployqt + TARGET_CUSTOM_EXT = .exe +} +macx { + DEPLOY_COMMAND = $$(QTDIR)/bin/macdeployqt + TARGET_CUSTOM_EXT = .app +} + +CONFIG( debug, debug|release ) { + CONFIG_TYPE=debug +} else { + CONFIG_TYPE=release +} + +QMAKE_POST_LINK = $${DEPLOY_COMMAND} $$shell_quote($$shell_path($${OUT_PWD}/$${CONFIG_TYPE}/$${TARGET}$${TARGET_CUSTOM_EXT})) diff --git a/applications/Photoframe/build-libexif.sh b/applications/Photoframe/build-libexif.sh index 35af5dc..1debdb6 100755 --- a/applications/Photoframe/build-libexif.sh +++ b/applications/Photoframe/build-libexif.sh @@ -20,19 +20,19 @@ qmake make -mkdir -p ../bin -mkdir -p ../lib -mkdir -p ../release -mkdir -p ../include/libexif/ +mkdir -p ../install/bin +mkdir -p ../install/lib +mkdir -p ../install/include/libexif/ -cp release/libexif*.dylib ../lib -cp release/libexif*.dylib ../bin -cp release/libexif.a ../lib -cp release/exif.dll ../release -cp release/exif.lib ../lib -cp release/liblibexif.a ../lib -cp release/libexif.dll ../lib -cp release/libexif.dll ../release -cp libexif/*.h ../include/libexif +cp release/exif.lib ../install/lib +cp release/libexif*.dylib ../install/lib +cp release/libexif.a ../install/lib + +cp release/libexif*.dylib ../install/bin +cp release/libexif*.dll ../install/bin +cp release/libexif*.so* ../install/bin +cp release/exif.dll ../install/bin + +cp libexif/*.h ../install/include/libexif cd ../.. diff --git a/applications/Photoframe/i18n/DPF_Chinese.ts b/applications/Photoframe/i18n/DPF_Chinese.ts index 2820549..f884afd 100755 --- a/applications/Photoframe/i18n/DPF_Chinese.ts +++ b/applications/Photoframe/i18n/DPF_Chinese.ts @@ -121,7 +121,7 @@ - + Settings @@ -141,38 +141,38 @@ - - - IP Mode: - - - - IP: + IP Mode: - Language: + IP: - Font: + Language: - Brightness: + Font: + Brightness: + + + + + Volume: diff --git a/applications/Photoframe/i18n/DPF_English.ts b/applications/Photoframe/i18n/DPF_English.ts index 0a969cc..f454e5f 100755 --- a/applications/Photoframe/i18n/DPF_English.ts +++ b/applications/Photoframe/i18n/DPF_English.ts @@ -125,7 +125,7 @@ - + Settings Satting @@ -145,38 +145,38 @@ Vadios - - + + IP Mode: IP Made: - - + + IP: IQ: - - + + Language: Longuage: - - + + Font: Fant: - - + + Brightness: Braghtnass: - - + + Volume: Valume: diff --git a/applications/Photoframe/i18n/DPF_Japanese.ts b/applications/Photoframe/i18n/DPF_Japanese.ts index 556ca02..6d827ae 100755 --- a/applications/Photoframe/i18n/DPF_Japanese.ts +++ b/applications/Photoframe/i18n/DPF_Japanese.ts @@ -121,7 +121,7 @@ - + Settings @@ -141,38 +141,38 @@ - - - IP Mode: - - - - IP: + IP Mode: - Language: + IP: - Font: + Language: - Brightness: + Font: + Brightness: + + + + + Volume: diff --git a/applications/Photoframe/i18n/DPF_Korean.ts b/applications/Photoframe/i18n/DPF_Korean.ts index 70bfc97..5179d19 100755 --- a/applications/Photoframe/i18n/DPF_Korean.ts +++ b/applications/Photoframe/i18n/DPF_Korean.ts @@ -121,7 +121,7 @@ - + Settings @@ -141,38 +141,38 @@ - - - IP Mode: - - - - IP: + IP Mode: - Language: + IP: - Font: + Language: - Brightness: + Font: + Brightness: + + + + + Volume: diff --git a/applications/Photoframe/Photoframe.pro b/applications/Photoframe/Photoframe.pro index d6018df..b1ab021 100755 --- a/applications/Photoframe/Photoframe.pro +++ b/applications/Photoframe/Photoframe.pro @@ -1,6 +1,6 @@ QT += widgets network multimedia TEMPLATE = app -LIBS += -Llib -lexif +LIBS += -L./install/lib -lexif SOURCES += src/main.cpp \ src/mainmenu.cpp \ src/devicelist.cpp \ @@ -34,17 +34,23 @@ src/stage.h CONFIG += release TRANSLATIONS += i18n/DPF_English.ts i18n/DPF_Japanese.ts i18n/DPF_Korean.ts i18n/DPF_Chinese.ts -INCLUDEPATH = include +INCLUDEPATH = ./install/include -# Copy dlls needed to make it run -QMAKE_POST_LINK += \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Cored.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Guid.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Widgetsd.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Networkd.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Multimediad.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Core.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Gui.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Widgets.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Network.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Multimedia.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) +TARGET = ../install/bin/Photoframe + +win32 { + DEPLOY_COMMAND = $$(QTDIR)\\bin\\windeployqt + TARGET_CUSTOM_EXT = .exe +} +macx { + DEPLOY_COMMAND = $$(QTDIR)/bin/macdeployqt + TARGET_CUSTOM_EXT = .app +} + +CONFIG( debug, debug|release ) { + CONFIG_TYPE=debug +} else { + CONFIG_TYPE=release +} + +QMAKE_POST_LINK = $${DEPLOY_COMMAND} $$shell_quote($$shell_path($${OUT_PWD}/$${CONFIG_TYPE}/$${TARGET}$${TARGET_CUSTOM_EXT})) diff --git a/applications/Photoframe/build-libexif.sh b/applications/Photoframe/build-libexif.sh index 35af5dc..1debdb6 100755 --- a/applications/Photoframe/build-libexif.sh +++ b/applications/Photoframe/build-libexif.sh @@ -20,19 +20,19 @@ qmake make -mkdir -p ../bin -mkdir -p ../lib -mkdir -p ../release -mkdir -p ../include/libexif/ +mkdir -p ../install/bin +mkdir -p ../install/lib +mkdir -p ../install/include/libexif/ -cp release/libexif*.dylib ../lib -cp release/libexif*.dylib ../bin -cp release/libexif.a ../lib -cp release/exif.dll ../release -cp release/exif.lib ../lib -cp release/liblibexif.a ../lib -cp release/libexif.dll ../lib -cp release/libexif.dll ../release -cp libexif/*.h ../include/libexif +cp release/exif.lib ../install/lib +cp release/libexif*.dylib ../install/lib +cp release/libexif.a ../install/lib + +cp release/libexif*.dylib ../install/bin +cp release/libexif*.dll ../install/bin +cp release/libexif*.so* ../install/bin +cp release/exif.dll ../install/bin + +cp libexif/*.h ../install/include/libexif cd ../.. diff --git a/applications/Photoframe/i18n/DPF_Chinese.ts b/applications/Photoframe/i18n/DPF_Chinese.ts index 2820549..f884afd 100755 --- a/applications/Photoframe/i18n/DPF_Chinese.ts +++ b/applications/Photoframe/i18n/DPF_Chinese.ts @@ -121,7 +121,7 @@ - + Settings @@ -141,38 +141,38 @@ - - - IP Mode: - - - - IP: + IP Mode: - Language: + IP: - Font: + Language: - Brightness: + Font: + Brightness: + + + + + Volume: diff --git a/applications/Photoframe/i18n/DPF_English.ts b/applications/Photoframe/i18n/DPF_English.ts index 0a969cc..f454e5f 100755 --- a/applications/Photoframe/i18n/DPF_English.ts +++ b/applications/Photoframe/i18n/DPF_English.ts @@ -125,7 +125,7 @@ - + Settings Satting @@ -145,38 +145,38 @@ Vadios - - + + IP Mode: IP Made: - - + + IP: IQ: - - + + Language: Longuage: - - + + Font: Fant: - - + + Brightness: Braghtnass: - - + + Volume: Valume: diff --git a/applications/Photoframe/i18n/DPF_Japanese.ts b/applications/Photoframe/i18n/DPF_Japanese.ts index 556ca02..6d827ae 100755 --- a/applications/Photoframe/i18n/DPF_Japanese.ts +++ b/applications/Photoframe/i18n/DPF_Japanese.ts @@ -121,7 +121,7 @@ - + Settings @@ -141,38 +141,38 @@ - - - IP Mode: - - - - IP: + IP Mode: - Language: + IP: - Font: + Language: - Brightness: + Font: + Brightness: + + + + + Volume: diff --git a/applications/Photoframe/i18n/DPF_Korean.ts b/applications/Photoframe/i18n/DPF_Korean.ts index 70bfc97..5179d19 100755 --- a/applications/Photoframe/i18n/DPF_Korean.ts +++ b/applications/Photoframe/i18n/DPF_Korean.ts @@ -121,7 +121,7 @@ - + Settings @@ -141,38 +141,38 @@ - - - IP Mode: - - - - IP: + IP Mode: - Language: + IP: - Font: + Language: - Brightness: + Font: + Brightness: + + + + + Volume: diff --git a/applications/Photoframe/src/devicelist.cpp b/applications/Photoframe/src/devicelist.cpp index ea90824..8bbaff9 100755 --- a/applications/Photoframe/src/devicelist.cpp +++ b/applications/Photoframe/src/devicelist.cpp @@ -21,6 +21,7 @@ DeviceList::DeviceList(QWidget *parent, const char *title, const char *iconfile) : Stage(parent) { QLabel *icon = new QLabel(this); + icon->setObjectName("icon"); icon->setPixmap(Image::icon(iconfile, 72)); icon->move(10, 10); diff --git a/applications/Photoframe/Photoframe.pro b/applications/Photoframe/Photoframe.pro index d6018df..b1ab021 100755 --- a/applications/Photoframe/Photoframe.pro +++ b/applications/Photoframe/Photoframe.pro @@ -1,6 +1,6 @@ QT += widgets network multimedia TEMPLATE = app -LIBS += -Llib -lexif +LIBS += -L./install/lib -lexif SOURCES += src/main.cpp \ src/mainmenu.cpp \ src/devicelist.cpp \ @@ -34,17 +34,23 @@ src/stage.h CONFIG += release TRANSLATIONS += i18n/DPF_English.ts i18n/DPF_Japanese.ts i18n/DPF_Korean.ts i18n/DPF_Chinese.ts -INCLUDEPATH = include +INCLUDEPATH = ./install/include -# Copy dlls needed to make it run -QMAKE_POST_LINK += \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Cored.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Guid.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Widgetsd.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Networkd.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Multimediad.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Core.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Gui.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Widgets.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Network.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Multimedia.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) +TARGET = ../install/bin/Photoframe + +win32 { + DEPLOY_COMMAND = $$(QTDIR)\\bin\\windeployqt + TARGET_CUSTOM_EXT = .exe +} +macx { + DEPLOY_COMMAND = $$(QTDIR)/bin/macdeployqt + TARGET_CUSTOM_EXT = .app +} + +CONFIG( debug, debug|release ) { + CONFIG_TYPE=debug +} else { + CONFIG_TYPE=release +} + +QMAKE_POST_LINK = $${DEPLOY_COMMAND} $$shell_quote($$shell_path($${OUT_PWD}/$${CONFIG_TYPE}/$${TARGET}$${TARGET_CUSTOM_EXT})) diff --git a/applications/Photoframe/build-libexif.sh b/applications/Photoframe/build-libexif.sh index 35af5dc..1debdb6 100755 --- a/applications/Photoframe/build-libexif.sh +++ b/applications/Photoframe/build-libexif.sh @@ -20,19 +20,19 @@ qmake make -mkdir -p ../bin -mkdir -p ../lib -mkdir -p ../release -mkdir -p ../include/libexif/ +mkdir -p ../install/bin +mkdir -p ../install/lib +mkdir -p ../install/include/libexif/ -cp release/libexif*.dylib ../lib -cp release/libexif*.dylib ../bin -cp release/libexif.a ../lib -cp release/exif.dll ../release -cp release/exif.lib ../lib -cp release/liblibexif.a ../lib -cp release/libexif.dll ../lib -cp release/libexif.dll ../release -cp libexif/*.h ../include/libexif +cp release/exif.lib ../install/lib +cp release/libexif*.dylib ../install/lib +cp release/libexif.a ../install/lib + +cp release/libexif*.dylib ../install/bin +cp release/libexif*.dll ../install/bin +cp release/libexif*.so* ../install/bin +cp release/exif.dll ../install/bin + +cp libexif/*.h ../install/include/libexif cd ../.. diff --git a/applications/Photoframe/i18n/DPF_Chinese.ts b/applications/Photoframe/i18n/DPF_Chinese.ts index 2820549..f884afd 100755 --- a/applications/Photoframe/i18n/DPF_Chinese.ts +++ b/applications/Photoframe/i18n/DPF_Chinese.ts @@ -121,7 +121,7 @@ - + Settings @@ -141,38 +141,38 @@ - - - IP Mode: - - - - IP: + IP Mode: - Language: + IP: - Font: + Language: - Brightness: + Font: + Brightness: + + + + + Volume: diff --git a/applications/Photoframe/i18n/DPF_English.ts b/applications/Photoframe/i18n/DPF_English.ts index 0a969cc..f454e5f 100755 --- a/applications/Photoframe/i18n/DPF_English.ts +++ b/applications/Photoframe/i18n/DPF_English.ts @@ -125,7 +125,7 @@ - + Settings Satting @@ -145,38 +145,38 @@ Vadios - - + + IP Mode: IP Made: - - + + IP: IQ: - - + + Language: Longuage: - - + + Font: Fant: - - + + Brightness: Braghtnass: - - + + Volume: Valume: diff --git a/applications/Photoframe/i18n/DPF_Japanese.ts b/applications/Photoframe/i18n/DPF_Japanese.ts index 556ca02..6d827ae 100755 --- a/applications/Photoframe/i18n/DPF_Japanese.ts +++ b/applications/Photoframe/i18n/DPF_Japanese.ts @@ -121,7 +121,7 @@ - + Settings @@ -141,38 +141,38 @@ - - - IP Mode: - - - - IP: + IP Mode: - Language: + IP: - Font: + Language: - Brightness: + Font: + Brightness: + + + + + Volume: diff --git a/applications/Photoframe/i18n/DPF_Korean.ts b/applications/Photoframe/i18n/DPF_Korean.ts index 70bfc97..5179d19 100755 --- a/applications/Photoframe/i18n/DPF_Korean.ts +++ b/applications/Photoframe/i18n/DPF_Korean.ts @@ -121,7 +121,7 @@ - + Settings @@ -141,38 +141,38 @@ - - - IP Mode: - - - - IP: + IP Mode: - Language: + IP: - Font: + Language: - Brightness: + Font: + Brightness: + + + + + Volume: diff --git a/applications/Photoframe/src/devicelist.cpp b/applications/Photoframe/src/devicelist.cpp index ea90824..8bbaff9 100755 --- a/applications/Photoframe/src/devicelist.cpp +++ b/applications/Photoframe/src/devicelist.cpp @@ -21,6 +21,7 @@ DeviceList::DeviceList(QWidget *parent, const char *title, const char *iconfile) : Stage(parent) { QLabel *icon = new QLabel(this); + icon->setObjectName("icon"); icon->setPixmap(Image::icon(iconfile, 72)); icon->move(10, 10); diff --git a/applications/Photoframe/src/manager.cpp b/applications/Photoframe/src/manager.cpp index 940939d..84dd307 100755 --- a/applications/Photoframe/src/manager.cpp +++ b/applications/Photoframe/src/manager.cpp @@ -1,4 +1,6 @@ #include +#include +#include #include #include "intro.h" #include "manager.h" @@ -35,6 +37,35 @@ } +void Manager::fadeInWidget(QWidget* w) +{ + w->show(); + w->setFocus(); + QGraphicsOpacityEffect* eff = new QGraphicsOpacityEffect(this); + w->setGraphicsEffect(eff); + QPropertyAnimation* anim = new QPropertyAnimation(eff, "opacity"); + anim->setDuration(500); + anim->setStartValue(0); + anim->setEndValue(1); + anim->setEasingCurve(QEasingCurve::InBack); + anim->start(QPropertyAnimation::DeleteWhenStopped); +} + + +void Manager::fadeOutWidget(QWidget* w) +{ + QGraphicsOpacityEffect* eff = new QGraphicsOpacityEffect(this); + w->setGraphicsEffect(eff); + QPropertyAnimation* anim = new QPropertyAnimation(eff, "opacity"); + anim->setDuration(500); + anim->setStartValue(1); + anim->setEndValue(0); + anim->setEasingCurve(QEasingCurve::OutBack); + anim->start(QPropertyAnimation::DeleteWhenStopped); + connect(anim, &QPropertyAnimation::finished, [w]() { w->hide(); }); +} + + void Manager::setStage(int stage) { switch (stage) { @@ -42,17 +73,17 @@ QSound::play("sounds/Delete.wav"); case -2: if (slideshow) - slideshow->hide(); + fadeOutWidget(slideshow); if (photos) - photos->hide(); + fadeOutWidget(photos); if (music) - music->hide(); + fadeOutWidget(music); if (videos) - videos->hide(); + fadeOutWidget(videos); if (info) - info->hide(); + fadeOutWidget(info); if (settings) - settings->hide(); + fadeOutWidget(settings); mainmenu->show(); mainmenu->setFocus(); break; @@ -61,48 +92,42 @@ slideshow = new SlideShow(this); connect(slideshow, SIGNAL(setStage(int)), this, SLOT(setStage(int))); } - slideshow->show(); - slideshow->setFocus(); + fadeInWidget(slideshow); break; case 1: if (!photos) { photos = new PhotoList(this); connect(photos, SIGNAL(setStage(int)), this, SLOT(setStage(int))); } - photos->show(); - photos->setFocus(); + fadeInWidget(photos); break; case 2: if (!music) { music = new MusicList(this); connect(music, SIGNAL(setStage(int)), this, SLOT(setStage(int))); } - music->show(); - music->setFocus(); + fadeInWidget(music); break; case 3: if (!videos) { videos = new VideoList(this); connect(videos, SIGNAL(setStage(int)), this, SLOT(setStage(int))); } - videos->show(); - videos->setFocus(); + fadeInWidget(videos); break; case 4: if (!info) { info = new Information(this); connect(info, SIGNAL(setStage(int)), this, SLOT(setStage(int))); } - info->show(); - info->setFocus(); + fadeInWidget(info); break; case 5: if (!settings) { settings = new Settings(this); connect(settings, SIGNAL(setStage(int)), this, SLOT(setStage(int))); } - settings->show(); - settings->setFocus(); + fadeInWidget(settings); break; case 6: // Turn Off diff --git a/applications/Photoframe/Photoframe.pro b/applications/Photoframe/Photoframe.pro index d6018df..b1ab021 100755 --- a/applications/Photoframe/Photoframe.pro +++ b/applications/Photoframe/Photoframe.pro @@ -1,6 +1,6 @@ QT += widgets network multimedia TEMPLATE = app -LIBS += -Llib -lexif +LIBS += -L./install/lib -lexif SOURCES += src/main.cpp \ src/mainmenu.cpp \ src/devicelist.cpp \ @@ -34,17 +34,23 @@ src/stage.h CONFIG += release TRANSLATIONS += i18n/DPF_English.ts i18n/DPF_Japanese.ts i18n/DPF_Korean.ts i18n/DPF_Chinese.ts -INCLUDEPATH = include +INCLUDEPATH = ./install/include -# Copy dlls needed to make it run -QMAKE_POST_LINK += \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Cored.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Guid.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Widgetsd.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Networkd.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Multimediad.dll)\" \"$$shell_path($$IN_PWD)/build/debug\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Core.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Gui.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Widgets.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Network.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \"$$shell_path($$[QT_INSTALL_BINS]/Qt5Multimedia.dll)\" \"$$shell_path($$IN_PWD)/build/release\" $$escape_expand(\\n\\t) +TARGET = ../install/bin/Photoframe + +win32 { + DEPLOY_COMMAND = $$(QTDIR)\\bin\\windeployqt + TARGET_CUSTOM_EXT = .exe +} +macx { + DEPLOY_COMMAND = $$(QTDIR)/bin/macdeployqt + TARGET_CUSTOM_EXT = .app +} + +CONFIG( debug, debug|release ) { + CONFIG_TYPE=debug +} else { + CONFIG_TYPE=release +} + +QMAKE_POST_LINK = $${DEPLOY_COMMAND} $$shell_quote($$shell_path($${OUT_PWD}/$${CONFIG_TYPE}/$${TARGET}$${TARGET_CUSTOM_EXT})) diff --git a/applications/Photoframe/build-libexif.sh b/applications/Photoframe/build-libexif.sh index 35af5dc..1debdb6 100755 --- a/applications/Photoframe/build-libexif.sh +++ b/applications/Photoframe/build-libexif.sh @@ -20,19 +20,19 @@ qmake make -mkdir -p ../bin -mkdir -p ../lib -mkdir -p ../release -mkdir -p ../include/libexif/ +mkdir -p ../install/bin +mkdir -p ../install/lib +mkdir -p ../install/include/libexif/ -cp release/libexif*.dylib ../lib -cp release/libexif*.dylib ../bin -cp release/libexif.a ../lib -cp release/exif.dll ../release -cp release/exif.lib ../lib -cp release/liblibexif.a ../lib -cp release/libexif.dll ../lib -cp release/libexif.dll ../release -cp libexif/*.h ../include/libexif +cp release/exif.lib ../install/lib +cp release/libexif*.dylib ../install/lib +cp release/libexif.a ../install/lib + +cp release/libexif*.dylib ../install/bin +cp release/libexif*.dll ../install/bin +cp release/libexif*.so* ../install/bin +cp release/exif.dll ../install/bin + +cp libexif/*.h ../install/include/libexif cd ../.. diff --git a/applications/Photoframe/i18n/DPF_Chinese.ts b/applications/Photoframe/i18n/DPF_Chinese.ts index 2820549..f884afd 100755 --- a/applications/Photoframe/i18n/DPF_Chinese.ts +++ b/applications/Photoframe/i18n/DPF_Chinese.ts @@ -121,7 +121,7 @@ - + Settings @@ -141,38 +141,38 @@ - - - IP Mode: - - - - IP: + IP Mode: - Language: + IP: - Font: + Language: - Brightness: + Font: + Brightness: + + + + + Volume: diff --git a/applications/Photoframe/i18n/DPF_English.ts b/applications/Photoframe/i18n/DPF_English.ts index 0a969cc..f454e5f 100755 --- a/applications/Photoframe/i18n/DPF_English.ts +++ b/applications/Photoframe/i18n/DPF_English.ts @@ -125,7 +125,7 @@ - + Settings Satting @@ -145,38 +145,38 @@ Vadios - - + + IP Mode: IP Made: - - + + IP: IQ: - - + + Language: Longuage: - - + + Font: Fant: - - + + Brightness: Braghtnass: - - + + Volume: Valume: diff --git a/applications/Photoframe/i18n/DPF_Japanese.ts b/applications/Photoframe/i18n/DPF_Japanese.ts index 556ca02..6d827ae 100755 --- a/applications/Photoframe/i18n/DPF_Japanese.ts +++ b/applications/Photoframe/i18n/DPF_Japanese.ts @@ -121,7 +121,7 @@ - + Settings @@ -141,38 +141,38 @@ - - - IP Mode: - - - - IP: + IP Mode: - Language: + IP: - Font: + Language: - Brightness: + Font: + Brightness: + + + + + Volume: diff --git a/applications/Photoframe/i18n/DPF_Korean.ts b/applications/Photoframe/i18n/DPF_Korean.ts index 70bfc97..5179d19 100755 --- a/applications/Photoframe/i18n/DPF_Korean.ts +++ b/applications/Photoframe/i18n/DPF_Korean.ts @@ -121,7 +121,7 @@ - + Settings @@ -141,38 +141,38 @@ - - - IP Mode: - - - - IP: + IP Mode: - Language: + IP: - Font: + Language: - Brightness: + Font: + Brightness: + + + + + Volume: diff --git a/applications/Photoframe/src/devicelist.cpp b/applications/Photoframe/src/devicelist.cpp index ea90824..8bbaff9 100755 --- a/applications/Photoframe/src/devicelist.cpp +++ b/applications/Photoframe/src/devicelist.cpp @@ -21,6 +21,7 @@ DeviceList::DeviceList(QWidget *parent, const char *title, const char *iconfile) : Stage(parent) { QLabel *icon = new QLabel(this); + icon->setObjectName("icon"); icon->setPixmap(Image::icon(iconfile, 72)); icon->move(10, 10); diff --git a/applications/Photoframe/src/manager.cpp b/applications/Photoframe/src/manager.cpp index 940939d..84dd307 100755 --- a/applications/Photoframe/src/manager.cpp +++ b/applications/Photoframe/src/manager.cpp @@ -1,4 +1,6 @@ #include +#include +#include #include #include "intro.h" #include "manager.h" @@ -35,6 +37,35 @@ } +void Manager::fadeInWidget(QWidget* w) +{ + w->show(); + w->setFocus(); + QGraphicsOpacityEffect* eff = new QGraphicsOpacityEffect(this); + w->setGraphicsEffect(eff); + QPropertyAnimation* anim = new QPropertyAnimation(eff, "opacity"); + anim->setDuration(500); + anim->setStartValue(0); + anim->setEndValue(1); + anim->setEasingCurve(QEasingCurve::InBack); + anim->start(QPropertyAnimation::DeleteWhenStopped); +} + + +void Manager::fadeOutWidget(QWidget* w) +{ + QGraphicsOpacityEffect* eff = new QGraphicsOpacityEffect(this); + w->setGraphicsEffect(eff); + QPropertyAnimation* anim = new QPropertyAnimation(eff, "opacity"); + anim->setDuration(500); + anim->setStartValue(1); + anim->setEndValue(0); + anim->setEasingCurve(QEasingCurve::OutBack); + anim->start(QPropertyAnimation::DeleteWhenStopped); + connect(anim, &QPropertyAnimation::finished, [w]() { w->hide(); }); +} + + void Manager::setStage(int stage) { switch (stage) { @@ -42,17 +73,17 @@ QSound::play("sounds/Delete.wav"); case -2: if (slideshow) - slideshow->hide(); + fadeOutWidget(slideshow); if (photos) - photos->hide(); + fadeOutWidget(photos); if (music) - music->hide(); + fadeOutWidget(music); if (videos) - videos->hide(); + fadeOutWidget(videos); if (info) - info->hide(); + fadeOutWidget(info); if (settings) - settings->hide(); + fadeOutWidget(settings); mainmenu->show(); mainmenu->setFocus(); break; @@ -61,48 +92,42 @@ slideshow = new SlideShow(this); connect(slideshow, SIGNAL(setStage(int)), this, SLOT(setStage(int))); } - slideshow->show(); - slideshow->setFocus(); + fadeInWidget(slideshow); break; case 1: if (!photos) { photos = new PhotoList(this); connect(photos, SIGNAL(setStage(int)), this, SLOT(setStage(int))); } - photos->show(); - photos->setFocus(); + fadeInWidget(photos); break; case 2: if (!music) { music = new MusicList(this); connect(music, SIGNAL(setStage(int)), this, SLOT(setStage(int))); } - music->show(); - music->setFocus(); + fadeInWidget(music); break; case 3: if (!videos) { videos = new VideoList(this); connect(videos, SIGNAL(setStage(int)), this, SLOT(setStage(int))); } - videos->show(); - videos->setFocus(); + fadeInWidget(videos); break; case 4: if (!info) { info = new Information(this); connect(info, SIGNAL(setStage(int)), this, SLOT(setStage(int))); } - info->show(); - info->setFocus(); + fadeInWidget(info); break; case 5: if (!settings) { settings = new Settings(this); connect(settings, SIGNAL(setStage(int)), this, SLOT(setStage(int))); } - settings->show(); - settings->setFocus(); + fadeInWidget(settings); break; case 6: // Turn Off diff --git a/applications/Photoframe/src/manager.h b/applications/Photoframe/src/manager.h index b5f2d7f..09855f4 100755 --- a/applications/Photoframe/src/manager.h +++ b/applications/Photoframe/src/manager.h @@ -35,6 +35,9 @@ void backgroundChanged(QString); private: + void fadeInWidget(QWidget* w); + void fadeOutWidget(QWidget* w); + MainMenu *mainmenu; SlideShow *slideshow; PhotoList *photos;