[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kcontrol/kio
From:       Dawit Alemayehu <adawit () kde ! org>
Date:       2004-11-11 13:21:40
Message-ID: 20041111132140.6B27016DB9 () office ! kde ! org
[Download RAW message or body]

CVS commit by adawit: 

- Properly restore the settings in the environment proxy dialog.


  M +11 -27    kenvvarproxydlg.cpp   1.40


--- kdebase/kcontrol/kio/kenvvarproxydlg.cpp  #1.39:1.40
@@ -74,6 +74,4 @@ void KEnvVarProxyDlg::setProxyData( cons
     mEnvVarsMap["http"].name = data.proxyList["http"];
     mEnvVarsMap["http"].value = QString::fromLocal8Bit( getenv(data.proxyList["http"].local8Bit()) );
-    if ( !mEnvVarsMap["http"].value.isEmpty() )
-      mDlg->leHttp->setText( data.proxyList["http"] );
   }
 
@@ -84,6 +82,4 @@ void KEnvVarProxyDlg::setProxyData( cons
     mEnvVarsMap["https"].name = data.proxyList["https"];
     mEnvVarsMap["https"].value = QString::fromLocal8Bit( getenv(data.proxyList["https"].local8Bit()) );
-    if ( !mEnvVarsMap["https"].value.isEmpty() )
-      mDlg->leHttps->setText( data.proxyList["https"] );
   }
 
@@ -94,6 +90,4 @@ void KEnvVarProxyDlg::setProxyData( cons
     mEnvVarsMap["ftp"].name = data.proxyList["ftp"];
     mEnvVarsMap["ftp"].value = QString::fromLocal8Bit( getenv(data.proxyList["ftp"].local8Bit()) );
-    if ( !mEnvVarsMap["ftp"].value.isEmpty() )
-      mDlg->leFtp->setText( data.proxyList["ftp"] );
   }
 
@@ -104,9 +98,8 @@ void KEnvVarProxyDlg::setProxyData( cons
     mEnvVarsMap["noProxy"].name = noProxy;
     mEnvVarsMap["noProxy"].value = QString::fromLocal8Bit( getenv(noProxy.local8Bit()) );
-    if ( !mEnvVarsMap["noProxy"].value.isEmpty() )
-      mDlg->leNoProxy->setText( noProxy );
   }
 
   mDlg->cbShowValue->setChecked( data.showEnvVarValue );
+  showValue();
 }
 
@@ -250,26 +243,17 @@ void KEnvVarProxyDlg::showValue()
   mDlg->leNoProxy->setReadOnly (enable);
 
-  if (!mDlg->leHttp->text().isEmpty())
-  {
-    QString value = enable ? mEnvVarsMap["http"].value : mEnvVarsMap["http"].name;
-    mDlg->leHttp->setText( value );
-  }
-
-  if (!mDlg->leHttps->text().isEmpty())
-  {
-    QString value = enable ? mEnvVarsMap["https"].value : mEnvVarsMap["https"].name;
-    mDlg->leHttps->setText( value );
-  }
-
-  if (!mDlg->leFtp->text().isEmpty())
+  if (enable)
   {
-    QString value = enable ? mEnvVarsMap["ftp"].value : mEnvVarsMap["ftp"].name;
-    mDlg->leFtp->setText( value );
+    mDlg->leHttp->setText( mEnvVarsMap["http"].value );
+    mDlg->leHttps->setText( mEnvVarsMap["https"].value );
+    mDlg->leFtp->setText( mEnvVarsMap["ftp"].value );
+    mDlg->leNoProxy->setText( mEnvVarsMap["noProxy"].value );
   }
-
-  if (!mDlg->leNoProxy->text().isEmpty())
+  else
   {
-    QString value = enable ? mEnvVarsMap["noProxy"].value : mEnvVarsMap["noProxy"].name;
-    mDlg->leNoProxy->setText( value );
+    mDlg->leHttp->setText( mEnvVarsMap["http"].name );
+    mDlg->leHttps->setText( mEnvVarsMap["https"].name );
+    mDlg->leFtp->setText( mEnvVarsMap["ftp"].name );
+    mDlg->leNoProxy->setText( mEnvVarsMap["noProxy"].name );
   }
 }


[prev in list] [next in list] [prev in thread] [next in thread]