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 @@ -237,13 +237,15 @@ void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) { 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 ); 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 @@ -10,9 +10,9 @@ <name>geometry</name> <rect> <x>0</x> <y>0</y> - <width>551</width> + <width>547</width> <height>547</height> </rect> </property> <property stdset="1"> @@ -131,17 +131,17 @@ <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> 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 @@ -7,9 +7,9 @@ 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; } @@ -20,9 +20,11 @@ void AProfile::setSpecificAttribute( QString & Attr, QString & Value ) { 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; @@ -31,9 +33,9 @@ void AProfile::setSpecificAttribute( QString & Attr, QString & 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; } 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 @@ -8,10 +8,10 @@ public : // 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 @@ -69,9 +69,9 @@ 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 ) { @@ -79,9 +79,9 @@ bool ProfileEdit::commit( ProfileData & Data ) { 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; } 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 @@ -3,26 +3,26 @@ #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 ); } } |