From c3ad09446bcf06c7715f27a3e290c25226063de9 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 16 Apr 2013 17:39:03 +0200 Subject: [PATCH] Qt4PM: Move icons and mimetypes into QtSupport Change-Id: I285b30d71951ad849e31c56daaa8d162a8efea9f Reviewed-by: Daniel Teske --- .../Qt4ProjectManager.mimetypes.xml | 5 ----- .../qt4projectmanager/profileeditorfactory.cpp | 7 ++++--- src/plugins/qt4projectmanager/qt4nodes.cpp | 8 ++++---- src/plugins/qt4projectmanager/qt4projectmanager.qbs | 3 --- src/plugins/qt4projectmanager/qt4projectmanager.qrc | 4 ---- .../qt4projectmanager/qt4projectmanagerconstants.h | 1 - .../qt4projectmanager/wizards/mobileappwizard.cpp | 4 +--- src/plugins/qtsupport/QtSupport.mimetypes.xml | 8 ++++++++ .../images/forms.png | Bin .../{qt4projectmanager => qtsupport}/images/qml.png | Bin .../images/qt_project.png | Bin .../images/qt_qrc.png | Bin src/plugins/qtsupport/qtsupport.pro | 6 ++++++ src/plugins/qtsupport/qtsupport.qbs | 7 +++++++ src/plugins/qtsupport/qtsupport.qrc | 9 +++++++++ src/plugins/qtsupport/qtsupportconstants.h | 2 ++ src/plugins/qtsupport/qtsupportplugin.cpp | 4 ++++ 17 files changed, 45 insertions(+), 23 deletions(-) create mode 100644 src/plugins/qtsupport/QtSupport.mimetypes.xml rename src/plugins/{qt4projectmanager => qtsupport}/images/forms.png (100%) rename src/plugins/{qt4projectmanager => qtsupport}/images/qml.png (100%) rename src/plugins/{qt4projectmanager => qtsupport}/images/qt_project.png (100%) rename src/plugins/{qt4projectmanager => qtsupport}/images/qt_qrc.png (100%) create mode 100644 src/plugins/qtsupport/qtsupport.qrc diff --git a/src/plugins/qt4projectmanager/Qt4ProjectManager.mimetypes.xml b/src/plugins/qt4projectmanager/Qt4ProjectManager.mimetypes.xml index 1730d1ffc0c..39b1d71cbbe 100644 --- a/src/plugins/qt4projectmanager/Qt4ProjectManager.mimetypes.xml +++ b/src/plugins/qt4projectmanager/Qt4ProjectManager.mimetypes.xml @@ -15,9 +15,4 @@ Qt Project feature file - - - message catalog - - diff --git a/src/plugins/qt4projectmanager/profileeditorfactory.cpp b/src/plugins/qt4projectmanager/profileeditorfactory.cpp index 20ddbfa6211..bb2c8323d1b 100644 --- a/src/plugins/qt4projectmanager/profileeditorfactory.cpp +++ b/src/plugins/qt4projectmanager/profileeditorfactory.cpp @@ -33,6 +33,7 @@ #include "qt4projectmanagerconstants.h" #include "profileeditor.h" +#include #include #include @@ -49,11 +50,11 @@ ProFileEditorFactory::ProFileEditorFactory(Qt4Manager *manager, TextEditor::Text m_actionHandler(handler) { Core::FileIconProvider *iconProvider = Core::FileIconProvider::instance(); - iconProvider->registerIconOverlayForSuffix(QIcon(QLatin1String(Constants::ICON_QT_PROJECT)), + iconProvider->registerIconOverlayForSuffix(QIcon(QLatin1String(QtSupport::Constants::ICON_QT_PROJECT)), QLatin1String("pro")); - iconProvider->registerIconOverlayForSuffix(QIcon(QLatin1String(Constants::ICON_QT_PROJECT)), + iconProvider->registerIconOverlayForSuffix(QIcon(QLatin1String(QtSupport::Constants::ICON_QT_PROJECT)), QLatin1String("pri")); - iconProvider->registerIconOverlayForSuffix(QIcon(QLatin1String(Constants::ICON_QT_PROJECT)), + iconProvider->registerIconOverlayForSuffix(QIcon(QLatin1String(QtSupport::Constants::ICON_QT_PROJECT)), QLatin1String("prf")); } diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp index 2c7506dd1a6..a5c2cb82a4f 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.cpp +++ b/src/plugins/qt4projectmanager/qt4nodes.cpp @@ -86,13 +86,13 @@ static const FileTypeDataStorage fileTypeDataStorage[] = { ":/qt4projectmanager/images/sources.png" }, { ProjectExplorer::FormType, QT_TRANSLATE_NOOP("Qt4ProjectManager::Qt4PriFileNode", "Forms"), - ":/qt4projectmanager/images/forms.png" }, + ":/qtsupport/images/forms.png" }, { ProjectExplorer::ResourceType, QT_TRANSLATE_NOOP("Qt4ProjectManager::Qt4PriFileNode", "Resources"), - ":/qt4projectmanager/images/qt_qrc.png" }, + ":/qtsupport/images/qt_qrc.png" }, { ProjectExplorer::QMLType, QT_TRANSLATE_NOOP("Qt4ProjectManager::Qt4PriFileNode", "QML"), - ":/qt4projectmanager/images/qml.png" }, + ":/qtsupport/images/qml.png" }, { ProjectExplorer::UnknownFileType, QT_TRANSLATE_NOOP("Qt4ProjectManager::Qt4PriFileNode", "Other files"), ":/qt4projectmanager/images/unknown.png" } @@ -146,7 +146,7 @@ Qt4NodeStaticData::Qt4NodeStaticData() desc, folderIcon)); } // Project icon - const QIcon projectBaseIcon(QLatin1String(":/qt4projectmanager/images/qt_project.png")); + const QIcon projectBaseIcon(QLatin1String(":/qtsupport/images/qt_project.png")); const QPixmap projectPixmap = Core::FileIconProvider::overlayIcon(QStyle::SP_DirIcon, projectBaseIcon, desiredSize); diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.qbs b/src/plugins/qt4projectmanager/qt4projectmanager.qbs index 2e03a379472..a03e41e022b 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanager.qbs +++ b/src/plugins/qt4projectmanager/qt4projectmanager.qbs @@ -111,10 +111,7 @@ QtcPlugin { "customwidgetwizard/plugingenerator.cpp", "customwidgetwizard/plugingenerator.h", "customwidgetwizard/pluginoptions.h", - "images/forms.png", "images/headers.png", - "images/qt_project.png", - "images/qt_qrc.png", "images/run_qmake.png", "images/run_qmake_small.png", "images/sources.png", diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.qrc b/src/plugins/qt4projectmanager/qt4projectmanager.qrc index 130651d4677..da22ca50ece 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanager.qrc +++ b/src/plugins/qt4projectmanager/qt4projectmanager.qrc @@ -2,13 +2,9 @@ images/run_qmake.png images/run_qmake_small.png - images/qt_project.png Qt4ProjectManager.mimetypes.xml - images/forms.png images/headers.png - images/qt_qrc.png images/sources.png images/unknown.png - images/qml.png diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h index 6be88403786..a157370557b 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h +++ b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h @@ -83,7 +83,6 @@ const char MAEMO_TOOLCHAIN_ID[] = "Qt4ProjectManager.ToolChain.Maemo"; const char RVCT_TOOLCHAIN_ID[] = "Qt4ProjectManager.ToolChain.RVCT"; // ICONS -const char ICON_QT_PROJECT[] = ":/qt4projectmanager/images/qt_project.png"; const char ICON_QTQUICK_APP[] = ":/wizards/images/qtquickapp.png"; const char ICON_HTML5_APP[] = ":/wizards/images/html5app.png"; diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp b/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp index bac306b5639..6e07436214b 100644 --- a/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/mobileappwizard.cpp @@ -31,10 +31,8 @@ #include "mobileapp.h" #include "targetsetuppage.h" -#include "qt4projectmanagerconstants.h" #include - #include #include @@ -98,7 +96,7 @@ Core::FeatureSet MobileAppWizard::requiredFeatures() const Core::BaseFileWizardParameters MobileAppWizard::parameters() { Core::BaseFileWizardParameters parameters(ProjectWizard); - parameters.setIcon(QIcon(QLatin1String(Constants::ICON_QT_PROJECT))); + parameters.setIcon(QIcon(QLatin1String(QtSupport::Constants::ICON_QT_PROJECT))); parameters.setDisplayName(DisplayName); parameters.setId(QLatin1String("C.Qt4GuiMobile")); parameters.setDescription(Description); diff --git a/src/plugins/qtsupport/QtSupport.mimetypes.xml b/src/plugins/qtsupport/QtSupport.mimetypes.xml new file mode 100644 index 00000000000..8737bdfbabc --- /dev/null +++ b/src/plugins/qtsupport/QtSupport.mimetypes.xml @@ -0,0 +1,8 @@ + + + + + message catalog + + + diff --git a/src/plugins/qt4projectmanager/images/forms.png b/src/plugins/qtsupport/images/forms.png similarity index 100% rename from src/plugins/qt4projectmanager/images/forms.png rename to src/plugins/qtsupport/images/forms.png diff --git a/src/plugins/qt4projectmanager/images/qml.png b/src/plugins/qtsupport/images/qml.png similarity index 100% rename from src/plugins/qt4projectmanager/images/qml.png rename to src/plugins/qtsupport/images/qml.png diff --git a/src/plugins/qt4projectmanager/images/qt_project.png b/src/plugins/qtsupport/images/qt_project.png similarity index 100% rename from src/plugins/qt4projectmanager/images/qt_project.png rename to src/plugins/qtsupport/images/qt_project.png diff --git a/src/plugins/qt4projectmanager/images/qt_qrc.png b/src/plugins/qtsupport/images/qt_qrc.png similarity index 100% rename from src/plugins/qt4projectmanager/images/qt_qrc.png rename to src/plugins/qtsupport/images/qt_qrc.png diff --git a/src/plugins/qtsupport/qtsupport.pro b/src/plugins/qtsupport/qtsupport.pro index 8e2f5a83aa3..9ce54d9515d 100644 --- a/src/plugins/qtsupport/qtsupport.pro +++ b/src/plugins/qtsupport/qtsupport.pro @@ -60,3 +60,9 @@ FORMS += \ qtversioninfo.ui \ debugginghelper.ui \ qtversionmanager.ui \ + +RESOURCES += \ + qtsupport.qrc + +OTHER_FILES += \ + QtSupport.mimetypes.xml diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs index d38f0c47f63..df1b1e5fd8a 100644 --- a/src/plugins/qtsupport/qtsupport.qbs +++ b/src/plugins/qtsupport/qtsupport.qbs @@ -56,6 +56,7 @@ QtcPlugin { "baseqtversion.h", "qtconfigwidget.cpp", "qtconfigwidget.h", + "qtsupport.qrc", "customexecutableconfigurationwidget.cpp", "customexecutableconfigurationwidget.h", "customexecutablerunconfiguration.cpp", @@ -101,8 +102,14 @@ QtcPlugin { "screenshotcropper.cpp", "screenshotcropper.h", "showbuildlog.ui", + "images/forms.png", + "images/qml.png", + "images/qt_project.png", + "images/qt_qrc.png", + "QtSupport.mimetypes.xml", ] + ProductModule { Depends { name: "cpp" } cpp.includePaths: "../../shared" diff --git a/src/plugins/qtsupport/qtsupport.qrc b/src/plugins/qtsupport/qtsupport.qrc new file mode 100644 index 00000000000..351b1291348 --- /dev/null +++ b/src/plugins/qtsupport/qtsupport.qrc @@ -0,0 +1,9 @@ + + + images/forms.png + images/qml.png + images/qt_project.png + images/qt_qrc.png + QtSupport.mimetypes.xml + + diff --git a/src/plugins/qtsupport/qtsupportconstants.h b/src/plugins/qtsupport/qtsupportconstants.h index d4a62c3ea4c..ff4479d395a 100644 --- a/src/plugins/qtsupport/qtsupportconstants.h +++ b/src/plugins/qtsupport/qtsupportconstants.h @@ -77,6 +77,8 @@ const char ANDROID_PLATFORM_TR[] = QT_TRANSLATE_NOOP("QtSupport", "Android"); // so we define the icon here const char QML_WIZARD_ICON[] = ":/qmlproject/images/qml_wizard.png"; +const char ICON_QT_PROJECT[] = ":/qtsupport/images/qt_project.png"; + } // namepsace Constants } // namepsace QtSupport diff --git a/src/plugins/qtsupport/qtsupportplugin.cpp b/src/plugins/qtsupport/qtsupportplugin.cpp index d7ad25f6465..964d969c19d 100644 --- a/src/plugins/qtsupport/qtsupportplugin.cpp +++ b/src/plugins/qtsupport/qtsupportplugin.cpp @@ -39,6 +39,8 @@ #include "gettingstartedwelcomepage.h" +#include +#include #include #include #include @@ -60,6 +62,8 @@ bool QtSupportPlugin::initialize(const QStringList &arguments, QString *errorMes ProFileEvaluator::initialize(); new ProFileCacheManager(this); + if (!Core::ICore::mimeDatabase()->addMimeTypes(QLatin1String(":qtsupport/QtSupport.mimetypes.xml"), errorMessage)) + return false; QtVersionManager *mgr = new QtVersionManager; addAutoReleasedObject(mgr);