diff --git a/Project/Mac/Make_xcarchive.sh b/Project/Mac/Make_xcarchive.sh index b2cb71ae0..d1ec13191 100755 --- a/Project/Mac/Make_xcarchive.sh +++ b/Project/Mac/Make_xcarchive.sh @@ -5,70 +5,7 @@ TEAMID=$4 SIGNATURE="MediaArea.net" -DATE=$(date -u +'%s') +cp -r ../QtCreator/qctools-gui/build/$APPNAME.app . || exit 1 -cp -r ../QtCreator/qctools-gui/$APPNAME.app . || exit 1 - -macdeployqt $APPNAME.app -no-strip -appstore-compliant -rm -rf $APPNAME.app/Contents/PlugIns/sqldrivers/{libqsqlmysql.dylib,libqsqlodbc.dylib,libqsqlpsql.dylib} - -dsymutil $APPNAME.app/Contents/MacOS/$APPNAME -o $APPNAME.app.dSYM - -for FRAMEWORK in $(ls $APPNAME.app/Contents/Frameworks | grep framework | sed 's/\.framework//') ; do - pushd $APPNAME.app/Contents/Frameworks/$FRAMEWORK.framework - - rm -fr _CodeSignature - rm -fr Versions/5/_CodeSignature - plutil -replace CFBundleIdentifier -string "$BUNDLEID" Resources/Info.plist - popd - - # codesign --force --verbose --sign "3rd Party Mac Developer Application: $SIGNATURE" -i $BUNDLEID $APPNAME.app/Contents/Frameworks/$FRAMEWORK.framework/Versions/5/$FRAMEWORK -done - -#find $APPNAME.app/Contents/PlugIns -name "*.dylib" -exec codesign --force --verbose --sign "3rd Party Mac Developer Application: $SIGNATURE" -i $BUNDLEID '{}' \; - -codesign --deep --force --verbose --sign "3rd Party Mac Developer Application: $SIGNATURE" --entitlements $APPNAME.entitlements $APPNAME.app - -productbuild --component $APPNAME.app /Applications --sign "3rd Party Mac Developer Installer: $SIGNATURE" $APPNAME-$VERSION.pkg - -rm -fr $APPNAME.xcarchive -mkdir -p $APPNAME.xcarchive{/Products/Applications,/dSYMs} -mv $APPNAME.app.dSYM $APPNAME.xcarchive/dSYMs -mv $APPNAME.app $APPNAME.xcarchive/Products/Applications - -cat > $APPNAME.xcarchive/Info.plist < - - - - ApplicationProperties - - ApplicationPath - Applications/$APPNAME.app - CFBundleIdentifier - $BUNDLEID - CFBundleShortVersionString - $VERSION - CFBundleVersion - 1.4 - IconPaths - - Applications/$APPNAME.app/Contents/Resources/Logo.icns - - SigningIdentity - 3rd Party Mac Developer Application: $SIGNATURE ($TEAMID) - - ArchiveVersion - 2 - CreationDate - $(date -u -j -f '%s' +'%Y-%m-%dT%H:%M:%SZ' $DATE) - Name - $APPNAME - SchemeName - $APPNAME - - -EOF - -mkdir -p $HOME/Library/Developer/Xcode/Archives/$(date -u -j -f '%s' +'%Y-%m-%d' $DATE) -cp -a $APPNAME.xcarchive $HOME/Library/Developer/Xcode/Archives/$(date -u -j -f '%s' +'%Y-%m-%d' $DATE)/"$APPNAME $(date -u -j -f '%s' +'%d-%m-%Y %H.%M' $DATE).xcarchive" +codesign --force --deep --verbose --sign "Apple Distribution: $SIGNATURE" --entitlements "$APPNAME.entitlements" "$APPNAME.app" +productbuild --component "$APPNAME.app" /Applications --sign "3rd Party Mac Developer Installer: $SIGNATURE" "$APPNAME-$VERSION.pkg" diff --git a/Project/QtCreator/QCTools.pro b/Project/QtCreator/QCTools.pro index cd8276beb..faa5861e4 100755 --- a/Project/QtCreator/QCTools.pro +++ b/Project/QtCreator/QCTools.pro @@ -8,6 +8,12 @@ USE_BREW = $$(USE_BREW) DEFINES += USE_BREW } +macx { + contains(MACSTORE, yes|1) { + DEFINES += MACSTORE + } +} + include(ffmpeg.pri) contains(DEFINES, USE_BREW) { diff --git a/Source/GUI/mainwindow.cpp b/Source/GUI/mainwindow.cpp index b2d7a5055..08c24c0e7 100755 --- a/Source/GUI/mainwindow.cpp +++ b/Source/GUI/mainwindow.cpp @@ -386,12 +386,14 @@ void MainWindow::on_actionFilesList_triggered() ui->menuLegacy_outputs->setVisible(false); if (ui->actionExport_XmlGz_Prompt) ui->actionExport_XmlGz_Prompt->setVisible(false); - if (ui->actionExport_XmlGz_Sidecar) - ui->actionExport_XmlGz_Sidecar->setVisible(false); if (ui->actionExport_Mkv_Prompt) ui->actionExport_Mkv_Prompt->setVisible(false); +#ifndef MACSTORE + if (ui->actionExport_XmlGz_Sidecar) + ui->actionExport_XmlGz_Sidecar->setVisible(false); if (ui->actionExport_Mkv_Sidecar) ui->actionExport_Mkv_Sidecar->setVisible(false); +#endif // !MACSTORE if (ui->actionExport_Mkv_QCvault) ui->actionExport_Mkv_QCvault->setVisible(false); if (ui->actionPrint) @@ -436,12 +438,14 @@ void MainWindow::on_actionGraphsLayout_triggered() ui->actionGoTo->setVisible(true); if (ui->actionExport_XmlGz_Prompt) ui->actionExport_XmlGz_Prompt->setVisible(true); - if (ui->actionExport_XmlGz_Sidecar) - ui->actionExport_XmlGz_Sidecar->setVisible(true); if (ui->actionExport_Mkv_Prompt) ui->actionExport_Mkv_Prompt->setVisible(true); +#ifndef MACSTORE + if (ui->actionExport_XmlGz_Sidecar) + ui->actionExport_XmlGz_Sidecar->setVisible(true); if (ui->actionExport_Mkv_Sidecar) ui->actionExport_Mkv_Sidecar->setVisible(true); +#endif // !MACSTORE //if (ui->actionPrint) // ui->actionPrint->setVisible(true); if (ui->actionZoomIn) @@ -823,12 +827,18 @@ void MainWindow::updateExportActions() exportEnabled = hasStats || parsed; } ui->actionExport_XmlGz_Prompt->setEnabled(exportEnabled); - ui->actionExport_XmlGz_Sidecar->setEnabled(exportEnabled); ui->actionExport_Mkv_Prompt->setEnabled(exportEnabled); +#ifndef MACSTORE + ui->actionExport_XmlGz_Sidecar->setEnabled(exportEnabled); ui->actionExport_Mkv_Sidecar->setEnabled(exportEnabled); +#endif // !MACSTORE ui->actionExport_Mkv_QCvault->setEnabled(exportEnabled); +#ifndef MACSTORE ui->menuLegacy_outputs->setEnabled(ui->actionExport_XmlGz_Prompt->isEnabled() || ui->actionExport_XmlGz_Sidecar->isEnabled() || ui->actionExport_XmlGz_SidecarAll->isEnabled()); +#else + ui->menuLegacy_outputs->setEnabled(ui->actionExport_XmlGz_Prompt->isEnabled()); +#endif // !MACSTORE } void MainWindow::updateExportAllAction() @@ -842,11 +852,17 @@ void MainWindow::updateExportAllAction() } } +#ifndef MACSTORE ui->actionExport_XmlGz_SidecarAll->setEnabled(allParsedOrHaveStats); ui->actionExport_Mkv_SidecarAll->setEnabled(allParsedOrHaveStats); +#endif // !MACSTORE ui->actionExport_Mkv_QCvaultAll->setEnabled(allParsedOrHaveStats); +#ifndef MACSTORE ui->menuLegacy_outputs->setEnabled(ui->actionExport_XmlGz_Prompt->isEnabled() || ui->actionExport_XmlGz_Sidecar->isEnabled() || ui->actionExport_XmlGz_SidecarAll->isEnabled()); +#else + ui->menuLegacy_outputs->setEnabled(ui->actionExport_XmlGz_Prompt->isEnabled()); +#endif // !MACSTORE } void MainWindow::showPlayer() diff --git a/Source/GUI/mainwindow_Ui.cpp b/Source/GUI/mainwindow_Ui.cpp index c30d87cce..7c9f30a4e 100755 --- a/Source/GUI/mainwindow_Ui.cpp +++ b/Source/GUI/mainwindow_Ui.cpp @@ -139,6 +139,19 @@ void MainWindow::Ui_Init() // Drag n drop setAcceptDrops(true); +#ifdef MACSTORE + if (ui->actionExport_XmlGz_Sidecar) + ui->actionExport_XmlGz_Sidecar->setVisible(false); + if (ui->actionExport_Mkv_Prompt) + ui->actionExport_Mkv_Prompt->setVisible(false); + if (ui->actionExport_Mkv_Sidecar) + ui->actionExport_Mkv_Sidecar->setVisible(false); + if (ui->actionExport_XmlGz_SidecarAll) + ui->actionExport_XmlGz_SidecarAll->setVisible(false); + if (ui->actionExport_Mkv_SidecarAll) + ui->actionExport_Mkv_SidecarAll->setVisible(false); +#endif // MACSTORE + // Icons ui->actionOpen->setIcon(QIcon(":/icon/document-open.png")); ui->actionExport_XmlGz_Prompt->setIcon(QIcon(":/icon/export_xml.png")); @@ -411,7 +424,9 @@ void MainWindow::configureZoom() ui->actionGoTo->setEnabled(!Files.empty()); ui->actionExport_XmlGz_Prompt->setEnabled(!Files.empty()); +#ifndef MACSTORE ui->actionExport_XmlGz_Sidecar->setEnabled(!Files.empty()); +#endif // !MACSTORE //ui->actionPrint->setEnabled(!Files.empty()); return; } @@ -421,7 +436,9 @@ void MainWindow::configureZoom() ui->actionZoomIn->setEnabled( isPlotZoomable() ); ui->actionGoTo->setEnabled(true); ui->actionExport_XmlGz_Prompt->setEnabled(true); +#ifndef MACSTORE ui->actionExport_XmlGz_Sidecar->setEnabled(true); +#endif // !MACSTORE //ui->actionPrint->setEnabled(true); } diff --git a/Source/Resource/Logo.icns b/Source/Resource/Logo.icns old mode 100755 new mode 100644 index 4347326a5..0ea0398d5 Binary files a/Source/Resource/Logo.icns and b/Source/Resource/Logo.icns differ diff --git a/Source/Resource/Logo.sketch b/Source/Resource/Logo.sketch new file mode 100644 index 000000000..2aeb785a2 Binary files /dev/null and b/Source/Resource/Logo.sketch differ