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

List:       kde-commits
Subject:    playground/devtools/icemon
From:       André Wöbbeking <Woebbeking () web ! de>
Date:       2006-09-12 22:05:38
Message-ID: 1158098738.324865.7477.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 583660 by woebbe:

forward port of today's KDE3 fixes

 A             COPYING   trunk/playground/devtools/icemon-kde3/COPYING#583656
 M  +18 -1     src/detailedhostview.cc  
 M  +3 -1      src/detailedhostview.h  
 M  +9 -2      src/hostlistview.cc  
 M  +1 -1      src/mon-kde.cc  


--- trunk/playground/devtools/icemon/src/detailedhostview.cc #583659:583660
@@ -1,7 +1,7 @@
 /*
     This file is part of Icecream.
 
-    Copyright (c) 2004 Andre Wöbbeking <Woebbeking@web.de>
+    Copyright (c) 2004-2006 Andre Wöbbeking <Woebbeking@web.de>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -82,6 +82,8 @@
 
   connect(mHostListView, SIGNAL( nodeActivated( unsigned int ) ),
           this, SLOT( slotNodeActivated() ) );
+
+  createKnownHosts();
 }
 
 
@@ -144,6 +146,21 @@
 }
 
 
+void DetailedHostView::createKnownHosts()
+{
+    const HostInfoManager::HostMap& hosts(hostInfoManager()->hostMap());
+
+    for (HostInfoManager::HostMap::ConstIterator it( hosts.begin() ),
+                                                 itEnd( hosts.end() );
+         it != itEnd; ++it )
+    {
+        const unsigned int hostid( (*it)->id() );
+
+        checkNode( hostid );
+    }
+}
+
+
 QWidget* DetailedHostView::widget()
 {
   return this;
--- trunk/playground/devtools/icemon/src/detailedhostview.h #583659:583660
@@ -1,7 +1,7 @@
 /*
     This file is part of Icecream.
 
-    Copyright (c) 2004 Andre Wöbbeking <Woebbeking@web.de>
+    Copyright (c) 2004-2006 Andre Wöbbeking <Woebbeking@web.de>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -56,6 +56,8 @@
 
 private:
 
+    void createKnownHosts();
+
     HostListView* mHostListView;
     JobListView* mLocalJobsView;
     JobListView* mRemoteJobsView;
--- trunk/playground/devtools/icemon/src/hostlistview.cc #583659:583660
@@ -1,7 +1,7 @@
 /*
     This file is part of Icecream.
 
-    Copyright (c) 2004 Andre Wöbbeking <Woebbeking@web.de>
+    Copyright (c) 2004-2006 Andre Wöbbeking <Woebbeking@web.de>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -209,12 +209,19 @@
 void HostListView::checkNode( unsigned int hostid )
 {
     const HostInfo* info = mHostInfoManager->find( hostid );
+    if ( !info )
+        return;
 
     ItemMap::iterator it = mItems.find( hostid );
     if ( it == mItems.end() )
-        mItems[hostid] = new HostListViewItem( this, *info );
+    {
+        if ( !info->name().isEmpty() )
+            mItems[hostid] = new HostListViewItem( this, *info );
+    }
     else
+    {
         ( *it )->updateText( *info );
+    }
 
     mUpdateSortTimer.setSingleShot( true );
     mUpdateSortTimer.start( 0 );
--- trunk/playground/devtools/icemon/src/mon-kde.cc #583659:583660
@@ -237,7 +237,7 @@
 int main( int argc, char **argv )
 {
   KAboutData aboutData( rs_program_name, appName, version, description,
-	                KAboutData::License_BSD, copyright );
+                        KAboutData::License_GPL_V2, copyright );
   aboutData.addAuthor( "Frerich Raabe", 0, "raabe@kde.org" );
   aboutData.addAuthor( "Stephan Kulow", 0, "coolo@kde.org" );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
[prev in list] [next in list] [prev in thread] [next in thread]