feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Remove redundant projects label

Browse Source 
As discussed with nigel, this label doesnt really make sense.
It is confusing because you might thing you should click it
and tab widgets do not usually require labels to indicate that
you should press them.
This commit is contained in:
Jens Bache-Wiig
2010-03-12 12:11:30 +01:00
parent 3e6ba8bae6
commit 1ed2874b4c
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/projectexplorer/doubletabwidget.cpp
View File

@@ -140,7 +140,9 @@ void DoubleTabWidget::mousePressEvent(QMouseEvent *event)
int eventX = event->x(); int eventX = event->x();
// clicked on the top level part of the bar // clicked on the top level part of the bar
QFontMetrics fm(font()); QFontMetrics fm(font());
int x = 2 * MARGIN + qMax(fm.width(m_title), MIN_LEFT_MARGIN); int x = m_title.isEmpty() ? 0 :
2 * MARGIN + qMax(fm.width(m_title), MIN_LEFT_MARGIN);
if (eventX <= x) if (eventX <= x)
return; return;
int i; int i;
@@ -238,8 +240,10 @@ void DoubleTabWidget::paintEvent(QPaintEvent *event)
int baseline = (r.height() + fm.ascent()) / 2 - 1; int baseline = (r.height() + fm.ascent()) / 2 - 1;
// top level title // top level title
if (!m_title.isEmpty()) {
painter.setPen(Utils::StyleHelper::panelTextColor()); painter.setPen(Utils::StyleHelper::panelTextColor());
painter.drawText(MARGIN, baseline, m_title); painter.drawText(MARGIN, baseline, m_title);
}
QLinearGradient grad(QPoint(0, 0), QPoint(0, r.height() + OTHER_HEIGHT - 1)); QLinearGradient grad(QPoint(0, 0), QPoint(0, r.height() + OTHER_HEIGHT - 1));
grad.setColorAt(0, QColor(247, 247, 247)); grad.setColorAt(0, QColor(247, 247, 247));
@@ -255,7 +259,8 @@ void DoubleTabWidget::paintEvent(QPaintEvent *event)
r.width(), r.height()); r.width(), r.height());
// top level tabs // top level tabs
int x = 2 * MARGIN + qMax(fm.width(m_title), MIN_LEFT_MARGIN); int x = m_title.isEmpty() ? 0 :
2 * MARGIN + qMax(fm.width(m_title), MIN_LEFT_MARGIN);
// calculate sizes // calculate sizes
QList<int> nameWidth; QList<int> nameWidth;
@@ -331,6 +336,11 @@ void DoubleTabWidget::paintEvent(QPaintEvent *event)
2 * MARGIN + fm.width(tab.name), 2 * MARGIN + fm.width(tab.name),
r.height() + 1), r.height() + 1),
grad); grad);
if (actualIndex != 0) {
painter.setPen(QColor(255, 255, 255, 170));
painter.drawLine(x, 0, x, r.height());
}
x += MARGIN; x += MARGIN;
painter.setPen(Qt::black); painter.setPen(Qt::black);
painter.drawText(x, baseline, tab.name); painter.drawText(x, baseline, tab.name);
@@ -338,6 +348,10 @@ void DoubleTabWidget::paintEvent(QPaintEvent *event)
x += MARGIN; x += MARGIN;
painter.setPen(Utils::StyleHelper::borderColor()); painter.setPen(Utils::StyleHelper::borderColor());
painter.drawLine(x, 0, x, r.height() - 1); painter.drawLine(x, 0, x, r.height() - 1);
painter.setPen(QColor(0, 0, 0, 20));
painter.drawLine(x + 1, 0, x + 1, r.height() - 1);
painter.setPen(QColor(255, 255, 255, 170));
painter.drawLine(x - 1, 0, x - 1, r.height());
} else { } else {
if (i == 0) if (i == 0)
drawFirstLevelSeparator(&painter, QPoint(x, 0), QPoint(x, r.height()-1)); drawFirstLevelSeparator(&painter, QPoint(x, 0), QPoint(x, r.height()-1));

1
src/plugins/projectexplorer/projectwindow.cpp
View File

@@ -263,7 +263,6 @@ ProjectWindow::ProjectWindow(QWidget *parent)
viewLayout->setSpacing(0); viewLayout->setSpacing(0);
m_tabWidget = new DoubleTabWidget(this); m_tabWidget = new DoubleTabWidget(this);
m_tabWidget->setTitle(tr("Select a Project:"));
viewLayout->addWidget(m_tabWidget); viewLayout->addWidget(m_tabWidget);
// Setup our container for the contents: // Setup our container for the contents: