summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/ppp/connect.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/noncore/settings/networksettings/ppp/connect.cpp b/noncore/settings/networksettings/ppp/connect.cpp
index 6905d79..2400d7b 100644
--- a/noncore/settings/networksettings/ppp/connect.cpp
+++ b/noncore/settings/networksettings/ppp/connect.cpp
@@ -92,49 +92,52 @@ ConnectWidget::ConnectWidget(InterfacePPP *ifp, QWidget *parent, const char *nam
92 readbuffer(""), 92 readbuffer(""),
93 scanvar(""), 93 scanvar(""),
94 scanning(false), 94 scanning(false),
95 pausing(false), 95 pausing(false),
96 dialnumber(0), 96 dialnumber(0),
97 _ifaceppp(ifp) 97 _ifaceppp(ifp)
98{ 98{
99 modified_hostname = false; 99 modified_hostname = false;
100 100
101 QVBoxLayout *tl = new QVBoxLayout(this, 8, 10); 101 QVBoxLayout *tl = new QVBoxLayout(this, 8, 10);
102 QString tit = i18n("Connecting to: "); 102 QString tit = i18n("Connecting to: ");
103 setCaption(tit); 103 setCaption(tit);
104 104
105 QHBoxLayout *l0 = new QHBoxLayout(10); 105 QHBoxLayout *l0 = new QHBoxLayout(10);
106 tl->addLayout(l0); 106 tl->addLayout(l0);
107 l0->addSpacing(10); 107 l0->addSpacing(10);
108 messg = new QLabel(this, "messg"); 108 messg = new QLabel(this, "messg");
109 messg->setFrameStyle(QFrame::Panel|QFrame::Sunken); 109 messg->setFrameStyle(QFrame::Panel|QFrame::Sunken);
110 messg->setAlignment(AlignCenter); 110 messg->setAlignment(AlignCenter);
111 messg->setText(i18n("Unable to create modem lock file.")); 111 messg->setText(i18n("Unable to create modem lock file."));
112 messg->setMinimumHeight(messg->sizeHint().height() + 5); 112 messg->setMinimumHeight(messg->sizeHint().height() + 5);
113// int messw = (messg->sizeHint().width() * 12) / 10; 113// int messw = (messg->sizeHint().width() * 12) / 10;
114// messw = QMAX(messw,280); 114// messw = QMAX(messw,280);
115// messg->setMinimumWidth(messw); 115// messg->setMinimumWidth(messw);
116 messg->setText(i18n("Offline")); 116 if (_ifaceppp->getStatus())
117 messg->setText(i18n("Online"));
118 else
119 messg->setText(i18n("Offline"));
117 l0->addSpacing(10); 120 l0->addSpacing(10);
118 l0->addWidget(messg); 121 l0->addWidget(messg);
119 l0->addSpacing(10); 122 l0->addSpacing(10);
120 123
121 QHBoxLayout *l1 = new QHBoxLayout(10); 124 QHBoxLayout *l1 = new QHBoxLayout(10);
122 tl->addLayout(l1); 125 tl->addLayout(l1);
123 l1->addStretch(1); 126 l1->addStretch(1);
124 127
125 debug = new QPushButton(i18n("Log"), this); 128 debug = new QPushButton(i18n("Log"), this);
126 debug->setToggleButton(true); 129 debug->setToggleButton(true);
127 debug->setEnabled( false ); // FIXME: disable the log button 130 debug->setEnabled( false ); // FIXME: disable the log button
128 connect(debug, SIGNAL(clicked()), SIGNAL(toggleDebugWindow())); 131 connect(debug, SIGNAL(clicked()), SIGNAL(toggleDebugWindow()));
129 132
130 cancel = new QPushButton(i18n("Cancel"), this); 133 cancel = new QPushButton(i18n("Cancel"), this);
131 cancel->setFocus(); 134 cancel->setFocus();
132 connect(cancel, SIGNAL(clicked()), SLOT(cancelbutton())); 135 connect(cancel, SIGNAL(clicked()), SLOT(cancelbutton()));
133 136
134// int maxw = QMAX(cancel->sizeHint().width(), 137// int maxw = QMAX(cancel->sizeHint().width(),
135 // debug->sizeHint().width()); 138 // debug->sizeHint().width());
136// maxw = QMAX(maxw,65); 139// maxw = QMAX(maxw,65);
137// debug->setFixedWidth(maxw); 140// debug->setFixedWidth(maxw);
138// cancel->setFixedWidth(maxw); 141// cancel->setFixedWidth(maxw);
139 l1->addWidget(debug); 142 l1->addWidget(debug);
140 l1->addWidget(cancel); 143 l1->addWidget(cancel);
@@ -1111,48 +1114,51 @@ void ConnectWidget::if_waiting_slot() {
1111 emit closeDebugWindow(); 1114 emit closeDebugWindow();
1112// p_kppp->statdlg->take_stats(); // start taking ppp statistics 1115// p_kppp->statdlg->take_stats(); // start taking ppp statistics
1113 auto_hostname(_ifaceppp); 1116 auto_hostname(_ifaceppp);
1114 1117
1115 if(!_ifaceppp->data()->command_on_connect().isEmpty()) { 1118 if(!_ifaceppp->data()->command_on_connect().isEmpty()) {
1116 messg->setText(i18n("Running startup command...")); 1119 messg->setText(i18n("Running startup command..."));
1117 1120
1118 // make sure that we don't get any async errors 1121 // make sure that we don't get any async errors
1119 qApp->flushX(); 1122 qApp->flushX();
1120 execute_command(_ifaceppp->data()->command_on_connect()); 1123 execute_command(_ifaceppp->data()->command_on_connect());
1121 messg->setText(i18n("Done")); 1124 messg->setText(i18n("Done"));
1122 } 1125 }
1123 1126
1124 // remove the authentication file 1127 // remove the authentication file
1125 _ifaceppp->modem()->removeSecret(AUTH_PAP); 1128 _ifaceppp->modem()->removeSecret(AUTH_PAP);
1126 _ifaceppp->modem()->removeSecret(AUTH_CHAP); 1129 _ifaceppp->modem()->removeSecret(AUTH_CHAP);
1127 1130
1128 emit debugMessage(i18n("Done")); 1131 emit debugMessage(i18n("Done"));
1129 set_con_speed_string(); 1132 set_con_speed_string();
1130 1133
1131// p_kppp->con_win->setConnectionSpeed(p_kppp->con_speed); 1134// p_kppp->con_win->setConnectionSpeed(p_kppp->con_speed);
1132 this->hide(); 1135 this->hide();
1133 messg->setText(""); 1136 messg->setText("");
1134 1137
1138 _ifaceppp->setStatus( true );
1139 // emit _ifaceppp->updateInterface(_ifaceppp);
1140
1135 // prepare the con_win so as to have the right size for 1141 // prepare the con_win so as to have the right size for
1136 // accounting / non-accounting mode 1142 // accounting / non-accounting mode
1137// if(p_kppp->acct != 0) 1143// if(p_kppp->acct != 0)
1138// p_kppp->con_win->accounting(p_kppp->acct->running()); 1144// p_kppp->con_win->accounting(p_kppp->acct->running());
1139// else 1145// else
1140// p_kppp->con_win->accounting(false); 1146// p_kppp->con_win->accounting(false);
1141 1147
1142// if (_ifaceppp->data()->get_dock_into_panel()) { 1148// if (_ifaceppp->data()->get_dock_into_panel()) {
1143// // DockWidget::dock_widget->show(); 1149// // DockWidget::dock_widget->show();
1144// // DockWidget::dock_widget->take_stats(); 1150// // DockWidget::dock_widget->take_stats();
1145// // this->hide(); 1151// // this->hide();
1146// } 1152// }
1147// else { 1153// else {
1148// // p_kppp->con_win->show(); 1154// // p_kppp->con_win->show();
1149 1155
1150// if(_ifaceppp->data()->get_iconify_on_connect()) { 1156// if(_ifaceppp->data()->get_iconify_on_connect()) {
1151// // p_kppp->con_win->showMinimized(); 1157// // p_kppp->con_win->showMinimized();
1152// } 1158// }
1153// } 1159// }
1154 1160
1155 _ifaceppp->modem()->closetty(); 1161 _ifaceppp->modem()->closetty();
1156} 1162}
1157 1163
1158 1164