diff options
37 files changed, 75 insertions, 22 deletions
diff --git a/share/qtcreator/templates/wizards/qml-runtime/lib.png b/share/qtcreator/templates/wizards/qml-runtime/lib.png Binary files differnew file mode 100644 index 0000000000..a4e818d986 --- /dev/null +++ b/share/qtcreator/templates/wizards/qml-runtime/lib.png diff --git a/share/qtcreator/templates/wizards/qml-runtime/wizard.xml b/share/qtcreator/templates/wizards/qml-runtime/wizard.xml index 4f7576f445..5800b8ef5d 100644 --- a/share/qtcreator/templates/wizards/qml-runtime/wizard.xml +++ b/share/qtcreator/templates/wizards/qml-runtime/wizard.xml @@ -37,6 +37,7 @@ leave room for the Qt 4 target page. <wizard version="1" kind="project" class="qt4project" firstpage="10" id="QmlRuntimePlugin" category="F.Projects"> + <icon>lib.png</icon> <description>Creates a C++ plugin to extend the funtionality of the QML runtime.</description> <displayname>QML Runtime Plug-in</displayname> <displaycategory>QML Runtime Plug-in</displaycategory> diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index a38f9d148c..20e9cfb9a8 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -59,5 +59,11 @@ <file>images/darkclose.png</file> <file>images/arrowdown.png</file> <file>images/arrowup.png</file> + <file>images/category_fakevim.png</file> + <file>images/category_locator.png</file> + <file>images/category_cpaster.png</file> + <file>images/category_cpp.png</file> + <file>images/category_vcs.png</file> + <file>images/category_qml.png</file> </qresource> </RCC> diff --git a/src/plugins/coreplugin/dialogs/newdialog.cpp b/src/plugins/coreplugin/dialogs/newdialog.cpp index 823f306b3e..75170a4de1 100644 --- a/src/plugins/coreplugin/dialogs/newdialog.cpp +++ b/src/plugins/coreplugin/dialogs/newdialog.cpp @@ -50,6 +50,8 @@ Q_DECLARE_METATYPE(Core::IWizard*) namespace { +const int ICON_SIZE = 22; + class TwoLevelProxyModel : public QAbstractProxyModel { // Q_OBJECT @@ -166,7 +168,7 @@ NewDialog::NewDialog(QWidget *parent) : m_ui->templateCategoryView->setEditTriggers(QAbstractItemView::NoEditTriggers); m_ui->templateCategoryView->setItemDelegate(new FancyTopLevelDelegate); - m_ui->templatesView->setIconSize(QSize(22, 22)); + m_ui->templatesView->setIconSize(QSize(ICON_SIZE, ICON_SIZE)); connect(m_ui->templateCategoryView, SIGNAL(clicked(const QModelIndex&)), this, SLOT(currentCategoryChanged(const QModelIndex&))); @@ -218,7 +220,7 @@ void NewDialog::setWizards(QList<IWizard*> wizards) parentItem->appendRow(filesClassesKindItem); if (m_dummyIcon.isNull()) { - m_dummyIcon = QPixmap(22, 22); + m_dummyIcon = QPixmap(ICON_SIZE, ICON_SIZE); m_dummyIcon.fill(Qt::transparent); } @@ -251,10 +253,11 @@ void NewDialog::setWizards(QList<IWizard*> wizards) QIcon wizardIcon; // spacing hack. Add proper icons instead - if (wizard->icon().isNull()) + if (wizard->icon().isNull()) { wizardIcon = m_dummyIcon; - else + } else { wizardIcon = wizard->icon(); + } wizardItem->setIcon(wizardIcon); wizardItem->setData(QVariant::fromValue(wizard), Qt::UserRole); wizardItem->setFlags(Qt::ItemIsEnabled|Qt::ItemIsSelectable); diff --git a/src/plugins/coreplugin/images/category_core.png b/src/plugins/coreplugin/images/category_core.png Binary files differindex 89745b3bc7..aaa9464535 100644 --- a/src/plugins/coreplugin/images/category_core.png +++ b/src/plugins/coreplugin/images/category_core.png diff --git a/src/plugins/coreplugin/images/category_cpaster.png b/src/plugins/coreplugin/images/category_cpaster.png Binary files differnew file mode 100644 index 0000000000..eef221c830 --- /dev/null +++ b/src/plugins/coreplugin/images/category_cpaster.png diff --git a/src/plugins/coreplugin/images/category_cpp.png b/src/plugins/coreplugin/images/category_cpp.png Binary files differnew file mode 100644 index 0000000000..2a3408dae3 --- /dev/null +++ b/src/plugins/coreplugin/images/category_cpp.png diff --git a/src/plugins/coreplugin/images/category_debug.png b/src/plugins/coreplugin/images/category_debug.png Binary files differindex f8c040c744..5e74d867c0 100644 --- a/src/plugins/coreplugin/images/category_debug.png +++ b/src/plugins/coreplugin/images/category_debug.png diff --git a/src/plugins/coreplugin/images/category_design.png b/src/plugins/coreplugin/images/category_design.png Binary files differindex fb9203565e..5a4111a345 100644 --- a/src/plugins/coreplugin/images/category_design.png +++ b/src/plugins/coreplugin/images/category_design.png diff --git a/src/plugins/coreplugin/images/category_fakevim.png b/src/plugins/coreplugin/images/category_fakevim.png Binary files differnew file mode 100644 index 0000000000..92b03a3459 --- /dev/null +++ b/src/plugins/coreplugin/images/category_fakevim.png diff --git a/src/plugins/coreplugin/images/category_help.png b/src/plugins/coreplugin/images/category_help.png Binary files differindex 5cc973c531..7736b0a32d 100644 --- a/src/plugins/coreplugin/images/category_help.png +++ b/src/plugins/coreplugin/images/category_help.png diff --git a/src/plugins/coreplugin/images/category_locator.png b/src/plugins/coreplugin/images/category_locator.png Binary files differnew file mode 100644 index 0000000000..98aa5049a6 --- /dev/null +++ b/src/plugins/coreplugin/images/category_locator.png diff --git a/src/plugins/coreplugin/images/category_project.png b/src/plugins/coreplugin/images/category_project.png Binary files differindex 18d157e971..a29396b2f8 100644 --- a/src/plugins/coreplugin/images/category_project.png +++ b/src/plugins/coreplugin/images/category_project.png diff --git a/src/plugins/coreplugin/images/category_qml.png b/src/plugins/coreplugin/images/category_qml.png Binary files differnew file mode 100644 index 0000000000..131a4b381e --- /dev/null +++ b/src/plugins/coreplugin/images/category_qml.png diff --git a/src/plugins/coreplugin/images/category_qt.png b/src/plugins/coreplugin/images/category_qt.png Binary files differindex 3731d351d4..bbd4dc681e 100644 --- a/src/plugins/coreplugin/images/category_qt.png +++ b/src/plugins/coreplugin/images/category_qt.png diff --git a/src/plugins/coreplugin/images/category_texteditor.png b/src/plugins/coreplugin/images/category_texteditor.png Binary files differindex c4798e0414..bdde584db4 100644 --- a/src/plugins/coreplugin/images/category_texteditor.png +++ b/src/plugins/coreplugin/images/category_texteditor.png diff --git a/src/plugins/coreplugin/images/category_vcs.png b/src/plugins/coreplugin/images/category_vcs.png Binary files differnew file mode 100644 index 0000000000..2b04fa747d --- /dev/null +++ b/src/plugins/coreplugin/images/category_vcs.png diff --git a/src/plugins/coreplugin/images/mode_Design.png b/src/plugins/coreplugin/images/mode_Design.png Binary files differindex 0bda5e5b87..268376e5fe 100644 --- a/src/plugins/coreplugin/images/mode_Design.png +++ b/src/plugins/coreplugin/images/mode_Design.png diff --git a/src/plugins/coreplugin/images/mode_Reference.png b/src/plugins/coreplugin/images/mode_Reference.png Binary files differindex 0bc7bf23b3..7247e639eb 100644 --- a/src/plugins/coreplugin/images/mode_Reference.png +++ b/src/plugins/coreplugin/images/mode_Reference.png diff --git a/src/plugins/cpaster/codepastersettings.cpp b/src/plugins/cpaster/codepastersettings.cpp index 7c6b4d62df..759a33b409 100644 --- a/src/plugins/cpaster/codepastersettings.cpp +++ b/src/plugins/cpaster/codepastersettings.cpp @@ -79,7 +79,7 @@ QString CodePasterSettingsPage::displayCategory() const QIcon CodePasterSettingsPage::categoryIcon() const { - return QIcon(); // TODO: Add icon for code paster category + return QIcon(); } QWidget *CodePasterSettingsPage::createPage(QWidget *parent) diff --git a/src/plugins/cpaster/cpasterconstants.h b/src/plugins/cpaster/cpasterconstants.h index 31f84f263a..a76905a1f4 100644 --- a/src/plugins/cpaster/cpasterconstants.h +++ b/src/plugins/cpaster/cpasterconstants.h @@ -36,6 +36,7 @@ namespace CodePaster { namespace Constants { const char * const CPASTER_SETTINGS_CATEGORY = "X.CPaster"; const char * const CPASTER_SETTINGS_TR_CATEGORY = QT_TRANSLATE_NOOP("CodePaster", "Code Pasting"); +const char * const SETTINGS_CATEGORY_CPASTER_ICON = ":/core/images/category_cpaster.png"; } } diff --git a/src/plugins/cpaster/settingspage.cpp b/src/plugins/cpaster/settingspage.cpp index 2d16327da6..3d59b7ac07 100644 --- a/src/plugins/cpaster/settingspage.cpp +++ b/src/plugins/cpaster/settingspage.cpp @@ -106,7 +106,7 @@ QString SettingsPage::displayCategory() const QIcon SettingsPage::categoryIcon() const { - return QIcon(); // TODO: Icon for CodePaster + return QIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CPASTER_ICON)); } QWidget *SettingsPage::createPage(QWidget *parent) diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp index 2a10677cb3..b3833e016f 100644 --- a/src/plugins/cpptools/cppfilesettingspage.cpp +++ b/src/plugins/cpptools/cppfilesettingspage.cpp @@ -321,7 +321,7 @@ QString CppFileSettingsPage::displayCategory() const QIcon CppFileSettingsPage::categoryIcon() const { - return QIcon(); // TODO: Icon for C++ or move into category + return QIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CPP_ICON)); } QWidget *CppFileSettingsPage::createPage(QWidget *parent) diff --git a/src/plugins/cpptools/cpptoolsconstants.h b/src/plugins/cpptools/cpptoolsconstants.h index 514624c7be..791915f31c 100644 --- a/src/plugins/cpptools/cpptoolsconstants.h +++ b/src/plugins/cpptools/cpptoolsconstants.h @@ -54,6 +54,7 @@ const char * const CPP_SETTINGS_ID = "File Naming"; const char * const CPP_SETTINGS_NAME = QT_TRANSLATE_NOOP("CppTools", "File Naming"); const char * const CPP_SETTINGS_CATEGORY = "I.C++"; const char * const CPP_SETTINGS_TR_CATEGORY = QT_TRANSLATE_NOOP("CppTools", "C++"); +const char * const SETTINGS_CATEGORY_CPP_ICON = ":/core/images/category_cpp.png"; } // namespace Constants } // namespace CppTools diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index c560318b76..a698cb01aa 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -97,14 +97,15 @@ using namespace ProjectExplorer; namespace FakeVim { namespace Constants { -const char * const INSTALL_HANDLER = "TextEditor.FakeVimHandler"; -const char * const MINI_BUFFER = "TextEditor.FakeVimMiniBuffer"; -const char * const INSTALL_KEY = "Alt+V,Alt+V"; -const char * const SETTINGS_CATEGORY = "D.FakeVim"; -const char * const SETTINGS_ID = "A.General"; -const char * const SETTINGS_EX_CMDS_ID = "B.ExCommands"; -const char * const CMD_FILE_NEXT = "FakeVim.SwitchFileNext"; -const char * const CMD_FILE_PREV = "FakeVim.SwitchFilePrev"; +const char * const INSTALL_HANDLER = "TextEditor.FakeVimHandler"; +const char * const MINI_BUFFER = "TextEditor.FakeVimMiniBuffer"; +const char * const INSTALL_KEY = "Alt+V,Alt+V"; +const char * const SETTINGS_CATEGORY = "D.FakeVim"; +const char * const SETTINGS_CATEGORY_FAKEVIM_ICON = ":/core/images/category_fakevim.png"; +const char * const SETTINGS_ID = "A.General"; +const char * const SETTINGS_EX_CMDS_ID = "B.ExCommands"; +const char * const CMD_FILE_NEXT = "FakeVim.SwitchFileNext"; +const char * const CMD_FILE_PREV = "FakeVim.SwitchFilePrev"; } // namespace Constants } // namespace FakeVim @@ -131,7 +132,7 @@ public: QString displayName() const { return tr("General"); } QString category() const { return QLatin1String(Constants::SETTINGS_CATEGORY); } QString displayCategory() const { return tr("FakeVim"); } - QIcon categoryIcon() const { return QIcon(); } // TODO: Add an icon or move into another category + QIcon categoryIcon() const { return QIcon(QLatin1String(Constants::SETTINGS_CATEGORY_FAKEVIM_ICON)); } QWidget *createPage(QWidget *parent); void apply() { m_group.apply(ICore::instance()->settings()); } diff --git a/src/plugins/genericprojectmanager/genericprojectwizard.cpp b/src/plugins/genericprojectmanager/genericprojectwizard.cpp index 25eea3fb5a..b7f184e3e4 100644 --- a/src/plugins/genericprojectmanager/genericprojectwizard.cpp +++ b/src/plugins/genericprojectmanager/genericprojectwizard.cpp @@ -38,6 +38,11 @@ #include <QtGui/QIcon> +#include <QtGui/QApplication> +#include <QtGui/QStyle> +#include <QtGui/QPainter> +#include <QtGui/QPixmap> + #include <QtCore/QDir> #include <QtCore/QFileInfo> #include <QtCore/QtDebug> @@ -93,7 +98,14 @@ GenericProjectWizard::~GenericProjectWizard() Core::BaseFileWizardParameters GenericProjectWizard::parameters() { Core::BaseFileWizardParameters parameters(ProjectWizard); - parameters.setIcon(QIcon(QLatin1String(":/wizards/images/console.png"))); + // TODO do something about the ugliness of standard icons in sizes different than 16, 32, 64, 128 + { + QPixmap icon(22, 22); + icon.fill(Qt::transparent); + QPainter p(&icon); + p.drawPixmap(3, 3, 16, 16, qApp->style()->standardIcon(QStyle::SP_DirIcon).pixmap(16)); + parameters.setIcon(icon); + } parameters.setDisplayName(tr("Import Existing Project")); parameters.setId(QLatin1String("Z.Makefile")); parameters.setDescription(tr("Imports existing projects that do not use qmake or CMake. " diff --git a/src/plugins/locator/locatorconstants.h b/src/plugins/locator/locatorconstants.h index 74d40a146c..ffc5d1e27f 100644 --- a/src/plugins/locator/locatorconstants.h +++ b/src/plugins/locator/locatorconstants.h @@ -38,6 +38,7 @@ namespace Constants { const char * const FILTER_OPTIONS_PAGE = QT_TRANSLATE_NOOP("Locator", "Filters"); const char * const LOCATOR_CATEGORY = "G.Locator"; const char * const LOCATOR_TR_CATEGORY = QT_TRANSLATE_NOOP("Locator", "Locator"); +const char * const SETTINGS_CATEGORY_LOCATOR_ICON = ":/core/images/category_locator.png"; const char * const TASK_INDEX = "Locator.Task.Index"; } // namespace Constants diff --git a/src/plugins/locator/settingspage.cpp b/src/plugins/locator/settingspage.cpp index 1f913c144b..cc3e4383a0 100644 --- a/src/plugins/locator/settingspage.cpp +++ b/src/plugins/locator/settingspage.cpp @@ -71,7 +71,7 @@ QString SettingsPage::displayCategory() const QIcon SettingsPage::categoryIcon() const { - return QIcon(); // TODO: Icon for Locator + return QIcon(QLatin1String(Locator::Constants::SETTINGS_CATEGORY_LOCATOR_ICON)); } QWidget *SettingsPage::createPage(QWidget *parent) diff --git a/src/plugins/qmldesigner/qmldesignerconstants.h b/src/plugins/qmldesigner/qmldesignerconstants.h index d1880493bf..d2e14a5bc3 100644 --- a/src/plugins/qmldesigner/qmldesignerconstants.h +++ b/src/plugins/qmldesigner/qmldesignerconstants.h @@ -63,6 +63,8 @@ const char * const QML_ITEMSPACING_KEY = "ItemSpacing"; const char * const QML_SNAPMARGIN_KEY = "SnapMargin"; enum { QML_OPENDESIGNMODE_DEFAULT = 0 }; // 0 for text mode, 1 for design mode +const char * const SETTINGS_CATEGORY_QML_ICON = ":/core/images/category_qml.png"; + namespace Internal { enum { debug = 0 }; } diff --git a/src/plugins/qmldesigner/settingspage.cpp b/src/plugins/qmldesigner/settingspage.cpp index adc8d772be..c0275419dd 100644 --- a/src/plugins/qmldesigner/settingspage.cpp +++ b/src/plugins/qmldesigner/settingspage.cpp @@ -95,7 +95,7 @@ QString SettingsPage::displayCategory() const QIcon SettingsPage::categoryIcon() const { - return QIcon(); // TODO: Icon for QML or move into other category (Designer?) + return QIcon(QLatin1String(Constants::SETTINGS_CATEGORY_QML_ICON)); } QWidget *SettingsPage::createPage(QWidget *parent) diff --git a/src/plugins/qmlprojectmanager/images/qml_wizard.png b/src/plugins/qmlprojectmanager/images/qml_wizard.png Binary files differnew file mode 100644 index 0000000000..5355c80bf8 --- /dev/null +++ b/src/plugins/qmlprojectmanager/images/qml_wizard.png diff --git a/src/plugins/qmlprojectmanager/qmlproject.qrc b/src/plugins/qmlprojectmanager/qmlproject.qrc index 82f0873a09..21338b6a54 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.qrc +++ b/src/plugins/qmlprojectmanager/qmlproject.qrc @@ -3,5 +3,6 @@ <file>QmlProject.mimetypes.xml</file> <file>images/qmlfolder.png</file> <file>images/qmlproject.png</file> + <file>images/qml_wizard.png</file> </qresource> </RCC> diff --git a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp index 30215eb12d..4edc8857c2 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp @@ -35,6 +35,9 @@ #include <QtGui/QIcon> +#include <QtGui/QPainter> +#include <QtGui/QPixmap> + #include <QtCore/QTextStream> #include <QtCore/QCoreApplication> @@ -58,7 +61,14 @@ QmlProjectApplicationWizard::~QmlProjectApplicationWizard() Core::BaseFileWizardParameters QmlProjectApplicationWizard::parameters() { Core::BaseFileWizardParameters parameters(ProjectWizard); - parameters.setIcon(QIcon(QLatin1String(":/wizards/images/console.png"))); + // TODO: provide icons in correct size + { + QPixmap icon(22, 22); + icon.fill(Qt::transparent); + QPainter p(&icon); + p.drawPixmap(3, 3, 16, 16, QPixmap(QLatin1String(Constants::QML_WIZARD_ICON))); + parameters.setIcon(icon); + } parameters.setDisplayName(tr("Qt QML Application")); parameters.setId(QLatin1String("QA.QML Application")); parameters.setDescription(tr("Creates a Qt QML application project with a single QML file containing the main view.\n\n" diff --git a/src/plugins/qmlprojectmanager/qmlprojectconstants.h b/src/plugins/qmlprojectmanager/qmlprojectconstants.h index a92e15aa04..1fd04264a0 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectconstants.h +++ b/src/plugins/qmlprojectmanager/qmlprojectconstants.h @@ -53,6 +53,7 @@ const char *const TASK_CATEGORY_QML = "Task.Category.Qml"; const char * const QML_WIZARD_CATEGORY = "F.Projects"; // (after Qt) const char * const QML_WIZARD_TR_SCOPE = "QmlProjectManager"; const char * const QML_WIZARD_TR_CATEGORY = QT_TRANSLATE_NOOP("QmlProjectManager", "Qt Quick Project"); +const char * const QML_WIZARD_ICON = ":/qmlproject/images/qml_wizard.png"; // Env variables for inspector const char * const E_QML_DEBUG_SERVER_PORT = "QML_DEBUG_SERVER_PORT"; diff --git a/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp b/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp index b7165143d0..a8d1349ac7 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp @@ -40,6 +40,11 @@ #include <QtGui/QIcon> +#include <QtGui/QApplication> +#include <QtGui/QStyle> +#include <QtGui/QPainter> +#include <QtGui/QPixmap> + #include <QtCore/QDir> #include <QtCore/QtDebug> #include <QtCore/QCoreApplication> @@ -100,7 +105,14 @@ QmlProjectImportWizard::~QmlProjectImportWizard() Core::BaseFileWizardParameters QmlProjectImportWizard::parameters() { Core::BaseFileWizardParameters parameters(ProjectWizard); - parameters.setIcon(QIcon(QLatin1String(":/wizards/images/console.png"))); + // TODO do something about the ugliness of standard icons in sizes different than 16, 32, 64, 128 + { + QPixmap icon(22, 22); + icon.fill(Qt::transparent); + QPainter p(&icon); + p.drawPixmap(3, 3, 16, 16, qApp->style()->standardIcon(QStyle::SP_DirIcon).pixmap(16)); + parameters.setIcon(icon); + } parameters.setDisplayName(tr("Import Existing Qt QML Directory")); parameters.setId(QLatin1String("QI.QML Import")); parameters.setDescription(tr("Creates a QML project from an existing directory of QML files.")); diff --git a/src/plugins/vcsbase/vcsbaseconstants.h b/src/plugins/vcsbase/vcsbaseconstants.h index c9d27f50ee..50bf63d6fc 100644 --- a/src/plugins/vcsbase/vcsbaseconstants.h +++ b/src/plugins/vcsbase/vcsbaseconstants.h @@ -37,6 +37,7 @@ namespace Constants { const char * const VCS_SETTINGS_CATEGORY = "V.Version Control"; const char * const VCS_SETTINGS_TR_CATEGORY = QT_TRANSLATE_NOOP("VCSBase", "Version Control"); +const char * const SETTINGS_CATEGORY_VCS_ICON = ":/core/images/category_vcs.png"; const char * const VCS_COMMON_SETTINGS_ID = "A.Common"; const char * const VCS_COMMON_SETTINGS_NAME = QT_TRANSLATE_NOOP("VCSBase", "Common"); diff --git a/src/plugins/vcsbase/vcsbaseoptionspage.cpp b/src/plugins/vcsbase/vcsbaseoptionspage.cpp index d5a025b722..2964a34f5a 100644 --- a/src/plugins/vcsbase/vcsbaseoptionspage.cpp +++ b/src/plugins/vcsbase/vcsbaseoptionspage.cpp @@ -52,7 +52,7 @@ QString VCSBaseOptionsPage::displayCategory() const QIcon VCSBaseOptionsPage::categoryIcon() const { - return QIcon(); // TODO: Icon for Version Control + return QIcon(QLatin1String(Constants::SETTINGS_CATEGORY_VCS_ICON)); } } // namespace VCSBase |
