summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
authorcon <qtc-committer@nokia.com>2010-02-19 14:16:37 +0100
committercon <qtc-committer@nokia.com>2010-02-23 17:00:50 +0100
commitcab971ae6148dfe4b5d731f51af00fc45062a92d (patch)
treee6b2f2a8ba46a71ce34515aa34642eae59a230fa /src/plugins
parent4ae45cf22eaaf71d763d0702d04c19b3aa8cc221 (diff)
downloadqt-creator-cab971ae6148dfe4b5d731f51af00fc45062a92d.tar.gz
Project settings icons.
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/projectexplorer/buildsettingspropertiespage.cpp2
-rw-r--r--src/plugins/projectexplorer/dependenciespanel.cpp2
-rw-r--r--src/plugins/projectexplorer/editorsettingspropertiespage.cpp2
-rw-r--r--src/plugins/projectexplorer/images/BuildSettings.pngbin0 -> 2163 bytes
-rw-r--r--src/plugins/projectexplorer/images/EditorSettings.pngbin0 -> 932 bytes
-rw-r--r--src/plugins/projectexplorer/images/ProjectDependencies.pngbin0 -> 3255 bytes
-rw-r--r--src/plugins/projectexplorer/images/RunSettings.pngbin0 -> 2203 bytes
-rw-r--r--src/plugins/projectexplorer/projectexplorer.qrc4
-rw-r--r--src/plugins/projectexplorer/projectwindow.cpp9
-rw-r--r--src/plugins/projectexplorer/runsettingspropertiespage.cpp2
10 files changed, 13 insertions, 8 deletions
diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
index 4727f07485..8d127d3145 100644
--- a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
@@ -94,7 +94,7 @@ IPropertiesPanel *BuildSettingsPanelFactory::createPanel(Target *target)
BuildSettingsPanel::BuildSettingsPanel(Target *target) :
m_widget(new BuildSettingsWidget(target)),
- m_icon(":/projectexplorer/images/rebuild.png")
+ m_icon(":/projectexplorer/images/BuildSettings.png")
{
}
diff --git a/src/plugins/projectexplorer/dependenciespanel.cpp b/src/plugins/projectexplorer/dependenciespanel.cpp
index f33b1cf030..45f521a591 100644
--- a/src/plugins/projectexplorer/dependenciespanel.cpp
+++ b/src/plugins/projectexplorer/dependenciespanel.cpp
@@ -259,7 +259,7 @@ DependenciesWidget::DependenciesWidget(SessionManager *session,
DependenciesPanel::DependenciesPanel(SessionManager *session, Project *project) :
m_widget(new DependenciesWidget(session, project)),
- m_icon(":/projectexplorer/images/session.png")
+ m_icon(":/projectexplorer/images/ProjectDependencies.png")
{
}
diff --git a/src/plugins/projectexplorer/editorsettingspropertiespage.cpp b/src/plugins/projectexplorer/editorsettingspropertiespage.cpp
index 5c58468552..a8c0ce17d6 100644
--- a/src/plugins/projectexplorer/editorsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/editorsettingspropertiespage.cpp
@@ -73,7 +73,7 @@ IPropertiesPanel *EditorSettingsPanelFactory::createPanel(Target *target)
EditorSettingsPanel::EditorSettingsPanel(Project *project) :
m_widget(new EditorSettingsWidget(project)),
- m_icon(":/projectexplorer/images/rebuild.png")
+ m_icon(":/projectexplorer/images/EditorSettings.png")
{
}
diff --git a/src/plugins/projectexplorer/images/BuildSettings.png b/src/plugins/projectexplorer/images/BuildSettings.png
new file mode 100644
index 0000000000..30a2c62380
--- /dev/null
+++ b/src/plugins/projectexplorer/images/BuildSettings.png
Binary files differ
diff --git a/src/plugins/projectexplorer/images/EditorSettings.png b/src/plugins/projectexplorer/images/EditorSettings.png
new file mode 100644
index 0000000000..ebd869fb32
--- /dev/null
+++ b/src/plugins/projectexplorer/images/EditorSettings.png
Binary files differ
diff --git a/src/plugins/projectexplorer/images/ProjectDependencies.png b/src/plugins/projectexplorer/images/ProjectDependencies.png
new file mode 100644
index 0000000000..635b472144
--- /dev/null
+++ b/src/plugins/projectexplorer/images/ProjectDependencies.png
Binary files differ
diff --git a/src/plugins/projectexplorer/images/RunSettings.png b/src/plugins/projectexplorer/images/RunSettings.png
new file mode 100644
index 0000000000..2bf7dc6519
--- /dev/null
+++ b/src/plugins/projectexplorer/images/RunSettings.png
Binary files differ
diff --git a/src/plugins/projectexplorer/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc
index d705787395..2d15195679 100644
--- a/src/plugins/projectexplorer/projectexplorer.qrc
+++ b/src/plugins/projectexplorer/projectexplorer.qrc
@@ -28,5 +28,9 @@
<file>images/targetremovebutton.png</file>
<file>images/compile_error.png</file>
<file>images/compile_warning.png</file>
+ <file>images/BuildSettings.png</file>
+ <file>images/RunSettings.png</file>
+ <file>images/EditorSettings.png</file>
+ <file>images/ProjectDependencies.png</file>
</qresource>
</RCC>
diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp
index d930acd531..4fcf486eef 100644
--- a/src/plugins/projectexplorer/projectwindow.cpp
+++ b/src/plugins/projectexplorer/projectwindow.cpp
@@ -169,7 +169,7 @@ void PanelsWidget::addPropertiesPanel(IPropertiesPanel *panel)
QLabel *iconLabel = new QLabel(m_root);
iconLabel->setPixmap(panel->icon().pixmap(ICON_SIZE, ICON_SIZE));
iconLabel->setContentsMargins(0, ABOVE_HEADING_MARGIN, 0, 0);
- m_layout->addWidget(iconLabel, headerRow, 0, 2, 1, Qt::AlignTop | Qt::AlignHCenter);
+ m_layout->addWidget(iconLabel, headerRow, 0, 3, 1, Qt::AlignTop | Qt::AlignHCenter);
}
// name:
@@ -178,13 +178,14 @@ void PanelsWidget::addPropertiesPanel(IPropertiesPanel *panel)
nameLabel->setContentsMargins(0, ABOVE_HEADING_MARGIN, 0, 0);
QFont f = nameLabel->font();
f.setBold(true);
- f.setPointSizeF(f.pointSizeF() * 1.4);
+ f.setPointSizeF(f.pointSizeF() * 1.6);
nameLabel->setFont(f);
- m_layout->addWidget(nameLabel, headerRow, 1, 1, 1, Qt::AlignBottom | Qt::AlignLeft);
+ m_layout->addWidget(nameLabel, headerRow, 1, 1, 1, Qt::AlignVCenter | Qt::AlignLeft);
// line:
const int lineRow(headerRow + 1);
- m_layout->addWidget(new OnePixelBlackLine(m_root), lineRow, 1);
+ QWidget *line = new OnePixelBlackLine(m_root);
+ m_layout->addWidget(line, lineRow, 1, 1, -1, Qt::AlignTop);
// add the widget:
const int widgetRow(lineRow + 1);
diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
index 907583a32b..f9a0628eb7 100644
--- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
@@ -131,7 +131,7 @@ IPropertiesPanel *RunSettingsPanelFactory::createPanel(Target *target)
RunSettingsPanel::RunSettingsPanel(Target *target) :
m_widget(new RunSettingsWidget(target)),
- m_icon(":/projectexplorer/images/run.png")
+ m_icon(":/projectexplorer/images/RunSettings.png")
{
}