Fixed problem with enabling profile from edit environment

rename disable to enable (much more clear)

6 files changed, 24 insertions, 20 deletions

diff --git a/noncore/settings/networksettings2/networksettings.cpp b/noncore/settings/networksettings2/networksettings.cpp
index 2714dd5..469cec5 100644
--- a/noncore/settings/networksettings2/networksettings.cpp
+++ b/noncore/settings/networksettings2/networksettings.cpp
@@ -193,101 +193,103 @@ void NetworkSettings::SLOT_DeleteNode( void ) {
       NSResources->removeNetworkSetup( LBI->text() );
       delete LBI;
       NSD.setModified( 1 );
     }
 }
 
 void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) {
     QString OldName = "";
 
     EditNetworkSetup EC( this );
 
     if( LBI ) {
       NetworkSetup * NC = NSResources->findNetworkSetup( LBI->text() );
       if( ! NC ) {
         return;
       }
       OldName = NC->name();
       EC.setNetworkSetup( NC );
     }
 
     EC.showMaximized();
     // disable refresh timer 
     UpdateTimer->stop();
 
     // we need to retry
     while( 1 ) {
       if( EC.exec() == QDialog::Accepted ) {
         // toplevel item -> store
         NetworkSetup * NC = EC.networkSetup();
         if( NC->isModified() ) {
           if( LBI ) {
             if( NC->name() != OldName ) {
               // find if new name is free
               NetworkSetup * LCN = NSResources->findNetworkSetup(
                     NC->name() );
               if( LCN ) {
                 QMessageBox::warning(
                   0, 
                   tr( "In System Config" ),
                   tr( "Name %1 already exists" ).arg(NC->name())
                 );
                 continue; // restart exec
               } // else new name
               // new name -> remove item
               NSResources->removeNetworkSetup( OldName );
               NSResources->addNetworkSetup( NC, 0 );
             } // else not changed
 
-            // must add it here since change will trigger event
+            // no update (will come later)
+            Profiles_LB->blockSignals( TRUE );
             Profiles_LB->changeItem( NC->devicePixmap(),
                                      NC->name(),
                                      Profiles_LB->index( LBI )
                                    );
+            Profiles_LB->blockSignals( FALSE );
           } else {
             // new item
             int ci = Profiles_LB->count();
             NSResources->addNetworkSetup( NC, 0 );
             NC->setNumber( NSResources->assignNetworkSetupNumber() );
             Profiles_LB->insertItem( NC->devicePixmap(), NC->name() );
             Profiles_LB->setSelected( ci, TRUE );
           }
           SLOT_RefreshStates();
         }
       } else {
         // cancelled : reset NetworkSetup 
         if( LBI ) {
           NetworkSetup * NC = NSResources->findNetworkSetup( LBI->text() );
           NC->reassign();
         }
       }
       break;
     }
     // reenable 
     UpdateTimer->start( 5000 );
 }
 
 void NetworkSettings::SLOT_ShowNode( QListBoxItem * LBI ) {
     if( LBI == 0 ) 
       return;
 
     NetworkSetup * NC = NSResources->findNetworkSetup( LBI->text() );
 
     if( NC->description().isEmpty() ) {
       Description_LBL->setText( tr( "<<No description>>" ) );
     } else {
       Description_LBL->setText( NC->description() );
     }
 
     Profile_GB->setTitle( LBI->text() + " : " + NC->stateName() );
 
     bool FrmActive = 1;
     bool IsEnabled = 1;
     int leds = 0;
 
     switch( NC->state() ) {
       case Disabled : // no further work
         IsEnabled = 0;
         FrmActive = 0;
         break;
       case Unknown :
       case Unchecked :
diff --git a/noncore/settings/networksettings2/profile/profileGUI.ui b/noncore/settings/networksettings2/profile/profileGUI.ui
index 8b421e8..eeb2e75 100644
--- a/noncore/settings/networksettings2/profile/profileGUI.ui
+++ b/noncore/settings/networksettings2/profile/profileGUI.ui
@@ -1,62 +1,62 @@
 <!DOCTYPE UI><UI>
 <class>ProfileGUI</class>
 <widget>
     <class>QWidget</class>
     <property stdset="1">
         <name>name</name>
         <cstring>Profile_FRM</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>551</width>
+            <width>547</width>
             <height>547</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Profile</string>
     </property>
     <property>
         <name>layoutMargin</name>
     </property>
     <property>
         <name>layoutSpacing</name>
     </property>
     <vbox>
         <property stdset="1">
             <name>margin</name>
             <number>1</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
             <number>3</number>
         </property>
         <widget>
             <class>QTabWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>TabWidget6</cstring>
             </property>
             <property>
                 <name>layoutMargin</name>
             </property>
             <property>
                 <name>layoutSpacing</name>
             </property>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>tab</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Setup</string>
                 </attribute>
                 <vbox>
                     <property stdset="1">
                         <name>margin</name>
                         <number>1</number>
@@ -87,105 +87,105 @@
                                     <cstring>GroupBox1</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>title</name>
                                     <string>Start</string>
                                 </property>
                                 <vbox>
                                     <property stdset="1">
                                         <name>margin</name>
                                         <number>11</number>
                                     </property>
                                     <property stdset="1">
                                         <name>spacing</name>
                                         <number>6</number>
                                     </property>
                                     <widget>
                                         <class>QCheckBox</class>
                                         <property stdset="1">
                                             <name>name</name>
                                             <cstring>Automatic_CB</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>text</name>
                                             <string>Automatically</string>
                                         </property>
                                     </widget>
                                     <widget>
                                         <class>QCheckBox</class>
                                         <property stdset="1">
                                             <name>name</name>
                                             <cstring>Confirm_CB</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>enabled</name>
                                             <bool>true</bool>
                                         </property>
                                         <property stdset="1">
                                             <name>text</name>
                                             <string>Ask</string>
                                         </property>
                                         <property>
                                             <name>layoutMargin</name>
                                         </property>
                                     </widget>
                                     <widget>
                                         <class>QCheckBox</class>
                                         <property stdset="1">
                                             <name>name</name>
-                                            <cstring>Disabled_CB</cstring>
+                                            <cstring>Enabled_CB</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>enabled</name>
                                             <bool>true</bool>
                                         </property>
                                         <property stdset="1">
                                             <name>text</name>
-                                            <string>Disabled</string>
+                                            <string>Enabled</string>
                                         </property>
                                         <property>
                                             <name>layoutMargin</name>
                                         </property>
                                     </widget>
                                 </vbox>
                             </widget>
                             <widget row="0"  column="1" >
                                 <class>QCheckBox</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>TriggersVPN_CB</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Trigger VPN</string>
                                 </property>
                             </widget>
                             <spacer row="1"  column="1" >
                                 <property>
                                     <name>name</name>
                                     <cstring>Spacer8</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>orientation</name>
                                     <enum>Vertical</enum>
                                 </property>
                                 <property stdset="1">
                                     <name>sizeType</name>
                                     <enum>Expanding</enum>
                                 </property>
                                 <property>
                                     <name>sizeHint</name>
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
                         </grid>
                     </widget>
                     <widget>
                         <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>TextLabel3</cstring>
                         </property>
                         <property stdset="1">
diff --git a/noncore/settings/networksettings2/profile/profile_NNI.cpp b/noncore/settings/networksettings2/profile/profile_NNI.cpp
index fc2d809..0bc13d1 100644
--- a/noncore/settings/networksettings2/profile/profile_NNI.cpp
+++ b/noncore/settings/networksettings2/profile/profile_NNI.cpp
@@ -1,81 +1,83 @@
 #include <qpe/qpeapplication.h>
 #include <opie2/odebug.h>
 #include "profileedit.h"
 #include "profile_NNI.h"
 #include "profile_NN.h"
 
 AProfile::AProfile( ProfileNetNode * PNN ) : ANetNodeInstance( PNN ) {
       Data.Automatic = 1;
       Data.Confirm = 0;
       Data.Description = "";
-      Data.Disabled = 0;
+      Data.Enabled = 1;
       Data.TriggerVPN = 0;
       GUI = 0;
       RT = 0;
 }
 
 void AProfile::setSpecificAttribute( QString & Attr, QString & Value ) {
 
       if ( Attr == "automatic" ) {
         Data.Automatic = (Value=="yes");
       } else if ( Attr == "preconfirm" ) {
         Data.Confirm = (Value=="yes");
       } else if ( Attr == "disabled" ) {
-        Data.Disabled = (Value=="yes");
+        Data.Enabled = (Value=="no");
+      } else if ( Attr == "enabled" ) {
+        Data.Enabled = (Value=="yes");
       } else if ( Attr == "triggervpn" ) {
         Data.TriggerVPN = (Value=="yes");
       } else if ( Attr == "description" ) {
         Data.Description = Value;
       }
 }
 
 void AProfile::saveSpecificAttribute( QTextStream & TS ) {
       TS << "automatic=" << ((Data.Automatic) ? "yes" : "no") << endl;
       TS << "preconfirm=" << ((Data.Confirm) ? "yes" : "no") << endl;
-      TS << "disabled=" << ((Data.Disabled) ? "yes" : "no") << endl;
+      TS << "enabled=" << ((Data.Enabled) ? "yes" : "no") << endl;
       TS << "triggervpn=" << ((Data.TriggerVPN) ? "yes" : "no") << endl;
       TS << "description=" << Data.Description << endl;
 }
 
 QWidget * AProfile::edit( QWidget * parent ) {
     GUI = new ProfileEdit( parent, this );
     GUI->showData( Data );
     return GUI;
 }
 
 QString AProfile::acceptable( void ) {
     return ( GUI ) ? GUI->acceptable( ) : QString();
 }
 
 void AProfile::commit( void ) {
     if( GUI && GUI->commit( Data ) )
       setModified( 1 );
 }
 
 short AProfile::generateFileEmbedded( SystemFile & SF,
                                      long DevNr ) {
 
       short rvl, rvd;
 
       rvl = 1;
 
       if( SF.name() == "interfaces" ) {
         Log(("Generate Profile for %s\n", SF.name().latin1() ));
         if( Data.TriggerVPN ) {
           // this profile triggers VPN -> insert trigger
           SF << "  up "
              << QPEApplication::qpeDir() 
              << "bin/networksettings2 --triggervpn " 
              << runtime()->device()->netNode()->nodeClass()->genNic( DevNr )
              << " || true" 
              << endl;
           rvl = 0;
         }
       }
       rvd = ANetNodeInstance::generateFileEmbedded( SF, DevNr );
       return (rvd == 2 || rvl == 2 ) ? 2 :
              (rvd == 0 || rvl == 0 ) ? 0 : 1;
 }
 
 
 
diff --git a/noncore/settings/networksettings2/profile/profiledata.h b/noncore/settings/networksettings2/profile/profiledata.h
index 2f7060d..376b393 100644
--- a/noncore/settings/networksettings2/profile/profiledata.h
+++ b/noncore/settings/networksettings2/profile/profiledata.h
@@ -1,17 +1,17 @@
 #ifndef PROFILE_DATA_H
 #define PROFILE_DATA_H
 
 #include <qstring.h>
 class ProfileData {
 public :
       QString Description;
       // start up automatically
       bool Automatic;
       // if started up automatically, ask user for confirmation
       bool Confirm;
-      // Do not bring this networkSetup up
-      bool Disabled;
+      // bring this networkSetup up
+      bool Enabled;
       bool TriggerVPN;
 } ; 
 
 #endif
diff --git a/noncore/settings/networksettings2/profile/profileedit.cpp b/noncore/settings/networksettings2/profile/profileedit.cpp
index 1713f0c..818bad6 100644
--- a/noncore/settings/networksettings2/profile/profileedit.cpp
+++ b/noncore/settings/networksettings2/profile/profileedit.cpp
@@ -25,101 +25,101 @@ ProfileEdit::ProfileEdit( QWidget * Parent, ANetNodeInstance * TNNI ) :
       if( ( II = NNI->networkSetup()->assignedInterface() ) ) {
 
         Refresh_CB->setEnabled( TRUE );
         ResetODO_But->setEnabled( TRUE );
         Sending_GB->setEnabled( TRUE );
         Receiving_GB->setEnabled( TRUE );
         Misc_GB->setEnabled( TRUE );
 
         // show current content
         SLOT_Refresh();
 
         // initialize ODO
         SLOT_ResetODO();
 
         // fill in static data
         InterfaceName_LBL->setText( II->Name );
         IPAddress_LBL->setText( II->Address );
         SubnetMask_LBL->setText( II->Netmask );
         Broadcast_LBL->setText( II->BCastAddress );
         MACAddress_LBL->setText( II->MACAddress );
         if( II->IsPointToPoint ) {
           PointToPoint_LBL->setText( II->DstAddress );
         }
         QString S;
         InterfaceName_LBL->setText( II->Name );
         if( II->HasMulticast ) {
           S += "Multicast";
         }
         if( ! S.isEmpty() ) {
           S.prepend( " : " );
         }
         InterfaceOptions_LBL->setText( S  );
 
         connect( &RefreshTimer, SIGNAL( timeout() ),
                  this, SLOT( SLOT_Refresh() ) );
       }
 
 }
 
 QString ProfileEdit::acceptable( void ) {
     return QString();
 }
 
 void ProfileEdit::showData( ProfileData & Data ) {
     Description_LE->setText( Data.Description );
     Automatic_CB->setChecked( Data.Automatic );
     TriggersVPN_CB->setChecked( Data.TriggerVPN );
     Confirm_CB->setChecked( Data.Confirm );
-    Disabled_CB->setChecked( Data.Disabled );
+    Enabled_CB->setChecked( Data.Enabled );
 }
 
 
 bool ProfileEdit::commit( ProfileData & Data ) {
     bool SM = 0;
     TXTM( Data.Description, Description_LE, SM );
 
     CBM( Data.Automatic, Automatic_CB, SM );
     CBM( Data.TriggerVPN, TriggersVPN_CB, SM );
-    CBM( Data.Disabled, Disabled_CB, SM );
+    CBM( Data.Enabled, Enabled_CB, SM );
     CBM( Data.Confirm, Confirm_CB, SM );
 
     return SM;
 }
 
 void ProfileEdit::SLOT_Refresh( void ) {
     InterfaceInfo * II = NNI->networkSetup()->assignedInterface();
     QString S;
     NSResources->system().refreshStatistics( *II );
 
     RcvBytes_LBL->setText( II->RcvBytes );
     RcvPackets_LBL->setText( II->RcvPackets );
     RcvErrors_LBL->setText( II->RcvErrors );
     RcvDropped_LBL->setText( II->RcvDropped );
     S.setNum( II->RcvBytes.toLong() - RcvODO );
     RcvODO_LBL->setText( S );
 
     SndBytes_LBL->setText( II->SndBytes );
     SndPackets_LBL->setText( II->SndPackets );
     SndErrors_LBL->setText( II->SndErrors );
     SndDropped_LBL->setText( II->SndDropped );
     S.setNum( II->SndBytes.toLong() - SndODO );
     SndODO_LBL->setText( S );
 
     Collisions_LBL->setText( II->Collisions );
 }
 
 void ProfileEdit::SLOT_AutoRefresh( bool ar ) {
     if( ar ) {
       RefreshTimer.start( 1000 );
       SLOT_Refresh();
     } else {
       RefreshTimer.stop();
     }
 }
 
 void ProfileEdit::SLOT_ResetODO( void ) {
     InterfaceInfo * II = NNI->networkSetup()->assignedInterface();
     RcvODO = II->RcvBytes.toLong();
     SndODO = II->SndBytes.toLong();
     SLOT_Refresh();
 }
diff --git a/noncore/settings/networksettings2/profile/profilerun.cpp b/noncore/settings/networksettings2/profile/profilerun.cpp
index 77bf9ac..faa7d66 100644
--- a/noncore/settings/networksettings2/profile/profilerun.cpp
+++ b/noncore/settings/networksettings2/profile/profilerun.cpp
@@ -1,30 +1,30 @@
 #include <resources.h>
 
 #include "profilerun.h"
 
 State_t ProfileRun::detectState( void ) { 
 
-    Log(( "Profile %sabled\n", (Data->Disabled) ? "dis" : "en" ));
+    Log(( "Profile %sabled\n", (Data->Enabled) ? "en" : "dis" ));
 
-    if( Data->Disabled ) {
-      return Disabled;
+    if( Data->Enabled ) {
+      return Unknown;
     } 
-    return Unknown;
+    return Disabled;
 }
 
 QString ProfileRun::setMyState( NetworkSetup * NC, Action_t A, bool ) { 
-    odebug << "Profile " << Data->Disabled << oendl;
+    odebug << "Profile " << Data->Enabled << oendl;
     if( A == Disable ) {
-      if( ! Data->Disabled ) {
-        Data->Disabled = 1;
+      if( Data->Enabled ) {
+        Data->Enabled = 0;
         NC->setModified( 1 );
       }
     } else if( A == Enable ) {
-      if( Data->Disabled ) { 
-        Data->Disabled = 0;
+      if( ! Data->Enabled ) { 
+        Data->Enabled = 1;
         NC->setModified( 1 );
       }
     }
 
     return QString();
 }