Diffstat (limited to 'noncore/settings/networksettings2/networksettings2') (more/less context) (ignore whitespace changes)
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 @@ | |||
1 | #include <qpe/qpeapplication.h> | ||
2 | #include <time.h> | 1 | #include <time.h> |
2 | #include <qpe/qpeapplication.h> | ||
3 | #include <qpainter.h> | ||
4 | #include <qbitmap.h> | ||
3 | #include <qtextstream.h> | 5 | #include <qtextstream.h> |
4 | #include <qpixmap.h> | 6 | #include <qpixmap.h> |
5 | 7 | ||
@@ -247,8 +249,17 @@ static char * State2PixmapTbl[] = { | |||
247 | }; | 249 | }; |
248 | 250 | ||
249 | QPixmap NodeCollection::devicePixmap( void ) { | 251 | QPixmap NodeCollection::devicePixmap( void ) { |
250 | return NSResources->getPixmap( | 252 | QPixmap pm = NSResources->getPixmap( |
251 | device()->netNode()->pixmapName()+"-large" ); | 253 | getToplevel()->nextNode()->pixmapName()+"-large"); |
254 | |||
255 | QPixmap Mini = NSResources->getPixmap( device()->netNode()->pixmapName() ); | ||
256 | |||
257 | QPainter painter( &pm ); | ||
258 | painter.drawPixmap( pm.width()-Mini.width(), | ||
259 | pm.height()-Mini.height(), | ||
260 | Mini ); | ||
261 | pm.setMask( pm.createHeuristicMask( TRUE ) ); | ||
262 | return pm; | ||
252 | } | 263 | } |
253 | 264 | ||
254 | QPixmap NodeCollection::statePixmap( State_t S) { | 265 | 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 : | |||
258 | { return NNI->connection(); } | 258 | { return NNI->connection(); } |
259 | 259 | ||
260 | virtual void detectState( NodeCollection * NC ) = 0; | 260 | virtual void detectState( NodeCollection * NC ) = 0; |
261 | virtual bool setState( NodeCollection * NC, Action_t A ) = 0; | 261 | virtual bool setState( NodeCollection * NC, Action_t A, bool Force = 0 ) = 0; |
262 | virtual bool canSetState( State_t Curr, Action_t A ) = 0; | 262 | virtual bool canSetState( State_t Curr, Action_t A ) = 0; |
263 | 263 | ||
264 | signals : | 264 | signals : |
@@ -322,8 +322,8 @@ public : | |||
322 | QString stateName( bool Update = 0 ) | 322 | QString stateName( bool Update = 0 ) |
323 | { return stateName( state(Update) ); } | 323 | { return stateName( state(Update) ); } |
324 | 324 | ||
325 | bool setState( Action_t A ) | 325 | bool setState( Action_t A, bool Force =0 ) |
326 | { return getToplevel()->runtime()->setState( this, A ); } | 326 | { return getToplevel()->runtime()->setState( this, A, Force ); } |
327 | bool canSetState( Action_t A ) | 327 | bool canSetState( Action_t A ) |
328 | { return getToplevel()->runtime()->canSetState( CurrentState, A ); } | 328 | { return getToplevel()->runtime()->canSetState( CurrentState, A ); } |
329 | 329 | ||
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 \ | |||
10 | asconnection.h \ | 10 | asconnection.h \ |
11 | asfullsetup.h \ | 11 | asfullsetup.h \ |
12 | systemfile.h \ | 12 | systemfile.h \ |
13 | wextensions.h \ | ||
13 | asdevice.h | 14 | asdevice.h |
14 | SOURCES = netnode.cpp \ | 15 | SOURCES = netnode.cpp \ |
15 | GUIUtils.cpp \ | 16 | GUIUtils.cpp \ |
16 | system.cpp \ | 17 | system.cpp \ |
17 | systemfile.cpp \ | 18 | systemfile.cpp \ |
19 | wextensions.cpp \ | ||
18 | resources.cpp | 20 | resources.cpp |
19 | INCLUDEPATH+= $(OPIEDIR)/include ../networksettings2 | 21 | INCLUDEPATH+= $(OPIEDIR)/include ../networksettings2 |
20 | DEPENDPATH+= $(OPIEDIR)/include | 22 | 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( | |||
177 | QPixmap TheNSResources::getPixmap( const QString & QS ) { | 177 | QPixmap TheNSResources::getPixmap( const QString & QS ) { |
178 | QString S("networksettings2/"); | 178 | QString S("networksettings2/"); |
179 | S += QS; | 179 | S += QS; |
180 | return Resource::loadPixmap( QString("networksettings2/")+QS ); | 180 | fprintf( stderr, "%s\n", S.latin1() ); |
181 | return Resource::loadPixmap( S ); | ||
181 | } | 182 | } |
182 | 183 | ||
183 | QString TheNSResources::tr( const char * s ) { | 184 | QString TheNSResources::tr( const char * s ) { |