summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/mainwindowimp.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index abf5663..a0b3113 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -57,65 +57,65 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par
57 connect(newProfileButton, SIGNAL(clicked()), this, SLOT(addProfile())); 57 connect(newProfileButton, SIGNAL(clicked()), this, SLOT(addProfile()));
58 connect(removeProfileButton, SIGNAL(clicked()), this, SLOT(removeProfile())); 58 connect(removeProfileButton, SIGNAL(clicked()), this, SLOT(removeProfile()));
59 connect(setCurrentProfileButton, SIGNAL(clicked()), this, SLOT(changeProfile())); 59 connect(setCurrentProfileButton, SIGNAL(clicked()), this, SLOT(changeProfile()));
60 60
61 connect(newProfile, SIGNAL(textChanged(const QString&)), this, SLOT(newProfileChanged(const QString&))); 61 connect(newProfile, SIGNAL(textChanged(const QString&)), this, SLOT(newProfileChanged(const QString&)));
62 62
63 //FIXME: disable profiles for the moment: 63 //FIXME: disable profiles for the moment:
64 tabWidget->setTabEnabled( tab, false ); 64 tabWidget->setTabEnabled( tab, false );
65 65
66 // Load connections. 66 // Load connections.
67 // /usr/local/kde/lib/libinterfaces.la 67 // /usr/local/kde/lib/libinterfaces.la
68#ifdef QWS 68#ifdef QWS
69 loadModules(QPEApplication::qpeDir() + "/plugins/networksettings"); 69 loadModules(QPEApplication::qpeDir() + "/plugins/networksettings");
70#else 70#else
71 loader = KLibLoader::self(); 71 loader = KLibLoader::self();
72 loadModules(QString("/usr/")+KStandardDirs::kde_default("lib")); 72 loadModules(QString("/usr/")+KStandardDirs::kde_default("lib"));
73#endif 73#endif
74 getAllInterfaces(); 74 getAllInterfaces();
75 75
76 Interfaces i; 76 Interfaces i;
77 QStringList list = i.getInterfaceList(); 77 QStringList list = i.getInterfaceList();
78 QMap<QString, Interface*>::Iterator it; 78 QMap<QString, Interface*>::Iterator it;
79 for ( QStringList::Iterator ni = list.begin(); ni != list.end(); ++ni ) { 79 for ( QStringList::Iterator ni = list.begin(); ni != list.end(); ++ni ) {
80 bool found = false; 80 bool found = false;
81 for( it = interfaceNames.begin(); it != interfaceNames.end(); ++it ){ 81 for( it = interfaceNames.begin(); it != interfaceNames.end(); ++it ){
82 if(it.key() == (*ni)) 82 if(it.key() == (*ni))
83 found = true; 83 found = true;
84 } 84 }
85 if(!found){ 85 if(!found){
86 if(!(*ni).contains("_")){ 86 if(!(*ni).contains("_")){
87 Interface *i = new Interface(this, *ni, false); 87 Interface *i = new Interface(this, *ni, false);
88 i->setAttached(false); 88 i->setAttached(false);
89 i->setHardwareName("Disconnected"); 89 i->setHardwareName(tr("Disconnected"));
90 interfaceNames.insert(i->getInterfaceName(), i); 90 interfaceNames.insert(i->getInterfaceName(), i);
91 updateInterface(i); 91 updateInterface(i);
92 connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *))); 92 connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *)));
93 } 93 }
94 } 94 }
95 } 95 }
96 96
97 //getInterfaceList(); 97 //getInterfaceList();
98 connectionList->header()->hide(); 98 connectionList->header()->hide();
99 99
100 Config cfg("NetworkSetup"); 100 Config cfg("NetworkSetup");
101 profiles = QStringList::split(" ", cfg.readEntry("Profiles", "All")); 101 profiles = QStringList::split(" ", cfg.readEntry("Profiles", "All"));
102 for ( QStringList::Iterator it = profiles.begin(); 102 for ( QStringList::Iterator it = profiles.begin();
103 it != profiles.end(); ++it) 103 it != profiles.end(); ++it)
104 profilesList->insertItem((*it)); 104 profilesList->insertItem((*it));
105 currentProfileLabel->setText(cfg.readEntry("CurrentProfile", "All")); 105 currentProfileLabel->setText(cfg.readEntry("CurrentProfile", "All"));
106 advancedUserMode = cfg.readBoolEntry("AdvancedUserMode", false); 106 advancedUserMode = cfg.readBoolEntry("AdvancedUserMode", false);
107 scheme = cfg.readEntry("SchemeFile", DEFAULT_SCHEME); 107 scheme = cfg.readEntry("SchemeFile", DEFAULT_SCHEME);
108 108
109 QFile file(scheme); 109 QFile file(scheme);
110 if ( file.open(IO_ReadOnly) ) { // file opened successfully 110 if ( file.open(IO_ReadOnly) ) { // file opened successfully
111 QTextStream stream( &file ); // use a text stream 111 QTextStream stream( &file ); // use a text stream
112 while ( !stream.eof() ) { // until end of file... 112 while ( !stream.eof() ) { // until end of file...
113 QString line = stream.readLine(); // line of text excluding '\n' 113 QString line = stream.readLine(); // line of text excluding '\n'
114 if(line.contains("SCHEME")){ 114 if(line.contains("SCHEME")){
115 line = line.mid(7, line.length()); 115 line = line.mid(7, line.length());
116 currentProfileLabel->setText(line); 116 currentProfileLabel->setText(line);
117 break; 117 break;
118 } 118 }
119 } 119 }
120 file.close(); 120 file.close();
121 } 121 }
@@ -359,82 +359,81 @@ void MainWindowImp::addClicked(){
359 return; 359 return;
360 360
361 for( it = libraries.begin(); it != libraries.end(); ++it ){ 361 for( it = libraries.begin(); it != libraries.end(); ++it ){
362 if(it.key()){ 362 if(it.key()){
363 Interface *i = (it.key())->addNewInterface(item->text(0)); 363 Interface *i = (it.key())->addNewInterface(item->text(0));
364 if(i){ 364 if(i){
365 qDebug("iface name %s",i->getInterfaceName().latin1()); 365 qDebug("iface name %s",i->getInterfaceName().latin1());
366 interfaceNames.insert(i->getInterfaceName(), i); 366 interfaceNames.insert(i->getInterfaceName(), i);
367 updateInterface(i); 367 updateInterface(i);
368 } 368 }
369 } 369 }
370 } 370 }
371 } 371 }
372} 372}
373 373
374/** 374/**
375 * Prompt the user to see if they really want to do this. 375 * Prompt the user to see if they really want to do this.
376 * If they do then remove from the list and unload. 376 * If they do then remove from the list and unload.
377 */ 377 */
378void MainWindowImp::removeClicked(){ 378void MainWindowImp::removeClicked(){
379 QListViewItem *item = connectionList->currentItem(); 379 QListViewItem *item = connectionList->currentItem();
380 if(!item) { 380 if(!item) {
381 QMessageBox::information(this, "Sorry","Please select an interface First.", QMessageBox::Ok); 381 QMessageBox::information(this, "Sorry","Please select an interface First.", QMessageBox::Ok);
382 return; 382 return;
383 } 383 }
384 384
385 Interface *i = interfaceItems[item]; 385 Interface *i = interfaceItems[item];
386 if(i->getModuleOwner() == NULL){ 386 if(i->getModuleOwner() == NULL){
387 QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", QMessageBox::Ok); 387 QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", QMessageBox::Ok);
388 } 388 }
389 else{ 389 else{
390 if(!i->getModuleOwner()->remove(i)) 390 if(!i->getModuleOwner()->remove(i))
391 QMessageBox::information(this, "Error", "Unable to remove.", QMessageBox::Ok); 391 QMessageBox::information(this, tr("Error"), tr("Unable to remove."), QMessageBox::Ok);
392 else{ 392 else{
393 QMessageBox::information(this, "Success", "Interface was removed.", QMessageBox::Ok); 393 delete item;
394 // TODO memory managment.... 394// QMessageBox::information(this, "Success", "Interface was removed.", QMessageBox::Ok);
395 // who deletes the interface?
396 } 395 }
397 } 396 }
398} 397}
399 398
400/** 399/**
401 * Pull up the configure about the currently selected interface. 400 * Pull up the configure about the currently selected interface.
402 * Report an error if no interface is selected. 401 * Report an error if no interface is selected.
403 * If the interface has a module owner then request its configure. 402 * If the interface has a module owner then request its configure.
404 */ 403 */
405void MainWindowImp::configureClicked(){ 404void MainWindowImp::configureClicked(){
406 QListViewItem *item = connectionList->currentItem(); 405 QListViewItem *item = connectionList->currentItem();
407 if(!item){ 406 if(!item){
408 QMessageBox::information(this, "Sorry","Please select an interface first.", QMessageBox::Ok); 407 QMessageBox::information(this, tr("Sorry"),tr("Please select an interface first."), QMessageBox::Ok);
409 return; 408 return;
410 } 409 }
411 410
412 QString currentProfileText = currentProfileLabel->text(); 411 QString currentProfileText = currentProfileLabel->text();
413 if(currentProfileText.upper() == "ALL"); 412 if(currentProfileText.upper() == "ALL");
414 currentProfileText = ""; 413 currentProfileText = "";
415 414
416 Interface *i = interfaceItems[item]; 415 Interface *i = interfaceItems[item];
417 416
418 if(i->getModuleOwner()){ 417 if(i->getModuleOwner()){
419 QWidget *moduleConfigure = i->getModuleOwner()->configure(i); 418 QWidget *moduleConfigure = i->getModuleOwner()->configure(i);
420 if(moduleConfigure != NULL){ 419 if(moduleConfigure != NULL){
421 i->getModuleOwner()->setProfile(currentProfileText); 420 i->getModuleOwner()->setProfile(currentProfileText);
422 moduleConfigure->showMaximized(); 421 moduleConfigure->showMaximized();
423 return; 422 return;
424 } 423 }
425 } 424 }
426 425
427 InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(this, "InterfaceSetupImp", i, true, Qt::WDestructiveClose ); 426 InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(this, "InterfaceSetupImp", i, true, Qt::WDestructiveClose );
428 configure->setProfile(currentProfileText); 427 configure->setProfile(currentProfileText);
429 configure->showMaximized(); 428 configure->showMaximized();
430} 429}
431 430
432/** 431/**
433 * Pull up the information about the currently selected interface. 432 * Pull up the information about the currently selected interface.
434 * Report an error if no interface is selected. 433 * Report an error if no interface is selected.
435 * If the interface has a module owner then request its configure. 434 * If the interface has a module owner then request its configure.
436 */ 435 */
437void MainWindowImp::informationClicked(){ 436void MainWindowImp::informationClicked(){
438 QListViewItem *item = connectionList->currentItem(); 437 QListViewItem *item = connectionList->currentItem();
439 if(!item){ 438 if(!item){
440 QMessageBox::information(this, "Sorry","Please select an interface First.", QMessageBox::Ok); 439 QMessageBox::information(this, "Sorry","Please select an interface First.", QMessageBox::Ok);