diff --git a/src/libs/qmljsdebugger/editor/qmltoolbar.cpp b/src/libs/qmljsdebugger/editor/qmltoolbar.cpp index 14c9c7c1a60bb461bb5410a921037a13685360fa..fe6ec1c1af7545086dc57aa450ad5eed2648f6f3 100644 --- a/src/libs/qmljsdebugger/editor/qmltoolbar.cpp +++ b/src/libs/qmljsdebugger/editor/qmltoolbar.cpp @@ -15,15 +15,15 @@ QmlToolbar::QmlToolbar(QWidget *parent) : m_isRunning(false), ui(new Ui) { - ui->designmode = new QAction(QIcon(":/qml/images/designmode.png"), tr("Design Mode"), this); - ui->play = new QAction(QIcon(":/qml/images/play.png"), tr("Play"), this); - ui->pause = new QAction(QIcon(":/qml/images/pause.png"), tr("Pause"), this); - ui->select = new QAction(QIcon(":/qml/images/select.png"), tr("Select"), this); - ui->selectMarquee = new QAction(QIcon(":/qml/images/select-marquee.png"), tr("Select (Marquee)"), this); - ui->zoom = new QAction(QIcon(":/qml/images/zoom.png"), tr("Zoom"), this); - ui->colorPicker = new QAction(QIcon(":/qml/images/color-picker-hicontrast.png"), tr("Color Picker"), this); - ui->toQml = new QAction(QIcon(":/qml/images/to-qml.png"), tr("Apply Changes to QML Viewer"), this); - ui->fromQml = new QAction(QIcon(":/qml/images/from-qml.png"), tr("Apply Changes to Document"), this); + ui->designmode = new QAction(QIcon(QLatin1String(":/qml/images/designmode.png")), tr("Design Mode"), this); + ui->play = new QAction(QIcon(QLatin1String(":/qml/images/play.png")), tr("Play"), this); + ui->pause = new QAction(QIcon(QLatin1String(":/qml/images/pause.png")), tr("Pause"), this); + ui->select = new QAction(QIcon(QLatin1String(":/qml/images/select.png")), tr("Select"), this); + ui->selectMarquee = new QAction(QIcon(QLatin1String(":/qml/images/select-marquee.png")), tr("Select (Marquee)"), this); + ui->zoom = new QAction(QIcon(QLatin1String(":/qml/images/zoom.png")), tr("Zoom"), this); + ui->colorPicker = new QAction(QIcon(QLatin1String(":/qml/images/color-picker-hicontrast.png")), tr("Color Picker"), this); + ui->toQml = new QAction(QIcon(QLatin1String(":/qml/images/to-qml.png")), tr("Apply Changes to QML Viewer"), this); + ui->fromQml = new QAction(QIcon(QLatin1String(":/qml/images/from-qml.png")), tr("Apply Changes to Document"), this); ui->designmode->setCheckable(true); ui->designmode->setChecked(false); diff --git a/src/libs/qmljsdebugger/editor/toolbarcolorbox.cpp b/src/libs/qmljsdebugger/editor/toolbarcolorbox.cpp index 8e1b94cfdd5b757b50b1a6022c3dea5e8c48aee7..e72f70842681c0798a2be68a6b1f1c966cd8a6c7 100644 --- a/src/libs/qmljsdebugger/editor/toolbarcolorbox.cpp +++ b/src/libs/qmljsdebugger/editor/toolbarcolorbox.cpp @@ -19,7 +19,7 @@ namespace QmlViewer { ToolBarColorBox::ToolBarColorBox(QWidget *parent) : QLabel(parent) { - m_copyHexColor = new QAction(QIcon(":/qml/images/color-picker-hicontrast.png"), tr("Copy"), this); + m_copyHexColor = new QAction(QIcon(QLatin1String(":/qml/images/color-picker-hicontrast.png")), tr("Copy"), this); connect(m_copyHexColor, SIGNAL(triggered()), SLOT(copyColorToClipboard())); setScaledContents(false); } diff --git a/src/libs/utils/filterlineedit.cpp b/src/libs/utils/filterlineedit.cpp index f74eb392ddf2a61d8ec46fbbee6fa905bf6e4e96..0ecd22e9e44ac40097ae0d16114c5c0b050578fa 100644 --- a/src/libs/utils/filterlineedit.cpp +++ b/src/libs/utils/filterlineedit.cpp @@ -41,7 +41,7 @@ FilterLineEdit::FilterLineEdit(QWidget *parent) : QIcon icon = QIcon::fromTheme(layoutDirection() == Qt::LeftToRight ? QLatin1String("edit-clear-locationbar-rtl") : QLatin1String("edit-clear-locationbar-ltr"), - QIcon::fromTheme("edit-clear", QIcon(QLatin1String(":/core/images/editclear.png")))); + QIcon::fromTheme(QLatin1String("edit-clear"), QIcon(QLatin1String(":/core/images/editclear.png")))); setButtonPixmap(Right, icon.pixmap(16)); setButtonVisible(Right, true); diff --git a/src/libs/utils/wizard.cpp b/src/libs/utils/wizard.cpp index 0cfcb5c1c47bfe734f1161eb22d53001812043e1..90d7a1746b2a744c22357673a82c5b4156535e3c 100644 --- a/src/libs/utils/wizard.cpp +++ b/src/libs/utils/wizard.cpp @@ -115,7 +115,7 @@ LinearProgressWidget::LinearProgressWidget(WizardProgress *progress, QWidget *pa m_dotsItemWidget(0), m_disableUpdatesCount(0) { - m_indicatorPixmap = QIcon::fromTheme("go-next", QIcon(QLatin1String(":/utils/images/arrow.png"))).pixmap(16); + m_indicatorPixmap = QIcon::fromTheme(QLatin1String("go-next"), QIcon(QLatin1String(":/utils/images/arrow.png"))).pixmap(16); m_wizardProgress = progress; m_mainLayout = new QVBoxLayout(this); m_itemWidgetLayout = new QVBoxLayout(); diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp index 3d1c180ae0131d20f2aedc81e7525d416524b56e..dec094d03195e8b949d08ed2d1d8920785fa7d87 100644 --- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp @@ -34,6 +34,7 @@ #include "cmakeprojectconstants.h" #include "cmaketarget.h" +#include <coreplugin/coreconstants.h> #include <projectexplorer/environment.h> #include <projectexplorer/debugginghelper.h> #include <utils/qtcassert.h> @@ -330,7 +331,7 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration * QToolButton *resetButton = new QToolButton(); resetButton->setToolTip(tr("Reset to default")); - resetButton->setIcon(QIcon(":/core/images/reset.png")); + resetButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_RESET))); QHBoxLayout *boxlayout = new QHBoxLayout(); boxlayout->addWidget(m_workingDirectoryEdit); diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h index f52aab9432025fce3da914a1332e4add0a68107b..31c1af8f6d7f0905edac913457650a3434dbf736 100644 --- a/src/plugins/coreplugin/coreconstants.h +++ b/src/plugins/coreplugin/coreconstants.h @@ -230,6 +230,13 @@ const char * const ICON_REPLACE = ":/core/images/replace.png"; const char * const ICON_RESET = ":/core/images/reset.png"; const char * const ICON_MAGNIFIER = ":/core/images/magnifier.png"; const char * const ICON_TOGGLE_SIDEBAR = ":/core/images/sidebaricon.png"; +const char * const ICON_CLOSE = ":/core/images/closebutton.png"; +const char * const ICON_CLOSE_DARK = ":/core/images/darkclosebutton.png"; +const char * const ICON_SPLIT_HORIZONTAL = ":/core/images/splitbutton_horizontal.png"; +const char * const ICON_FILTER = ":/core/images/filtericon.png"; +const char * const ICON_LINK = ":/core/images/linkicon.png"; +const char * const ICON_QTLOGO_32 = ":/core/images/qtcreator_logo_32.png"; +const char * const ICON_QTLOGO_128 = ":/core/images/qtcreator_logo_128.png"; const char * const WIZARD_CATEGORY_QT = "R.Qt"; const char * const WIZARD_TR_CATEGORY_QT = QT_TRANSLATE_NOOP("Core", "Qt"); diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index fc3ee7d4e0d0d9206015dec879a1b0374e1fce59..621e161a535b59868e7ed2b1bc3a0f75efee3546 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -230,8 +230,8 @@ EditorManagerPrivate::EditorManagerPrivate(ICore *core, QWidget *parent) : m_closeOtherEditorsAction(new QAction(EditorManager::tr("Close Others"), parent)), m_gotoNextDocHistoryAction(new QAction(EditorManager::tr("Next Open Document in History"), parent)), m_gotoPreviousDocHistoryAction(new QAction(EditorManager::tr("Previous Open Document in History"), parent)), - m_goBackAction(new QAction(QIcon(QLatin1String(":/help/images/previous.png")), EditorManager::tr("Go Back"), parent)), - m_goForwardAction(new QAction(QIcon(QLatin1String(":/help/images/next.png")), EditorManager::tr("Go Forward"), parent)), + m_goBackAction(new QAction(QIcon(QLatin1String(Constants::ICON_PREV)), EditorManager::tr("Go Back"), parent)), + m_goForwardAction(new QAction(QIcon(QLatin1String(Constants::ICON_NEXT)), EditorManager::tr("Go Forward"), parent)), m_openInExternalEditorAction(new QAction(EditorManager::tr("Open in External Editor"), parent)), m_windowPopup(0), m_coreListener(0), diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp index 61bd9b66e3f17a9dc5a7f15211986c22e64d29b7..77f37713f638d967a67f9e55f1548c92afa1731a 100644 --- a/src/plugins/coreplugin/editormanager/editorview.cpp +++ b/src/plugins/coreplugin/editormanager/editorview.cpp @@ -114,7 +114,7 @@ EditorView::EditorView(QWidget *parent) : m_infoWidgetCloseButton = new QToolButton; m_infoWidgetCloseButton->setAutoRaise(true); - m_infoWidgetCloseButton->setIcon(QIcon(":/core/images/clear.png")); + m_infoWidgetCloseButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_CLEAR))); m_infoWidgetCloseButton->setToolTip(tr("Close")); hbox->addWidget(m_infoWidgetCloseButton); @@ -146,7 +146,7 @@ EditorView::EditorView(QWidget *parent) : m_statusWidgetButton = new QToolButton; m_statusWidgetButton->setContentsMargins(0, 0, 0, 0); - //m_statusWidgetButton->setIcon(QIcon(":/core/images/clear.png")); + //m_statusWidgetButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_CLEAR))); hbox->addWidget(m_statusWidgetButton); m_statusHLine->setVisible(false); diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.cpp b/src/plugins/coreplugin/editormanager/openeditorsview.cpp index 1fe1f29b847e2b078dbbd0431539f18cd2258dae..c479950984c3887392079484249bd884c79830dd 100644 --- a/src/plugins/coreplugin/editormanager/openeditorsview.cpp +++ b/src/plugins/coreplugin/editormanager/openeditorsview.cpp @@ -77,8 +77,8 @@ void OpenEditorsDelegate::paint(QPainter *painter, const QStyleOptionViewItem &o QStyledItemDelegate::paint(painter, option, index); if (index.column() == 1 && option.state & QStyle::State_MouseOver) { - QIcon icon((option.state & QStyle::State_Selected) ? ":/core/images/closebutton.png" - : ":/core/images/darkclosebutton.png"); + const QIcon icon(QLatin1String((option.state & QStyle::State_Selected) ? + Constants::ICON_CLOSE : Constants::ICON_CLOSE_DARK)); QRect iconRect(option.rect.right() - option.rect.height(), option.rect.top(), diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp index 4ce33f5c4af916fb2866463f8e309cbffd6ecaaf..10caf248e42bda370a02c556e17b797e7fe50741 100644 --- a/src/plugins/coreplugin/editortoolbar.cpp +++ b/src/plugins/coreplugin/editortoolbar.cpp @@ -110,7 +110,7 @@ EditorToolBar::EditorToolBar(QWidget *parent) : m_lockButton->setVisible(false); m_closeButton->setAutoRaise(true); - m_closeButton->setIcon(QIcon(":/core/images/closebutton.png")); + m_closeButton->setIcon(QIcon(QLatin1String(Constants::ICON_CLOSE))); m_closeButton->setProperty("type", QLatin1String("dockbutton")); m_closeButton->setEnabled(false); diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index 89df9eb24173a91c33a46532a6887e97b7116b7e..eb7a8b98b5218e5ad892fa0020ca17e4364937e6 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -161,13 +161,13 @@ MainWindow::MainWindow() : setWindowTitle(tr("Qt Creator")); #ifndef Q_WS_MAC - qApp->setWindowIcon(QIcon(":/core/images/qtcreator_logo_128.png")); + QApplication::setWindowIcon(QIcon(QLatin1String(Constants::ICON_QTLOGO_128))); #endif QCoreApplication::setApplicationName(QLatin1String("QtCreator")); QCoreApplication::setApplicationVersion(QLatin1String(Core::Constants::IDE_VERSION_LONG)); QCoreApplication::setOrganizationName(QLatin1String("Nokia")); QSettings::setDefaultFormat(QSettings::IniFormat); - QString baseName = qApp->style()->objectName(); + QString baseName = QApplication::style()->objectName(); #ifdef Q_WS_X11 if (baseName == QLatin1String("windows")) { // Sometimes we get the standard windows 95 style as a fallback diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp index 7d63911c3ab7335a7854873f0a9389694cf96b3d..29e4dabde6b9ea93cda798a3ba5f3921148ffcb4 100644 --- a/src/plugins/coreplugin/manhattanstyle.cpp +++ b/src/plugins/coreplugin/manhattanstyle.cpp @@ -33,6 +33,8 @@ #include <QtCore/QLibrary> +#include <coreplugin/coreconstants.h> + #include <utils/qtcassert.h> #include <utils/stylehelper.h> @@ -141,7 +143,7 @@ ManhattanStylePrivate::ManhattanStylePrivate() : lineeditImage(QLatin1String(":/core/images/inputfield.png")), lineeditImage_disabled(QLatin1String(":/core/images/inputfield_disabled.png")), extButtonPixmap(QLatin1String(":/core/images/extension.png")), - closeButtonPixmap(QLatin1String(":/core/images/closebutton.png")) + closeButtonPixmap(QLatin1String(Core::Constants::ICON_CLOSE)) { } diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp index b23f7e67314baac400cf4cf8a1267d3b212f1088..2e8753f1775379a9d3a20c36a8d6282f1bb152b5 100644 --- a/src/plugins/coreplugin/navigationwidget.cpp +++ b/src/plugins/coreplugin/navigationwidget.cpp @@ -408,10 +408,10 @@ NavigationSubWidget::NavigationSubWidget(NavigationWidget *parentWidget, int pos toolBarLayout->addWidget(m_navigationComboBox); QToolButton *splitAction = new QToolButton(); - splitAction->setIcon(QIcon(":/core/images/splitbutton_horizontal.png")); + splitAction->setIcon(QIcon(QLatin1String(Constants::ICON_SPLIT_HORIZONTAL))); splitAction->setToolTip(tr("Split")); QToolButton *close = new QToolButton(); - close->setIcon(QIcon(":/core/images/closebutton.png")); + close->setIcon(QIcon(QLatin1String(Constants::ICON_CLOSE))); close->setToolTip(tr("Close")); toolBarLayout->addWidget(splitAction); diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp index 5511b9be1e33a76e98fc645390225590bcb7d52e..2d180561b971f88e3fc792c15ee8c479e061a975 100644 --- a/src/plugins/coreplugin/outputpane.cpp +++ b/src/plugins/coreplugin/outputpane.cpp @@ -209,17 +209,17 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) : setWindowTitle(tr("Output")); connect(m_widgetComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(changePage())); - m_clearButton->setIcon(QIcon(Constants::ICON_CLEAN_PANE)); + m_clearButton->setIcon(QIcon(QLatin1String(Constants::ICON_CLEAN_PANE))); m_clearButton->setToolTip(tr("Clear")); connect(m_clearButton, SIGNAL(clicked()), this, SLOT(clearPage())); m_nextAction = new QAction(this); - m_nextAction->setIcon(QIcon(":/core/images/next.png")); + m_nextAction->setIcon(QIcon(QLatin1String(Constants::ICON_NEXT))); m_nextAction->setText(tr("Next Item")); connect(m_nextAction, SIGNAL(triggered()), this, SLOT(slotNext())); m_prevAction = new QAction(this); - m_prevAction->setIcon(QIcon(":/core/images/prev.png")); + m_prevAction->setIcon(QIcon(QLatin1String(Constants::ICON_PREV))); m_prevAction->setText(tr("Previous Item")); connect(m_prevAction, SIGNAL(triggered()), this, SLOT(slotPrev())); @@ -227,7 +227,7 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) : m_minMaxAction->setIcon(m_maximizeIcon); m_minMaxAction->setText(tr("Maximize Output Pane")); - m_closeButton->setIcon(QIcon(":/core/images/closebutton.png")); + m_closeButton->setIcon(QIcon(QLatin1String(Constants::ICON_CLOSE))); connect(m_closeButton, SIGNAL(clicked()), this, SLOT(slotHide())); QVBoxLayout *mainlayout = new QVBoxLayout; diff --git a/src/plugins/coreplugin/sidebar.cpp b/src/plugins/coreplugin/sidebar.cpp index 1f30a508452102e41a3825bf67fe880f996f6cd0..44cb0fd7de78eede3fc92f94bee19b6de9349945 100644 --- a/src/plugins/coreplugin/sidebar.cpp +++ b/src/plugins/coreplugin/sidebar.cpp @@ -30,6 +30,8 @@ #include "sidebar.h" #include "imode.h" +#include <coreplugin/coreconstants.h> + #include "actionmanager/actionmanager.h" #include "actionmanager/command.h" @@ -324,12 +326,12 @@ SideBarWidget::SideBarWidget(SideBar *sideBar, const QString &id) m_toolbar->addWidget(m_comboBox); m_splitButton = new QToolButton; - m_splitButton->setIcon(QIcon(":/core/images/splitbutton_horizontal.png")); + m_splitButton->setIcon(QIcon(QLatin1String(Constants::ICON_SPLIT_HORIZONTAL))); m_splitButton->setToolTip(tr("Split")); connect(m_splitButton, SIGNAL(clicked(bool)), this, SIGNAL(splitMe())); m_closeButton = new QToolButton; - m_closeButton->setIcon(QIcon(":/core/images/closebutton.png")); + m_closeButton->setIcon(QIcon(QLatin1String(Constants::ICON_CLOSE))); m_closeButton->setToolTip(tr("Close")); connect(m_closeButton, SIGNAL(clicked(bool)), this, SIGNAL(closeMe())); diff --git a/src/plugins/coreplugin/versiondialog.cpp b/src/plugins/coreplugin/versiondialog.cpp index e92b81627294af83dffa766bdbaf3fbf923fe2d0..646afccd7fc3b0a6b79d1da95102a517218152a5 100644 --- a/src/plugins/coreplugin/versiondialog.cpp +++ b/src/plugins/coreplugin/versiondialog.cpp @@ -53,7 +53,7 @@ VersionDialog::VersionDialog(QWidget *parent) { // We need to set the window icon explicitly here since for some reason the // application icon isn't used when the size of the dialog is fixed (at least not on X11/GNOME) - setWindowIcon(QIcon(":/core/images/qtcreator_logo_128.png")); + setWindowIcon(QIcon(QLatin1String(Constants::ICON_QTLOGO_128))); setWindowTitle(tr("About Qt Creator")); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); @@ -104,7 +104,7 @@ VersionDialog::VersionDialog(QWidget *parent) connect(buttonBox , SIGNAL(rejected()), this, SLOT(reject())); QLabel *logoLabel = new QLabel; - logoLabel->setPixmap(QPixmap(QLatin1String(":/core/images/qtcreator_logo_128.png"))); + logoLabel->setPixmap(QPixmap(QLatin1String(Constants::ICON_QTLOGO_128))); layout->addWidget(logoLabel , 0, 0, 1, 1); layout->addWidget(copyRightLabel, 0, 1, 4, 4); layout->addWidget(buttonBox, 4, 0, 1, 5); diff --git a/src/plugins/cppeditor/cppplugin.cpp b/src/plugins/cppeditor/cppplugin.cpp index 9d269b536efc4199005005d4178fc296c650f03f..f12c1c9a46a273fac2e11f5b218c9af487cc5d41 100644 --- a/src/plugins/cppeditor/cppplugin.cpp +++ b/src/plugins/cppeditor/cppplugin.cpp @@ -81,11 +81,11 @@ CppEditorFactory::CppEditorFactory(CppPlugin *owner) : #if !defined(Q_WS_MAC) && !defined(Q_WS_WIN) Core::FileIconProvider *iconProvider = Core::FileIconProvider::instance(); Core::MimeDatabase *mimeDatabase = Core::ICore::instance()->mimeDatabase(); - iconProvider->registerIconOverlayForMimeType(QIcon(":/cppeditor/images/qt_cpp.png"), + iconProvider->registerIconOverlayForMimeType(QIcon(QLatin1String(":/cppeditor/images/qt_cpp.png")), mimeDatabase->findByType(QLatin1String(CppEditor::Constants::CPP_SOURCE_MIMETYPE))); - iconProvider->registerIconOverlayForMimeType(QIcon(":/cppeditor/images/qt_c.png"), + iconProvider->registerIconOverlayForMimeType(QIcon(QLatin1String(":/cppeditor/images/qt_c.png")), mimeDatabase->findByType(QLatin1String(CppEditor::Constants::C_SOURCE_MIMETYPE))); - iconProvider->registerIconOverlayForMimeType(QIcon(":/cppeditor/images/qt_h.png"), + iconProvider->registerIconOverlayForMimeType(QIcon(QLatin1String(":/cppeditor/images/qt_h.png")), mimeDatabase->findByType(QLatin1String(CppEditor::Constants::CPP_HEADER_MIMETYPE))); #endif } diff --git a/src/plugins/debugger/breakwindow.cpp b/src/plugins/debugger/breakwindow.cpp index 222fa8f400cb425c6ed99a37e4f15019a0a0d01a..630f99c718a9b6e184b9733bcd29a497fd848779 100644 --- a/src/plugins/debugger/breakwindow.cpp +++ b/src/plugins/debugger/breakwindow.cpp @@ -87,7 +87,7 @@ BreakWindow::BreakWindow(QWidget *parent) setFrameStyle(QFrame::NoFrame); setAttribute(Qt::WA_MacShowFocusRect, false); setWindowTitle(tr("Breakpoints")); - setWindowIcon(QIcon(":/debugger/images/debugger_breakpoints.png")); + setWindowIcon(QIcon(QLatin1String(":/debugger/images/debugger_breakpoints.png"))); setAlternatingRowColors(act->isChecked()); setRootIsDecorated(false); setIconSize(QSize(10, 10)); diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp index 10adf8d645585776b85f2b28ad5f9fd699faefd1..608499b1936af56868871ac70982035d4c866d68 100644 --- a/src/plugins/debugger/debuggeractions.cpp +++ b/src/plugins/debugger/debuggeractions.cpp @@ -227,7 +227,7 @@ DebuggerSettings *DebuggerSettings::instance() item->setText(tr("Operate by Instruction")); item->setCheckable(true); item->setDefaultValue(false); - item->setIcon(QIcon(":/debugger/images/debugger_singleinstructionmode.png")); + item->setIcon(QIcon(QLatin1String(":/debugger/images/debugger_singleinstructionmode.png"))); item->setToolTip(tr("This switches the debugger to instruction-wise " "operation mode. In this mode, stepping operates on single " "instructions and the source location view also shows the " diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index e2442ae85cf3c74bb5714fb29db03dd92e6e36b3..e7ad33ad28f99c6a16f4d96d265ec82a5145f9e3 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -443,7 +443,7 @@ public: { setDisplayName(QCoreApplication::translate("Debugger::Internal::DebugMode", "Debug")); setId(MODE_DEBUG); - setIcon(QIcon(":/fancyactionbar/images/mode_Debug.png")); + setIcon(QIcon(__(":/fancyactionbar/images/mode_Debug.png"))); setPriority(P_MODE_DEBUG); } @@ -1083,9 +1083,9 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments, QString *er const Core::Context cppeditorcontext(CppEditor::Constants::C_CPPEDITOR); m_stopIcon = QIcon(_(":/debugger/images/debugger_stop_small.png")); - m_stopIcon.addFile(":/debugger/images/debugger_stop.png"); + m_stopIcon.addFile(__(":/debugger/images/debugger_stop.png")); m_interruptIcon = QIcon(_(":/debugger/images/debugger_interrupt_small.png")); - m_interruptIcon.addFile(":/debugger/images/debugger_interrupt.png"); + m_interruptIcon.addFile(__(":/debugger/images/debugger_interrupt.png")); m_locationMarkIcon = QIcon(_(":/debugger/images/location_16.png")); m_busy = false; @@ -1133,8 +1133,8 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments, QString *er this, SLOT(updateWatchersHeader(int,int,int)), Qt::QueuedConnection); m_actions.continueAction = new QAction(tr("Continue"), this); - QIcon continueIcon = QIcon(":/debugger/images/debugger_continue_small.png"); - continueIcon.addFile(":/debugger/images/debugger_continue.png"); + QIcon continueIcon = QIcon(__(":/debugger/images/debugger_continue_small.png")); + continueIcon.addFile(__(":/debugger/images/debugger_continue.png")); m_actions.continueAction->setIcon(continueIcon); m_actions.continueAction->setProperty(Role, RequestExecContinueRole); @@ -1154,17 +1154,17 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments, QString *er m_actions.nextAction = new QAction(tr("Step Over"), this); m_actions.nextAction->setProperty(Role, RequestExecNextRole); m_actions.nextAction->setIcon( - QIcon(":/debugger/images/debugger_stepover_small.png")); + QIcon(__(":/debugger/images/debugger_stepover_small.png"))); m_actions.stepAction = new QAction(tr("Step Into"), this); m_actions.stepAction->setProperty(Role, RequestExecStepRole); m_actions.stepAction->setIcon( - QIcon(":/debugger/images/debugger_stepinto_small.png")); + QIcon(__(":/debugger/images/debugger_stepinto_small.png"))); m_actions.stepOutAction = new QAction(tr("Step Out"), this); m_actions.stepOutAction->setProperty(Role, RequestExecStepOutRole); m_actions.stepOutAction->setIcon( - QIcon(":/debugger/images/debugger_stepout_small.png")); + QIcon(__(":/debugger/images/debugger_stepout_small.png"))); m_actions.runToLineAction1 = new QAction(tr("Run to Line"), this); m_actions.runToLineAction1->setProperty(Role, RequestExecRunToLineRole); @@ -1194,14 +1194,14 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments, QString *er m_actions.snapshotAction = new QAction(tr("Create Snapshot"), this); m_actions.snapshotAction->setProperty(Role, RequestCreateSnapshotRole); m_actions.snapshotAction->setIcon( - QIcon(":/debugger/images/debugger_snapshot_small.png")); + QIcon(__(":/debugger/images/debugger_snapshot_small.png"))); m_actions.reverseDirectionAction = new QAction(tr("Reverse Direction"), this); m_actions.reverseDirectionAction->setCheckable(true); m_actions.reverseDirectionAction->setChecked(false); m_actions.reverseDirectionAction->setIcon( - QIcon(":/debugger/images/debugger_reversemode_16.png")); + QIcon(__(":/debugger/images/debugger_reversemode_16.png"))); m_actions.reverseDirectionAction->setIconVisibleInMenu(false); m_actions.frameDownAction = diff --git a/src/plugins/debugger/snapshothandler.cpp b/src/plugins/debugger/snapshothandler.cpp index 40c827a42fc3b51b5f7e04e8e6074ab1d3c404e0..0bcfcc9054e93ec5793ff3aa37dba65a8e0eede1 100644 --- a/src/plugins/debugger/snapshothandler.cpp +++ b/src/plugins/debugger/snapshothandler.cpp @@ -117,8 +117,8 @@ QDebug operator<<(QDebug d, const SnapshotData &f) //////////////////////////////////////////////////////////////////////// SnapshotHandler::SnapshotHandler() - : m_positionIcon(QIcon(":/debugger/images/location_16.png")), - m_emptyIcon(QIcon(":/debugger/images/debugger_empty_14.png")) + : m_positionIcon(QIcon(QLatin1String(":/debugger/images/location_16.png"))), + m_emptyIcon(QIcon(QLatin1String(":/debugger/images/debugger_empty_14.png"))) { m_currentIndex = -1; } diff --git a/src/plugins/debugger/stackhandler.cpp b/src/plugins/debugger/stackhandler.cpp index 3cb1787eadf532c52b1c737f167db464bee3d5bc..0e46db76f74eb5890b4d1fd1efa610e3e89819c0 100644 --- a/src/plugins/debugger/stackhandler.cpp +++ b/src/plugins/debugger/stackhandler.cpp @@ -51,8 +51,8 @@ namespace Internal { //////////////////////////////////////////////////////////////////////// StackHandler::StackHandler(DebuggerEngine *engine) - : m_positionIcon(QIcon(":/debugger/images/location_16.png")), - m_emptyIcon(QIcon(":/debugger/images/debugger_empty_14.png")) + : m_positionIcon(QIcon(QLatin1String(":/debugger/images/location_16.png"))), + m_emptyIcon(QIcon(QLatin1String(":/debugger/images/debugger_empty_14.png"))) { m_engine = engine; m_disassemblerViewAgent = new DisassemblerViewAgent(engine); diff --git a/src/plugins/find/findtoolbar.cpp b/src/plugins/find/findtoolbar.cpp index 30cadf84fa0189dc74fdfa1732d21e83a90ae0ab..f12506f2e9591772356e3d1bfef07d9ed12966e1 100644 --- a/src/plugins/find/findtoolbar.cpp +++ b/src/plugins/find/findtoolbar.cpp @@ -91,7 +91,7 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen connect(m_ui.findEdit, SIGNAL(editingFinished()), this, SLOT(invokeResetIncrementalSearch())); - m_ui.close->setIcon(QIcon(":/core/images/closebutton.png")); + m_ui.close->setIcon(QIcon(QLatin1String(Core::Constants::ICON_CLOSE))); connect(m_ui.close, SIGNAL(clicked()), this, SLOT(hideAndResetFocus())); m_findCompleter->setModel(m_plugin->findCompletionModel()); @@ -201,7 +201,7 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen m_ui.replaceAllButton->setDefaultAction(cmd->action()); m_caseSensitiveAction = new QAction(tr("Case Sensitive"), this); - m_caseSensitiveAction->setIcon(QIcon(":/find/images/casesensitively.png")); + m_caseSensitiveAction->setIcon(QIcon(QLatin1String(":/find/images/casesensitively.png"))); m_caseSensitiveAction->setCheckable(true); m_caseSensitiveAction->setChecked(false); cmd = am->registerAction(m_caseSensitiveAction, Constants::CASE_SENSITIVE, globalcontext); @@ -210,7 +210,7 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen lineEditMenu->addAction(m_caseSensitiveAction); m_wholeWordAction = new QAction(tr("Whole Words Only"), this); - m_wholeWordAction->setIcon(QIcon(":/find/images/wholewords.png")); + m_wholeWordAction->setIcon(QIcon(QLatin1String(":/find/images/wholewords.png"))); m_wholeWordAction->setCheckable(true); m_wholeWordAction->setChecked(false); cmd = am->registerAction(m_wholeWordAction, Constants::WHOLE_WORDS, globalcontext); @@ -219,7 +219,7 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen lineEditMenu->addAction(m_wholeWordAction); m_regularExpressionAction = new QAction(tr("Use Regular Expressions"), this); - m_regularExpressionAction->setIcon(QIcon(":/find/images/regexp.png")); + m_regularExpressionAction->setIcon(QIcon(QLatin1String(":/find/images/regexp.png"))); m_regularExpressionAction->setCheckable(true); m_regularExpressionAction->setChecked(false); cmd = am->registerAction(m_regularExpressionAction, Constants::REGULAR_EXPRESSIONS, globalcontext); diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index 83df160161de5d458719c5678c26bdc0014b5aad..9ff9a4e063ffec7a691b90256ed7a854024aff94 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -530,7 +530,7 @@ void HelpPlugin::createRightPaneContextViewer() hboxLayout->addStretch(); QToolButton *closeButton = new QToolButton(); - closeButton->setIcon(QIcon(":/core/images/closebutton.png")); + closeButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_CLOSE))); connect(closeButton, SIGNAL(clicked()), this, SLOT(slotHideRightPane())); // close button to the right @@ -866,7 +866,7 @@ QToolBar *HelpPlugin::createToolBar() SLOT(updateSideBarSource())); m_closeButton = new QToolButton(); - m_closeButton->setIcon(QIcon(":/core/images/closebutton.png")); + m_closeButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_CLOSE))); m_closeButton->setToolTip(tr("Close current Page")); connect(m_closeButton, SIGNAL(clicked()), &OpenPagesManager::instance(), SLOT(closeCurrentPage())); diff --git a/src/plugins/help/openpageswidget.cpp b/src/plugins/help/openpageswidget.cpp index 5de1e56eece5b22d1e761c7e6c697f056333c251..b872de9c89f3242276cf97b59d12d1f00f83efbf 100644 --- a/src/plugins/help/openpageswidget.cpp +++ b/src/plugins/help/openpageswidget.cpp @@ -32,6 +32,8 @@ #include "centralwidget.h" #include "openpagesmodel.h" +#include <coreplugin/coreconstants.h> + #include <QtGui/QApplication> #include <QtGui/QPainter> @@ -70,8 +72,8 @@ void OpenPagesDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opt if (index.column() == 1 && index.model()->rowCount() > 1 && option.state & QStyle::State_MouseOver) { - QIcon icon((option.state & QStyle::State_Selected) - ? ":/core/images/closebutton.png" : ":/core/images/darkclosebutton.png"); + const QIcon icon(QLatin1String((option.state & QStyle::State_Selected) ? + Core::Constants::ICON_CLOSE : Core::Constants::ICON_CLOSE_DARK)); const QRect iconRect(option.rect.right() - option.rect.height(), option.rect.top(), option.rect.height(), option.rect.height()); diff --git a/src/plugins/locator/locatorwidget.cpp b/src/plugins/locator/locatorwidget.cpp index d58481ee60f1e531efb4363802cf65f0139bd221..5887390987fb4cd20e3d9827ed9c7094e00ca08b 100644 --- a/src/plugins/locator/locatorwidget.cpp +++ b/src/plugins/locator/locatorwidget.cpp @@ -285,7 +285,7 @@ LocatorWidget::LocatorWidget(LocatorPlugin *qop) : layout->setMargin(0); layout->addWidget(m_fileLineEdit); - setWindowIcon(QIcon(":/locator/images/locator.png")); + setWindowIcon(QIcon(QLatin1String(":/locator/images/locator.png"))); QPixmap image(Core::Constants::ICON_MAGNIFIER); m_fileLineEdit->setButtonPixmap(Utils::FancyLineEdit::Left, image); m_fileLineEdit->setPlaceholderText(tr("Type to locate")); diff --git a/src/plugins/projectexplorer/buildstepspage.cpp b/src/plugins/projectexplorer/buildstepspage.cpp index 7b2bd3d8dd83b0ca4ae18ba69349000f7360ecce..f6df541a56957a7313d5ffd2f5b406438c4b0636 100644 --- a/src/plugins/projectexplorer/buildstepspage.cpp +++ b/src/plugins/projectexplorer/buildstepspage.cpp @@ -180,19 +180,19 @@ void BuildStepsPage::addBuildStepWidget(int pos, BuildStep *step) s.upButton->setAutoRaise(true); s.upButton->setToolTip(tr("Move Up")); s.upButton->setFixedSize(buttonSize); - s.upButton->setIcon(QIcon(":/core/images/darkarrowup.png")); + s.upButton->setIcon(QIcon(QLatin1String(":/core/images/darkarrowup.png"))); s.downButton = new QToolButton(toolWidget); s.downButton->setAutoRaise(true); s.downButton->setToolTip(tr("Move Down")); s.downButton->setFixedSize(buttonSize); - s.downButton->setIcon(QIcon(":/core/images/darkarrowdown.png")); + s.downButton->setIcon(QIcon(QLatin1String(":/core/images/darkarrowdown.png"))); s.removeButton = new QToolButton(toolWidget); s.removeButton->setAutoRaise(true); s.removeButton->setToolTip(tr("Remove Item")); s.removeButton->setFixedSize(buttonSize); - s.removeButton->setIcon(QIcon(":/core/images/darkclose.png")); + s.removeButton->setIcon(QIcon(QLatin1String(":/core/images/darkclose.png"))); toolWidget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding); QHBoxLayout *hbox = new QHBoxLayout(); diff --git a/src/plugins/projectexplorer/compileoutputwindow.cpp b/src/plugins/projectexplorer/compileoutputwindow.cpp index 862df157ef02742a24743e0b2c1065a972f06292..8849832ab683269268fa541cb2e0a541e2a456b9 100644 --- a/src/plugins/projectexplorer/compileoutputwindow.cpp +++ b/src/plugins/projectexplorer/compileoutputwindow.cpp @@ -35,6 +35,7 @@ #include <find/basetextfind.h> #include <aggregation/aggregate.h> #include <extensionsystem/pluginmanager.h> +#include <qt4projectmanager/qt4projectmanagerconstants.h> #include <QtGui/QKeyEvent> #include <QtGui/QIcon> @@ -56,7 +57,7 @@ CompileOutputWindow::CompileOutputWindow(BuildManager * /*bm*/) { m_outputWindow = new OutputWindow(); m_outputWindow->setWindowTitle(tr("Compile Output")); - m_outputWindow->setWindowIcon(QIcon(":/qt4projectmanager/images/window.png")); + m_outputWindow->setWindowIcon(QIcon(QLatin1String(Qt4ProjectManager::Constants::ICON_WINDOW))); m_outputWindow->setReadOnly(true); Aggregation::Aggregate *agg = new Aggregation::Aggregate; diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp index 4c1be6fa9de08a20acac97b4b9737073531e8c0e..6add41d6992e405cbef8fe84f01d09703e37b2e4 100644 --- a/src/plugins/projectexplorer/foldernavigationwidget.cpp +++ b/src/plugins/projectexplorer/foldernavigationwidget.cpp @@ -482,7 +482,7 @@ Core::NavigationView FolderNavigationWidgetFactory::createWidget() FolderNavigationWidget *ptw = new FolderNavigationWidget; n.widget = ptw; QToolButton *toggleSync = new QToolButton; - toggleSync->setIcon(QIcon(QLatin1String(":/core/images/linkicon.png"))); + toggleSync->setIcon(QIcon(QLatin1String(Core::Constants::ICON_LINK))); toggleSync->setCheckable(true); toggleSync->setChecked(ptw->autoSynchronization()); toggleSync->setToolTip(tr("Synchronize with Editor")); diff --git a/src/plugins/projectexplorer/outputwindow.cpp b/src/plugins/projectexplorer/outputwindow.cpp index 67ab62a32f5db25603eaa5e26f69bb207ef17e8f..bcee5d1c771a7dbca556484003211ce37926427b 100644 --- a/src/plugins/projectexplorer/outputwindow.cpp +++ b/src/plugins/projectexplorer/outputwindow.cpp @@ -46,6 +46,7 @@ #include <aggregation/aggregate.h> #include <texteditor/basetexteditor.h> #include <projectexplorer/project.h> +#include <qt4projectmanager/qt4projectmanagerconstants.h> #include <QtGui/QIcon> #include <QtGui/QScrollBar> @@ -222,7 +223,7 @@ void OutputPane::createNewOutputWindow(RunControl *rc) if (!found) { OutputWindow *ow = new OutputWindow(m_tabWidget); ow->setWindowTitle(tr("Application Output Window")); - ow->setWindowIcon(QIcon(":/qt4projectmanager/images/window.png")); + ow->setWindowIcon(QIcon(QLatin1String(Qt4ProjectManager::Constants::ICON_WINDOW))); ow->setFormatter(rc->outputFormatter()); Aggregation::Aggregate *agg = new Aggregation::Aggregate; agg->add(ow); diff --git a/src/plugins/projectexplorer/projecttreewidget.cpp b/src/plugins/projectexplorer/projecttreewidget.cpp index 0189bd667f1fb3fa1b3f31708e22133691850e37..c3931e2ea5f8c48876dd3dc88a5626fcd204a931 100644 --- a/src/plugins/projectexplorer/projecttreewidget.cpp +++ b/src/plugins/projectexplorer/projecttreewidget.cpp @@ -35,6 +35,7 @@ #include "projectexplorerconstants.h" #include "projectmodels.h" +#include <coreplugin/coreconstants.h> #include <coreplugin/icore.h> #include <coreplugin/editormanager/editormanager.h> #include <utils/qtcassert.h> @@ -130,7 +131,7 @@ ProjectTreeWidget::ProjectTreeWidget(QWidget *parent) this, SLOT(startupProjectChanged(ProjectExplorer::Project *))); m_toggleSync = new QToolButton; - m_toggleSync->setIcon(QIcon(":/core/images/linkicon.png")); + m_toggleSync->setIcon(QIcon(QLatin1String(Core::Constants::ICON_LINK))); m_toggleSync->setCheckable(true); m_toggleSync->setChecked(autoSynchronization()); m_toggleSync->setToolTip(tr("Synchronize with Editor")); @@ -356,7 +357,7 @@ Core::NavigationView ProjectTreeWidgetFactory::createWidget() n.widget = ptw; QToolButton *filter = new QToolButton; - filter->setIcon(QIcon(":/core/images/filtericon.png")); + filter->setIcon(QIcon(QLatin1String(Core::Constants::ICON_FILTER))); filter->setToolTip(tr("Filter tree")); filter->setPopupMode(QToolButton::InstantPopup); QMenu *filterMenu = new QMenu(filter); diff --git a/src/plugins/projectexplorer/projectwelcomepagewidget.cpp b/src/plugins/projectexplorer/projectwelcomepagewidget.cpp index 9c30289eb4fbdce405b157e7a1227440c757f85b..22cfd95d2b70d58b0f833444265241e99241690b 100644 --- a/src/plugins/projectexplorer/projectwelcomepagewidget.cpp +++ b/src/plugins/projectexplorer/projectwelcomepagewidget.cpp @@ -100,9 +100,9 @@ ProjectWelcomePageWidget::ProjectWelcomePageWidget(QWidget *parent) : connect(ui->manageSessionsButton, SIGNAL(clicked()), SIGNAL(manageSessions())); ui->createNewProjectButton->setIcon( - QIcon::fromTheme("document-new", ui->createNewProjectButton->icon())); + QIcon::fromTheme(QLatin1String("document-new"), ui->createNewProjectButton->icon())); ui->openProjectButton->setIcon( - QIcon::fromTheme("document-open", ui->openProjectButton->icon())); + QIcon::fromTheme(QLatin1String("document-open"), ui->openProjectButton->icon())); } ProjectWelcomePageWidget::~ProjectWelcomePageWidget() diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp index 3f7358f9d563385663a065b12c7e0842a6946a0a..3bd62297180ad52f33c8aa499151b97429e0186e 100644 --- a/src/plugins/projectexplorer/taskwindow.cpp +++ b/src/plugins/projectexplorer/taskwindow.cpp @@ -40,6 +40,7 @@ #include <coreplugin/icontext.h> #include <coreplugin/icore.h> #include <extensionsystem/pluginmanager.h> +#include <qt4projectmanager/qt4projectmanagerconstants.h> #include <QtCore/QDir> #include <QtCore/QFileInfo> @@ -525,7 +526,7 @@ TaskWindow::TaskWindow(TaskHub *taskhub) : d(new TaskWindowPrivate) d->m_listview->setSelectionMode(QAbstractItemView::SingleSelection); Internal::TaskDelegate *tld = new Internal::TaskDelegate(this); d->m_listview->setItemDelegate(tld); - d->m_listview->setWindowIcon(QIcon(":/qt4projectmanager/images/window.png")); + d->m_listview->setWindowIcon(QIcon(QLatin1String(Qt4ProjectManager::Constants::ICON_WINDOW))); d->m_listview->setContextMenuPolicy(Qt::ActionsContextMenu); d->m_listview->setAttribute(Qt::WA_MacShowFocusRect, false); @@ -560,7 +561,7 @@ TaskWindow::TaskWindow(TaskHub *taskhub) : d(new TaskWindowPrivate) connect(d->m_categoriesMenu, SIGNAL(triggered(QAction*)), this, SLOT(filterCategoryTriggered(QAction*))); d->m_categoriesButton = new QToolButton; - d->m_categoriesButton->setIcon(QIcon(":/core/images/filtericon.png")); + d->m_categoriesButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_FILTER))); d->m_categoriesButton->setToolTip(tr("Filter by categories")); d->m_categoriesButton->setAutoRaise(true); d->m_categoriesButton->setPopupMode(QToolButton::InstantPopup); diff --git a/src/plugins/qmldesigner/components/easingpane/easingcontextpane.cpp b/src/plugins/qmldesigner/components/easingpane/easingcontextpane.cpp index ff33ef5c9c508a4233e57692fb599840c4b19cfe..1e32aa552b83138575ccf98ddd22feef01a453ee 100644 --- a/src/plugins/qmldesigner/components/easingpane/easingcontextpane.cpp +++ b/src/plugins/qmldesigner/components/easingpane/easingcontextpane.cpp @@ -99,7 +99,7 @@ EasingContextPane::EasingContextPane(QWidget *parent) : m_easingGraph->raise(); setLinear(); - ui->playButton->setIcon(QIcon(":/playicon.png")); + ui->playButton->setIcon(QIcon(QLatin1String(":/playicon.png"))); @@ -215,14 +215,14 @@ void EasingContextPane::startAnimation() m_simulation->stop(); else { m_simulation->animate(ui->durationSpinBox->value(), m_easingGraph->easingCurve()); - ui->playButton->setIcon(QIcon(":/stopicon.png")); + ui->playButton->setIcon(QIcon(QLatin1String(":/stopicon.png"))); } } void EasingContextPane::switchToGraph() { - ui->playButton->setIcon(QIcon(":/playicon.png")); + ui->playButton->setIcon(QIcon(QLatin1String(":/playicon.png"))); setGraphDisplayMode(GraphMode); } diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp index 13e61c24b00f66e4c5527df0927295a6473331b9..a363d7c57b090217d322a80c4cafaf9807ccd073 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp @@ -187,7 +187,7 @@ void IdItemDelegate::paint(QPainter *painter, // if the library was also empty, use the default icon if (icon.isNull()) - icon = QIcon(":/ItemLibrary/images/item-default-icon.png"); + icon = QIcon(QLatin1String(":/ItemLibrary/images/item-default-icon.png")); // If no icon is present, leave an empty space of 24 pixels anyway int pixmapSide = 16; diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp index 104e036ac92758ae2764f812efb4b670bd551c63..e89ec025c3af9bf3895ea2e9659a293a36187513 100644 --- a/src/plugins/qmljseditor/qmljseditorplugin.cpp +++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp @@ -175,7 +175,7 @@ bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *e error_message->clear(); Core::FileIconProvider *iconProvider = Core::FileIconProvider::instance(); - iconProvider->registerIconOverlayForSuffix(QIcon(":/qmljseditor/images/qmlfile.png"), "qml"); + iconProvider->registerIconOverlayForSuffix(QIcon(QLatin1String(":/qmljseditor/images/qmlfile.png")), "qml"); m_quickFixCollector = new QmlJSQuickFixCollector; addAutoReleasedObject(m_quickFixCollector); diff --git a/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp b/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp index 98d4dd3adabb90050b82165a34efba0afe9d5fd6..0363979896a0a788b73ee1657d2f13fa9642f036 100644 --- a/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp +++ b/src/plugins/qmljsinspector/qmlinspectortoolbar.cpp @@ -156,17 +156,17 @@ void QmlInspectorToolbar::createActions(const Core::Context &context) ExtensionSystem::PluginManager *pluginManager = ExtensionSystem::PluginManager::instance(); Debugger::DebuggerUISwitcher *uiSwitcher = pluginManager->getObject<Debugger::DebuggerUISwitcher>(); - m_fromQmlAction = new QAction(QIcon(":/qml/images/from-qml-small.png"), tr("Apply Changes to Document"), this); - m_designmodeAction = new QAction(QIcon(":/qml/images/designmode.png"), "Design Mode", this); - - m_reloadAction = new QAction(QIcon(":/qml/images/reload.png"), "Reload", this); - m_playAction = new QAction(QIcon(":/qml/images/play-small.png"), tr("Play animations"), this); - m_pauseAction = new QAction(QIcon(":/qml/images/pause-small.png"), tr("Pause animations"), this); - m_selectAction = new QAction(QIcon(":/qml/images/select-small.png"), tr("Select"), this); - m_selectMarqueeAction = new QAction(QIcon(":/qml/images/select-marquee-small.png"), tr("Select (Marquee)"), this); - m_zoomAction = new QAction(QIcon(":/qml/images/zoom-small.png"), tr("Zoom"), this); - m_colorPickerAction = new QAction(QIcon(":/qml/images/color-picker-small.png"), tr("Color Picker"), this); - m_toQmlAction = new QAction(QIcon(":/qml/images/to-qml-small.png"), tr("Live Preview Changes in QML Viewer"), this); + m_fromQmlAction = new QAction(QIcon(QLatin1String(":/qml/images/from-qml-small.png")), tr("Apply Changes to Document"), this); + m_designmodeAction = new QAction(QIcon(QLatin1String(":/qml/images/designmode.png")), QLatin1String("Design Mode"), this); // TODO: tr? + + m_reloadAction = new QAction(QIcon(QLatin1String(":/qml/images/reload.png")), QLatin1String("Reload"), this); // TODO: tr? + m_playAction = new QAction(QIcon(QLatin1String(":/qml/images/play-small.png")), tr("Play animations"), this); + m_pauseAction = new QAction(QIcon(QLatin1String(":/qml/images/pause-small.png")), tr("Pause animations"), this); + m_selectAction = new QAction(QIcon(QLatin1String(":/qml/images/select-small.png")), tr("Select"), this); + m_selectMarqueeAction = new QAction(QIcon(QLatin1String(":/qml/images/select-marquee-small.png")), tr("Select (Marquee)"), this); + m_zoomAction = new QAction(QIcon(QLatin1String(":/qml/images/zoom-small.png")), tr("Zoom"), this); + m_colorPickerAction = new QAction(QIcon(QLatin1String(":/qml/images/color-picker-small.png")), tr("Color Picker"), this); + m_toQmlAction = new QAction(QIcon(QLatin1String(":/qml/images/to-qml-small.png")), tr("Live Preview Changes in QML Viewer"), this); m_designmodeAction->setCheckable(true); m_designmodeAction->setChecked(false); diff --git a/src/plugins/qmljsinspector/qmljstoolbarcolorbox.cpp b/src/plugins/qmljsinspector/qmljstoolbarcolorbox.cpp index 64d4f7411ae9d5e26845bc6f0e1570cdb165c501..5ea4b1a34957d3a45e0d553b75c7188d85492767 100644 --- a/src/plugins/qmljsinspector/qmljstoolbarcolorbox.cpp +++ b/src/plugins/qmljsinspector/qmljstoolbarcolorbox.cpp @@ -22,7 +22,7 @@ ToolBarColorBox::ToolBarColorBox(QWidget *parent) : m_borderColorOuter = Qt::white; m_borderColorInner = QColor(143, 143 ,143); - m_copyHexColorAction = new QAction(QIcon(":/qml/images/color-picker-small-hicontrast.png"), tr("Copy Color"), this); + m_copyHexColorAction = new QAction(QIcon(QLatin1String(":/qml/images/color-picker-small-hicontrast.png")), tr("Copy Color"), this); connect(m_copyHexColorAction, SIGNAL(triggered()), SLOT(copyColorToClipboard())); setScaledContents(false); } diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp index 4ee13444258062a392ae3c8d4586c3b8fcd7d021..4c1dff9367ba763b0befba2178e61882fd0c6d9d 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp @@ -85,7 +85,7 @@ bool QmlProjectPlugin::initialize(const QStringList &, QString *errorMessage) QmlProjectFileFormat::registerDeclarativeTypes(); Core::FileIconProvider *iconProvider = Core::FileIconProvider::instance(); - iconProvider->registerIconOverlayForSuffix(QIcon(":/qmlproject/images/qmlproject.png"), "qmlproject"); + iconProvider->registerIconOverlayForSuffix(QIcon(QLatin1String(":/qmlproject/images/qmlproject.png")), "qmlproject"); return true; } diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp index a44cbb90d049ff5bd32d041a49bb45dc0ef0b136..1719ec5130d8fa7c75a3643c7c9fd3621cb32a00 100644 --- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp +++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp @@ -99,9 +99,9 @@ GettingStartedWelcomePageWidget::GettingStartedWelcomePageWidget(QWidget *parent connect(ui->createNewProjectButton, SIGNAL(clicked()), this, SLOT(slotCreateNewProject())); ui->createNewProjectButton->setIcon( - QIcon::fromTheme("document-new", ui->createNewProjectButton->icon())); + QIcon::fromTheme(QLatin1String("document-new"), ui->createNewProjectButton->icon())); ui->openProjectButton->setIcon( - QIcon::fromTheme("document-open", ui->openProjectButton->icon())); + QIcon::fromTheme(QLatin1String("document-open"), ui->openProjectButton->icon())); QTimer::singleShot(0, this, SLOT(slotSetPrivateQmlExamples())); } diff --git a/src/plugins/qt4projectmanager/profileeditorfactory.cpp b/src/plugins/qt4projectmanager/profileeditorfactory.cpp index 0fabec8677bf22bfab2cf990fcd5e6a08ff599a2..c2e5e02889680a21be78b33d41cd7769db250a22 100644 --- a/src/plugins/qt4projectmanager/profileeditorfactory.cpp +++ b/src/plugins/qt4projectmanager/profileeditorfactory.cpp @@ -53,11 +53,11 @@ ProFileEditorFactory::ProFileEditorFactory(Qt4Manager *manager, TextEditor::Text m_actionHandler(handler) { Core::FileIconProvider *iconProvider = Core::FileIconProvider::instance(); - iconProvider->registerIconOverlayForSuffix(QIcon(":/qt4projectmanager/images/qt_project.png"), + iconProvider->registerIconOverlayForSuffix(QIcon(QLatin1String(Constants::ICON_QT_PROJECT)), QLatin1String("pro")); - iconProvider->registerIconOverlayForSuffix(QIcon(":/qt4projectmanager/images/qt_project.png"), + iconProvider->registerIconOverlayForSuffix(QIcon(QLatin1String(Constants::ICON_QT_PROJECT)), QLatin1String("pri")); - iconProvider->registerIconOverlayForSuffix(QIcon(":/qt4projectmanager/images/qt_project.png"), + iconProvider->registerIconOverlayForSuffix(QIcon(QLatin1String(Constants::ICON_QT_PROJECT)), QLatin1String("prf")); } diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp index a3a726dc3f9b042f335832cb22a342e1f69d13ee..c8ce15d61e9268d8383d2dca49ffbb4294e59139 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfigurationwidget.cpp @@ -41,6 +41,7 @@ #include "maemorunconfiguration.h" #include "maemosettingspage.h" +#include <coreplugin/coreconstants.h> #include <coreplugin/icore.h> #include <projectexplorer/environmenteditmodel.h> #include <utils/detailswidget.h> @@ -201,12 +202,12 @@ void MaemoRunConfigurationWidget::addMountWidgets(QVBoxLayout *mainLayout) tableLayout->addLayout(mountViewButtonsLayout); QToolButton *addMountButton = new QToolButton; QIcon plusIcon; - plusIcon.addFile(QLatin1String(":/core/images/plus.png")); + plusIcon.addFile(QLatin1String(Core::Constants::ICON_PLUS)); addMountButton->setIcon(plusIcon); mountViewButtonsLayout->addWidget(addMountButton); m_removeMountButton = new QToolButton; QIcon minusIcon; - minusIcon.addFile(QLatin1String(":/core/images/minus.png")); + minusIcon.addFile(QLatin1String(Core::Constants::ICON_MINUS)); m_removeMountButton->setIcon(minusIcon); mountViewButtonsLayout->addWidget(m_removeMountButton); mountViewButtonsLayout->addStretch(1); diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h index ae4df4907de4d4d3fc1d213002de449846d7c2c6..41ca1944eb0065fffef698d0e9af73279005f468 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h +++ b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h @@ -102,6 +102,10 @@ const char * const S60_DEVICE_TARGET_ID("Qt4ProjectManager.Target.S60DeviceTarge const char * const MAEMO_DEVICE_TARGET_ID("Qt4ProjectManager.Target.MaemoDeviceTarget"); const char * const QT_SIMULATOR_TARGET_ID("Qt4ProjectManager.Target.QtSimulatorTarget"); +// ICONS +const char * const ICON_QT_PROJECT = ":/qt4projectmanager/images/qt_project.png"; +const char * const ICON_WINDOW = ":/qt4projectmanager/images/window.png"; + } // namespace Constants } // namespace Qt4ProjectManager diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp index d866299aa53ae91a55bc982d4f61cf27cf30f83d..2a97ea2cbde80d5f93686136d037f87580011ef6 100644 --- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp @@ -38,6 +38,7 @@ #include "qt4projectmanagerconstants.h" #include "qtoutputformatter.h" +#include <coreplugin/coreconstants.h> #include <coreplugin/icore.h> #include <coreplugin/messagemanager.h> #include <coreplugin/variablemanager.h> @@ -215,7 +216,7 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run QToolButton *resetButton = new QToolButton(this); resetButton->setToolTip(tr("Reset to default")); - resetButton->setIcon(QIcon(":/core/images/reset.png")); + resetButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_RESET))); QHBoxLayout *boxlayout = new QHBoxLayout(); boxlayout->setMargin(0); diff --git a/src/plugins/qt4projectmanager/qt4target.cpp b/src/plugins/qt4projectmanager/qt4target.cpp index 6387799691ef9eed6e489fa1db5637ce39b4d25b..a5cbb8ce852a97a0d12d48dc411b75d031790566 100644 --- a/src/plugins/qt4projectmanager/qt4target.cpp +++ b/src/plugins/qt4projectmanager/qt4target.cpp @@ -76,13 +76,13 @@ QIcon iconForId(const QString &id) { if (id == QLatin1String(Constants::DESKTOP_TARGET_ID)) return QIcon(qApp->style()->standardIcon(QStyle::SP_ComputerIcon)); if (id == QLatin1String(Constants::S60_EMULATOR_TARGET_ID)) - return QIcon(":/projectexplorer/images/SymbianEmulator.png"); + return QIcon(QLatin1String(":/projectexplorer/images/SymbianEmulator.png")); if (id == QLatin1String(Constants::S60_DEVICE_TARGET_ID)) - return QIcon(":/projectexplorer/images/SymbianDevice.png"); + return QIcon(QLatin1String(":/projectexplorer/images/SymbianDevice.png")); if (id == QLatin1String(Constants::MAEMO_DEVICE_TARGET_ID)) - return QIcon(":/projectexplorer/images/MaemoDevice.png"); + return QIcon(QLatin1String(":/projectexplorer/images/MaemoDevice.png")); if (id == QLatin1String(Constants::QT_SIMULATOR_TARGET_ID)) - return QIcon(":/projectexplorer/images/SymbianEmulator.png"); + return QIcon(QLatin1String(":/projectexplorer/images/SymbianEmulator.png")); return QIcon(); } diff --git a/src/plugins/resourceeditor/resourceeditorfactory.cpp b/src/plugins/resourceeditor/resourceeditorfactory.cpp index 2809cf15e1507c2fe3019ea81b54df6cdd29dd6e..7a3019b69dfb72eb8136608cd80b94d705e6f4e8 100644 --- a/src/plugins/resourceeditor/resourceeditorfactory.cpp +++ b/src/plugins/resourceeditor/resourceeditorfactory.cpp @@ -48,7 +48,7 @@ ResourceEditorFactory::ResourceEditorFactory(ResourceEditorPlugin *plugin) : m_plugin(plugin) { Core::FileIconProvider *iconProvider = Core::FileIconProvider::instance(); - iconProvider->registerIconOverlayForSuffix(QIcon(":/resourceeditor/images/qt_qrc.png"), + iconProvider->registerIconOverlayForSuffix(QIcon(QLatin1String(":/resourceeditor/images/qt_qrc.png")), QLatin1String("qrc")); } diff --git a/src/plugins/texteditor/outlinefactory.cpp b/src/plugins/texteditor/outlinefactory.cpp index e2542ee9536195298de1629264d01be95f910a36..9829115f120b691a80bbc4257174308039788dc3 100644 --- a/src/plugins/texteditor/outlinefactory.cpp +++ b/src/plugins/texteditor/outlinefactory.cpp @@ -1,4 +1,5 @@ #include "outlinefactory.h" +#include <coreplugin/coreconstants.h> #include <coreplugin/icore.h> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/ieditor.h> @@ -27,14 +28,14 @@ OutlineWidgetStack::OutlineWidgetStack(OutlineFactory *factory) : addWidget(label); m_toggleSync = new QToolButton; - m_toggleSync->setIcon(QIcon(":/core/images/linkicon.png")); + m_toggleSync->setIcon(QIcon(QLatin1String(Core::Constants::ICON_LINK))); m_toggleSync->setCheckable(true); m_toggleSync->setChecked(true); m_toggleSync->setToolTip(tr("Synchronize with Editor")); connect(m_toggleSync, SIGNAL(clicked(bool)), this, SLOT(toggleCursorSynchronization())); m_filterButton = new QToolButton; - m_filterButton->setIcon(QIcon(":/core/images/filtericon.png")); + m_filterButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_FILTER))); m_filterButton->setToolTip(tr("Filter tree")); m_filterButton->setPopupMode(QToolButton::InstantPopup); m_filterMenu = new QMenu(m_filterButton); diff --git a/src/plugins/welcome/welcomemode.cpp b/src/plugins/welcome/welcomemode.cpp index 7d345bc471a743c88bfa5648ab1be524036e80bd..4c7e3d576303c871569769ec2943db0f460a7d8a 100644 --- a/src/plugins/welcome/welcomemode.cpp +++ b/src/plugins/welcome/welcomemode.cpp @@ -129,7 +129,7 @@ QString WelcomeMode::displayName() const QIcon WelcomeMode::icon() const { - return QIcon(QLatin1String(":/core/images/qtcreator_logo_32.png")); + return QIcon(QLatin1String(Core::Constants::ICON_QTLOGO_32)); } int WelcomeMode::priority() const