[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeplasma-addons/applets/weather
From:       Shawn Starr <shawn.starr () rogers ! com>
Date:       2009-12-09 7:20:41
Message-ID: 1260343241.283224.25861.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1060492 by spstarr:

Revert change to notices. This broke completely, didn't display any of them

 M  +1 -9      weatherapplet.cpp  
 M  +0 -1      weatherapplet.h  


--- trunk/KDE/kdeplasma-addons/applets/weather/weatherapplet.cpp #1060491:1060492
@@ -64,7 +64,6 @@
         m_detailsModel(0),
         m_fiveDaysView(0),
         m_detailsView(0),
-        m_noticesView(0),
         m_setupLayout(0),
         m_graphicsWidget(0),
         m_titleFrame(new Plasma::Frame)
@@ -624,10 +623,6 @@
 
     int rowCount = 0;
     if (data["Total Watches Issued"].toInt() > 0 || data["Total Warnings Issued"].toInt() > 0) {
-        if (!m_noticesView) {
-            m_noticesView = new QGraphicsWidget;
-        }
-
         QGraphicsLinearLayout *noticeLayout = new QGraphicsLinearLayout(Qt::Vertical);
         QPalette pal;
 
@@ -702,10 +697,7 @@
             noticeLayout->addItem(watchLayout);
         }
 
-        m_tabBar->addTab(i18nc("weather notices", "Notices"), m_noticesView);
-    } else {
-        delete m_noticesView;
-        m_noticesView = 0;
+        m_tabBar->addTab(i18nc("weather notices", "Notices"), noticeLayout);
     }
 
     if (!m_setupLayout) {
--- trunk/KDE/kdeplasma-addons/applets/weather/weatherapplet.h #1060491:1060492
@@ -83,7 +83,6 @@
 
     Plasma::WeatherView *m_fiveDaysView;
     Plasma::WeatherView *m_detailsView;
-    QGraphicsWidget *m_noticesView;
 
     // Layout
     int m_setupLayout;
[prev in list] [next in list] [prev in thread] [next in thread]