v1.10

ilia3101 · Nov 22, 2019 · 33bfe61 · 33bfe61
1 parent f300040
commit 33bfe61
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/osx_installer/BuildInstaller.sh b/osx_installer/BuildInstaller.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 #Copy deployed "MLV App.app" to ./App directory before running this
 #Copy content from create-dmg (https://github.com/andreyvit/create-dmg) to ./create-dmg-master
-test -f "MLVApp.v1.9.OSX.dmg" && rm "MLVApp.v1.9.OSX.dmg"
+test -f "MLVApp.v1.10.OSX.dmg" && rm "MLVApp.v1.10.OSX.dmg"
 create-dmg-master/create-dmg \
---volname "MLVApp v1.9 Installer" \
+--volname "MLVApp v1.10 Installer" \
 --volicon "app/MLV App.app/Contents/Resources/MLVAPP.icns" \
 --background "dmg-background.png" \
 --window-pos 200 120 \
@@ -12,5 +12,5 @@ create-dmg-master/create-dmg \
 --icon "MLV App.app" 165 175 \
 --hide-extension "MLV App.app" \
 --app-drop-link 495 175 \
-"MLVApp.v1.9.OSX.dmg" \
+"MLVApp.v1.10.OSX.dmg" \
 "./app/"
diff --git a/platform/qt/Info.plist b/platform/qt/Info.plist
@@ -26,6 +26,6 @@
 	<key>CFBundleTypeRole</key>
         <string>Viewer</string>
 	<key>CFBundleShortVersionString</key>
-        <string>1.9</string>
+        <string>1.10</string>
 </dict>
 </plist>
diff --git a/platform/qt/MLVApp.pro b/platform/qt/MLVApp.pro
@@ -289,7 +289,7 @@ RC_ICONS = MLVAPP.ico
 #    QMAKE_TARGET_COMPANY = magiclantern
 #    QMAKE_TARGET_DESCRIPTION = "Processing and converting tool for MLV files"
 #    QMAKE_TARGET_PRODUCT = MLVApp
-#    VERSION = 0.17.0
+#    VERSION = 1.10.0
 #    RC_CODEPAGE = 1252
 #}
 macx: ICON = MLVAPP.icns
@@ -310,8 +310,8 @@ QMAKE_BUNDLE_DATA += PACKAGE_FILES
 macx: QMAKE_POST_LINK += unzip -o ../qt/FFmpeg/ffmpegOSX.zip $$escape_expand(\n\t)
 macx: QMAKE_POST_LINK += "mv ffmpeg MLV\ App.app/Contents/MacOS/" $$escape_expand(\n\t)
 #unpack & install raw2mlv on OSX
-macx: QMAKE_POST_LINK += unzip -o ../qt/raw2mlv/raw2mlvOSX.zip $$escape_expand(\n\t)
-macx: QMAKE_POST_LINK += "mv raw2mlv MLV\ App.app/Contents/MacOS/" $$escape_expand(\n\t)
+#macx: QMAKE_POST_LINK += unzip -o ../qt/raw2mlv/raw2mlvOSX.zip $$escape_expand(\n\t)
+#macx: QMAKE_POST_LINK += "mv raw2mlv MLV\ App.app/Contents/MacOS/" $$escape_expand(\n\t)
 
 unix{
     OBJECTS_DIR = .obj
@@ -331,7 +331,7 @@ linux-g++ {
     INSTALLS += target desktop icon512
 
     QMAKE_POST_LINK += tar -C $$(HOME)/bin -xvJf $$_PRO_FILE_PWD_/FFmpeg/ffmpegLinux.tar.xz --strip-components=1 --wildcards */ffmpeg $$escape_expand(\n\t)
-    QMAKE_POST_LINK += tar -C $$(HOME)/bin -xvJf $$_PRO_FILE_PWD_/raw2mlv/raw2mlvLinux.tar.xz --strip-components=1 --wildcards */raw2mlv $$escape_expand(\n\t)
+    #QMAKE_POST_LINK += tar -C $$(HOME)/bin -xvJf $$_PRO_FILE_PWD_/raw2mlv/raw2mlvLinux.tar.xz --strip-components=1 --wildcards */raw2mlv $$escape_expand(\n\t)
 }
 
 #for using linuxdeployqt
@@ -343,16 +343,16 @@ linux-g++ {
 #    QMAKE_POST_LINK += tar -C ../qt/FFmpeg/ -xvJf ../qt/FFmpeg/ffmpegLinux.tar.xz --strip=1 --wildcards */ffmpeg $$escape_expand(\n\t)
 #    QMAKE_POST_LINK += chmod a+x ../qt/FFmpeg/ffmpeg $$escape_expand(\n\t)
 
-#    QMAKE_POST_LINK += tar -C ../qt/raw2mlv/ -xvJf ../qt/raw2mlv/raw2mlvLinux.tar.xz --strip=1 --wildcards */raw2mlv $$escape_expand(\n\t)
-#    QMAKE_POST_LINK += chmod a+x ../qt/raw2mlv/raw2mlv $$escape_expand(\n\t)
+#    #QMAKE_POST_LINK += tar -C ../qt/raw2mlv/ -xvJf ../qt/raw2mlv/raw2mlvLinux.tar.xz --strip=1 --wildcards */raw2mlv $$escape_expand(\n\t)
+#    #QMAKE_POST_LINK += chmod a+x ../qt/raw2mlv/raw2mlv $$escape_expand(\n\t)
 
 #    isEmpty(PREFIX) {
 #        PREFIX = /usr
 #    }
 #    target.path = $$PREFIX/bin
 #    ffmpegSt.path = $$PREFIX/bin
 #    ffmpegSt.files += FFmpeg/ffmpeg
-#    ffmpegSt.files += raw2mlv/raw2mlv
+#    #ffmpegSt.files += raw2mlv/raw2mlv
 #    desktop.path = $$PREFIX/share/applications
 #    desktop.files += mlvapp.desktop
 #    icon512.path = $$PREFIX/share/icons/hicolor/512x512/apps

diff --git a/platform/qt/MainWindow.cpp b/platform/qt/MainWindow.cpp
@@ -48,8 +48,8 @@
 #include "TranscodeDialog.h"
 
 #define APPNAME "MLV App"
-#define VERSION "1.9"
-#define GITVERSION "QTv1.9"
+#define VERSION "1.10"
+#define GITVERSION "QTv1.10"
 
 #define FACTOR_DS       22.5
 #define FACTOR_LS       11.2
@@ -1342,14 +1342,14 @@ void MainWindow::initGui( void )
 
     //raw2mlv available?
     ui->actionTranscodeAndImport->setVisible( false );
-#ifdef Q_OS_WIN
+/*#ifdef Q_OS_WIN
     if( QFileInfo( QString( "%1/raw2mlv.exe" ).arg( QCoreApplication::applicationDirPath() ) ).exists() )
         ui->actionTranscodeAndImport->setVisible( true );
 #endif
 #ifdef Q_OS_UNIX
     if( QFileInfo( QString( "%1/raw2mlv" ).arg( QCoreApplication::applicationDirPath() ) ).exists() )
         ui->actionTranscodeAndImport->setVisible( true );
-#endif
+#endif*/
 }
 
 //Initialize the library