summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/mainwindow.ui2
-rw-r--r--noncore/settings/networksettings/mainwindowimp.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/noncore/settings/networksettings/mainwindow.ui b/noncore/settings/networksettings/mainwindow.ui
index 8e17cb3..f61a1ae 100644
--- a/noncore/settings/networksettings/mainwindow.ui
+++ b/noncore/settings/networksettings/mainwindow.ui
@@ -129,97 +129,97 @@
129 </property> 129 </property>
130 </column> 130 </column>
131 <property stdset="1"> 131 <property stdset="1">
132 <name>name</name> 132 <name>name</name>
133 <cstring>connectionList</cstring> 133 <cstring>connectionList</cstring>
134 </property> 134 </property>
135 <property stdset="1"> 135 <property stdset="1">
136 <name>allColumnsShowFocus</name> 136 <name>allColumnsShowFocus</name>
137 <bool>true</bool> 137 <bool>true</bool>
138 </property> 138 </property>
139 </widget> 139 </widget>
140 <widget> 140 <widget>
141 <class>QLayoutWidget</class> 141 <class>QLayoutWidget</class>
142 <property stdset="1"> 142 <property stdset="1">
143 <name>name</name> 143 <name>name</name>
144 <cstring>Layout2</cstring> 144 <cstring>Layout2</cstring>
145 </property> 145 </property>
146 <property> 146 <property>
147 <name>layoutMargin</name> 147 <name>layoutMargin</name>
148 </property> 148 </property>
149 <grid> 149 <grid>
150 <property stdset="1"> 150 <property stdset="1">
151 <name>margin</name> 151 <name>margin</name>
152 <number>5</number> 152 <number>5</number>
153 </property> 153 </property>
154 <property stdset="1"> 154 <property stdset="1">
155 <name>spacing</name> 155 <name>spacing</name>
156 <number>6</number> 156 <number>6</number>
157 </property> 157 </property>
158 <widget row="1" column="0" > 158 <widget row="1" column="0" >
159 <class>QPushButton</class> 159 <class>QPushButton</class>
160 <property stdset="1"> 160 <property stdset="1">
161 <name>name</name> 161 <name>name</name>
162 <cstring>addConnectionButton</cstring> 162 <cstring>addConnectionButton</cstring>
163 </property> 163 </property>
164 <property stdset="1"> 164 <property stdset="1">
165 <name>text</name> 165 <name>text</name>
166 <string>&amp;Add</string> 166 <string>&amp;Add</string>
167 </property> 167 </property>
168 </widget> 168 </widget>
169 <widget row="0" column="0" > 169 <widget row="0" column="0" >
170 <class>QPushButton</class> 170 <class>QPushButton</class>
171 <property stdset="1"> 171 <property stdset="1">
172 <name>name</name> 172 <name>name</name>
173 <cstring>informationConnectionButton</cstring> 173 <cstring>informationConnectionButton</cstring>
174 </property> 174 </property>
175 <property stdset="1"> 175 <property stdset="1">
176 <name>text</name> 176 <name>text</name>
177 <string>&amp;Information</string> 177 <string>&amp;Start/Stop</string>
178 </property> 178 </property>
179 </widget> 179 </widget>
180 <widget row="0" column="1" > 180 <widget row="0" column="1" >
181 <class>QPushButton</class> 181 <class>QPushButton</class>
182 <property stdset="1"> 182 <property stdset="1">
183 <name>name</name> 183 <name>name</name>
184 <cstring>configureConnectionButton</cstring> 184 <cstring>configureConnectionButton</cstring>
185 </property> 185 </property>
186 <property stdset="1"> 186 <property stdset="1">
187 <name>text</name> 187 <name>text</name>
188 <string>&amp;Configure</string> 188 <string>&amp;Configure</string>
189 </property> 189 </property>
190 </widget> 190 </widget>
191 <widget row="1" column="1" > 191 <widget row="1" column="1" >
192 <class>QPushButton</class> 192 <class>QPushButton</class>
193 <property stdset="1"> 193 <property stdset="1">
194 <name>name</name> 194 <name>name</name>
195 <cstring>removeConnectionButton</cstring> 195 <cstring>removeConnectionButton</cstring>
196 </property> 196 </property>
197 <property stdset="1"> 197 <property stdset="1">
198 <name>text</name> 198 <name>text</name>
199 <string>&amp;Remove</string> 199 <string>&amp;Remove</string>
200 </property> 200 </property>
201 </widget> 201 </widget>
202 </grid> 202 </grid>
203 </widget> 203 </widget>
204 </vbox> 204 </vbox>
205 </widget> 205 </widget>
206 <widget> 206 <widget>
207 <class>QWidget</class> 207 <class>QWidget</class>
208 <property stdset="1"> 208 <property stdset="1">
209 <name>name</name> 209 <name>name</name>
210 <cstring>tab</cstring> 210 <cstring>tab</cstring>
211 </property> 211 </property>
212 <attribute> 212 <attribute>
213 <name>title</name> 213 <name>title</name>
214 <string>Profiles</string> 214 <string>Profiles</string>
215 </attribute> 215 </attribute>
216 <grid> 216 <grid>
217 <property stdset="1"> 217 <property stdset="1">
218 <name>margin</name> 218 <name>margin</name>
219 <number>11</number> 219 <number>11</number>
220 </property> 220 </property>
221 <property stdset="1"> 221 <property stdset="1">
222 <name>spacing</name> 222 <name>spacing</name>
223 <number>6</number> 223 <number>6</number>
224 </property> 224 </property>
225 <spacer row="7" column="2" > 225 <spacer row="7" column="2" >
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 56bbd2c..a61f620 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -375,100 +375,100 @@ void MainWindowImp::removeClicked(){
375 } 375 }
376} 376}
377 377
378/** 378/**
379 * Pull up the configure about the currently selected interface. 379 * Pull up the configure about the currently selected interface.
380 * Report an error if no interface is selected. 380 * Report an error if no interface is selected.
381 * If the interface has a module owner then request its configure. 381 * If the interface has a module owner then request its configure.
382 */ 382 */
383void MainWindowImp::configureClicked(){ 383void MainWindowImp::configureClicked(){
384 QListViewItem *item = connectionList->currentItem(); 384 QListViewItem *item = connectionList->currentItem();
385 if(!item){ 385 if(!item){
386 QMessageBox::information(this, "Sorry","Please select an interface first.", QMessageBox::Ok); 386 QMessageBox::information(this, "Sorry","Please select an interface first.", QMessageBox::Ok);
387 return; 387 return;
388 } 388 }
389 389
390 QString currentProfileText = currentProfileLabel->text(); 390 QString currentProfileText = currentProfileLabel->text();
391 if(currentProfileText.upper() == "ALL"); 391 if(currentProfileText.upper() == "ALL");
392 currentProfileText = ""; 392 currentProfileText = "";
393 393
394 Interface *i = interfaceItems[item]; 394 Interface *i = interfaceItems[item];
395 395
396 if(i->getModuleOwner()){ 396 if(i->getModuleOwner()){
397 QWidget *moduleConfigure = i->getModuleOwner()->configure(i); 397 QWidget *moduleConfigure = i->getModuleOwner()->configure(i);
398 if(moduleConfigure != NULL){ 398 if(moduleConfigure != NULL){
399 i->getModuleOwner()->setProfile(currentProfileText); 399 i->getModuleOwner()->setProfile(currentProfileText);
400 moduleConfigure->showMaximized(); 400 moduleConfigure->showMaximized();
401 return; 401 return;
402 } 402 }
403 } 403 }
404 404
405 InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(this, "InterfaceSetupImp", i, true, Qt::WDestructiveClose ); 405 InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(this, "InterfaceSetupImp", i, true, Qt::WDestructiveClose );
406 configure->setProfile(currentProfileText); 406 configure->setProfile(currentProfileText);
407 configure->showMaximized(); 407 configure->showMaximized();
408} 408}
409 409
410/** 410/**
411 * Pull up the information about the currently selected interface. 411 * Pull up the information about the currently selected interface.
412 * Report an error if no interface is selected. 412 * Report an error if no interface is selected.
413 * If the interface has a module owner then request its configure. 413 * If the interface has a module owner then request its configure.
414 */ 414 */
415void MainWindowImp::informationClicked(){ 415void MainWindowImp::informationClicked(){
416 QListViewItem *item = connectionList->currentItem(); 416 QListViewItem *item = connectionList->currentItem();
417 if(!item){ 417 if(!item){
418 QMessageBox::information(this, "Sorry","Please select an interface First.", QMessageBox::Ok); 418 QMessageBox::information(this, "Sorry","Please select an interface First.", QMessageBox::Ok);
419 return; 419 return;
420 } 420 }
421 421
422 Interface *i = interfaceItems[item]; 422 Interface *i = interfaceItems[item];
423 if(!i->isAttached()){ 423// if(!i->isAttached()){
424 QMessageBox::information(this, "Sorry","No information about\na disconnected interface.", QMessageBox::Ok); 424// QMessageBox::information(this, "Sorry","No information about\na disconnected interface.", QMessageBox::Ok);
425 return; 425// return;
426 } 426// }
427 427
428 if(i->getModuleOwner()){ 428 if(i->getModuleOwner()){
429 QWidget *moduleInformation = i->getModuleOwner()->information(i); 429 QWidget *moduleInformation = i->getModuleOwner()->information(i);
430 if(moduleInformation != NULL){ 430 if(moduleInformation != NULL){
431 moduleInformation->showMaximized(); 431 moduleInformation->showMaximized();
432#ifdef DEBUG 432#ifdef DEBUG
433 qDebug("MainWindowImp::informationClicked:: Module owner has created, we showed."); 433 qDebug("MainWindowImp::informationClicked:: Module owner has created, we showed.");
434#endif 434#endif
435 return; 435 return;
436 } 436 }
437 } 437 }
438 InterfaceInformationImp *information = new InterfaceInformationImp(this, "InterfaceSetupImp", i, Qt::WType_Modal | Qt::WDestructiveClose | Qt::WStyle_Dialog); 438 InterfaceInformationImp *information = new InterfaceInformationImp(this, "InterfaceSetupImp", i, Qt::WType_Modal | Qt::WDestructiveClose | Qt::WStyle_Dialog);
439 information->showMaximized(); 439 information->showMaximized();
440} 440}
441 441
442/** 442/**
443 * Update this interface. If no QListViewItem exists create one. 443 * Update this interface. If no QListViewItem exists create one.
444 * @param Interface* pointer to the interface that needs to be updated. 444 * @param Interface* pointer to the interface that needs to be updated.
445 */ 445 */
446void MainWindowImp::updateInterface(Interface *i){ 446void MainWindowImp::updateInterface(Interface *i){
447 if(!advancedUserMode){ 447 if(!advancedUserMode){
448 if(i->getInterfaceName() == "lo") 448 if(i->getInterfaceName() == "lo")
449 return; 449 return;
450 } 450 }
451 451
452 QListViewItem *item = NULL; 452 QListViewItem *item = NULL;
453 453
454 // Find the interface, making it if needed. 454 // Find the interface, making it if needed.
455 if(items.find(i) == items.end()){ 455 if(items.find(i) == items.end()){
456 item = new QListViewItem(connectionList, "", "", ""); 456 item = new QListViewItem(connectionList, "", "", "");
457 // See if you can't find a module owner for this interface 457 // See if you can't find a module owner for this interface
458 QMap<Module*, QLibrary*>::Iterator it; 458 QMap<Module*, QLibrary*>::Iterator it;
459 for( it = libraries.begin(); it != libraries.end(); ++it ){ 459 for( it = libraries.begin(); it != libraries.end(); ++it ){
460 if(it.key()->isOwner(i)) 460 if(it.key()->isOwner(i))
461 i->setModuleOwner(it.key()); 461 i->setModuleOwner(it.key());
462 } 462 }
463 items.insert(i, item); 463 items.insert(i, item);
464 interfaceItems.insert(item, i); 464 interfaceItems.insert(item, i);
465 } 465 }
466 else 466 else
467 item = items[i]; 467 item = items[i];
468 468
469 // Update the icons and information 469 // Update the icons and information
470#ifdef QWS 470#ifdef QWS
471 item->setPixmap(0, (Resource::loadPixmap(i->getStatus() ? "up": "down"))); 471 item->setPixmap(0, (Resource::loadPixmap(i->getStatus() ? "up": "down")));
472#else 472#else
473 item->setPixmap(0, (SmallIcon(i->getStatus() ? "up": "down"))); 473 item->setPixmap(0, (SmallIcon(i->getStatus() ? "up": "down")));
474#endif 474#endif