From 6c1e557d70a15cea93e1cb59522849b4266e229a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Mon, 12 Jan 2009 15:06:43 +0100
Subject: [PATCH] Changed coreplugin resource prefix to "/core"
It still read "/qworkbench", the research project name for Qt Creator.
Reviewed-by: con
---
src/libs/utils/filewizarddialog.cpp | 2 +-
src/plugins/coreplugin/basefilewizard.cpp | 2 +-
src/plugins/coreplugin/core.qrc | 2 +-
src/plugins/coreplugin/coreconstants.h | 42 +++++++++----------
src/plugins/coreplugin/coreplugin.h | 6 +--
.../coreplugin/dialogs/shortcutsettings.ui | 4 +-
.../coreplugin/editormanager/editorgroup.cpp | 2 +-
.../editormanager/openeditorsview.cpp | 4 +-
.../editormanager/openeditorswindow.cpp | 4 +-
.../editormanager/stackededitorgroup.cpp | 8 ++--
src/plugins/coreplugin/fileiconprovider.cpp | 2 +-
src/plugins/coreplugin/generalsettings.ui | 4 +-
src/plugins/coreplugin/mainwindow.cpp | 2 +-
src/plugins/coreplugin/manhattanstyle.cpp | 12 +++---
src/plugins/coreplugin/navigationwidget.cpp | 4 +-
src/plugins/coreplugin/outputpane.cpp | 12 +++---
src/plugins/coreplugin/sidebar.cpp | 4 +-
src/plugins/coreplugin/versiondialog.cpp | 4 +-
src/plugins/coreplugin/welcomemode.cpp | 12 +++---
src/plugins/find/findtoolbar.cpp | 2 +-
src/plugins/help/helpplugin.cpp | 2 +-
.../buildsettingspropertiespage.cpp | 5 ++-
.../projectexplorer/buildstepspage.cpp | 5 ++-
.../foldernavigationwidget.cpp | 2 +-
.../projectexplorer/projecttreewidget.cpp | 2 +-
.../runsettingspropertiespage.cpp | 5 ++-
26 files changed, 79 insertions(+), 76 deletions(-)
diff --git a/src/libs/utils/filewizarddialog.cpp b/src/libs/utils/filewizarddialog.cpp
index a564c63bb4f..0e8655bf7ca 100644
--- a/src/libs/utils/filewizarddialog.cpp
+++ b/src/libs/utils/filewizarddialog.cpp
@@ -46,7 +46,7 @@ FileWizardDialog::FileWizardDialog(QWidget *parent) :
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
setOption(QWizard::NoCancelButton, false);
setOption(QWizard::NoDefaultButton, false);
- setPixmap(QWizard::WatermarkPixmap, QPixmap(QLatin1String(":/qworkbench/images/qtwatermark.png")));
+ setPixmap(QWizard::WatermarkPixmap, QPixmap(QLatin1String(":/core/images/qtwatermark.png")));
addPage(m_filePage);
connect(m_filePage, SIGNAL(activated()), button(QWizard::FinishButton), SLOT(animateClick()));
}
diff --git a/src/plugins/coreplugin/basefilewizard.cpp b/src/plugins/coreplugin/basefilewizard.cpp
index 51ad57bc27d..468c76a0dc6 100644
--- a/src/plugins/coreplugin/basefilewizard.cpp
+++ b/src/plugins/coreplugin/basefilewizard.cpp
@@ -503,7 +503,7 @@ QStringList BaseFileWizard::runWizard(const QString &path, QWidget *parent)
QPixmap BaseFileWizard::watermark()
{
- return QPixmap(QLatin1String(":/qworkbench/images/qtwatermark.png"));
+ return QPixmap(QLatin1String(":/core/images/qtwatermark.png"));
}
void BaseFileWizard::setupWizard(QWizard *w)
diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc
index 00cd47c92b0..c2a38452dcf 100644
--- a/src/plugins/coreplugin/core.qrc
+++ b/src/plugins/coreplugin/core.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/qworkbench" >
+ <qresource prefix="/core" >
<file>html/images/bg_site_header_dark_grey.png</file>
<file>html/images/body_bg_circles_bottom_right.png</file>
<file>html/images/body_bg_gradient.png</file>
diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h
index 301cfb6d39a..dd8155db820 100644
--- a/src/plugins/coreplugin/coreconstants.h
+++ b/src/plugins/coreplugin/coreconstants.h
@@ -194,27 +194,27 @@ const char * const G_WINDOW_LIST = "QtCreator.Group.Window.List";
const char * const G_HELP_HELP = "QtCreator.Group.Help.Help";
const char * const G_HELP_ABOUT = "QtCreator.Group.Help.About";
-const char * const ICON_MINUS = ":/qworkbench/images/minus.png";
-const char * const ICON_PLUS = ":/qworkbench/images/plus.png";
-const char * const ICON_NEWFILE = ":/qworkbench/images/filenew.png";
-const char * const ICON_OPENFILE = ":/qworkbench/images/fileopen.png";
-const char * const ICON_SAVEFILE = ":/qworkbench/images/filesave.png";
-const char * const ICON_UNDO = ":/qworkbench/images/undo.png";
-const char * const ICON_REDO = ":/qworkbench/images/redo.png";
-const char * const ICON_COPY = ":/qworkbench/images/editcopy.png";
-const char * const ICON_PASTE = ":/qworkbench/images/editpaste.png";
-const char * const ICON_CUT = ":/qworkbench/images/editcut.png";
-const char * const ICON_NEXT = ":/qworkbench/images/next.png";
-const char * const ICON_PREV = ":/qworkbench/images/prev.png";
-const char * const ICON_DIR = ":/qworkbench/images/dir.png";
-const char * const ICON_CLEAN_PANE = ":/qworkbench/images/clean_pane_small.png";
-const char * const ICON_CLEAR = ":/qworkbench/images/clear.png";
-const char * const ICON_FIND = ":/qworkbench/images/find.png";
-const char * const ICON_FINDNEXT = ":/qworkbench/images/findnext.png";
-const char * const ICON_REPLACE = ":/qworkbench/images/replace.png";
-const char * const ICON_RESET = ":/qworkbench/images/reset.png";
-const char * const ICON_MAGNIFIER = ":/qworkbench/images/magnifier.png";
-const char * const ICON_TOGGLE_SIDEBAR = ":/qworkbench/images/sidebaricon.png";
+const char * const ICON_MINUS = ":/core/images/minus.png";
+const char * const ICON_PLUS = ":/core/images/plus.png";
+const char * const ICON_NEWFILE = ":/core/images/filenew.png";
+const char * const ICON_OPENFILE = ":/core/images/fileopen.png";
+const char * const ICON_SAVEFILE = ":/core/images/filesave.png";
+const char * const ICON_UNDO = ":/core/images/undo.png";
+const char * const ICON_REDO = ":/core/images/redo.png";
+const char * const ICON_COPY = ":/core/images/editcopy.png";
+const char * const ICON_PASTE = ":/core/images/editpaste.png";
+const char * const ICON_CUT = ":/core/images/editcut.png";
+const char * const ICON_NEXT = ":/core/images/next.png";
+const char * const ICON_PREV = ":/core/images/prev.png";
+const char * const ICON_DIR = ":/core/images/dir.png";
+const char * const ICON_CLEAN_PANE = ":/core/images/clean_pane_small.png";
+const char * const ICON_CLEAR = ":/core/images/clear.png";
+const char * const ICON_FIND = ":/core/images/find.png";
+const char * const ICON_FINDNEXT = ":/core/images/findnext.png";
+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";
// wizard kind
const char * const WIZARD_TYPE_FILE = "QtCreator::WizardType::File";
diff --git a/src/plugins/coreplugin/coreplugin.h b/src/plugins/coreplugin/coreplugin.h
index f14d3b1a74c..a8341c97e90 100644
--- a/src/plugins/coreplugin/coreplugin.h
+++ b/src/plugins/coreplugin/coreplugin.h
@@ -31,8 +31,8 @@
**
***************************************************************************/
-#ifndef QWORKBENCHPLUGIN_H
-#define QWORKBENCHPLUGIN_H
+#ifndef COREPLUGIN_H
+#define COREPLUGIN_H
#include <extensionsystem/iplugin.h>
@@ -68,4 +68,4 @@ private:
} // namespace Internal
} // namespace Core
-#endif // QWORKBENCHPLUGIN_H
+#endif // COREPLUGIN_H
diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.ui b/src/plugins/coreplugin/dialogs/shortcutsettings.ui
index 4faaec4b32e..f1cc3f795a5 100644
--- a/src/plugins/coreplugin/dialogs/shortcutsettings.ui
+++ b/src/plugins/coreplugin/dialogs/shortcutsettings.ui
@@ -131,7 +131,7 @@
</property>
<property name="icon">
<iconset resource="../core.qrc">
- <normaloff>:/qworkbench/images/reset.png</normaloff>:/qworkbench/images/reset.png</iconset>
+ <normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset>
</property>
</widget>
</item>
@@ -145,7 +145,7 @@
</property>
<property name="icon">
<iconset resource="../core.qrc">
- <normaloff>:/qworkbench/images/clear.png</normaloff>:/qworkbench/images/clear.png</iconset>
+ <normaloff>:/core/images/clear.png</normaloff>:/core/images/clear.png</iconset>
</property>
</widget>
</item>
diff --git a/src/plugins/coreplugin/editormanager/editorgroup.cpp b/src/plugins/coreplugin/editormanager/editorgroup.cpp
index 82c30db30fb..91adef17805 100644
--- a/src/plugins/coreplugin/editormanager/editorgroup.cpp
+++ b/src/plugins/coreplugin/editormanager/editorgroup.cpp
@@ -118,7 +118,7 @@ QVariant EditorModel::data(const QModelIndex &index, int role) const
: editor->displayName();
case Qt::DecorationRole:
return editor->file()->isReadOnly()
- ? QIcon(QLatin1String(":/qworkbench/images/locked.png"))
+ ? QIcon(QLatin1String(":/core/images/locked.png"))
: QIcon();
case Qt::ToolTipRole:
return editor->file()->fileName().isEmpty()
diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.cpp b/src/plugins/coreplugin/editormanager/openeditorsview.cpp
index a25e92ef0ce..755826c94a4 100644
--- a/src/plugins/coreplugin/editormanager/openeditorsview.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorsview.cpp
@@ -172,8 +172,8 @@ void OpenEditorsWidget::updateCurrentItem(QTreeWidgetItem *currentItem)
//todo: this is almost duplicated in openeditorswindow
void OpenEditorsWidget::updateItem(QTreeWidgetItem *item, IEditor *editor)
{
- static const QIcon lockedIcon(QLatin1String(":/qworkbench/images/locked.png"));
- static const QIcon emptyIcon(QLatin1String(":/qworkbench/images/empty14.png"));
+ static const QIcon lockedIcon(QLatin1String(":/core/images/locked.png"));
+ static const QIcon emptyIcon(QLatin1String(":/core/images/empty14.png"));
QString title = editor->displayName();
if (editor->file()->isModified())
title += tr("*");
diff --git a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
index b17b79c9119..c7fe93b7155 100644
--- a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
@@ -300,8 +300,8 @@ void OpenEditorsWindow::centerOnItem(int selectedIndex)
void OpenEditorsWindow::updateItem(QTreeWidgetItem *item, IEditor *editor)
{
- static const QIcon lockedIcon(QLatin1String(":/qworkbench/images/locked.png"));
- static const QIcon emptyIcon(QLatin1String(":/qworkbench/images/empty14.png"));
+ static const QIcon lockedIcon(QLatin1String(":/core/images/locked.png"));
+ static const QIcon emptyIcon(QLatin1String(":/core/images/empty14.png"));
QString title = editor->displayName();
if (editor->file()->isModified())
diff --git a/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp b/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp
index 6b46fa3b164..0111be02b76 100644
--- a/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp
+++ b/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp
@@ -103,7 +103,7 @@ StackedEditorGroup::StackedEditorGroup(QWidget *parent) :
m_lockButton->setProperty("type", QLatin1String("dockbutton"));
m_closeButton->setAutoRaise(true);
- m_closeButton->setIcon(QIcon(":/qworkbench/images/closebutton.png"));
+ m_closeButton->setIcon(QIcon(":/core/images/closebutton.png"));
m_closeButton->setProperty("type", QLatin1String("dockbutton"));
QToolBar *rightToolBar = new QToolBar;
@@ -150,7 +150,7 @@ StackedEditorGroup::StackedEditorGroup(QWidget *parent) :
QToolButton *closeButton = new QToolButton;
closeButton->setAutoRaise(true);
- closeButton->setIcon(QIcon(":/qworkbench/images/clear.png"));
+ closeButton->setIcon(QIcon(":/core/images/clear.png"));
closeButton->setToolTip(tr("Close"));
connect(closeButton, SIGNAL(clicked()), m_infoWidget, SLOT(hide()));
@@ -303,8 +303,8 @@ void StackedEditorGroup::checkEditorStatus()
void StackedEditorGroup::updateEditorStatus(IEditor *editor)
{
- static const QIcon lockedIcon(QLatin1String(":/qworkbench/images/locked.png"));
- static const QIcon unlockedIcon(QLatin1String(":/qworkbench/images/unlocked.png"));
+ static const QIcon lockedIcon(QLatin1String(":/core/images/locked.png"));
+ static const QIcon unlockedIcon(QLatin1String(":/core/images/unlocked.png"));
if (editor->file()->isReadOnly()) {
m_lockButton->setIcon(lockedIcon);
diff --git a/src/plugins/coreplugin/fileiconprovider.cpp b/src/plugins/coreplugin/fileiconprovider.cpp
index 772c826d3fe..0c4b4a39de1 100644
--- a/src/plugins/coreplugin/fileiconprovider.cpp
+++ b/src/plugins/coreplugin/fileiconprovider.cpp
@@ -48,7 +48,7 @@ using namespace Core;
FileIconProvider *FileIconProvider::m_instance = 0;
FileIconProvider::FileIconProvider()
- : m_unknownFileIcon(QLatin1String(":/qworkbench/images/unknownfile.png"))
+ : m_unknownFileIcon(QLatin1String(":/core/images/unknownfile.png"))
{
}
diff --git a/src/plugins/coreplugin/generalsettings.ui b/src/plugins/coreplugin/generalsettings.ui
index f3b50c5e4b3..c014fae607b 100644
--- a/src/plugins/coreplugin/generalsettings.ui
+++ b/src/plugins/coreplugin/generalsettings.ui
@@ -77,7 +77,7 @@
</property>
<property name="icon">
<iconset resource="core.qrc">
- <normaloff>:/qworkbench/images/reset.png</normaloff>:/qworkbench/images/reset.png</iconset>
+ <normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset>
</property>
</widget>
</item>
@@ -118,7 +118,7 @@
</property>
<property name="icon">
<iconset resource="core.qrc">
- <normaloff>:/qworkbench/images/reset.png</normaloff>:/qworkbench/images/reset.png</iconset>
+ <normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset>
</property>
</widget>
</item>
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index f68c5da7d06..9a70673e088 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -149,7 +149,7 @@ MainWindow::MainWindow() :
m_toggleSideBarButton(new QToolButton)
{
setWindowTitle(tr("Qt Creator"));
- qApp->setWindowIcon(QIcon(":/qworkbench/images/qtcreator_logo_128.png"));
+ qApp->setWindowIcon(QIcon(":/core/images/qtcreator_logo_128.png"));
setDockNestingEnabled(true);
setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea);
diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
index 5b72c891cd6..9237883221b 100644
--- a/src/plugins/coreplugin/manhattanstyle.cpp
+++ b/src/plugins/coreplugin/manhattanstyle.cpp
@@ -102,11 +102,11 @@ public:
{
style = QStyleFactory::create(baseStyleName);
QTC_ASSERT(style, /**/);
- buttonImage_pressed = QImage(":/qworkbench/images/pushbutton_pressed.png");
- buttonImage = QImage(":/qworkbench/images/pushbutton.png");
+ buttonImage_pressed = QImage(":/core/images/pushbutton_pressed.png");
+ buttonImage = QImage(":/core/images/pushbutton.png");
- lineeditImage = QImage(":/qworkbench/images/inputfield.png");
- lineeditImage_disabled = QImage(":/qworkbench/images/inputfield_disabled.png");
+ lineeditImage = QImage(":/core/images/inputfield.png");
+ lineeditImage_disabled = QImage(":/core/images/inputfield_disabled.png");
}
~ManhattanStylePrivate()
@@ -345,7 +345,7 @@ void ManhattanStyle::polish(QPalette &pal)
QIcon ManhattanStyle::standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *option,
const QWidget *widget) const
{
- static const QIcon closeButton(":/qworkbench/images/closebutton.png");
+ static const QIcon closeButton(":/core/images/closebutton.png");
QIcon icon;
switch (standardIcon) {
case QStyle::SP_TitleBarCloseButton:
@@ -360,7 +360,7 @@ QIcon ManhattanStyle::standardIconImplementation(StandardPixmap standardIcon, co
QPixmap ManhattanStyle::standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt,
const QWidget *widget) const
{
- static const QPixmap closeButton(":/qworkbench/images/closebutton.png");
+ static const QPixmap closeButton(":/core/images/closebutton.png");
QPixmap pixmap;
switch (standardPixmap) {
case QStyle::SP_TitleBarCloseButton:
diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp
index 412559a9b0a..491c3943438 100644
--- a/src/plugins/coreplugin/navigationwidget.cpp
+++ b/src/plugins/coreplugin/navigationwidget.cpp
@@ -358,13 +358,13 @@ NavigationSubWidget::NavigationSubWidget(NavigationWidget *parentWidget)
QToolButton *split = new QToolButton;
split->setProperty("type", QLatin1String("dockbutton"));
- split->setIcon(QIcon(":/qworkbench/images/splitbutton_horizontal.png"));
+ split->setIcon(QIcon(":/core/images/splitbutton_horizontal.png"));
split->setToolTip(tr("Split"));
connect(split, SIGNAL(clicked(bool)), this, SIGNAL(split()));
QToolButton *close = new QToolButton;
close->setProperty("type", QLatin1String("dockbutton"));
- close->setIcon(QIcon(":/qworkbench/images/closebutton.png"));
+ close->setIcon(QIcon(":/core/images/closebutton.png"));
close->setToolTip(tr("Close"));
connect(close, SIGNAL(clicked(bool)), this, SIGNAL(close()));
diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp
index 6d97c5d3611..6b5c3b146d1 100644
--- a/src/plugins/coreplugin/outputpane.cpp
+++ b/src/plugins/coreplugin/outputpane.cpp
@@ -167,7 +167,7 @@ OutputPane::OutputPane(const QList<int> &context, QWidget *parent) :
m_clearButton->setToolTip(tr("Clear"));
connect(m_clearButton, SIGNAL(clicked()), this, SLOT(clearPage()));
- m_closeButton->setIcon(QIcon(":/qworkbench/images/closebutton.png"));
+ m_closeButton->setIcon(QIcon(":/core/images/closebutton.png"));
m_closeButton->setProperty("type", QLatin1String("dockbutton"));
connect(m_closeButton, SIGNAL(clicked()), this, SLOT(slotHide()));
@@ -488,13 +488,13 @@ OutputPaneToggleButton::OutputPaneToggleButton(int number, const QString &text,
setFocusPolicy(Qt::NoFocus);
setCheckable(true);
setStyleSheet(
- "QPushButton { border-image: url(:/qworkbench/images/panel_button.png) 2 2 2 19;"
+ "QPushButton { border-image: url(:/core/images/panel_button.png) 2 2 2 19;"
" border-width: 2px 2px 2px 19px; padding-left: -17; padding-right: 4 } "
- "QPushButton:checked { border-image: url(:/qworkbench/images/panel_button_checked.png) 2 2 2 19 } "
+ "QPushButton:checked { border-image: url(:/core/images/panel_button_checked.png) 2 2 2 19 } "
#ifndef Q_WS_MAC // Mac UI's dont usually do hover
- "QPushButton:checked:hover { border-image: url(:/qworkbench/images/panel_button_checked_hover.png) 2 2 2 19 } "
- "QPushButton:pressed:hover { border-image: url(:/qworkbench/images/panel_button_pressed.png) 2 2 2 19 } "
- "QPushButton:hover { border-image: url(:/qworkbench/images/panel_button_hover.png) 2 2 2 19 } "
+ "QPushButton:checked:hover { border-image: url(:/core/images/panel_button_checked_hover.png) 2 2 2 19 } "
+ "QPushButton:pressed:hover { border-image: url(:/core/images/panel_button_pressed.png) 2 2 2 19 } "
+ "QPushButton:hover { border-image: url(:/core/images/panel_button_hover.png) 2 2 2 19 } "
#endif
);
}
diff --git a/src/plugins/coreplugin/sidebar.cpp b/src/plugins/coreplugin/sidebar.cpp
index 36f744769fb..17887450d9b 100644
--- a/src/plugins/coreplugin/sidebar.cpp
+++ b/src/plugins/coreplugin/sidebar.cpp
@@ -231,13 +231,13 @@ SideBarWidget::SideBarWidget(SideBar *sideBar, const QString &title)
m_splitButton = new QToolButton;
m_splitButton->setProperty("type", QLatin1String("dockbutton"));
- m_splitButton->setIcon(QIcon(":/qworkbench/images/splitbutton_horizontal.png"));
+ m_splitButton->setIcon(QIcon(":/core/images/splitbutton_horizontal.png"));
m_splitButton->setToolTip(tr("Split"));
connect(m_splitButton, SIGNAL(clicked(bool)), this, SIGNAL(split()));
m_closeButton = new QToolButton;
m_closeButton->setProperty("type", QLatin1String("dockbutton"));
- m_closeButton->setIcon(QIcon(":/qworkbench/images/closebutton.png"));
+ m_closeButton->setIcon(QIcon(":/core/images/closebutton.png"));
m_closeButton->setToolTip(tr("Close"));
connect(m_closeButton, SIGNAL(clicked(bool)), this, SIGNAL(close()));
diff --git a/src/plugins/coreplugin/versiondialog.cpp b/src/plugins/coreplugin/versiondialog.cpp
index 4fdb3166cf3..52810c00efc 100644
--- a/src/plugins/coreplugin/versiondialog.cpp
+++ b/src/plugins/coreplugin/versiondialog.cpp
@@ -56,7 +56,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(":/qworkbench/images/qtcreator_logo_128.png"));
+ setWindowIcon(QIcon(":/core/images/qtcreator_logo_128.png"));
setWindowTitle(tr("About Qt Creator"));
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
@@ -102,7 +102,7 @@ VersionDialog::VersionDialog(QWidget *parent)
connect(buttonBox , SIGNAL(helpRequested()), this, SLOT(popupLicense()));
QLabel *logoLabel = new QLabel;
- logoLabel->setPixmap(QPixmap(QLatin1String(":/qworkbench/images/qtcreator_logo_128.png")));
+ logoLabel->setPixmap(QPixmap(QLatin1String(":/core/images/qtcreator_logo_128.png")));
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/coreplugin/welcomemode.cpp b/src/plugins/coreplugin/welcomemode.cpp
index be5dd624295..a0f5f98b998 100644
--- a/src/plugins/coreplugin/welcomemode.cpp
+++ b/src/plugins/coreplugin/welcomemode.cpp
@@ -92,16 +92,16 @@ WelcomeModePrivate::WelcomeModePrivate() :
#else
m_label(new QLabel),
#endif
- m_htmlTemplate(readFile(QLatin1String(":/qworkbench/html/welcome.html"))),
- m_sessionHtmlTemplate(readFile(QLatin1String(":/qworkbench/html/recent_sessions.html"))),
- m_projectHtmlTemplate(readFile(QLatin1String(":/qworkbench/html/recent_projects.html"))),
- m_baseUrl(QUrl(QLatin1String("qrc:/qworkbench/html/welcome.html")))
+ m_htmlTemplate(readFile(QLatin1String(":/core/html/welcome.html"))),
+ m_sessionHtmlTemplate(readFile(QLatin1String(":/core/html/recent_sessions.html"))),
+ m_projectHtmlTemplate(readFile(QLatin1String(":/core/html/recent_projects.html"))),
+ m_baseUrl(QUrl(QLatin1String("qrc:/core/html/welcome.html")))
{
}
#if defined(QT_NO_WEBKIT)
-const char *LABEL = "<center><table><tr><td><img src=\":/qworkbench/html/images/product_logo.png\"/></td><td width=300>"
+const char *LABEL = "<center><table><tr><td><img src=\":/core/html/images/product_logo.png\"/></td><td width=300>"
"<h2><br/><br/>Welcome</h2><p> Qt Creator is an intuitive, modern cross platform IDE that enables "
"developers to create graphically appealing applications for desktop, "
"embedded, and mobile devices. "
@@ -172,7 +172,7 @@ QString WelcomeMode::name() const
QIcon WelcomeMode::icon() const
{
- return QIcon(QLatin1String(":/qworkbench/images/qtcreator_logo_32.png"));
+ return QIcon(QLatin1String(":/core/images/qtcreator_logo_32.png"));
}
int WelcomeMode::priority() const
diff --git a/src/plugins/find/findtoolbar.cpp b/src/plugins/find/findtoolbar.cpp
index d11768499a9..edfb5015baa 100644
--- a/src/plugins/find/findtoolbar.cpp
+++ b/src/plugins/find/findtoolbar.cpp
@@ -81,7 +81,7 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen
addWidget(spacerItem);
QToolButton *close = new QToolButton;
close->setProperty("type", QLatin1String("dockbutton"));
- close->setIcon(QIcon(":/qworkbench/images/closebutton.png"));
+ close->setIcon(QIcon(":/core/images/closebutton.png"));
connect(close, SIGNAL(clicked()), this, SLOT(hideAndResetFocus()));
addWidget(close);
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 5ecb375240d..3ed3263478d 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -355,7 +355,7 @@ void HelpPlugin::createRightPaneSideBar()
QToolButton *closeButton = new QToolButton();
closeButton->setProperty("type", QLatin1String("dockbutton"));
- closeButton->setIcon(QIcon(":/qworkbench/images/closebutton.png"));
+ closeButton->setIcon(QIcon(":/core/images/closebutton.png"));
// Dummy layout to align the close button to the right
QHBoxLayout *hboxLayout = new QHBoxLayout();
diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
index 8a42ec12736..b642a4e3867 100644
--- a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
@@ -36,6 +36,7 @@
#include "buildstepspage.h"
#include "project.h"
+#include <coreplugin/coreconstants.h>
#include <extensionsystem/pluginmanager.h>
#include <QtCore/QDebug>
@@ -102,9 +103,9 @@ BuildSettingsWidget::BuildSettingsWidget(Project *project)
m_ui.splitter->setStretchFactor(1,10);
m_ui.buildSettingsList->setContextMenuPolicy(Qt::CustomContextMenu);
- m_ui.addButton->setIcon(QIcon(":/qworkbench/images/plus.png"));
+ m_ui.addButton->setIcon(QIcon(Core::Constants::ICON_PLUS));
m_ui.addButton->setText("");
- m_ui.removeButton->setIcon(QIcon(":/qworkbench/images/minus.png"));
+ m_ui.removeButton->setIcon(QIcon(Core::Constants::ICON_MINUS));
m_ui.removeButton->setText("");
QMenu *addButtonMenu = new QMenu(this);
diff --git a/src/plugins/projectexplorer/buildstepspage.cpp b/src/plugins/projectexplorer/buildstepspage.cpp
index 88536a09e09..735770877b0 100644
--- a/src/plugins/projectexplorer/buildstepspage.cpp
+++ b/src/plugins/projectexplorer/buildstepspage.cpp
@@ -36,6 +36,7 @@
#include "ui_buildstepspage.h"
#include "project.h"
+#include <coreplugin/coreconstants.h>
#include <extensionsystem/pluginmanager.h>
#include <utils/qtcassert.h>
@@ -50,8 +51,8 @@ BuildStepsPage::BuildStepsPage(Project *project) :
m_ui->setupUi(this);
m_ui->buildStepAddButton->setMenu(new QMenu(this));
- m_ui->buildStepAddButton->setIcon(QIcon(":/qworkbench/images/plus.png"));
- m_ui->buildStepRemoveToolButton->setIcon(QIcon(":/qworkbench/images/minus.png"));
+ m_ui->buildStepAddButton->setIcon(QIcon(Core::Constants::ICON_PLUS));
+ m_ui->buildStepRemoveToolButton->setIcon(QIcon(Core::Constants::ICON_MINUS));
m_ui->buildStepUpToolButton->setArrowType(Qt::UpArrow);
m_ui->buildStepDownToolButton->setArrowType(Qt::DownArrow);
diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp
index 75a92945dd6..4fcca615163 100644
--- a/src/plugins/projectexplorer/foldernavigationwidget.cpp
+++ b/src/plugins/projectexplorer/foldernavigationwidget.cpp
@@ -209,7 +209,7 @@ Core::NavigationView FolderNavigationWidgetFactory::createWidget()
n.widget = ptw;
QToolButton *toggleSync = new QToolButton;
toggleSync->setProperty("type", "dockbutton");
- toggleSync->setIcon(QIcon(":/qworkbench/images/linkicon.png"));
+ toggleSync->setIcon(QIcon(":/core/images/linkicon.png"));
toggleSync->setCheckable(true);
toggleSync->setChecked(ptw->autoSynchronization());
toggleSync->setToolTip(tr("Synchronize with Editor"));
diff --git a/src/plugins/projectexplorer/projecttreewidget.cpp b/src/plugins/projectexplorer/projecttreewidget.cpp
index 49d8ff3070e..39b7214d214 100644
--- a/src/plugins/projectexplorer/projecttreewidget.cpp
+++ b/src/plugins/projectexplorer/projecttreewidget.cpp
@@ -159,7 +159,7 @@ ProjectTreeWidget::ProjectTreeWidget(Core::ICore *core, QWidget *parent)
m_toggleSync = new QToolButton;
m_toggleSync->setProperty("type", "dockbutton");
- m_toggleSync->setIcon(QIcon(":/qworkbench/images/linkicon.png"));
+ m_toggleSync->setIcon(QIcon(":/core/images/linkicon.png"));
m_toggleSync->setCheckable(true);
m_toggleSync->setChecked(autoSynchronization());
m_toggleSync->setToolTip(tr("Synchronize with Editor"));
diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
index afaa8b04cce..2f309814dd7 100644
--- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
@@ -36,6 +36,7 @@
#include "ui_runsettingspropertiespage.h"
+#include <coreplugin/coreconstants.h>
#include <extensionsystem/pluginmanager.h>
#include <utils/qtcassert.h>
@@ -180,9 +181,9 @@ RunSettingsWidget::RunSettingsWidget(Project *project)
m_ui = new Ui::RunSettingsPropertiesPage;
m_ui->setupUi(this);
m_addMenu = new QMenu(m_ui->addToolButton);
- m_ui->addToolButton->setIcon(QIcon(":/qworkbench/images/plus.png"));
+ m_ui->addToolButton->setIcon(QIcon(Core::Constants::ICON_PLUS));
m_ui->addToolButton->setMenu(m_addMenu);
- m_ui->removeToolButton->setIcon(QIcon(":/qworkbench/images/minus.png"));
+ m_ui->removeToolButton->setIcon(QIcon(Core::Constants::ICON_MINUS));
m_ui->runConfigurationCombo->setModel(m_runConfigurationsModel);
connect(m_addMenu, SIGNAL(aboutToShow()),
--
GitLab