diff options
author | dt <qtc-committer@nokia.com> | 2011-05-20 19:48:44 +0200 |
---|---|---|
committer | Daniel Teske <daniel.teske@nokia.com> | 2011-05-23 11:55:39 +0200 |
commit | 1ce9e72dc106ea048d4af3e2c2de0a033826790d (patch) | |
tree | fd78999f5fb2ea01e2a1b9651c229ffe851cdf3f /src | |
parent | 9f5473e76957681c191ad96d8a7cc9187019eada (diff) | |
download | qt-creator-1ce9e72dc106ea048d4af3e2c2de0a033826790d.tar.gz |
Move window.png from qt4projectmanager to projectexplorer
Change-Id: Iceb54733dc92c2d674561b803757e1836544aa43
Reviewed-on: http://codereview.qt.nokia.com/60
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/projectexplorer/appoutputpane.cpp | 4 | ||||
-rw-r--r-- | src/plugins/projectexplorer/compileoutputwindow.cpp | 3 | ||||
-rw-r--r-- | src/plugins/projectexplorer/images/window.png (renamed from src/plugins/qt4projectmanager/images/window.png) | bin | 323 -> 323 bytes | |||
-rw-r--r-- | src/plugins/projectexplorer/projectexplorer.qrc | 1 | ||||
-rw-r--r-- | src/plugins/projectexplorer/projectexplorerconstants.h | 1 | ||||
-rw-r--r-- | src/plugins/projectexplorer/taskwindow.cpp | 3 | ||||
-rw-r--r-- | src/plugins/qt4projectmanager/qt4projectmanager.qrc | 1 | ||||
-rw-r--r-- | src/plugins/qt4projectmanager/qt4projectmanagerconstants.h | 1 |
8 files changed, 5 insertions, 9 deletions
diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp index 95ede24570..67171f20b5 100644 --- a/src/plugins/projectexplorer/appoutputpane.cpp +++ b/src/plugins/projectexplorer/appoutputpane.cpp @@ -47,7 +47,6 @@ #include <texteditor/fontsettings.h> #include <texteditor/texteditorsettings.h> -#include <qt4projectmanager/qt4projectmanagerconstants.h> #include <utils/qtcassert.h> #include <utils/outputformatter.h> @@ -259,8 +258,7 @@ void AppOutputPane::createNewOutputWindow(RunControl *rc) Core::Context context(Constants::C_APP_OUTPUT, counter++); Core::OutputWindow *ow = new Core::OutputWindow(context, m_tabWidget); ow->setWindowTitle(tr("Application Output Window")); - // TODO the following is a hidden impossible dependency of projectexplorer on qt4projectmanager - ow->setWindowIcon(QIcon(QLatin1String(Qt4ProjectManager::Constants::ICON_WINDOW))); + ow->setWindowIcon(QIcon(QLatin1String(Constants::ICON_WINDOW))); ow->setFormatter(formatter); ow->setWordWrapEnabled(ProjectExplorerPlugin::instance()->projectExplorerSettings().wrapAppOutput); ow->setMaxLineCount(ProjectExplorerPlugin::instance()->projectExplorerSettings().maxAppOutputLines); diff --git a/src/plugins/projectexplorer/compileoutputwindow.cpp b/src/plugins/projectexplorer/compileoutputwindow.cpp index 932e65b51b..a0b5d6a15c 100644 --- a/src/plugins/projectexplorer/compileoutputwindow.cpp +++ b/src/plugins/projectexplorer/compileoutputwindow.cpp @@ -42,7 +42,6 @@ #include <find/basetextfind.h> #include <aggregation/aggregate.h> #include <extensionsystem/pluginmanager.h> -#include <qt4projectmanager/qt4projectmanagerconstants.h> #include <QtGui/QKeyEvent> #include <QtGui/QIcon> @@ -65,7 +64,7 @@ CompileOutputWindow::CompileOutputWindow(BuildManager * /*bm*/) Core::Context context(Constants::C_COMPILE_OUTPUT); m_outputWindow = new Core::OutputWindow(context); m_outputWindow->setWindowTitle(tr("Compile Output")); - m_outputWindow->setWindowIcon(QIcon(QLatin1String(Qt4ProjectManager::Constants::ICON_WINDOW))); + m_outputWindow->setWindowIcon(QIcon(QLatin1String(Constants::ICON_WINDOW))); m_outputWindow->setReadOnly(true); m_outputWindow->setUndoRedoEnabled(false); m_outputWindow->setMaxLineCount(MAX_LINECOUNT); diff --git a/src/plugins/qt4projectmanager/images/window.png b/src/plugins/projectexplorer/images/window.png Binary files differindex 9493e3b1ce..9493e3b1ce 100644 --- a/src/plugins/qt4projectmanager/images/window.png +++ b/src/plugins/projectexplorer/images/window.png diff --git a/src/plugins/projectexplorer/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc index 09cb165d56..b4be8745b9 100644 --- a/src/plugins/projectexplorer/projectexplorer.qrc +++ b/src/plugins/projectexplorer/projectexplorer.qrc @@ -38,5 +38,6 @@ <file>images/targetpanel_gradient.png</file> <file>images/targetaddbutton_disabled.png</file> <file>images/targetremovebutton_disabled.png</file> + <file>images/window.png</file> </qresource> </RCC> diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h index e925406a13..f28bf1c226 100644 --- a/src/plugins/projectexplorer/projectexplorerconstants.h +++ b/src/plugins/projectexplorer/projectexplorerconstants.h @@ -165,6 +165,7 @@ const char * const ICON_RUN_SMALL = ":/projectexplorer/images/run_small.pn const char * const ICON_DEBUG_SMALL = ":/projectexplorer/images/debugger_start_small.png"; const char * const ICON_STOP = ":/projectexplorer/images/stop.png"; const char * const ICON_TOOLCHAIN_SETTINGS_CATEGORY = ":projectexplorer/images/build.png"; // FIXME: Need an icon! +const char * const ICON_WINDOW = ":/projectexplorer/images/window.png"; const char * const TASK_BUILD = "ProjectExplorer.Task.Build"; diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp index 509993cd3a..6d22111a9e 100644 --- a/src/plugins/projectexplorer/taskwindow.cpp +++ b/src/plugins/projectexplorer/taskwindow.cpp @@ -43,7 +43,6 @@ #include <coreplugin/icontext.h> #include <coreplugin/icore.h> #include <extensionsystem/pluginmanager.h> -#include <qt4projectmanager/qt4projectmanagerconstants.h> #include <QtCore/QDir> #include <QtCore/QFileInfo> @@ -623,7 +622,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(QLatin1String(Qt4ProjectManager::Constants::ICON_WINDOW))); + d->m_listview->setWindowIcon(QIcon(QLatin1String(Constants::ICON_WINDOW))); d->m_listview->setContextMenuPolicy(Qt::ActionsContextMenu); d->m_listview->setAttribute(Qt::WA_MacShowFocusRect, false); diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.qrc b/src/plugins/qt4projectmanager/qt4projectmanager.qrc index 9634502f80..2fa83ca94b 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanager.qrc +++ b/src/plugins/qt4projectmanager/qt4projectmanager.qrc @@ -1,6 +1,5 @@ <RCC> <qresource prefix="/qt4projectmanager"> - <file>images/window.png</file> <file>images/run_qmake.png</file> <file>images/run_qmake_small.png</file> <file>images/qt_project.png</file> diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h index 2075d6be23..3cd3971385 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h +++ b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h @@ -120,7 +120,6 @@ const char * const WINCEQT = "Qt4ProjectManager.QtVersion.WinCE"; // ICONS const char * const ICON_QT_PROJECT = ":/qt4projectmanager/images/qt_project.png"; -const char * const ICON_WINDOW = ":/qt4projectmanager/images/window.png"; const char * const ICON_QTQUICK_APP = ":/wizards/images/qtquickapp.png"; const char * const ICON_HTML5_APP = ":/wizards/images/html5app.png"; |