diff --git a/qt-creator/.gitignore b/qt-creator/.gitignore index f100f31..b4e4147 100644 --- a/qt-creator/.gitignore +++ b/qt-creator/.gitignore @@ -46,7 +46,6 @@ wrapper.bat *.qmlproject.user* *.pyqtc.user* /src/plugins/**/*.json -/src/app/Info.plist app_version.h /src/plugins/coreplugin/ide_version.h /share/qtcreator/externaltools diff --git a/qt-creator/qtcreator.pri b/qt-creator/qtcreator.pri index 7e73c69..357f671 100644 --- a/qt-creator/qtcreator.pri +++ b/qt-creator/qtcreator.pri @@ -82,7 +82,7 @@ osx { #OPENMV-DIFF# #IDE_APP_TARGET = "Qt Creator" #OPENMV-DIFF# - IDE_APP_TARGET = "OpenMV IDE" + IDE_APP_TARGET = "NXTCamView5" #OPENMV-DIFF# IDE_APP_BUNDLE = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app @@ -111,28 +111,28 @@ osx { # target output path if not set manually isEmpty(IDE_OUTPUT_PATH): IDE_OUTPUT_PATH = $$IDE_BUILD_TREE - IDE_LIBRARY_PATH = $$IDE_OUTPUT_PATH/$$IDE_LIBRARY_BASENAME/qtcreator + IDE_LIBRARY_PATH = $$IDE_OUTPUT_PATH/$$IDE_LIBRARY_BASENAME/nxtcamview5 IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH/plugins - IDE_DATA_PATH = $$IDE_OUTPUT_PATH/share/qtcreator - IDE_DOC_PATH = $$IDE_OUTPUT_PATH/share/doc/qtcreator + IDE_DATA_PATH = $$IDE_OUTPUT_PATH/share/nxtcamview5 + IDE_DOC_PATH = $$IDE_OUTPUT_PATH/share/doc/nxtcamview5 IDE_BIN_PATH = $$IDE_OUTPUT_PATH/bin win32: \ IDE_LIBEXEC_PATH = $$IDE_OUTPUT_PATH/bin else: \ - IDE_LIBEXEC_PATH = $$IDE_OUTPUT_PATH/libexec/qtcreator + IDE_LIBEXEC_PATH = $$IDE_OUTPUT_PATH/libexec/nxtcamview5 !isEqual(IDE_SOURCE_TREE, $$IDE_OUTPUT_PATH):copydata = 1 - LINK_LIBRARY_PATH = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator + LINK_LIBRARY_PATH = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/nxtcamview5 LINK_PLUGIN_PATH = $$LINK_LIBRARY_PATH/plugins - INSTALL_LIBRARY_PATH = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator + INSTALL_LIBRARY_PATH = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/nxtcamview5 INSTALL_PLUGIN_PATH = $$INSTALL_LIBRARY_PATH/plugins win32: \ INSTALL_LIBEXEC_PATH = $$QTC_PREFIX/bin else: \ - INSTALL_LIBEXEC_PATH = $$QTC_PREFIX/libexec/qtcreator - INSTALL_DATA_PATH = $$QTC_PREFIX/share/qtcreator - INSTALL_DOC_PATH = $$QTC_PREFIX/share/doc/qtcreator + INSTALL_LIBEXEC_PATH = $$QTC_PREFIX/libexec/nxtcamview5 + INSTALL_DATA_PATH = $$QTC_PREFIX/share/nxtcamview5 + INSTALL_DOC_PATH = $$QTC_PREFIX/share/doc/nxtcamview5 INSTALL_BIN_PATH = $$QTC_PREFIX/bin } diff --git a/qt-creator/qtcreator.pro b/qt-creator/qtcreator.pro index 13eebef..0bf4385 100644 --- a/qt-creator/qtcreator.pro +++ b/qt-creator/qtcreator.pro @@ -106,12 +106,12 @@ macx { #OPENMV-DIFF# #APPBUNDLE = "$$OUT_PWD/bin/Qt Creator.app" #OPENMV-DIFF# - APPBUNDLE = "$$OUT_PWD/bin/OpenMV IDE.app" + APPBUNDLE = "$$OUT_PWD/bin/NXTCamView5.app" #OPENMV-DIFF# #OPENMV-DIFF# #BINDIST_SOURCE = "$$OUT_PWD/bin/Qt Creator.app" #OPENMV-DIFF# - BINDIST_SOURCE = "$$OUT_PWD/bin/OpenMV IDE.app" + BINDIST_SOURCE = "$$OUT_PWD/bin/NXTCamView5.app" #OPENMV-DIFF# BINDIST_INSTALLER_SOURCE = $$BINDIST_SOURCE deployqt.commands = $$PWD/scripts/deployqtHelper_mac.sh \"$${APPBUNDLE}\" \"$$[QT_INSTALL_TRANSLATIONS]\" \"$$[QT_INSTALL_PLUGINS]\" \"$$[QT_INSTALL_IMPORTS]\" \"$$[QT_INSTALL_QML]\" diff --git a/qt-creator/qtcreator.qbs b/qt-creator/qtcreator.qbs index 7bcc6ce..2906db1 100644 --- a/qt-creator/qtcreator.qbs +++ b/qt-creator/qtcreator.qbs @@ -40,7 +40,7 @@ Project { } property string ide_data_path: qbs.targetOS.contains("osx") ? ide_app_target + ".app/Contents/Resources" - : "share/qtcreator" + : "share/nxtcamview5" property string ide_libexec_path: qbs.targetOS.contains("osx") ? ide_data_path : qbs.targetOS.contains("windows") ? ide_app_path diff --git a/qt-creator/scripts/deployqtHelper_mac.sh b/qt-creator/scripts/deployqtHelper_mac.sh old mode 100644 new mode 100755 diff --git a/qt-creator/scripts/makedmg.sh b/qt-creator/scripts/makedmg.sh old mode 100644 new mode 100755 index 585246e..cb07d5f --- a/qt-creator/scripts/makedmg.sh +++ b/qt-creator/scripts/makedmg.sh @@ -33,7 +33,7 @@ finalDMGName="$2" #OPENMV-DIFF# #title="Qt Creator" #OPENMV-DIFF# -title="OpenMV IDE" +title="NXTCamView5" #OPENMV-DIFF# echo Preparing image artifacts... diff --git a/qt-creator/src/app/Info.plist b/qt-creator/src/app/Info.plist new file mode 100644 index 0000000..31348bf --- /dev/null +++ b/qt-creator/src/app/Info.plist @@ -0,0 +1,28 @@ + + + + + NSPrincipalClass + NSApplication + NSSupportsAutomaticGraphicsSwitching + + NSHumanReadableCopyright + (C) 2017 mindsensors.com + CFBundleIconFile + @ICON@ + CFBundlePackageType + APPL + CFBundleSignature + ???? + CFBundleExecutable + @EXECUTABLE@ + CFBundleIdentifier + @BUNDLEIDENTIFIER@ + CFBundleVersion + @FULL_VERSION@ + CFBundleShortVersionString + @SHORT_VERSION@ + LSMinimumSystemVersion + 10.7.0 + + diff --git a/qt-creator/src/app/app.pro b/qt-creator/src/app/app.pro index 4d82dfb..a04f17c 100644 --- a/qt-creator/src/app/app.pro +++ b/qt-creator/src/app/app.pro @@ -5,7 +5,7 @@ TEMPLATE = app CONFIG += qtc_runnable TARGET = $$IDE_APP_TARGET DESTDIR = $$IDE_APP_PATH -VERSION = $$QTCREATOR_VERSION +VERSION = $$NXTCAMVIEW_VERSION QT -= testlib HEADERS += ../tools/qtcreatorcrashhandler/crashhandlersetup.h @@ -45,6 +45,7 @@ win32 { #OPENMV-DIFF# ICON = ../../../nxtcamview-media/icons/nxtcamview-icon/nxtcamview.icns #OPENMV-DIFF# + QMAKE_TARGET_BUNDLE_PREFIX = com.mindsensors QMAKE_INFO_PLIST = Info.plist } else { target.path = $$INSTALL_BIN_PATH diff --git a/qt-creator/src/app/main.cpp b/qt-creator/src/app/main.cpp index 8d626f7..d1414a9 100644 --- a/qt-creator/src/app/main.cpp +++ b/qt-creator/src/app/main.cpp @@ -224,7 +224,7 @@ static inline QStringList getPluginPaths() pluginPath = rootDirPath; pluginPath += QLatin1Char('/'); pluginPath += QLatin1String(IDE_LIBRARY_BASENAME); - pluginPath += QLatin1String("/qtcreator/plugins"); + pluginPath += QLatin1String("/nxtcamview5/plugins"); rc.push_back(pluginPath); } // 3) /plugins/ @@ -239,7 +239,7 @@ static inline QStringList getPluginPaths() pluginPath += QLatin1Char('/') + QLatin1String(Core::Constants::IDE_SETTINGSVARIANT_STR) + QLatin1Char('/'); - pluginPath += QLatin1String(Utils::HostOsInfo::isMacHost() ? "Qt Creator" : "qtcreator"); + pluginPath += QLatin1String(Utils::HostOsInfo::isMacHost() ? "NXTCamView5" : "nxtcamview5"); pluginPath += QLatin1String("/plugins/"); pluginPath += QLatin1String(Core::Constants::IDE_VERSION_LONG); rc.push_back(pluginPath); @@ -301,7 +301,7 @@ static inline QSettings *userSettings() } static const char *SHARE_PATH = - Utils::HostOsInfo::isMacHost() ? "/../Resources" : "/../share/qtcreator"; + Utils::HostOsInfo::isMacHost() ? "/../Resources" : "/../share/nxtcamview5"; int main(int argc, char **argv) { diff --git a/qt-creator/src/app/old_Info.plist b/qt-creator/src/app/old_Info.plist deleted file mode 100644 index 8772259..0000000 --- a/qt-creator/src/app/old_Info.plist +++ /dev/null @@ -1,258 +0,0 @@ - - - - - UTExportedTypeDeclarations - - - UTTypeIconFile - profile.icns - UTTypeDescription - Qt Creator Makefile Based Project File - UTTypeConformsTo - - public.plain-text - - UTTypeIdentifier - org.qt-project.qtcreator-genericproject - UTTypeTagSpecification - - public.filename-extension - - creator - - - - - UTTypeIconFile - profile.icns - UTTypeDescription - Quick Project File - UTTypeConformsTo - - public.plain-text - org.qt-project.qml - - UTTypeIdentifier - org.qt-project.qtcreator-qmlproject - UTTypeTagSpecification - - public.filename-extension - - qmlproject - - - - - UTImportedTypeDeclarations - - - UTTypeIconFile - profile.icns - UTTypeDescription - Qt Project File - UTTypeConformsTo - - public.source-code - - UTTypeIdentifier - org.qt-project.pro - UTTypeTagSpecification - - public.filename-extension - - pro - - - - - UTTypeIconFile - prifile.icns - UTTypeDescription - Qt Project Include File - UTTypeConformsTo - - public.source-code - - UTTypeIdentifier - org.qt-project.pri - UTTypeTagSpecification - - public.filename-extension - - pri - prf - - - - - UTTypeIconFile - profile.icns - UTTypeDescription - Qbs Project File - UTTypeConformsTo - - public.source-code - - UTTypeIdentifier - org.qt-project.qbs - UTTypeTagSpecification - - public.filename-extension - - qbs - - - - - UTTypeDescription - Qt Resource File - UTTypeConformsTo - - public.source-code - public.xml - - UTTypeIdentifier - org.qt-project.qrc - UTTypeTagSpecification - - public.filename-extension - - qrc - - - - - UTTypeDescription - Qt UI File - UTTypeConformsTo - - public.source-code - public.xml - - UTTypeIdentifier - org.qt-project.ui - UTTypeTagSpecification - - public.filename-extension - - ui - - - - - UTTypeDescription - Qt Markup Language - UTTypeConformsTo - - public.source-code - - UTTypeIdentifier - org.qt-project.qml - UTTypeTagSpecification - - public.filename-extension - - qml - - - - - UTTypeDescription - Qt Documentation - UTTypeConformsTo - - public.source-code - - UTTypeIdentifier - org.qt-project.qdoc - UTTypeTagSpecification - - public.filename-extension - - qdoc - - - - - UTTypeDescription - Qt Documentation Configuration - UTTypeConformsTo - - public.source-code - - UTTypeIdentifier - org.qt-project.qdocconf - UTTypeTagSpecification - - public.filename-extension - - qdocconf - - - - - NSPrincipalClass - NSApplication - NSSupportsAutomaticGraphicsSwitching - - CFBundleDocumentTypes - - - CFBundleTypeRole - Editor - LSHandlerRank - Default - LSItemContentTypes - - org.qt-project.pro - org.qt-project.pri - org.qt-project.qbs - org.qt-project.qrc - org.qt-project.ui - org.qt-project.qml - org.qt-project.qdoc - org.qt-project.qdocconf - org.qt-project.qtcreator-genericproject - org.qt-project.qtcreator-qmlproject - - - - CFBundleTypeRole - Editor - LSItemContentTypes - - public.c-source - public.objective-c-source - public.c-plus-plus-source - public.objective-c-plus-plus-source - public.c-header - public.c-plus-plus-header - com.sun.java-source - com.netscape.javascript-source - public.python-script - public.plain-text - com.apple.nspboard-type - - - - NSHumanReadableCopyright - (C) 2016 The Qt Company Ltd - CFBundleIconFile - qtcreator - CFBundlePackageType - APPL - CFBundleSignature - ???? - CFBundleExecutable - Qt Creator - CFBundleIdentifier - org.qt-project.qtcreator - CFBundleVersion - @FULL_VERSION@ - CFBundleShortVersionString - @SHORT_VERSION@ - LSMinimumSystemVersion - 10.7.0 - - diff --git a/qt-creator/src/plugins/coreplugin/coreplugin.pro b/qt-creator/src/plugins/coreplugin/coreplugin.pro index 5b376c0..1dab81e 100644 --- a/qt-creator/src/plugins/coreplugin/coreplugin.pro +++ b/qt-creator/src/plugins/coreplugin/coreplugin.pro @@ -256,8 +256,8 @@ else:unix { #OPENMV-DIFF# #eval(image$${imagesize}.files = images/logo/$${imagesize}/QtProject-qtcreator.png) #OPENMV-DIFF# - eval(image$${imagesize}.extra = mkdir -p $$OUT_PWD/../../../install/share/icons/hicolor/$${imagesize}x$${imagesize}/apps && cp $$PWD/../../../../nxtcamview-media/icons/nxtcamview-icon/nxtcamview$${imagesize}x$${imagesize}.png $$OUT_PWD/../../../install/share/icons/hicolor/$${imagesize}x$${imagesize}/apps/NXTCamView-nxtcamview.png) - eval(image$${imagesize}.files = $$OUT_PWD/../../../install/share/icons/hicolor/$${imagesize}x$${imagesize}/apps/NXTCamView-nxtcamview.png) + eval(image$${imagesize}.extra = cp $$PWD/../../../../nxtcamview-media/icons/nxtcamview-icon/nxtcamview$${imagesize}x$${imagesize}.png \ + $(INSTALL_ROOT)/share/icons/hicolor/$${imagesize}x$${imagesize}/apps/nxtcamview5.png) #OPENMV-DIFF# eval(image$${imagesize}.path = $$QTC_PREFIX/share/icons/hicolor/$${imagesize}x$${imagesize}/apps) INSTALLS += image$${imagesize} diff --git a/qt-creator/src/plugins/coreplugin/icore.cpp b/qt-creator/src/plugins/coreplugin/icore.cpp index 5278a1e..2b3309f 100644 --- a/qt-creator/src/plugins/coreplugin/icore.cpp +++ b/qt-creator/src/plugins/coreplugin/icore.cpp @@ -398,15 +398,15 @@ QString ICore::userInterfaceLanguage() QString ICore::resourcePath() { const QString sharePath = QLatin1String(Utils::HostOsInfo::isMacHost() - ? "/../Resources" : "/../share/qtcreator"); + ? "/../Resources" : "/../share/nxtcamview5"); return QDir::cleanPath(QCoreApplication::applicationDirPath() + sharePath); } QString ICore::userResourcePath() { - // Create qtcreator dir if it doesn't yet exist + // Create nxtcamview5 dir if it doesn't yet exist const QString configDir = QFileInfo(settings(QSettings::UserScope)->fileName()).path(); - const QString urp = configDir + QLatin1String("/qtcreator"); + const QString urp = configDir + QLatin1String("/nxtcamview5"); if (!QFileInfo::exists(urp + QLatin1Char('/'))) { QDir dir; @@ -420,7 +420,7 @@ QString ICore::userResourcePath() QString ICore::documentationPath() { const QString docPath = QLatin1String(Utils::HostOsInfo::isMacHost() - ? "/../Resources/doc" : "/../share/doc/qtcreator"); + ? "/../Resources/doc" : "/../share/doc/nxtcamview5"); return QDir::cleanPath(QCoreApplication::applicationDirPath() + docPath); } @@ -441,7 +441,7 @@ QString ICore::libexecPath() case Utils::OsTypeLinux: case Utils::OsTypeOtherUnix: case Utils::OsTypeOther: - path = QCoreApplication::applicationDirPath() + QLatin1String("/../libexec/qtcreator"); + path = QCoreApplication::applicationDirPath() + QLatin1String("/../libexec/nxtcamview5"); break; } return QDir::cleanPath(path); diff --git a/qt-creator/src/plugins/openmv/histogram/openmvpluginhistogram.cpp b/qt-creator/src/plugins/openmv/histogram/openmvpluginhistogram.cpp index 482a4fd..65c2bbc 100644 --- a/qt-creator/src/plugins/openmv/histogram/openmvpluginhistogram.cpp +++ b/qt-creator/src/plugins/openmv/histogram/openmvpluginhistogram.cpp @@ -1103,7 +1103,7 @@ void OpenMVPluginHistogram::writeColorMap() char msg[200]; bool b; QString defaultsPath = QDir::cleanPath(QCoreApplication::applicationDirPath() - + QLatin1String( "/../share/qtcreator/examples/NXTCamv5-defaults/")); + + QLatin1String( "/../share/nxtcamview5/examples/NXTCamv5-defaults/")); if ( m_working == false ) { diff --git a/qt-creator/src/plugins/openmv/openmvplugin.cpp b/qt-creator/src/plugins/openmv/openmvplugin.cpp index 28f0322..6852f15 100644 --- a/qt-creator/src/plugins/openmv/openmvplugin.cpp +++ b/qt-creator/src/plugins/openmv/openmvplugin.cpp @@ -1190,7 +1190,7 @@ void OpenMVPlugin::extensionsInitialized() Core::IEditor *editor = Core::EditorManager::currentEditor(); if(editor ? (editor->document() ? editor->document()->contents().isEmpty() : true) : true) { - QString filePath = Core::ICore::userResourcePath() + QStringLiteral("/examples/01-Basics/NXTCam5_default.py"); + QString filePath = Core::ICore::resourcePath() + QStringLiteral("/examples/01-Basics/NXTCam5_default.py"); QFile file(filePath); @@ -2550,9 +2550,6 @@ void OpenMVPlugin::restoreDefaults() bool scriptStatus = false; int freeSize; - QString defaultsPath = QDir::cleanPath(QCoreApplication::applicationDirPath() - + QLatin1String( "/../share/qtcreator/examples/NXTCamv5-defaults/")); - logLine(QStringLiteral("Restore Defaults clicked...\n")); QSettings *settings = ExtensionSystem::PluginManager::settings(); @@ -2575,7 +2572,7 @@ void OpenMVPlugin::restoreDefaults() return; } - //QString filePath = Core::ICore::userResourcePath() + QStringLiteral("/examples/NXTCamv5-defaults/"); + QString defaultsPath = Core::ICore::resourcePath() + QStringLiteral("/examples/NXTCamv5-defaults/"); QDir dir(defaultsPath); // Check if folder exists, if not, it's a installation error. // If the folder exists, copy all files from this folder to NXTCam. diff --git a/qt-creator/src/rpath.pri b/qt-creator/src/rpath.pri index 0d8911a..88c0fbd 100644 --- a/qt-creator/src/rpath.pri +++ b/qt-creator/src/rpath.pri @@ -5,7 +5,7 @@ macx { # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var QMAKE_RPATHDIR += \$\$ORIGIN QMAKE_RPATHDIR += \$\$ORIGIN/.. - QMAKE_RPATHDIR += \$\$ORIGIN/../$$IDE_LIBRARY_BASENAME/qtcreator + QMAKE_RPATHDIR += \$\$ORIGIN/../$$IDE_LIBRARY_BASENAME/nxtcamview5 IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":") QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\' diff --git a/qt-creator/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro b/qt-creator/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro index 89a7026..8238467 100644 --- a/qt-creator/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro +++ b/qt-creator/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro @@ -18,7 +18,7 @@ linux-*||win32 { QTC_LIBS=$$dirname(OUT_PWD) QTC_LIBS=$$dirname(QTC_LIBS) QTC_LIBS=$$dirname(QTC_LIBS) - QTC_LIBS=$$QTC_LIBS/$$IDE_LIBRARY_BASENAME/qtcreator + QTC_LIBS=$$QTC_LIBS/$$IDE_LIBRARY_BASENAME/nxtcamview5 } linux-*{