[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-05 11:12:02
Message-ID: 1254741122.454518.4672.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1031522 by winterz:

don't create the summary part if it isn't active
MERGE: none
DO_NOT_BACKPORT:


 M  +15 -21    summaryview_part.cpp  


--- trunk/KDE/kdepim/kontact/plugins/summary/summaryview_part.cpp #1031521:1031522
@@ -156,33 +156,27 @@
   QList<KontactInterface::Plugin*>::ConstIterator it = plugins.constBegin();
   for ( ; it != end; ++it ) {
     KontactInterface::Plugin *plugin = *it;
-    //winterz: comment out the next block because I think showing the
-    //configuration page for all summaries, even if they aren't active,
-    //is less confusing for the user.
-    //if ( !activeSummaries.contains( plugin->identifier() ) ) {
-    //  continue;
-    //}
+    if ( activeSummaries.contains( plugin->identifier() ) ) {
+      KontactInterface::Summary *summary = plugin->createSummaryWidget( mFrame );
 
-    KontactInterface::Summary *summary = plugin->createSummaryWidget( mFrame );
-    if ( summary ) {
-      if ( summary->summaryHeight() > 0 ) {
-        mSummaries.insert( plugin->identifier(), summary );
+      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() );
-        }
+          if ( !mLeftColumnSummaries.contains( plugin->identifier() ) &&
+               !mRightColumnSummaries.contains( plugin->identifier() ) ) {
+            mLeftColumnSummaries.append( plugin->identifier() );
+          }
 
-        if ( activeSummaries.contains( plugin->identifier() ) ) {
           loadedSummaries.append( plugin->identifier() );
+        } else {
+          summary->hide();
         }
-      } else {
-        summary->hide();
       }
     }
   }
[prev in list] [next in list] [prev in thread] [next in thread]