*** empty log message ***

4 files changed, 21 insertions, 7 deletions

diff --git a/noncore/settings/networksettings2/networksettings2/netnode.cpp b/noncore/settings/networksettings2/networksettings2/netnode.cpp
index dc66aff..1182543 100644
--- a/noncore/settings/networksettings2/networksettings2/netnode.cpp
+++ b/noncore/settings/networksettings2/networksettings2/netnode.cpp
@@ -1,5 +1,7 @@
-#include <qpe/qpeapplication.h>
 #include <time.h>
+#include <qpe/qpeapplication.h>
+#include <qpainter.h>
+#include <qbitmap.h>
 #include <qtextstream.h>
 #include <qpixmap.h>
 
@@ -247,8 +249,17 @@ static char * State2PixmapTbl[] = {
 };
 
 QPixmap NodeCollection::devicePixmap( void ) {
-    return NSResources->getPixmap(
-          device()->netNode()->pixmapName()+"-large" );
+    QPixmap pm = NSResources->getPixmap(
+            getToplevel()->nextNode()->pixmapName()+"-large");
+
+    QPixmap Mini = NSResources->getPixmap( device()->netNode()->pixmapName() );
+
+    QPainter painter( &pm );
+    painter.drawPixmap( pm.width()-Mini.width(), 
+                        pm.height()-Mini.height(), 
+                        Mini );
+    pm.setMask( pm.createHeuristicMask( TRUE ) );
+    return pm;
 }
 
 QPixmap NodeCollection::statePixmap( State_t S) {
diff --git a/noncore/settings/networksettings2/networksettings2/netnode.h b/noncore/settings/networksettings2/networksettings2/netnode.h
index 27d54f8..5e36062 100644
--- a/noncore/settings/networksettings2/networksettings2/netnode.h
+++ b/noncore/settings/networksettings2/networksettings2/netnode.h
@@ -258,7 +258,7 @@ public :
         { return NNI->connection(); }
 
       virtual void detectState( NodeCollection * NC ) = 0;
-      virtual bool setState( NodeCollection * NC, Action_t A ) = 0;
+      virtual bool setState( NodeCollection * NC, Action_t A, bool Force = 0 ) = 0;
       virtual bool canSetState( State_t Curr, Action_t A ) = 0;
 
 signals :
@@ -322,8 +322,8 @@ public :
       QString stateName( bool Update = 0 ) 
         { return stateName( state(Update) ); }
 
-      bool setState( Action_t A )
-        { return getToplevel()->runtime()->setState( this, A ); }
+      bool setState( Action_t A, bool Force =0 )
+        { return getToplevel()->runtime()->setState( this, A, Force ); }
       bool canSetState( Action_t A )
         { return getToplevel()->runtime()->canSetState( CurrentState, A ); }
 
diff --git a/noncore/settings/networksettings2/networksettings2/networksettings2.pro b/noncore/settings/networksettings2/networksettings2/networksettings2.pro
index 11b5f84..f97c93b 100644
--- a/noncore/settings/networksettings2/networksettings2/networksettings2.pro
+++ b/noncore/settings/networksettings2/networksettings2/networksettings2.pro
@@ -10,11 +10,13 @@ HEADERS		= netnode.h  \
                   asconnection.h \
                   asfullsetup.h \
                   systemfile.h \
+                  wextensions.h \
                   asdevice.h
 SOURCES		= netnode.cpp \
                   GUIUtils.cpp \
                   system.cpp \
                   systemfile.cpp \
+                  wextensions.cpp \
                   resources.cpp
 INCLUDEPATH	+= $(OPIEDIR)/include ../networksettings2
 DEPENDPATH	+= $(OPIEDIR)/include
diff --git a/noncore/settings/networksettings2/networksettings2/resources.cpp b/noncore/settings/networksettings2/networksettings2/resources.cpp
index 4b7a62f..c95ac7f 100644
--- a/noncore/settings/networksettings2/networksettings2/resources.cpp
+++ b/noncore/settings/networksettings2/networksettings2/resources.cpp
@@ -177,7 +177,8 @@ bool TheNSResources::loadNetNode(
 QPixmap TheNSResources::getPixmap( const QString & QS ) {
     QString S("networksettings2/");
     S += QS;
-    return Resource::loadPixmap( QString("networksettings2/")+QS );
+    fprintf( stderr, "%s\n", S.latin1() );
+    return Resource::loadPixmap( S );
 }
 
 QString TheNSResources::tr( const char * s ) {