author | ar <ar> | 2004-02-21 18:32:37 (UTC) |
---|---|---|
committer | ar <ar> | 2004-02-21 18:32:37 (UTC) |
commit | 536f271b1e6a1d1886e96a28524a3503c4c38c4e (patch) (side-by-side diff) | |
tree | 63b3c0ce472a89a0f9731195fececc701bf4ca67 | |
parent | db2afda83e495bff9fc19fa14a30072f1cd4c67a (diff) | |
download | opie-536f271b1e6a1d1886e96a28524a3503c4c38c4e.zip opie-536f271b1e6a1d1886e96a28524a3503c4c38c4e.tar.gz opie-536f271b1e6a1d1886e96a28524a3503c4c38c4e.tar.bz2 |
improve support for BigScreen
7 files changed, 395 insertions, 225 deletions
diff --git a/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp b/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp index 37c3a91..698dfd3 100644 --- a/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp +++ b/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp @@ -1 +1,2 @@ + #include "interfaceinformationimp.h" @@ -3,2 +4,7 @@ +/* OPIE */ +#include <qpe/config.h> +#include <qpe/qpeapplication.h> + +/* QT */ #include <qcheckbox.h> @@ -9,3 +15,2 @@ -#include <qpe/config.h> @@ -20,3 +25,4 @@ */ -InterfaceInformationImp::InterfaceInformationImp(QWidget *parent, const char *name, Interface *i, WFlags f):InterfaceInformation(parent, name, f), interface(i){ +InterfaceInformationImp::InterfaceInformationImp(QWidget *parent, const char *name, Interface *i, WFlags f):InterfaceInformation(parent, name, f), interface(i) +{ connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *))); @@ -46,4 +52,6 @@ InterfaceInformationImp::~InterfaceInformationImp() */ -void InterfaceInformationImp::updateInterface(Interface *){ - if(interface->getStatus()){ +void InterfaceInformationImp::updateInterface(Interface *) +{ + if(interface->getStatus()) + { startButton->setEnabled(false); @@ -52,3 +60,4 @@ void InterfaceInformationImp::updateInterface(Interface *){ } - else{ + else + { startButton->setEnabled(true); @@ -67,3 +76,4 @@ void InterfaceInformationImp::updateInterface(Interface *){ */ -void InterfaceInformationImp::advanced(){ +void InterfaceInformationImp::advanced() +{ InterfaceAdvanced *a = new InterfaceAdvanced(this, "InterfaceAdvanced", Qt::WType_Modal | Qt::WDestructiveClose | Qt::WStyle_Dialog); @@ -78,3 +88,3 @@ void InterfaceInformationImp::advanced(){ a->dhcpInformation->setEnabled(interface->isDhcp()); - a->showMaximized(); + QPEApplication::showWidget( a ); } @@ -86,3 +96,4 @@ void InterfaceInformationImp::advanced(){ */ -void InterfaceInformationImp::showMessage(const QString &message){ +void InterfaceInformationImp::showMessage(const QString &message) +{ if (CheckBoxSilent->isChecked()) return; diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp index d9752ce..b0a1dd9 100644 --- a/noncore/settings/networksettings/mainwindowimp.cpp +++ b/noncore/settings/networksettings/mainwindowimp.cpp @@ -1 +1,2 @@ + #include "mainwindowimp.h" @@ -7,2 +8,10 @@ +/* OPIE */ +#include <qpe/qcopenvelope_qws.h> +#include <qpe/qpeapplication.h> +#include <qpe/config.h> +#include <qpe/qlibrary.h> +#include <qpe/resource.h> + +/* QT */ #include <qpushbutton.h> @@ -13,23 +22,5 @@ #include <qlabel.h> -#include <qpe/qcopenvelope_qws.h> #include <qtabwidget.h> // in order to disable the profiles tab -#include <qpe/qpeapplication.h> - #include <qmessagebox.h> -#ifdef QWS - #include <qpe/config.h> - #include <qpe/qlibrary.h> - #include <qpe/resource.h> - #include <qpe/qpeapplication.h> -#else - #include <klibloader.h> - #define QLibrary KLibrary - #include <kconfig.h> - #define Config KConfig - #include <kapplication.h> - #include <kstandarddirs.h> - #include <kiconloader.h> - #define showMaximized show -#endif @@ -45,2 +36,3 @@ +/* STD */ #include <net/if.h> @@ -52,3 +44,4 @@ -MainWindowImp::MainWindowImp(QWidget *parent, const char *name, WFlags) : MainWindow(parent, name, Qt::WStyle_ContextHelp), advancedUserMode(true), scheme(DEFAULT_SCHEME){ +MainWindowImp::MainWindowImp(QWidget *parent, const char *name, WFlags) : MainWindow(parent, name, Qt::WStyle_ContextHelp), advancedUserMode(true), scheme(DEFAULT_SCHEME) +{ connect(addConnectionButton, SIGNAL(clicked()), this, SLOT(addClicked())); @@ -80,3 +73,4 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name, WFlags) : MainWi QMap<QString, Interface*>::Iterator it; - for ( QStringList::Iterator ni = list.begin(); ni != list.end(); ++ni ) { + for ( QStringList::Iterator ni = list.begin(); ni != list.end(); ++ni ) + { /* @@ -85,3 +79,4 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name, WFlags) : MainWi */ - if (m_handledIfaces.contains( *ni) ) { + if (m_handledIfaces.contains( *ni) ) + { qDebug("Not up iface handled by module"); @@ -90,3 +85,4 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name, WFlags) : MainWi bool found = false; - for( it = interfaceNames.begin(); it != interfaceNames.end(); ++it ){ + for( it = interfaceNames.begin(); it != interfaceNames.end(); ++it ) + { if(it.key() == (*ni)) @@ -94,4 +90,6 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name, WFlags) : MainWi } - if(!found){ - if(!(*ni).contains("_")){ + if(!found) + { + if(!(*ni).contains("_")) + { Interface *i = new Interface(this, *ni, false); @@ -119,7 +117,10 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name, WFlags) : MainWi QFile file(scheme); - if ( file.open(IO_ReadOnly) ) { // file opened successfully + if ( file.open(IO_ReadOnly) ) + { // file opened successfully QTextStream stream( &file ); // use a text stream - while ( !stream.eof() ) { // until end of file... + while ( !stream.eof() ) + { // until end of file... QString line = stream.readLine(); // line of text excluding '\n' - if(line.contains("SCHEME")){ + if(line.contains("SCHEME")) + { line = line.mid(7, line.length()); @@ -137,3 +138,4 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name, WFlags) : MainWi */ -MainWindowImp::~MainWindowImp(){ +MainWindowImp::~MainWindowImp() +{ // Save profiles. @@ -145,3 +147,4 @@ MainWindowImp::~MainWindowImp(){ QMap<Interface*, QListViewItem*>::Iterator iIt; - for( iIt = items.begin(); iIt != items.end(); ++iIt ){ + for( iIt = items.begin(); iIt != items.end(); ++iIt ) + { if(iIt.key()->getModuleOwner() == NULL) @@ -153,3 +156,4 @@ MainWindowImp::~MainWindowImp(){ QMap<Module*, QLibrary*>::Iterator it; - for( it = libraries.begin(); it != libraries.end(); ++it ){ + for( it = libraries.begin(); it != libraries.end(); ++it ) + { delete it.key(); @@ -167,3 +171,4 @@ MainWindowImp::~MainWindowImp(){ */ -void MainWindowImp::getAllInterfaces(){ +void MainWindowImp::getAllInterfaces() +{ int sockfd = socket(PF_INET, SOCK_DGRAM, 0); @@ -178,3 +183,4 @@ void MainWindowImp::getAllInterfaces(){ - if (! procFile.exists()) { + if (! procFile.exists()) + { struct ifreq ifrs[100]; @@ -185,3 +191,4 @@ void MainWindowImp::getAllInterfaces(){ - for (unsigned int i = 0; i < ifc.ifc_len / sizeof(struct ifreq); i++) { + for (unsigned int i = 0; i < ifc.ifc_len / sizeof(struct ifreq); i++) + { struct ifreq *pifr = &ifrs[i]; @@ -190,3 +197,5 @@ void MainWindowImp::getAllInterfaces(){ } - } else { + } + else + { procFile.open(IO_ReadOnly); @@ -198,4 +207,6 @@ void MainWindowImp::getAllInterfaces(){ procTs.readLine(); // eat a line - while((line = procTs.readLine().simplifyWhiteSpace()) != QString::null) { - if((loc = line.find(":")) != -1) { + while((line = procTs.readLine().simplifyWhiteSpace()) != QString::null) + { + if((loc = line.find(":")) != -1) + { ifaces += line.left(loc); @@ -205,5 +216,7 @@ void MainWindowImp::getAllInterfaces(){ - for (QStringList::Iterator it = ifaces.begin(); it != ifaces.end(); ++it) { + for (QStringList::Iterator it = ifaces.begin(); it != ifaces.end(); ++it) + { int flags = 0; - if ( m_handledIfaces.contains( (*it) ) ) { + if ( m_handledIfaces.contains( (*it) ) ) + { qDebug(" %s is handled by a module", (*it).latin1() ); @@ -247,6 +260,9 @@ void MainWindowImp::getAllInterfaces(){ QList<Interface> ilist; - for( it = libraries.begin(); it != libraries.end(); ++it ){ - if(it.key()){ + for( it = libraries.begin(); it != libraries.end(); ++it ) + { + if(it.key()) + { ilist = it.key()->getInterfaces(); - for( i = ilist.first(); i != 0; i = ilist.next() ){ + for( i = ilist.first(); i != 0; i = ilist.next() ) + { qWarning("Adding interface %s to interfaceNames\n", i->getInterfaceName().latin1() ); @@ -266,3 +282,4 @@ void MainWindowImp::getAllInterfaces(){ */ -void MainWindowImp::loadModules(const QString &path){ +void MainWindowImp::loadModules(const QString &path) +{ #ifdef DEBUG @@ -279,7 +296,10 @@ void MainWindowImp::loadModules(const QString &path){ QFileInfo *fi; - while ( (fi=it.current()) ) { + while ( (fi=it.current()) ) + { #ifdef QWS - if(fi->fileName().contains(".so")){ + if(fi->fileName().contains(".so")) + { #else - if(fi->fileName().contains(".so") && fi->fileName().contains("networksettings_")){ + if(fi->fileName().contains(".so") && fi->fileName().contains("networksettings_")) + { #endif @@ -298,3 +318,4 @@ void MainWindowImp::loadModules(const QString &path){ */ -Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &resolveString){ +Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &resolveString) +{ #ifdef DEBUG @@ -305,3 +326,4 @@ Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString & void *functionPointer = lib->resolve(resolveString); - if( !functionPointer ){ + if( !functionPointer ) + { #ifdef DEBUG @@ -314,3 +336,4 @@ Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString & Module *object = ((Module* (*)()) functionPointer)(); - if(object == NULL){ + if(object == NULL) + { #ifdef DEBUG @@ -329,3 +352,4 @@ Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString & QLibrary *lib = loader->library(pluginFileName); - if( !lib || !lib->hasSymbol(resolveString) ){ + if( !lib || !lib->hasSymbol(resolveString) ) + { qDebug(QString("MainWindowImp::loadPlugin: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1()); @@ -335,3 +359,4 @@ Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString & Module *object = ((Module* (*)()) lib->symbol(resolveString))(); - if(object == NULL){ + if(object == NULL) + { #ifdef DEBUG @@ -354,3 +379,4 @@ Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString & */ -void MainWindowImp::addClicked(){ +void MainWindowImp::addClicked() +{ QMap<Module*, QLibrary*>::Iterator it; @@ -359,4 +385,6 @@ void MainWindowImp::addClicked(){ - for( it = libraries.begin(); it != libraries.end(); ++it ){ - if(it.key()){ + for( it = libraries.begin(); it != libraries.end(); ++it ) + { + if(it.key()) + { (it.key())->possibleNewInterfaces(list); @@ -365,3 +393,4 @@ void MainWindowImp::addClicked(){ // See if the list has anything that we can add. - if(list.count() == 0){ + if(list.count() == 0) + { QMessageBox::information(this, "Sorry", "Nothing to add.", QMessageBox::Ok); @@ -371,4 +400,4 @@ void MainWindowImp::addClicked(){ addNewConnection.addConnections(list); - addNewConnection.showMaximized(); - if(QDialog::Accepted == addNewConnection.exec()){ + if( QDialog::Accepted == QPEApplication::execDialog( &addNewConnection ) ) + { QListViewItem *item = addNewConnection.registeredServicesList->currentItem(); @@ -377,6 +406,9 @@ void MainWindowImp::addClicked(){ - for( it = libraries.begin(); it != libraries.end(); ++it ){ - if(it.key()){ + for( it = libraries.begin(); it != libraries.end(); ++it ) + { + if(it.key()) + { Interface *i = (it.key())->addNewInterface(item->text(0)); - if(i){ + if(i) + { qDebug("iface name %s",i->getInterfaceName().latin1()); @@ -394,5 +426,7 @@ void MainWindowImp::addClicked(){ */ -void MainWindowImp::removeClicked(){ +void MainWindowImp::removeClicked() +{ QListViewItem *item = connectionList->currentItem(); - if(!item) { + if(!item) + { QMessageBox::information(this, "Sorry","Please select an interface First.", QMessageBox::Ok); @@ -402,9 +436,12 @@ void MainWindowImp::removeClicked(){ Interface *i = interfaceItems[item]; - if(i->getModuleOwner() == NULL){ + if(i->getModuleOwner() == NULL) + { QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", QMessageBox::Ok); } - else{ + else + { if(!i->getModuleOwner()->remove(i)) QMessageBox::information(this, tr("Error"), tr("Unable to remove."), QMessageBox::Ok); - else{ + else + { delete item; @@ -420,5 +457,7 @@ void MainWindowImp::removeClicked(){ */ -void MainWindowImp::configureClicked(){ +void MainWindowImp::configureClicked() +{ QListViewItem *item = connectionList->currentItem(); - if(!item){ + if(!item) + { QMessageBox::information(this, tr("Sorry"),tr("Please select an interface first."), QMessageBox::Ok); @@ -433,7 +472,9 @@ void MainWindowImp::configureClicked(){ - if(i->getModuleOwner()){ + if(i->getModuleOwner()) + { QWidget *moduleConfigure = i->getModuleOwner()->configure(i); - if(moduleConfigure != NULL){ + if(moduleConfigure != NULL) + { i->getModuleOwner()->setProfile(currentProfileText); - moduleConfigure->showMaximized(); + QPEApplication::showWidget( moduleConfigure ); return; @@ -444,3 +485,3 @@ void MainWindowImp::configureClicked(){ configure->setProfile(currentProfileText); - configure->showMaximized(); + QPEApplication::showDialog( configure ); } @@ -452,5 +493,7 @@ void MainWindowImp::configureClicked(){ */ -void MainWindowImp::informationClicked(){ +void MainWindowImp::informationClicked() +{ QListViewItem *item = connectionList->currentItem(); - if(!item){ + if(!item) + { QMessageBox::information(this, "Sorry","Please select an interface First.", QMessageBox::Ok); @@ -465,6 +508,8 @@ void MainWindowImp::informationClicked(){ - if(i->getModuleOwner()){ + if(i->getModuleOwner()) + { QWidget *moduleInformation = i->getModuleOwner()->information(i); - if(moduleInformation != NULL){ - moduleInformation->showMaximized(); + if(moduleInformation != NULL) + { + QPEApplication::showWidget( moduleInformation ); #ifdef DEBUG @@ -476,3 +521,3 @@ void MainWindowImp::informationClicked(){ InterfaceInformationImp *information = new InterfaceInformationImp(this, "InterfaceSetupImp", i, Qt::WType_Modal | Qt::WDestructiveClose | Qt::WStyle_Dialog | Qt::WStyle_ContextHelp); - information->showMaximized(); + QPEApplication::showWidget( information ); } @@ -483,4 +528,6 @@ void MainWindowImp::informationClicked(){ */ -void MainWindowImp::updateInterface(Interface *i){ - if(!advancedUserMode){ +void MainWindowImp::updateInterface(Interface *i) +{ + if(!advancedUserMode) + { if(i->getInterfaceName() == "lo") @@ -492,3 +539,4 @@ void MainWindowImp::updateInterface(Interface *i){ // Find the interface, making it if needed. - if(items.find(i) == items.end()){ + if(items.find(i) == items.end()) + { item = new QListViewItem(connectionList, "", "", ""); @@ -496,3 +544,4 @@ void MainWindowImp::updateInterface(Interface *i){ QMap<Module*, QLibrary*>::Iterator it; - for( it = libraries.begin(); it != libraries.end(); ++it ){ + for( it = libraries.begin(); it != libraries.end(); ++it ) + { if(it.key()->isOwner(i)) @@ -539,3 +588,4 @@ void MainWindowImp::updateInterface(Interface *i){ -void MainWindowImp::newProfileChanged(const QString& newText){ +void MainWindowImp::newProfileChanged(const QString& newText) +{ if(newText.length() > 0) @@ -551,5 +601,7 @@ void MainWindowImp::newProfileChanged(const QString& newText){ */ -void MainWindowImp::addProfile(){ +void MainWindowImp::addProfile() +{ QString newProfileName = newProfile->text(); - if(profiles.grep(newProfileName).count() > 0){ + if(profiles.grep(newProfileName).count() > 0) + { QMessageBox::information(this, "Can't Add","Profile already exists.", QMessageBox::Ok); @@ -565,4 +617,6 @@ void MainWindowImp::addProfile(){ */ -void MainWindowImp::removeProfile(){ - if(profilesList->count() <= 1){ +void MainWindowImp::removeProfile() +{ + if(profilesList->count() <= 1) + { QMessageBox::information(this, "Can't remove.","At least one profile\nis needed.", QMessageBox::Ok); @@ -571,3 +625,4 @@ void MainWindowImp::removeProfile(){ QString profileToRemove = profilesList->currentText(); - if(profileToRemove == "All"){ + if(profileToRemove == "All") + { QMessageBox::information(this, "Can't remove.","Can't remove default.", QMessageBox::Ok); @@ -576,3 +631,4 @@ void MainWindowImp::removeProfile(){ // Can't remove the curent profile - if(profileToRemove == currentProfileLabel->text()){ + if(profileToRemove == currentProfileLabel->text()) + { QMessageBox::information(this, "Can't remove.",QString("%1 is the current profile.").arg(profileToRemove), QMessageBox::Ok); @@ -582,3 +638,4 @@ void MainWindowImp::removeProfile(){ - if(QMessageBox::information(this, "Question",QString("Remove profile: %1").arg(profileToRemove), QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok){ + if(QMessageBox::information(this, "Question",QString("Remove profile: %1").arg(profileToRemove), QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok) + { profiles = QStringList::split(" ", profiles.join(" ").replace(QRegExp(profileToRemove), "")); @@ -592,11 +649,15 @@ void MainWindowImp::removeProfile(){ QMap<Interface*, QListViewItem*>::Iterator it; - for( it = items.begin(); it != items.end(); ++it ){ + for( it = items.begin(); it != items.end(); ++it ) + { QString interfaceName = it.key()->getInterfaceName(); qDebug(interfaceName.latin1()); - if(interfaces.setInterface(interfaceName + "_" + profileToRemove)){ + if(interfaces.setInterface(interfaceName + "_" + profileToRemove)) + { interfaces.removeInterface(); - if(interfaces.setMapping(interfaceName)){ + if(interfaces.setMapping(interfaceName)) + { if(profilesList->count() == 1) interfaces.removeMapping(); - else{ + else + { interfaces.removeMap("map", interfaceName + "_" + profileToRemove); @@ -615,4 +676,6 @@ void MainWindowImp::removeProfile(){ */ -void MainWindowImp::changeProfile(){ - if(profilesList->currentItem() == -1){ +void MainWindowImp::changeProfile() +{ + if(profilesList->currentItem() == -1) + { QMessageBox::information(this, "Can't Change.","Please select a profile.", QMessageBox::Ok); @@ -621,3 +684,4 @@ void MainWindowImp::changeProfile(){ QString newProfile = profilesList->text(profilesList->currentItem()); - if(newProfile != currentProfileLabel->text()){ + if(newProfile != currentProfileLabel->text()) + { currentProfileLabel->setText(newProfile); @@ -625,3 +689,4 @@ void MainWindowImp::changeProfile(){ QFile file(scheme); - if ( file.open(IO_ReadWrite) ) { + if ( file.open(IO_ReadWrite) ) + { QTextStream stream( &file ); @@ -631,6 +696,8 @@ void MainWindowImp::changeProfile(){ // restart all up devices? - if(QMessageBox::information(this, "Question","Restart all running interfaces?", QMessageBox::Ok, QMessageBox::No) == QMessageBox::Ok){ + if(QMessageBox::information(this, "Question","Restart all running interfaces?", QMessageBox::Ok, QMessageBox::No) == QMessageBox::Ok) + { // Go through them one by one QMap<Interface*, QListViewItem*>::Iterator it; - for( it = items.begin(); it != items.end(); ++it ){ + for( it = items.begin(); it != items.end(); ++it ) + { if(it.key()->getStatus() == true) @@ -655,3 +722,4 @@ void MainWindowImp::receive(const QCString &msg, const QByteArray &arg) qDebug("MainWindowImp::receive QCop msg >"+msg+"<"); - if (msg == "raise") { + if (msg == "raise") + { raise(); @@ -666,5 +734,7 @@ void MainWindowImp::receive(const QCString &msg, const QByteArray &arg) QMap<Module*, QLibrary*>::Iterator it; - for( it = libraries.begin(); it != libraries.end(); ++it ){ + for( it = libraries.begin(); it != libraries.end(); ++it ) + { qDebug("plugin >%s<", it.key()->type().latin1() ); - if(it.key()->type() == dest){ + if(it.key()->type() == dest) + { it.key()->receive( param, arg ); diff --git a/noncore/settings/networksettings/ppp/accounts.cpp b/noncore/settings/networksettings/ppp/accounts.cpp index 28d8732..b8a1925a 100644 --- a/noncore/settings/networksettings/ppp/accounts.cpp +++ b/noncore/settings/networksettings/ppp/accounts.cpp @@ -26,4 +26,12 @@ +#include "accounts.h" +#include "authwidget.h" +#include "pppdata.h" +#include "edit.h" + +/* OPIE */ +#include <qpe/qpeapplication.h> + +/* QT */ #include <qdir.h> -#include <stdlib.h> #include <qlayout.h> @@ -33,3 +41,2 @@ #include <qmessagebox.h> - #include <qapplication.h> @@ -39,6 +46,4 @@ -#include "accounts.h" -#include "authwidget.h" -#include "pppdata.h" -#include "edit.h" +/* STD */ +#include <stdlib.h> @@ -70,3 +75,4 @@ AccountWidget::AccountWidget( PPPData *pd, QWidget *parent, const char *name, WF - for (uint i = 0; i < listListbox->count(); i++){ + for (uint i = 0; i < listListbox->count(); i++) + { if ( listListbox->text(i) == _pppdata->accname() ) @@ -78,3 +84,4 @@ AccountWidget::AccountWidget( PPPData *pd, QWidget *parent, const char *name, WF -void AccountWidget::slotListBoxSelect(int idx) { +void AccountWidget::slotListBoxSelect(int idx) +{ bool ok = _pppdata->setAccount( listListbox->text(idx) ); @@ -86,3 +93,4 @@ void AccountWidget::slotListBoxSelect(int idx) { -void AccountWidget::edit() { +void AccountWidget::edit() +{ _pppdata->setAccount(listListbox->text(listListbox->currentItem())); @@ -91,3 +99,4 @@ void AccountWidget::edit() { - if(result == QDialog::Accepted) { + if(result == QDialog::Accepted) + { listListbox->changeItem(_pppdata->accname(),listListbox->currentItem()); @@ -99,3 +108,4 @@ void AccountWidget::edit() { -void AccountWidget::create() { +void AccountWidget::create() +{ @@ -108,3 +118,4 @@ void AccountWidget::create() { int result; - if (_pppdata->newaccount() == -1){ + if (_pppdata->newaccount() == -1) + { qDebug("_pppdata->newaccount() == -1"); @@ -114,3 +125,4 @@ void AccountWidget::create() { - if(result == QDialog::Accepted) { + if(result == QDialog::Accepted) + { listListbox->insertItem(_pppdata->accname()); @@ -119,3 +131,4 @@ void AccountWidget::create() { _pppdata->save(); - } else + } + else _pppdata->deleteAccount(); @@ -124,3 +137,4 @@ void AccountWidget::create() { -void AccountWidget::copy() { +void AccountWidget::copy() +{ // if(listListbox->count() == MAX_ACCOUNTS) { @@ -130,3 +144,4 @@ void AccountWidget::copy() { - if(listListbox->currentItem()<0) { + if(listListbox->currentItem()<0) + { QMessageBox::information(this, "sorry", tr("No account selected.")); @@ -143,3 +158,4 @@ void AccountWidget::copy() { -void AccountWidget::remove() { +void AccountWidget::remove() +{ @@ -166,3 +182,4 @@ void AccountWidget::remove() { -int AccountWidget::doTab(){ +int AccountWidget::doTab() +{ QDialog *dlg = new QDialog( 0, "newAccount", true, Qt::WStyle_ContextHelp ); @@ -177,6 +194,9 @@ int AccountWidget::doTab(){ - if(_pppdata->accname().isEmpty()) { + if(_pppdata->accname().isEmpty()) + { dlg->setCaption(tr("New Account")); isnewaccount = true; - } else { + } + else + { QString tit = tr("Edit Account: "); @@ -214,14 +234,20 @@ int AccountWidget::doTab(){ - while (!ok){ - dlg->showMaximized(); - result = dlg->exec(); + while (!ok) + { + result = QPEApplication::execDialog( dlg ); ok = true; - if(result == QDialog::Accepted) { - if (!auth_w->check()){ + if(result == QDialog::Accepted) + { + if (!auth_w->check()) + { ok = false; - } else if(!dial_w->save()) { + } + else if(!dial_w->save()) + { QMessageBox::critical(this, "error", tr( "You must enter a unique account name")); ok = false; - }else{ + } + else + { ip_w->save(); diff --git a/noncore/settings/networksettings/ppp/general.cpp b/noncore/settings/networksettings/ppp/general.cpp index 5540946..ff1b11b 100644 --- a/noncore/settings/networksettings/ppp/general.cpp +++ b/noncore/settings/networksettings/ppp/general.cpp @@ -26,5 +26,13 @@ -#include <termios.h> -#include <string.h> +#include "general.h" +#include "interfaceppp.h" +#include "modeminfo.h" +#include "modemcmds.h" +#include "pppdata.h" +/* OPIE */ +#include <qpe/config.h> +#include <qpe/qpeapplication.h> + +/* QT */ #include <qcheckbox.h> @@ -37,16 +45,6 @@ #include <qwhatsthis.h> -#include <qpe/config.h> -// #include <qgroupbox.h> - - -#include "general.h" -#include "interfaceppp.h" -//#include "miniterm.h" -#include "modeminfo.h" -#include "modemcmds.h" -//#include "devices.h" -#include "pppdata.h" -//#include <klocale.h> - +/* STD */ +#include <termios.h> +#include <string.h> @@ -150,3 +148,4 @@ ModemWidget::ModemWidget( PPPData *pd, QWidget *parent, const char *name ) - static const char *baudrates[] = { + static const char *baudrates[] = + { @@ -172,3 +171,4 @@ ModemWidget::ModemWidget( PPPData *pd, QWidget *parent, const char *name ) "2400", - 0}; + 0 + }; @@ -192,3 +192,4 @@ ModemWidget::ModemWidget( PPPData *pd, QWidget *parent, const char *name ) - for(int i=0; i <= enter->count()-1; i++) { + for(int i=0; i <= enter->count()-1; i++) + { if(_pppdata->enter() == enter->text(i)) @@ -239,3 +240,4 @@ ModemWidget::ModemWidget( PPPData *pd, QWidget *parent, const char *name ) //set stuff from gpppdata - for(int i=0; i <= enter->count()-1; i++) { + for(int i=0; i <= enter->count()-1; i++) + { if(_pppdata->enter() == enter->text(i)) @@ -244,3 +246,4 @@ ModemWidget::ModemWidget( PPPData *pd, QWidget *parent, const char *name ) - for(int i=0; i <= modemdevice->count()-1; i++) { + for(int i=0; i <= modemdevice->count()-1; i++) + { if(_pppdata->modemDevice() == modemdevice->text(i)) @@ -249,3 +252,4 @@ ModemWidget::ModemWidget( PPPData *pd, QWidget *parent, const char *name ) - for(int i=0; i <= flowcontrol->count()-1; i++) { + for(int i=0; i <= flowcontrol->count()-1; i++) + { if(_pppdata->flowcontrol() == flowcontrol->text(i)) @@ -275,5 +279,7 @@ ModemWidget::~ModemWidget() QString edited = modemdevice->currentText(); - if ( !( edited ).isEmpty() ) { + if ( !( edited ).isEmpty() ) + { edited.simplifyWhiteSpace(); - if ( devs.contains( edited ) == 0 ) { + if ( devs.contains( edited ) == 0 ) + { devs << edited; @@ -472,6 +478,7 @@ ModemWidget2::ModemWidget2( PPPData *pd, InterfacePPP *ip, QWidget *parent, -void ModemWidget2::modemcmdsbutton() { +void ModemWidget2::modemcmdsbutton() +{ ModemCommands mc(_ifaceppp->data(), this, "commands" , true, Qt::WStyle_ContextHelp); - mc.showMaximized(); - mc.exec(); + + QPEApplication::execDialog( &mc ); } @@ -479,3 +486,4 @@ void ModemWidget2::modemcmdsbutton() { -void ModemWidget2::query_modem() { +void ModemWidget2::query_modem() +{ ModemTransfer mt(_ifaceppp->modem(), this); diff --git a/noncore/settings/networksettings/ppp/modeminfo.cpp b/noncore/settings/networksettings/ppp/modeminfo.cpp index dbb26db..df0bf9b 100644 --- a/noncore/settings/networksettings/ppp/modeminfo.cpp +++ b/noncore/settings/networksettings/ppp/modeminfo.cpp @@ -26,12 +26,16 @@ -#include <unistd.h> +#include "modeminfo.h" +#include "modem.h" + +/* OPIE */ +#include <qpe/qpeapplication.h> + +/* QT */ #include <qregexp.h> #include <qlayout.h> -// #include <kwin.h> -// #include <kmessagebox.h> -// #include <kapplication.h> #include <qmessagebox.h> #include <qapplication.h> -#include "modeminfo.h" -#include "modem.h" + +/* STD */ +#include <unistd.h> @@ -95,3 +99,4 @@ ModemTransfer::ModemTransfer(Modem *mo, QWidget *parent, const char *name) -void ModemTransfer::ati_done() { +void ModemTransfer::ati_done() +{ scripttimer->stop(); @@ -106,4 +111,4 @@ void ModemTransfer::ati_done() { mi->setAtiString(i, ati_query_strings[i]); - mi->showMaximized(); - mi->exec(); + + QPEApplication::execDialog( mi ); delete mi; @@ -114,3 +119,4 @@ void ModemTransfer::ati_done() { -void ModemTransfer::time_out_slot() { +void ModemTransfer::time_out_slot() +{ timeout_timer->stop(); @@ -123,3 +129,4 @@ void ModemTransfer::time_out_slot() { -void ModemTransfer::init() { +void ModemTransfer::init() +{ @@ -128,3 +135,4 @@ void ModemTransfer::init() { int lock = _modem->lockdevice(); - if (lock == 1) { + if (lock == 1) + { @@ -134,3 +142,4 @@ void ModemTransfer::init() { - if (lock == -1) { + if (lock == -1) + { @@ -141,4 +150,6 @@ void ModemTransfer::init() { - if(_modem->opentty()) { - if(_modem->hangup()) { + if(_modem->opentty()) + { + if(_modem->hangup()) + { usleep(100000); // wait 0.1 secs @@ -167,3 +178,4 @@ void ModemTransfer::init() { -void ModemTransfer::do_script() { +void ModemTransfer::do_script() +{ QString msg; @@ -171,3 +183,4 @@ void ModemTransfer::do_script() { - switch(step) { + switch(step) + { case 0: @@ -201,3 +214,4 @@ void ModemTransfer::do_script() { -void ModemTransfer::readChar(unsigned char c) { +void ModemTransfer::readChar(unsigned char c) +{ if(readbuffer.length() < 255) @@ -206,3 +220,4 @@ void ModemTransfer::readChar(unsigned char c) { -void ModemTransfer::readtty() { +void ModemTransfer::readtty() +{ @@ -222,3 +237,4 @@ void ModemTransfer::readtty() { -void ModemTransfer::cancelbutton() { +void ModemTransfer::cancelbutton() +{ scripttimer->stop(); @@ -238,3 +254,4 @@ void ModemTransfer::cancelbutton() { -void ModemTransfer::closeEvent( QCloseEvent *e ) { +void ModemTransfer::closeEvent( QCloseEvent *e ) +{ cancelbutton(); @@ -256,3 +273,4 @@ ModemInfo::ModemInfo(QWidget *parent, const char* name) tl->addLayout(l1, 1); - for(int i = 0 ; i < NUM_OF_ATI ; i++) { + for(int i = 0 ; i < NUM_OF_ATI ; i++) + { @@ -288,3 +306,4 @@ ModemInfo::ModemInfo(QWidget *parent, const char* name) -void ModemInfo::setAtiString(int i, QString s) { +void ModemInfo::setAtiString(int i, QString s) +{ if(i < NUM_OF_ATI) diff --git a/noncore/settings/networksettings/ppp/pppmodule.cpp b/noncore/settings/networksettings/ppp/pppmodule.cpp index f7dacf6..a7caffe 100644 --- a/noncore/settings/networksettings/ppp/pppmodule.cpp +++ b/noncore/settings/networksettings/ppp/pppmodule.cpp @@ -1,6 +1 @@ -#include <errno.h> -#include <signal.h> - - -#include <qpe/config.h> @@ -13,4 +8,15 @@ +/* OPIE */ +#include <qpe/config.h> +#include <qpe/qpeapplication.h> + +/* QT */ + +/* STD */ +#include <errno.h> +#include <signal.h> + // don't polute global namespace -namespace { +namespace +{ /* @@ -20,3 +26,4 @@ namespace { */ - struct Connection { + struct Connection + { pid_t pid; @@ -25,3 +32,4 @@ namespace { }; - class InterfaceKeeper { + class InterfaceKeeper + { public: @@ -55,3 +63,4 @@ PPPModule::PPPModule() : Module() qDebug("getting interfaces"); - for( it = ifaces.begin(); it != ifaces.end(); ++it ){ + for( it = ifaces.begin(); it != ifaces.end(); ++it ) + { qDebug("ifaces %s %s", it.key().latin1(), it.data().latin1() ); @@ -62,3 +71,4 @@ PPPModule::PPPModule() : Module() // check if (*it) is one of the running ifaces - if ( running.contains( it.data() ) ) { + if ( running.contains( it.data() ) ) + { qDebug("iface is running %s", it.key().latin1() ); @@ -78,3 +88,4 @@ PPPModule::PPPModule() : Module() */ -PPPModule::~PPPModule(){ +PPPModule::~PPPModule() +{ qDebug("PPPModule::~PPPModule() " ); @@ -83,5 +94,7 @@ PPPModule::~PPPModule(){ Interface *i; - for ( i=list.first(); i != 0; i=list.next() ){ + for ( i=list.first(); i != 0; i=list.next() ) + { /* if online save the state */ - if ( i->getStatus() ) { + if ( i->getStatus() ) + { qDebug("Iface %s is still up", i->getHardwareName().latin1() ); @@ -99,3 +112,4 @@ PPPModule::~PPPModule(){ */ -void PPPModule::setProfile(const QString &newProfile){ +void PPPModule::setProfile(const QString &newProfile) +{ profile = newProfile; @@ -108,3 +122,4 @@ void PPPModule::setProfile(const QString &newProfile){ */ -QString PPPModule::getPixmapName(Interface* ){ +QString PPPModule::getPixmapName(Interface* ) +{ return "ppp"; @@ -117,3 +132,4 @@ QString PPPModule::getPixmapName(Interface* ){ */ -bool PPPModule::isOwner(Interface *i){ +bool PPPModule::isOwner(Interface *i) +{ return list.find( i ) != -1; @@ -125,3 +141,4 @@ bool PPPModule::isOwner(Interface *i){ */ -QWidget *PPPModule::configure(Interface *i){ +QWidget *PPPModule::configure(Interface *i) +{ qDebug("return ModemWidget"); @@ -137,3 +154,4 @@ QWidget *PPPModule::configure(Interface *i){ */ -QWidget *PPPModule::information(Interface *i){ +QWidget *PPPModule::information(Interface *i) +{ // We don't have any advanced pppd information widget yet :-D @@ -149,3 +167,4 @@ QWidget *PPPModule::information(Interface *i){ */ -QList<Interface> PPPModule::getInterfaces(){ +QList<Interface> PPPModule::getInterfaces() +{ // List all of the files in the peer directory @@ -161,3 +180,4 @@ QList<Interface> PPPModule::getInterfaces(){ */ -Interface *PPPModule::addNewInterface(const QString &newInterface){ +Interface *PPPModule::addNewInterface(const QString &newInterface) +{ @@ -167,4 +187,5 @@ Interface *PPPModule::addNewInterface(const QString &newInterface){ PPPConfigWidget imp(ifaceppp, 0, "PPPConfigImp", true); - imp.showMaximized(); - if(imp.exec() == QDialog::Accepted ){ + + if( QPEApplication::execDialog( &imp ) == QDialog::Accepted ) + { iface = (InterfacePPP*) ifaceppp; @@ -173,3 +194,5 @@ Interface *PPPModule::addNewInterface(const QString &newInterface){ return iface; - }else { + } + else + { delete ifaceppp; @@ -184,3 +207,4 @@ Interface *PPPModule::addNewInterface(const QString &newInterface){ */ -bool PPPModule::remove(Interface *i){ +bool PPPModule::remove(Interface *i) +{ return list.remove(i); @@ -196,9 +220,12 @@ void PPPModule::possibleNewInterfaces(QMap<QString, QString> &newIfaces) -namespace { - InterfaceKeeper::InterfaceKeeper( ) { - } - InterfaceKeeper::~InterfaceKeeper() { +namespace +{ + InterfaceKeeper::InterfaceKeeper( ) + {} + InterfaceKeeper::~InterfaceKeeper() + { Config cfg("ppp_plugin_keeper"); QStringList lst = cfg.groupList(); - for (QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { + for (QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) + { Connection con; @@ -208,3 +235,4 @@ namespace { - for (QMap<QString, Connection>::Iterator it = m_interfaces.begin(); it != m_interfaces.end(); ++it ) { + for (QMap<QString, Connection>::Iterator it = m_interfaces.begin(); it != m_interfaces.end(); ++it ) + { Connection con = it.data(); @@ -215,3 +243,4 @@ namespace { } - void InterfaceKeeper::addInterface(pid_t pid, const QString& dev, const QString& name ) { + void InterfaceKeeper::addInterface(pid_t pid, const QString& dev, const QString& name ) + { Connection con; @@ -222,3 +251,4 @@ namespace { } - QMap<QString, Connection> InterfaceKeeper::interfaces()const { + QMap<QString, Connection> InterfaceKeeper::interfaces()const + { Config cfg("ppp_plugin_keeper"); @@ -226,3 +256,4 @@ namespace { QStringList lst = cfg.groupList(); - for (QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { + for (QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) + { Connection con; @@ -239,4 +270,6 @@ namespace { } - bool InterfaceKeeper::isAvailable( pid_t p)const { - if (::kill(p, 0 ) == 0 || errno != ESRCH ) { + bool InterfaceKeeper::isAvailable( pid_t p)const + { + if (::kill(p, 0 ) == 0 || errno != ESRCH ) + { qDebug("isAvailable %d", p); diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp index 07bf73f..74d7f8e 100644 --- a/noncore/settings/networksettings/wlan/wlanmodule.cpp +++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp @@ -1 +1,2 @@ + #include "wlanmodule.h" @@ -6,2 +7,6 @@ +/* OPIE */ +#include <qpe/qpeapplication.h> + +/* QT */ #include <qcheckbox.h> @@ -15,4 +20,2 @@ - - /** @@ -174,3 +177,3 @@ void WLANModule::receive(const QCString ¶m, const QByteArray &arg) QWidget *info = getInfo( ifa ); - info->showMaximized(); + QPEApplication::showWidget( info ); @@ -192,3 +195,3 @@ void WLANModule::receive(const QCString ¶m, const QByteArray &arg) } - wlanconfigWiget->showMaximized(); + QPEApplication::showWidget( wlanconfigWiget ); stream >> value; |