1 files changed, 15 insertions, 44 deletions

diff --git a/noncore/settings/networksettings/ppp/accounts.cpp b/noncore/settings/networksettings/ppp/accounts.cpp
index f704c84..7760d5e 100644
--- a/noncore/settings/networksettings/ppp/accounts.cpp
+++ b/noncore/settings/networksettings/ppp/accounts.cpp
@@ -39,4 +39,5 @@
 
-#include "pppdata.h"
 #include "accounts.h"
+#include "authwidget.h"
+#include "pppdata.h"
 #include "edit.h"
@@ -46,4 +47,5 @@ void parseargs(char* buf, char** args);
 AccountWidget::AccountWidget( PPPData *pd, QWidget *parent, const char *name )
-    : QWidget( parent, name ), _pppdata(pd)
+    : QWidget( parent, name )//, _pppdata(pd)
 {
+    _pppdata = pd;
   QVBoxLayout *l1 = new QVBoxLayout(this, 10, 10);
@@ -88,2 +90,5 @@ AccountWidget::AccountWidget( PPPData *pd, QWidget *parent, const char *name )
 
+  int currAccId = _pppdata->currentAccountID();
+  qDebug("currentAccountID %i", currAccId);
+
   //load up account list from gppdata to the list box
@@ -95,3 +100,3 @@ AccountWidget::AccountWidget( PPPData *pd, QWidget *parent, const char *name )
   }
-
+  _pppdata->setAccountbyIndex( currAccId );
 
@@ -99,3 +104,3 @@ AccountWidget::AccountWidget( PPPData *pd, QWidget *parent, const char *name )
   accountlist_l->setCurrentItem( _pppdata->currentAccountID() );
-  slotListBoxSelect( _pppdata->currentAccountID());
+  slotListBoxSelect( _pppdata->currentAccountID() );
 
@@ -114,3 +119,2 @@ void AccountWidget::slotListBoxSelect(int idx) {
     _pppdata->setAccountbyIndex(accountlist_l->currentItem());
-    //   _pppdata->setAccount(account);
  }
@@ -118,34 +122,2 @@ void AccountWidget::slotListBoxSelect(int idx) {
 
-
-// void AccountWidget::viewLogClicked(){
-
-//     QApplication::flushX();
-//     if(fork() == 0) {
-//       setgid(getgid());
-//       setuid(getuid());
-//       system("kppplogview -kppp");
-//       _exit(0);
-//     }
-// }
-
-
-// void AccountWidget::resetClicked(){
-//   if(accountlist_l->currentItem() == -1)
-//     return;
-
-// //   QueryReset dlg(this);
-// //   int what = dlg.exec();
-
-// //   if(what && QueryReset::COSTS) {
-// //     emit resetCosts(accountlist_l->text(accountlist_l->currentItem()));
-// //     costedit->setText("0");
-// //   }
-
-// //   if(what && QueryReset::VOLUME) {
-// //     emit resetVolume(accountlist_l->text(accountlist_l->currentItem()));
-// //     voledit->setText(prettyPrintVolume(0));
-// //   }
-// }
-
-
 void AccountWidget::editaccount() {
@@ -251,2 +223,6 @@ int AccountWidget::doTab(){
 
+//   // AUTH WIDGET
+   auth_w = new AuthWidget( _pppdata, tabWindow, isnewaccount, tr("Edit Login Script"));
+   tabWindow->addTab( auth_w, tr("Authentication") );
+
 //   // IP WIDGET
@@ -263,6 +239,2 @@ int AccountWidget::doTab(){
 
-//   // SCRIPT WIDGET
-   script_w = new ScriptWidget( _pppdata, tabWindow, isnewaccount, tr("Edit Login Script"));
-   tabWindow->addTab( script_w, tr("Login Script") );
-
 //   // EXECUTE WIDGET
@@ -280,4 +252,3 @@ int AccountWidget::doTab(){
         if(result == QDialog::Accepted) {
-            if (!script_w->check()){
-                QMessageBox::critical(this, "error", tr("<qt>Login script has unbalanced loop Start/End<qt>"));
+            if (!auth_w->check()){
                 ok = false;
@@ -290,3 +261,3 @@ int AccountWidget::doTab(){
                 gateway_w->save();
-                script_w->save();
+                auth_w->save();
                 exec_w->save();