summaryrefslogtreecommitdiff
path: root/noncore/settings/networksettings2/editconnection.cpp
Side-by-side diff
Diffstat (limited to 'noncore/settings/networksettings2/editconnection.cpp') (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/networksettings2/editconnection.cpp54
1 files changed, 28 insertions, 26 deletions
diff --git a/noncore/settings/networksettings2/editconnection.cpp b/noncore/settings/networksettings2/editconnection.cpp
index 717d9e9..6ab2dd6 100644
--- a/noncore/settings/networksettings2/editconnection.cpp
+++ b/noncore/settings/networksettings2/editconnection.cpp
@@ -87,6 +87,6 @@ void MyQListViewItem::paintCell( QPainter *p, const QColorGroup &cg,
-bool EditConnection::AutoCollapse = 1;
+bool EditNetworkSetup::AutoCollapse = 1;
-EditConnection::EditConnection( QWidget* parent ) :
- EditConnectionGUI( parent, 0, TRUE ), TmpCollection() {
+EditNetworkSetup::EditNetworkSetup( QWidget* parent ) :
+ EditNetworkSetupGUI( parent, 0, TRUE ), TmpCollection() {
@@ -107,3 +107,3 @@ EditConnection::EditConnection( QWidget* parent ) :
-NodeCollection * EditConnection::getTmpCollection( void ) {
+NetworkSetup * EditNetworkSetup::getTmpCollection( void ) {
@@ -121,3 +121,5 @@ NodeCollection * EditConnection::getTmpCollection( void ) {
}
+
TmpCollection.clear();
+ TmpCollection.copyFrom( *SelectedNodes );
@@ -195,4 +197,4 @@ NodeCollection * EditConnection::getTmpCollection( void ) {
-// pass a connection NodeCollection to be edited
-void EditConnection::setConnection( NodeCollection * NC ) {
+// pass a NetworkSetup NetworkSetup to be edited
+void EditNetworkSetup::setNetworkSetup( NetworkSetup * NC ) {
ANetNodeInstance * NNI;
@@ -245,4 +247,4 @@ void EditConnection::setConnection( NodeCollection * NC ) {
0,
- tr( "Error presentig Connection" ),
- tr( "<p>Old connection or missing plugin \"<i>%1</i>\"</p>" ).
+ tr( "Error presentig NetworkSetup" ),
+ tr( "<p>Old NetworkSetup or missing plugin \"<i>%1</i>\"</p>" ).
arg(NNI->nodeClass()->name()) );
@@ -260,4 +262,4 @@ void EditConnection::setConnection( NodeCollection * NC ) {
0,
- tr( "Error presentig Connection" ),
- tr( "<p>Old connection or missing plugin \"<i>%1</i>\"</p>" ).
+ tr( "Error presentig NetworkSetup" ),
+ tr( "<p>Old NetworkSetup or missing plugin \"<i>%1</i>\"</p>" ).
arg(NNI->nodeClass()->name()) );
@@ -266,4 +268,4 @@ void EditConnection::setConnection( NodeCollection * NC ) {
0,
- tr( "Error presentig Connection" ),
- tr( "<p>Missing connection\"<i>%1</i>\"</p>" ).
+ tr( "Error presentig NetworkSetup" ),
+ tr( "<p>Missing NetworkSetup\"<i>%1</i>\"</p>" ).
arg(it->text(0)) );
@@ -278,3 +280,3 @@ void EditConnection::setConnection( NodeCollection * NC ) {
// get result of editing (either new OR updated collection
-NodeCollection * EditConnection::connection( void ) {
+NetworkSetup * EditNetworkSetup::networkSetup( void ) {
@@ -282,3 +284,3 @@ NodeCollection * EditConnection::connection( void ) {
// new collection
- SelectedNodes = new NodeCollection;
+ SelectedNodes = new NetworkSetup;
}
@@ -307,3 +309,3 @@ NodeCollection * EditConnection::connection( void ) {
// Build device tree -> start
-void EditConnection::buildFullTree( void ) {
+void EditNetworkSetup::buildFullTree( void ) {
ANetNode * NN;
@@ -321,3 +323,3 @@ void EditConnection::buildFullTree( void ) {
// find all Nodes that are toplevel nodes -> ie provide
- // TCP/IP Connection
+ // TCP/IP NetworkSetup
for( QDictIterator<ANetNode> Iter(NSResources->netNodes());
@@ -344,3 +346,3 @@ void EditConnection::buildFullTree( void ) {
// Build device tree -> help function
-void EditConnection::buildSubTree( QListViewItem * it, ANetNode *NN ) {
+void EditNetworkSetup::buildSubTree( QListViewItem * it, ANetNode *NN ) {
ANetNode::NetNodeList & NNL = NN->alternatives();
@@ -380,3 +382,3 @@ void EditConnection::buildSubTree( QListViewItem * it, ANetNode *NN ) {
// Clicked ok OK button
-void EditConnection::accept( void ) {
+void EditNetworkSetup::accept( void ) {
if( ! haveCompleteConfig( 0 ) || Name_LE->text().isEmpty() ) {
@@ -384,3 +386,3 @@ void EditConnection::accept( void ) {
0,
- tr( "Closing Connection Setup" ),
+ tr( "Closing NetworkSetup Setup" ),
tr( "Definition not complete or no name" ) );
@@ -420,3 +422,3 @@ void EditConnection::accept( void ) {
// triggered by CB
-void EditConnection::SLOT_AutoCollapse( bool b ) {
+void EditNetworkSetup::SLOT_AutoCollapse( bool b ) {
AutoCollapse = b;
@@ -425,3 +427,3 @@ void EditConnection::SLOT_AutoCollapse( bool b ) {
// clicked on node in tree -> update GUI
-void EditConnection::SLOT_SelectNode( QListViewItem * it ) {
+void EditNetworkSetup::SLOT_SelectNode( QListViewItem * it ) {
ANetNode * NN;
@@ -467,3 +469,3 @@ void EditConnection::SLOT_SelectNode( QListViewItem * it ) {
// cliecked on TAB to go to setup
-void EditConnection::SLOT_AlterTab( const QString & S ) {
+void EditNetworkSetup::SLOT_AlterTab( const QString & S ) {
if( S == tr( "Setup" ) && Setup_FRM->isEnabled() ) {
@@ -516,3 +518,3 @@ void EditConnection::SLOT_AlterTab( const QString & S ) {
// update visual feedback of selection state
-void EditConnection::updateGUI( QListViewItem * it, ANetNode * NN ) {
+void EditNetworkSetup::updateGUI( QListViewItem * it, ANetNode * NN ) {
@@ -542,3 +544,3 @@ void EditConnection::updateGUI( QListViewItem * it, ANetNode * NN ) {
-void EditConnection::disableTree( QListViewItem * it, bool Mode ) {
+void EditNetworkSetup::disableTree( QListViewItem * it, bool Mode ) {
while( it ) {
@@ -554,3 +556,3 @@ void EditConnection::disableTree( QListViewItem * it, bool Mode ) {
// pah : ParentHasAlternatives
-void EditConnection::enablePath( QListViewItem * it, bool pha ) {
+void EditNetworkSetup::enablePath( QListViewItem * it, bool pha ) {
while( it ) {
@@ -591,3 +593,3 @@ void EditConnection::enablePath( QListViewItem * it, bool pha ) {
// do we have a complete configuration (all needs are provided for ?)
-bool EditConnection::haveCompleteConfig( QListViewItem * it ) {
+bool EditNetworkSetup::haveCompleteConfig( QListViewItem * it ) {