diff options
author | Luiz Agostini <luiz.agostini@openbossa.org> | 2009-11-30 16:19:47 -0300 |
---|---|---|
committer | Luiz Agostini <luiz.agostini@openbossa.org> | 2009-11-30 16:19:47 -0300 |
commit | f5b001f9ca0e3051bd04a8b922c8f2815f140a65 (patch) | |
tree | 3ae121bb0a999eb82d562750d9138b150b1ea3ac | |
parent | 7226a3dec152d52a86a5ab59ea4b25fb43545edf (diff) |
Weather: removing forecast description texts.release-4.6.0
Signed-off-by: Luiz Agostini <luiz.agostini@openbossa.org>
-rw-r--r-- | weather/citycarroussel.cpp | 21 | ||||
-rw-r--r-- | weather/citycarroussel.h | 1 |
2 files changed, 0 insertions, 22 deletions
diff --git a/weather/citycarroussel.cpp b/weather/citycarroussel.cpp index b2323e2..3f2d5a3 100644 --- a/weather/citycarroussel.cpp +++ b/weather/citycarroussel.cpp @@ -221,18 +221,6 @@ void CityCarrousselGesture::gestureEnd(QPointF pos, QPointF speed) // CityCarroussel -static QGraphicsTextItem *createText(QGraphicsItem *parent) -{ - QGraphicsTextItem *result = new QGraphicsTextItem(parent); - QFont font = result->font(); - font.setFamily("Nokia sans"); - font.setPixelSize(Settings::scaleHeight(16)); - font.setBold(true); - result->setFont(font); - result->setDefaultTextColor(QColor("white")); - return result; -} - static const qreal transparencyRef = 58.0 / 480.0; static const qreal marginRef = 47.0 / 480.0; static const qreal backgroundPosRef = -(transparencyRef + marginRef); @@ -254,7 +242,6 @@ CityCarroussel::CityCarroussel(QGraphicsItem *parent) m_gestureBox->setRect(boundingRect()); m_carroussel.add(&m_data); m_carroussel.add(&m_background); - m_carroussel.add(&m_texts); m_carroussel.add(&m_cityInfo); TitleBar *titleBar = new TitleBar(this); @@ -280,13 +267,6 @@ CityCarroussel::CityCarroussel(QGraphicsItem *parent) background->pos().y() + Settings::scaleHeight(525.0)); city->setZValue(11.0); background->addCompanion(city); - - QGraphicsTextItem *text = createText(this); - m_texts.add(text); - text->setPos(background->pos().x() + Settings::scaleWidth(120.0), - background->pos().y() + Settings::scaleHeight(835.0)); - text->setZValue(11.0); - background->addCompanion(text); } updateBackground(-1); @@ -408,7 +388,6 @@ void CityCarroussel::updateBackground(int idx) m_background[idx]->setForecast(m_data[idx].type(), m_data[idx].night()); m_background[idx]->setZValue(idx); m_background[idx]->setReferencePos(m_positions[idx + 1]); - m_texts[idx]->setPlainText(m_background[idx]->description()); QString cityName = m_data.count() ? m_data[idx].cityName() : QString("unknown"); m_cityInfo[idx]->setCityName(cityName); if (m_data.count() > 0) diff --git a/weather/citycarroussel.h b/weather/citycarroussel.h index 64d0570..8bea25b 100644 --- a/weather/citycarroussel.h +++ b/weather/citycarroussel.h @@ -132,7 +132,6 @@ private: Carroussel<ForecastData> m_data; Carroussel<ForecastBackground*> m_background; - Carroussel<QGraphicsTextItem*> m_texts; Carroussel<CityInfoDisplay*> m_cityInfo; CarrousselGroup m_carroussel; |