author | wimpie <wimpie> | 2004-04-04 00:27:59 (UTC) |
---|---|---|
committer | wimpie <wimpie> | 2004-04-04 00:27:59 (UTC) |
commit | a416c6c9630d6d63ee63cf520953b86af8b7cddc (patch) (unidiff) | |
tree | dbd0f5173728129f5a3faffdafd4f73d8cc72407 | |
parent | 152ffce2a4e8191d28738e3b40d8a726250a8767 (diff) | |
download | opie-a416c6c9630d6d63ee63cf520953b86af8b7cddc.zip opie-a416c6c9630d6d63ee63cf520953b86af8b7cddc.tar.gz opie-a416c6c9630d6d63ee63cf520953b86af8b7cddc.tar.bz2 |
*** empty log message ***
25 files changed, 130 insertions, 250 deletions
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMM_NNI.h b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMM_NNI.h index 4dd508d..57ff95e 100644 --- a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMM_NNI.h +++ b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMM_NNI.h | |||
@@ -21,3 +21,3 @@ public : | |||
21 | RuntimeInfo * runtime( void ) | 21 | RuntimeInfo * runtime( void ) |
22 | { if( RT ) | 22 | { if( RT == 0 ) |
23 | RT = new BluetoothRFCOMMRun( this, Data ); | 23 | RT = new BluetoothRFCOMMRun( this, Data ); |
diff --git a/noncore/settings/networksettings2/bluetooth/bluetooth_NN.h b/noncore/settings/networksettings2/bluetooth/bluetooth_NN.h index ee346f0..705201c 100644 --- a/noncore/settings/networksettings2/bluetooth/bluetooth_NN.h +++ b/noncore/settings/networksettings2/bluetooth/bluetooth_NN.h | |||
@@ -17,3 +17,3 @@ public: | |||
17 | virtual const QString pixmapName() | 17 | virtual const QString pixmapName() |
18 | { return "bluetooth"; } | 18 | { return "Devices/bluetooth"; } |
19 | 19 | ||
@@ -48,3 +48,3 @@ public: | |||
48 | virtual const QString pixmapName() | 48 | virtual const QString pixmapName() |
49 | { return "bluetooth"; } | 49 | { return "Devices/bluetooth"; } |
50 | 50 | ||
diff --git a/noncore/settings/networksettings2/cable/cable_NN.h b/noncore/settings/networksettings2/cable/cable_NN.h index 401317b..da99c1c 100644 --- a/noncore/settings/networksettings2/cable/cable_NN.h +++ b/noncore/settings/networksettings2/cable/cable_NN.h | |||
@@ -17,3 +17,3 @@ public: | |||
17 | virtual const QString pixmapName() | 17 | virtual const QString pixmapName() |
18 | { return "cable"; } | 18 | { return "Devices/cable"; } |
19 | 19 | ||
diff --git a/noncore/settings/networksettings2/editconnection.cpp b/noncore/settings/networksettings2/editconnection.cpp index d4b2bb3..ce13573 100644 --- a/noncore/settings/networksettings2/editconnection.cpp +++ b/noncore/settings/networksettings2/editconnection.cpp | |||
@@ -291,3 +291,3 @@ void EditConnection::buildFullTree( void ) { | |||
291 | QCheckListItem::RadioButton ); | 291 | QCheckListItem::RadioButton ); |
292 | it->setPixmap( 0, NSResources->getPixmap( "commprofile" ) ); | 292 | it->setPixmap( 0, NSResources->getPixmap( "Devices/commprofile" ) ); |
293 | // remember that this node maps to this listitem | 293 | // remember that this node maps to this listitem |
diff --git a/noncore/settings/networksettings2/irda/irda_NN.h b/noncore/settings/networksettings2/irda/irda_NN.h index 82811a4..6574c17 100644 --- a/noncore/settings/networksettings2/irda/irda_NN.h +++ b/noncore/settings/networksettings2/irda/irda_NN.h | |||
@@ -17,3 +17,3 @@ public: | |||
17 | virtual const QString pixmapName() | 17 | virtual const QString pixmapName() |
18 | { return "irda"; } | 18 | { return "Devices/irda"; } |
19 | 19 | ||
diff --git a/noncore/settings/networksettings2/lancard/lancard_NN.h b/noncore/settings/networksettings2/lancard/lancard_NN.h index 576a6e0..71b49d0 100644 --- a/noncore/settings/networksettings2/lancard/lancard_NN.h +++ b/noncore/settings/networksettings2/lancard/lancard_NN.h | |||
@@ -17,3 +17,3 @@ public: | |||
17 | virtual const QString pixmapName() | 17 | virtual const QString pixmapName() |
18 | { return "card"; } | 18 | { return "Devices/card"; } |
19 | 19 | ||
diff --git a/noncore/settings/networksettings2/main.cpp b/noncore/settings/networksettings2/main.cpp index 1e1270e..7ec26a7 100644 --- a/noncore/settings/networksettings2/main.cpp +++ b/noncore/settings/networksettings2/main.cpp | |||
@@ -90,5 +90,5 @@ int main( int argc, char * argv[] ) { | |||
90 | if( AP.exec() == QDialog::Accepted ) { | 90 | if( AP.exec() == QDialog::Accepted ) { |
91 | printf( "%s-c%d-allowed", AP.selectedProfile() ); | 91 | printf( "%s-c%ld-allowed", argv[1], AP.selectedProfile() ); |
92 | } else { | 92 | } else { |
93 | printf( "%s-cNN-disallowed" ); | 93 | printf( "%s-cNN-disallowed", argv[1] ); |
94 | } | 94 | } |
diff --git a/noncore/settings/networksettings2/modem/modem_NN.h b/noncore/settings/networksettings2/modem/modem_NN.h index 0f4c124..5eceed2 100644 --- a/noncore/settings/networksettings2/modem/modem_NN.h +++ b/noncore/settings/networksettings2/modem/modem_NN.h | |||
@@ -17,3 +17,3 @@ public: | |||
17 | virtual const QString pixmapName() | 17 | virtual const QString pixmapName() |
18 | { return "modem"; } | 18 | { return "Devices/modem"; } |
19 | 19 | ||
diff --git a/noncore/settings/networksettings2/network/network_NN.h b/noncore/settings/networksettings2/network/network_NN.h index 3b0cd64..220e00f 100644 --- a/noncore/settings/networksettings2/network/network_NN.h +++ b/noncore/settings/networksettings2/network/network_NN.h | |||
@@ -17,3 +17,3 @@ public: | |||
17 | virtual const QString pixmapName() | 17 | virtual const QString pixmapName() |
18 | { return "tcpip"; } | 18 | { return "Devices/tcpip"; } |
19 | 19 | ||
diff --git a/noncore/settings/networksettings2/network/networkrun.cpp b/noncore/settings/networksettings2/network/networkrun.cpp index e732bfa..8deca14 100644 --- a/noncore/settings/networksettings2/network/networkrun.cpp +++ b/noncore/settings/networksettings2/network/networkrun.cpp | |||
@@ -28,3 +28,3 @@ bool NetworkRun::setState( NodeCollection * NC, Action_t A ) { | |||
28 | QString S; | 28 | QString S; |
29 | S.sprintf( "ifup %s=manual", II->Name.latin1() ); | 29 | S.sprintf( "ifup %s", II->Name.latin1() ); |
30 | NSResources->system().execute( S ); | 30 | NSResources->system().execute( S ); |
diff --git a/noncore/settings/networksettings2/networksettings.cpp b/noncore/settings/networksettings2/networksettings.cpp index f72fa8e..e1110e2 100644 --- a/noncore/settings/networksettings2/networksettings.cpp +++ b/noncore/settings/networksettings2/networksettings.cpp | |||
@@ -3,3 +3,3 @@ | |||
3 | #include <qpe/qpeapplication.h> | 3 | #include <qpe/qpeapplication.h> |
4 | #include <qiconset.h> | 4 | #include <qlistbox.h> |
5 | #include <qgroupbox.h> | 5 | #include <qgroupbox.h> |
@@ -37,7 +37,5 @@ NetworkSettings::NetworkSettings( QWidget *parent, | |||
37 | // populate main Listbox | 37 | // populate main Listbox |
38 | Profiles_IV->clear(); | 38 | Profiles_LB->clear(); |
39 | { Name2Connection_t & M = NSResources->connections(); | 39 | { Name2Connection_t & M = NSResources->connections(); |
40 | NodeCollection * NC; | 40 | NodeCollection * NC; |
41 | QIconViewItem * IVI; | ||
42 | |||
43 | // for all connections | 41 | // for all connections |
@@ -47,5 +45,4 @@ NetworkSettings::NetworkSettings( QWidget *parent, | |||
47 | NC = it.current(); | 45 | NC = it.current(); |
48 | IVI = new QIconViewItem( Profiles_IV, | 46 | Profiles_LB->insertItem( NC->devicePixmap(), |
49 | NC->name(), | 47 | NC->name() ); |
50 | NC->devicePixmap() ); | ||
51 | } | 48 | } |
@@ -53,4 +50,4 @@ NetworkSettings::NetworkSettings( QWidget *parent, | |||
53 | 50 | ||
54 | if( Profiles_IV->count() ) { | 51 | if( Profiles_LB->count() ) { |
55 | Profiles_IV->setSelected( Profiles_IV->firstItem(), TRUE ); | 52 | Profiles_LB->setSelected( 0, TRUE ); |
56 | } | 53 | } |
@@ -93,5 +90,5 @@ NetworkSettings::~NetworkSettings() { | |||
93 | void NetworkSettings::SLOT_RefreshStates( void ) { | 90 | void NetworkSettings::SLOT_RefreshStates( void ) { |
94 | QIconViewItem * IVI = Profiles_IV->currentItem(); // remeber | 91 | QListBoxItem * LBI = Profiles_LB->item( Profiles_LB->currentItem() ); // remember |
95 | 92 | ||
96 | if( IVI ) { | 93 | if( LBI ) { |
97 | NodeCollection * NC; | 94 | NodeCollection * NC; |
@@ -99,3 +96,3 @@ void NetworkSettings::SLOT_RefreshStates( void ) { | |||
99 | // update current selection only | 96 | // update current selection only |
100 | NC = NSResources->findConnection( IVI->text() ); | 97 | NC = NSResources->findConnection( LBI->text() ); |
101 | if( NC ) { | 98 | if( NC ) { |
@@ -104,3 +101,3 @@ void NetworkSettings::SLOT_RefreshStates( void ) { | |||
104 | if( OldS != NewS ) { | 101 | if( OldS != NewS ) { |
105 | updateProfileState( IVI ); | 102 | updateProfileState( LBI ); |
106 | } | 103 | } |
@@ -140,5 +137,5 @@ void NetworkSettings::SLOT_AddNode( void ) { | |||
140 | void NetworkSettings::SLOT_DeleteNode( void ) { | 137 | void NetworkSettings::SLOT_DeleteNode( void ) { |
141 | QIconViewItem * IVI = Profiles_IV->currentItem(); | 138 | QListBoxItem * LBI = Profiles_LB->item( Profiles_LB->currentItem() ); |
142 | 139 | ||
143 | if ( ! IVI ) | 140 | if ( ! LBI ) |
144 | return; | 141 | return; |
@@ -150,4 +147,4 @@ void NetworkSettings::SLOT_DeleteNode( void ) { | |||
150 | 1, 0 ) == 1 ) { | 147 | 1, 0 ) == 1 ) { |
151 | NSResources->removeConnection( IVI->text() ); | 148 | NSResources->removeConnection( LBI->text() ); |
152 | delete IVI; | 149 | delete LBI; |
153 | setModified( 1 ); | 150 | setModified( 1 ); |
@@ -157,3 +154,3 @@ void NetworkSettings::SLOT_DeleteNode( void ) { | |||
157 | 154 | ||
158 | void NetworkSettings::SLOT_EditNode( QIconViewItem * IVI ) { | 155 | void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) { |
159 | QString OldName = ""; | 156 | QString OldName = ""; |
@@ -161,4 +158,4 @@ void NetworkSettings::SLOT_EditNode( QIconViewItem * IVI ) { | |||
161 | 158 | ||
162 | if( IVI ) { | 159 | if( LBI ) { |
163 | NodeCollection * NC = NSResources->findConnection( IVI->text() ); | 160 | NodeCollection * NC = NSResources->findConnection( LBI->text() ); |
164 | if( ! NC ) { | 161 | if( ! NC ) { |
@@ -178,3 +175,3 @@ void NetworkSettings::SLOT_EditNode( QIconViewItem * IVI ) { | |||
178 | setModified( 1 ); | 175 | setModified( 1 ); |
179 | if( IVI ) { | 176 | if( LBI ) { |
180 | // new name -> remove item | 177 | // new name -> remove item |
@@ -183,15 +180,15 @@ void NetworkSettings::SLOT_EditNode( QIconViewItem * IVI ) { | |||
183 | NSResources->addConnection( NC ); | 180 | NSResources->addConnection( NC ); |
184 | IVI->setText( NC->name() ); | 181 | Profiles_LB->changeItem( NC->devicePixmap(), |
185 | IVI->setPixmap( NC->devicePixmap() ); | 182 | NC->name(), |
183 | Profiles_LB->index( LBI ) | ||
184 | ); | ||
186 | } else { | 185 | } else { |
187 | // new item | 186 | // new item |
187 | int ci = Profiles_LB->count(); | ||
188 | NSResources->addConnection( NC ); | 188 | NSResources->addConnection( NC ); |
189 | NC->setNumber( NC->maxConnectionNumber()+1 ); | 189 | NC->setNumber( NC->maxConnectionNumber()+1 ); |
190 | IVI = new QIconViewItem( Profiles_IV, | 190 | Profiles_LB->insertItem( NC->devicePixmap(), NC->name() ); |
191 | NC->name(), | 191 | Profiles_LB->setSelected( ci, TRUE ); |
192 | NC->devicePixmap() | ||
193 | ); | ||
194 | Profiles_IV->setSelected( IVI, TRUE ); | ||
195 | } | 192 | } |
196 | updateProfileState( IVI ); | 193 | updateProfileState( LBI ); |
197 | } | 194 | } |
@@ -199,4 +196,4 @@ void NetworkSettings::SLOT_EditNode( QIconViewItem * IVI ) { | |||
199 | // cancelled : reset connection | 196 | // cancelled : reset connection |
200 | if( IVI ) { | 197 | if( LBI ) { |
201 | NodeCollection * NC = NSResources->findConnection( IVI->text() ); | 198 | NodeCollection * NC = NSResources->findConnection( LBI->text() ); |
202 | NC->reassign(); | 199 | NC->reassign(); |
@@ -208,7 +205,7 @@ void NetworkSettings::SLOT_EditNode( QIconViewItem * IVI ) { | |||
208 | 205 | ||
209 | void NetworkSettings::SLOT_ShowNode( QIconViewItem * IVI ) { | 206 | void NetworkSettings::SLOT_ShowNode( QListBoxItem * LBI ) { |
210 | if( IVI == 0 ) | 207 | if( LBI == 0 ) |
211 | return; | 208 | return; |
212 | 209 | ||
213 | NodeCollection * NC = NSResources->findConnection( IVI->text() ); | 210 | NodeCollection * NC = NSResources->findConnection( LBI->text() ); |
214 | 211 | ||
@@ -263,3 +260,3 @@ void NetworkSettings::SLOT_ShowNode( QIconViewItem * IVI ) { | |||
263 | 260 | ||
264 | CurProfile_GB->setTitle( IVI->text() ); | 261 | CurProfile_GB->setTitle( LBI->text() ); |
265 | State_LBL->setText( NC->stateName() ); | 262 | State_LBL->setText( NC->stateName() ); |
@@ -268,11 +265,11 @@ void NetworkSettings::SLOT_ShowNode( QIconViewItem * IVI ) { | |||
268 | void NetworkSettings::SLOT_CheckState( void ) { | 265 | void NetworkSettings::SLOT_CheckState( void ) { |
269 | QIconViewItem * IVI = Profiles_IV->currentItem(); | 266 | QListBoxItem * LBI = Profiles_LB->item( Profiles_LB->currentItem() ); |
270 | if ( ! IVI ) | 267 | if ( ! LBI ) |
271 | return; | 268 | return; |
272 | updateProfileState( IVI ); | 269 | updateProfileState( LBI ); |
273 | } | 270 | } |
274 | 271 | ||
275 | void NetworkSettings::updateProfileState( QIconViewItem * IVI ) { | 272 | void NetworkSettings::updateProfileState( QListBoxItem * LBI ) { |
276 | if( IVI == Profiles_IV->currentItem() ) { | 273 | if( LBI == Profiles_LB->item( Profiles_LB->currentItem() ) ) { |
277 | SLOT_ShowNode( IVI ); | 274 | SLOT_ShowNode( LBI ); |
278 | } | 275 | } |
@@ -293,5 +290,5 @@ void NetworkSettings::SLOT_GenerateConfig( void ) { | |||
293 | void NetworkSettings::SLOT_Enable( void ) { | 290 | void NetworkSettings::SLOT_Enable( void ) { |
294 | QIconViewItem * IVI = Profiles_IV->currentItem(); | 291 | QListBoxItem * LBI = Profiles_LB->item( Profiles_LB->currentItem() ); |
295 | QString Msg; | 292 | QString Msg; |
296 | if ( ! IVI ) | 293 | if ( ! LBI ) |
297 | return; | 294 | return; |
@@ -299,3 +296,3 @@ void NetworkSettings::SLOT_Enable( void ) { | |||
299 | NodeCollection * NC = | 296 | NodeCollection * NC = |
300 | NSResources->findConnection( IVI->text() ); | 297 | NSResources->findConnection( LBI->text() ); |
301 | 298 | ||
@@ -320,3 +317,3 @@ void NetworkSettings::SLOT_Enable( void ) { | |||
320 | } | 317 | } |
321 | updateProfileState( IVI ); | 318 | updateProfileState( LBI ); |
322 | } | 319 | } |
@@ -324,5 +321,5 @@ void NetworkSettings::SLOT_Enable( void ) { | |||
324 | void NetworkSettings::SLOT_On( void ) { | 321 | void NetworkSettings::SLOT_On( void ) { |
325 | QIconViewItem * IVI = Profiles_IV->currentItem(); | 322 | QListBoxItem * LBI = Profiles_LB->item( Profiles_LB->currentItem() ); |
326 | 323 | ||
327 | if ( ! IVI ) | 324 | if ( ! LBI ) |
328 | return; | 325 | return; |
@@ -330,3 +327,3 @@ void NetworkSettings::SLOT_On( void ) { | |||
330 | NodeCollection * NC = | 327 | NodeCollection * NC = |
331 | NSResources->findConnection( IVI->text() ); | 328 | NSResources->findConnection( LBI->text() ); |
332 | 329 | ||
@@ -359,3 +356,3 @@ void NetworkSettings::SLOT_On( void ) { | |||
359 | } | 356 | } |
360 | updateProfileState( IVI ); | 357 | updateProfileState( LBI ); |
361 | } | 358 | } |
@@ -363,5 +360,5 @@ void NetworkSettings::SLOT_On( void ) { | |||
363 | void NetworkSettings::SLOT_Connect( void ) { | 360 | void NetworkSettings::SLOT_Connect( void ) { |
364 | QIconViewItem * IVI = Profiles_IV->currentItem(); | 361 | QListBoxItem * LBI = Profiles_LB->item( Profiles_LB->currentItem() ); |
365 | 362 | ||
366 | if ( ! IVI ) | 363 | if ( ! LBI ) |
367 | return; | 364 | return; |
@@ -369,3 +366,3 @@ void NetworkSettings::SLOT_Connect( void ) { | |||
369 | NodeCollection * NC = | 366 | NodeCollection * NC = |
370 | NSResources->findConnection( IVI->text() ); | 367 | NSResources->findConnection( LBI->text() ); |
371 | 368 | ||
diff --git a/noncore/settings/networksettings2/networksettings.h b/noncore/settings/networksettings2/networksettings.h index fadf81b..d9ea5d4 100644 --- a/noncore/settings/networksettings2/networksettings.h +++ b/noncore/settings/networksettings2/networksettings.h | |||
@@ -7,3 +7,3 @@ class ANetNodeInstance; | |||
7 | class QTimer; | 7 | class QTimer; |
8 | class QIconViewItem; | 8 | class QListBoxItem; |
9 | 9 | ||
@@ -32,4 +32,4 @@ public slots : | |||
32 | void SLOT_DeleteNode( void ); | 32 | void SLOT_DeleteNode( void ); |
33 | void SLOT_ShowNode( QIconViewItem * ); | 33 | void SLOT_ShowNode( QListBoxItem * ); |
34 | void SLOT_EditNode( QIconViewItem * ); | 34 | void SLOT_EditNode( QListBoxItem * ); |
35 | void SLOT_CheckState( void ); | 35 | void SLOT_CheckState( void ); |
@@ -44,3 +44,3 @@ private : | |||
44 | 44 | ||
45 | void updateProfileState( QIconViewItem * it ); | 45 | void updateProfileState( QListBoxItem * it ); |
46 | QTimer * UpdateTimer; | 46 | QTimer * UpdateTimer; |
diff --git a/noncore/settings/networksettings2/networksettings2/netnode.cpp b/noncore/settings/networksettings2/networksettings2/netnode.cpp index d36a1e5..f040c99 100644 --- a/noncore/settings/networksettings2/networksettings2/netnode.cpp +++ b/noncore/settings/networksettings2/networksettings2/netnode.cpp | |||
@@ -234,4 +234,4 @@ static char * State2PixmapTbl[] = { | |||
234 | QPixmap NodeCollection::devicePixmap( void ) { | 234 | QPixmap NodeCollection::devicePixmap( void ) { |
235 | return NSResources->getPixmap( | 235 | return NSResources->getPixmap( |
236 | device()->netNode()->pixmapName()+"-large" ); | 236 | device()->netNode()->pixmapName()+"-large" ); |
237 | } | 237 | } |
diff --git a/noncore/settings/networksettings2/networksettings2/resources.cpp b/noncore/settings/networksettings2/networksettings2/resources.cpp index 15e1b64..0301361 100644 --- a/noncore/settings/networksettings2/networksettings2/resources.cpp +++ b/noncore/settings/networksettings2/networksettings2/resources.cpp | |||
@@ -170,3 +170,6 @@ bool TheNSResources::loadNetNode( | |||
170 | QPixmap TheNSResources::getPixmap( const QString & QS ) { | 170 | QPixmap TheNSResources::getPixmap( const QString & QS ) { |
171 | return Resource::loadPixmap( QString("networksettings2")+QS ); | 171 | QString S("networksettings2/"); |
172 | S += QS; | ||
173 | printf( " pixmap %s\n", S.latin1() ); | ||
174 | return Resource::loadPixmap( QString("networksettings2/")+QS ); | ||
172 | } | 175 | } |
diff --git a/noncore/settings/networksettings2/networksettings2/system.cpp b/noncore/settings/networksettings2/networksettings2/system.cpp index 99f642e..85dcd7d 100644 --- a/noncore/settings/networksettings2/networksettings2/system.cpp +++ b/noncore/settings/networksettings2/networksettings2/system.cpp | |||
@@ -316,2 +316,3 @@ void System::probeInterfaces( void ) { | |||
316 | } | 316 | } |
317 | fprintf( stderr, "NIC %s UP %d\n", NicName.latin1(), IFI->IsUp ); | ||
317 | } | 318 | } |
diff --git a/noncore/settings/networksettings2/networksettingsGUI.ui b/noncore/settings/networksettings2/networksettingsGUI.ui index d457c35..1d79123 100644 --- a/noncore/settings/networksettings2/networksettingsGUI.ui +++ b/noncore/settings/networksettings2/networksettingsGUI.ui | |||
@@ -13,3 +13,3 @@ | |||
13 | <y>0</y> | 13 | <y>0</y> |
14 | <width>403</width> | 14 | <width>399</width> |
15 | <height>502</height> | 15 | <height>502</height> |
@@ -34,3 +34,3 @@ | |||
34 | <name>spacing</name> | 34 | <name>spacing</name> |
35 | <number>2</number> | 35 | <number>0</number> |
36 | </property> | 36 | </property> |
@@ -246,148 +246,6 @@ | |||
246 | <widget> | 246 | <widget> |
247 | <class>QIconView</class> | 247 | <class>QListBox</class> |
248 | <item> | ||
249 | <property> | ||
250 | <name>text</name> | ||
251 | <string>New Item</string> | ||
252 | </property> | ||
253 | <property> | ||
254 | <name>pixmap</name> | ||
255 | <pixmap>image0</pixmap> | ||
256 | </property> | ||
257 | </item> | ||
258 | <item> | ||
259 | <property> | ||
260 | <name>text</name> | ||
261 | <string>New Item</string> | ||
262 | </property> | ||
263 | <property> | ||
264 | <name>pixmap</name> | ||
265 | <pixmap>image0</pixmap> | ||
266 | </property> | ||
267 | </item> | ||
268 | <item> | ||
269 | <property> | ||
270 | <name>text</name> | ||
271 | <string>New Item</string> | ||
272 | </property> | ||
273 | <property> | ||
274 | <name>pixmap</name> | ||
275 | <pixmap>image0</pixmap> | ||
276 | </property> | ||
277 | </item> | ||
278 | <item> | ||
279 | <property> | ||
280 | <name>text</name> | ||
281 | <string>New Item</string> | ||
282 | </property> | ||
283 | <property> | ||
284 | <name>pixmap</name> | ||
285 | <pixmap>image0</pixmap> | ||
286 | </property> | ||
287 | </item> | ||
288 | <item> | ||
289 | <property> | ||
290 | <name>text</name> | ||
291 | <string>New Item</string> | ||
292 | </property> | ||
293 | <property> | ||
294 | <name>pixmap</name> | ||
295 | <pixmap>image0</pixmap> | ||
296 | </property> | ||
297 | </item> | ||
298 | <item> | ||
299 | <property> | ||
300 | <name>text</name> | ||
301 | <string>New Item</string> | ||
302 | </property> | ||
303 | <property> | ||
304 | <name>pixmap</name> | ||
305 | <pixmap>image0</pixmap> | ||
306 | </property> | ||
307 | </item> | ||
308 | <item> | ||
309 | <property> | ||
310 | <name>text</name> | ||
311 | <string>New Item</string> | ||
312 | </property> | ||
313 | <property> | ||
314 | <name>pixmap</name> | ||
315 | <pixmap>image0</pixmap> | ||
316 | </property> | ||
317 | </item> | ||
318 | <item> | ||
319 | <property> | ||
320 | <name>text</name> | ||
321 | <string>New Item</string> | ||
322 | </property> | ||
323 | <property> | ||
324 | <name>pixmap</name> | ||
325 | <pixmap>image0</pixmap> | ||
326 | </property> | ||
327 | </item> | ||
328 | <item> | ||
329 | <property> | ||
330 | <name>text</name> | ||
331 | <string>New Item</string> | ||
332 | </property> | ||
333 | <property> | ||
334 | <name>pixmap</name> | ||
335 | <pixmap>image0</pixmap> | ||
336 | </property> | ||
337 | </item> | ||
338 | <item> | ||
339 | <property> | ||
340 | <name>text</name> | ||
341 | <string>New Item</string> | ||
342 | </property> | ||
343 | <property> | ||
344 | <name>pixmap</name> | ||
345 | <pixmap>image0</pixmap> | ||
346 | </property> | ||
347 | </item> | ||
348 | <item> | ||
349 | <property> | ||
350 | <name>text</name> | ||
351 | <string>New Item</string> | ||
352 | </property> | ||
353 | <property> | ||
354 | <name>pixmap</name> | ||
355 | <pixmap>image0</pixmap> | ||
356 | </property> | ||
357 | </item> | ||
358 | <item> | ||
359 | <property> | ||
360 | <name>text</name> | ||
361 | <string>New Item</string> | ||
362 | </property> | ||
363 | <property> | ||
364 | <name>pixmap</name> | ||
365 | <pixmap>image0</pixmap> | ||
366 | </property> | ||
367 | </item> | ||
368 | <item> | ||
369 | <property> | ||
370 | <name>text</name> | ||
371 | <string>New Item</string> | ||
372 | </property> | ||
373 | <property> | ||
374 | <name>pixmap</name> | ||
375 | <pixmap>image0</pixmap> | ||
376 | </property> | ||
377 | </item> | ||
378 | <property stdset="1"> | 248 | <property stdset="1"> |
379 | <name>name</name> | 249 | <name>name</name> |
380 | <cstring>Profiles_IV</cstring> | 250 | <cstring>Profiles_LB</cstring> |
381 | </property> | ||
382 | <property stdset="1"> | ||
383 | <name>spacing</name> | ||
384 | <number>5</number> | ||
385 | </property> | ||
386 | <property stdset="1"> | ||
387 | <name>itemsMovable</name> | ||
388 | <bool>false</bool> | ||
389 | </property> | ||
390 | <property stdset="1"> | ||
391 | <name>showToolTips</name> | ||
392 | <bool>false</bool> | ||
393 | </property> | 251 | </property> |
@@ -401,2 +259,9 @@ | |||
401 | <property stdset="1"> | 259 | <property stdset="1"> |
260 | <name>sizePolicy</name> | ||
261 | <sizepolicy> | ||
262 | <hsizetype>5</hsizetype> | ||
263 | <vsizetype>1</vsizetype> | ||
264 | </sizepolicy> | ||
265 | </property> | ||
266 | <property stdset="1"> | ||
402 | <name>title</name> | 267 | <name>title</name> |
@@ -520,8 +385,2 @@ | |||
520 | </widget> | 385 | </widget> |
521 | <images> | ||
522 | <image> | ||
523 | <name>image0</name> | ||
524 | <data format="XPM.GZ" length="1347">789c7dd3c14ac4301405d07dbf22f4ed8a743ace0882f8098a4b415ca4c92475310a3a2e44fc777393a64df2dabed7452e1c6eb368778d787e7a10cdaefabac8cb9b126a909fa2d1dfe7f3cfcbebfd6f551fae857bf69dd8d75755dd0a251e3fde4f38933b53e707b10f518df18478e8b08803e271c21af1e6168b681165e7f688681055874594211a13a242347efc95da9688dad58946ca75e58d6be9e5ba0a46e92d351a952aa2d3b2495459989849f949546632b5688c32c65aeadde428ed0132da23306e4c5863f1ba017042738f6fc138a5fdbd0a135b2203ec7bca7b723022e23d19628601cb0d6f59e8612dce0c2b2641658fb5650b375a0795a2c2b8afcaaba4859ba852c4cda4364da9964daed64caa60c2475d9a590503c54d54d1d0a2096abb67541bf79955fc0debbfbbea1f81b84f0e</data> | ||
525 | </image> | ||
526 | </images> | ||
527 | <connections> | 386 | <connections> |
@@ -570,18 +429,18 @@ | |||
570 | <connection> | 429 | <connection> |
571 | <sender>Profiles_IV</sender> | 430 | <sender>Profiles_LB</sender> |
572 | <signal>selectionChanged(QIconViewItem*)</signal> | 431 | <signal>clicked(QListBoxItem*)</signal> |
573 | <receiver>NetworkSettingsGUI</receiver> | 432 | <receiver>NetworkSettingsGUI</receiver> |
574 | <slot>SLOT_ShowNode( QIconViewItem*)</slot> | 433 | <slot>SLOT_ShowNode( QListBoxItem*)</slot> |
575 | </connection> | 434 | </connection> |
576 | <connection> | 435 | <connection> |
577 | <sender>Profiles_IV</sender> | 436 | <sender>Profiles_LB</sender> |
578 | <signal>doubleClicked(QIconViewItem*)</signal> | 437 | <signal>currentChanged(QListBoxItem*)</signal> |
579 | <receiver>NetworkSettingsGUI</receiver> | 438 | <receiver>NetworkSettingsGUI</receiver> |
580 | <slot>SLOT_EditNode( QIconViewItem*)</slot> | 439 | <slot>SLOT_ShowNode( QListBoxItem*)</slot> |
581 | </connection> | 440 | </connection> |
582 | <connection> | 441 | <connection> |
583 | <sender>Profiles_IV</sender> | 442 | <sender>Profiles_LB</sender> |
584 | <signal>currentChanged(QIconViewItem*)</signal> | 443 | <signal>doubleClicked(QListBoxItem*)</signal> |
585 | <receiver>NetworkSettingsGUI</receiver> | 444 | <receiver>NetworkSettingsGUI</receiver> |
586 | <slot>SLOT_ShowNode( QIconViewItem*)</slot> | 445 | <slot>SLOT_EditNode( QListBoxItem *)</slot> |
587 | </connection> | 446 | </connection> |
@@ -591,3 +450,3 @@ | |||
591 | <slot access="public">SLOT_DeleteNode()</slot> | 450 | <slot access="public">SLOT_DeleteNode()</slot> |
592 | <slot access="public">SLOT_EditNode( QIconViewItem*)</slot> | 451 | <slot access="public">SLOT_EditNode( QListBoxItem *)</slot> |
593 | <slot access="public">SLOT_Enable()</slot> | 452 | <slot access="public">SLOT_Enable()</slot> |
@@ -595,3 +454,3 @@ | |||
595 | <slot access="public">SLOT_On()</slot> | 454 | <slot access="public">SLOT_On()</slot> |
596 | <slot access="public">SLOT_ShowNode( QIconViewItem*)</slot> | 455 | <slot access="public">SLOT_ShowNode( QListBoxItem*)</slot> |
597 | </connections> | 456 | </connections> |
diff --git a/noncore/settings/networksettings2/nsdata.cpp b/noncore/settings/networksettings2/nsdata.cpp index 9b2ad3a..3f5e958 100644 --- a/noncore/settings/networksettings2/nsdata.cpp +++ b/noncore/settings/networksettings2/nsdata.cpp | |||
@@ -21,2 +21,3 @@ NetworkSettingsData::NetworkSettingsData( void ) { | |||
21 | Force = 0; | 21 | Force = 0; |
22 | IsModified = 0; | ||
22 | loadSettings(); | 23 | loadSettings(); |
diff --git a/noncore/settings/networksettings2/ppp/ppp_NN.h b/noncore/settings/networksettings2/ppp/ppp_NN.h index a933523..3f9a338 100644 --- a/noncore/settings/networksettings2/ppp/ppp_NN.h +++ b/noncore/settings/networksettings2/ppp/ppp_NN.h | |||
@@ -17,3 +17,3 @@ public: | |||
17 | virtual const QString pixmapName() | 17 | virtual const QString pixmapName() |
18 | { return "ppp"; } | 18 | { return "Devices/ppp"; } |
19 | 19 | ||
diff --git a/noncore/settings/networksettings2/ppp/ppp_NNI.h b/noncore/settings/networksettings2/ppp/ppp_NNI.h index 08dca1d..a17721a 100644 --- a/noncore/settings/networksettings2/ppp/ppp_NNI.h +++ b/noncore/settings/networksettings2/ppp/ppp_NNI.h | |||
@@ -23,3 +23,3 @@ public : | |||
23 | RT = new PPPRun( this, Data ); | 23 | RT = new PPPRun( this, Data ); |
24 | return RT; | 24 | return RT->runtimeInfo(); |
25 | } | 25 | } |
diff --git a/noncore/settings/networksettings2/ppp/ppprun.cpp b/noncore/settings/networksettings2/ppp/ppprun.cpp index 8933f85..4ac0c5a 100644 --- a/noncore/settings/networksettings2/ppp/ppprun.cpp +++ b/noncore/settings/networksettings2/ppp/ppprun.cpp | |||
@@ -3,2 +3,7 @@ | |||
3 | 3 | ||
4 | PPPRun::PPPRun( ANetNodeInstance * NNI, PPPData & Data ) : | ||
5 | AsConnection( NNI ), AsDevice( NNI ), Pat( "eth[0-9]" ) { | ||
6 | D = &Data; | ||
7 | } | ||
8 | |||
4 | void PPPRun::detectState( NodeCollection * NC ) { | 9 | void PPPRun::detectState( NodeCollection * NC ) { |
@@ -13,3 +18,11 @@ void PPPRun::detectState( NodeCollection * NC ) { | |||
13 | // but could also be unavailable | 18 | // but could also be unavailable |
14 | netNode()->nextNode()->runtime()->detectState( NC ); | 19 | ANetNodeInstance * NNI; |
20 | RuntimeInfo * RI; | ||
21 | NNI = AsDevice::netNode(); | ||
22 | printf( "%p\n", NNI ); | ||
23 | NNI = NNI->nextNode(); | ||
24 | printf( "%p\n", NNI ); | ||
25 | RI = NNI->runtime(); | ||
26 | printf( "%p\n", RI ); | ||
27 | RI->detectState( NC ); | ||
15 | } | 28 | } |
@@ -54,3 +67,3 @@ bool PPPRun::isMyPPPUp( void ) { | |||
54 | System & S = NSResources->system(); | 67 | System & S = NSResources->system(); |
55 | InterfaceInfo * best = 0, * Run; | 68 | InterfaceInfo * Run; |
56 | QRegExp R( "ppp[0-9]" ); | 69 | QRegExp R( "ppp[0-9]" ); |
@@ -65,3 +78,3 @@ bool PPPRun::isMyPPPUp( void ) { | |||
65 | // this is a LAN card | 78 | // this is a LAN card |
66 | if( Run->assignedNode() == netNode() ) { | 79 | if( Run->assignedNode() == AsDevice::netNode() ) { |
67 | // assigned to us | 80 | // assigned to us |
diff --git a/noncore/settings/networksettings2/ppp/ppprun.h b/noncore/settings/networksettings2/ppp/ppprun.h index 76a05be..abb9176 100644 --- a/noncore/settings/networksettings2/ppp/ppprun.h +++ b/noncore/settings/networksettings2/ppp/ppprun.h | |||
@@ -5,5 +5,6 @@ | |||
5 | #include <asconnection.h> | 5 | #include <asconnection.h> |
6 | #include <asdevice.h> | ||
6 | #include "pppdata.h" | 7 | #include "pppdata.h" |
7 | 8 | ||
8 | class PPPRun : public AsConnection { | 9 | class PPPRun : public AsConnection, public AsDevice { |
9 | 10 | ||
@@ -12,8 +13,12 @@ public : | |||
12 | PPPRun( ANetNodeInstance * NNI, | 13 | PPPRun( ANetNodeInstance * NNI, |
13 | PPPData & Data ) : | 14 | PPPData & Data ); |
14 | AsConnection( NNI ), | 15 | virtual QString genNic( long NicNr ) |
15 | Pat( "eth[0-9]" ) | 16 | { QString S; return S.sprintf( "ppp%ld", NicNr ); } |
16 | { D = &Data; } | ||
17 | 17 | ||
18 | protected : | 18 | virtual AsDevice * device( void ) |
19 | { return AsDevice::asDevice(); } | ||
20 | virtual RuntimeInfo * runtimeInfo( void ) | ||
21 | { return ( AsConnection *)this; } | ||
22 | |||
23 | protected : | ||
19 | 24 | ||
@@ -22,3 +27,4 @@ protected : | |||
22 | bool canSetState( State_t S, Action_t A ) | 27 | bool canSetState( State_t S, Action_t A ) |
23 | { return connection()->findNext( netNode() )->runtime()->canSetState( S,A ); } | 28 | { return AsDevice::connection()->findNext( |
29 | AsDevice::netNode() )->runtime()->canSetState( S,A ); } | ||
24 | 30 | ||
diff --git a/noncore/settings/networksettings2/profile/profile_NN.h b/noncore/settings/networksettings2/profile/profile_NN.h index 2b469c7..3c06947 100644 --- a/noncore/settings/networksettings2/profile/profile_NN.h +++ b/noncore/settings/networksettings2/profile/profile_NN.h | |||
@@ -17,3 +17,3 @@ public: | |||
17 | virtual const QString pixmapName() | 17 | virtual const QString pixmapName() |
18 | { return "commprofile"; } | 18 | { return "Devices/commprofile"; } |
19 | 19 | ||
diff --git a/noncore/settings/networksettings2/usb/usb_NN.h b/noncore/settings/networksettings2/usb/usb_NN.h index 3871afc..8b97452 100644 --- a/noncore/settings/networksettings2/usb/usb_NN.h +++ b/noncore/settings/networksettings2/usb/usb_NN.h | |||
@@ -17,3 +17,3 @@ public: | |||
17 | virtual const QString pixmapName() | 17 | virtual const QString pixmapName() |
18 | { return "usb"; } | 18 | { return "Devices/usb"; } |
19 | 19 | ||
diff --git a/noncore/settings/networksettings2/vpn/vpn_NN.h b/noncore/settings/networksettings2/vpn/vpn_NN.h index 5718961..a113ab9 100644 --- a/noncore/settings/networksettings2/vpn/vpn_NN.h +++ b/noncore/settings/networksettings2/vpn/vpn_NN.h | |||
@@ -17,3 +17,3 @@ public: | |||
17 | virtual const QString pixmapName() | 17 | virtual const QString pixmapName() |
18 | { return "vpn"; } | 18 | { return "Devices/vpn"; } |
19 | 19 | ||
diff --git a/noncore/settings/networksettings2/wlan/wlan_NN.h b/noncore/settings/networksettings2/wlan/wlan_NN.h index d1d6ded..0728a79 100644 --- a/noncore/settings/networksettings2/wlan/wlan_NN.h +++ b/noncore/settings/networksettings2/wlan/wlan_NN.h | |||
@@ -17,3 +17,3 @@ public: | |||
17 | virtual const QString pixmapName() | 17 | virtual const QString pixmapName() |
18 | { return "wlan"; } | 18 | { return "Devices/wlan"; } |
19 | 19 | ||