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

List:       kde-commits
Subject:    KDE/kdepim/kontact/plugins/summary
From:       Allen Winter <winter () kde ! org>
Date:       2009-10-08 0:23:53
Message-ID: 1254961433.200615.29445.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1032510 by winterz:

revert back to r1024583.
unfortunately, there is no way to know what summaries are available until
they are created by the plugin itself.



 M  +20 -22    summaryview_part.cpp  


--- trunk/KDE/kdepim/kontact/plugins/summary/summaryview_part.cpp #1032509:1032510
@@ -19,8 +19,9 @@
   You should have received a copy of the GNU Library General Public License
   along with this library; see the file COPYING.LIB.  If not, write to
   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
+  Boston, MA 02110-1301, USA.
 */
+
 #include "summaryview_part.h"
 
 #include <kontactinterface/summary.h>
@@ -156,27 +157,28 @@
   QList<KontactInterface::Plugin*>::ConstIterator it = plugins.constBegin();
   for ( ; it != end; ++it ) {
     KontactInterface::Plugin *plugin = *it;
-    if ( activeSummaries.contains( plugin->identifier() ) ) {
-      KontactInterface::Summary *summary = plugin->createSummaryWidget( mFrame );
+    if ( !activeSummaries.contains( plugin->identifier() ) ) {
+      continue;
+    }
 
-      if ( summary ) {
-        if ( summary->summaryHeight() > 0 ) {
-          mSummaries.insert( plugin->identifier(), summary );
+    KontactInterface::Summary *summary = plugin->createSummaryWidget( mFrame );
+    if ( summary ) {
+      if ( summary->summaryHeight() > 0 ) {
+        mSummaries.insert( plugin->identifier(), summary );
 
-          connect( summary, SIGNAL(message(const QString&)),
-                   BroadcastStatus::instance(), SLOT(setStatusMsg(const QString&)) );
-          connect( summary, SIGNAL(summaryWidgetDropped(QWidget*,QWidget*,int)),
-                   this, SLOT(summaryWidgetMoved(QWidget*,QWidget*,int)) );
+        connect( summary, SIGNAL(message(const QString&)),
+                 BroadcastStatus::instance(), SLOT(setStatusMsg(const QString&)) );
+        connect( summary, SIGNAL(summaryWidgetDropped(QWidget*,QWidget*,int)),
+                 this, SLOT(summaryWidgetMoved(QWidget*,QWidget*,int)) );
 
-          if ( !mLeftColumnSummaries.contains( plugin->identifier() ) &&
-               !mRightColumnSummaries.contains( plugin->identifier() ) ) {
-            mLeftColumnSummaries.append( plugin->identifier() );
-          }
-
-          loadedSummaries.append( plugin->identifier() );
-        } else {
-          summary->hide();
+        if ( !mLeftColumnSummaries.contains( plugin->identifier() ) &&
+             !mRightColumnSummaries.contains( plugin->identifier() ) ) {
+          mLeftColumnSummaries.append( plugin->identifier() );
         }
+
+        loadedSummaries.append( plugin->identifier() );
+      } else {
+        summary->hide();
       }
     }
   }
@@ -229,10 +231,6 @@
       mRightColumn->addWidget( mSummaries[ *strIt ] );
     }
   }
-  QSpacerItem *lspacer = new QSpacerItem( 1, 1000 );
-  QSpacerItem *rspacer = new QSpacerItem( 1, 1000 );
-  mLeftColumn->addSpacerItem( lspacer );
-  mRightColumn->addSpacerItem( rspacer );
 
   mFrame->show();
 
[prev in list] [next in list] [prev in thread] [next in thread]