improve support for BigScreen

1 files changed, 171 insertions, 101 deletions

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 );