Diffstat (limited to 'noncore/settings/networksettings/ppp/conwindow.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/ppp/conwindow.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/noncore/settings/networksettings/ppp/conwindow.cpp b/noncore/settings/networksettings/ppp/conwindow.cpp index d6b3fbe..ad89005 100644 --- a/noncore/settings/networksettings/ppp/conwindow.cpp +++ b/noncore/settings/networksettings/ppp/conwindow.cpp @@ -74,11 +74,11 @@ ConWindow::ConWindow(QWidget *parent, const char *name, QDialog *mainwidget ) clocktimer = new QTimer(this); connect(clocktimer, SIGNAL(timeout()), SLOT(timeclick())); // read window position from config file - int p_x, p_y; - gpppdata.winPosConWin(p_x, p_y); - setGeometry(p_x, p_y, 320, 110); +// int p_x, p_y; +// PPPData::data()->winPosConWin(p_x, p_y); +// setGeometry(p_x, p_y, 320, 110); } ConWindow::~ConWindow() { stopClock(); @@ -87,9 +87,9 @@ ConWindow::~ConWindow() { // save window position when window was closed bool ConWindow::event(QEvent *e) { if (e->type() == QEvent::Hide) { - gpppdata.setWinPosConWin(x(), y()); +// PPPData::data()->setWinPosConWin(x(), y()); return true; } else return QWidget::event(e); @@ -117,9 +117,9 @@ QString ConWindow::prettyPrintVolume(unsigned int n) { void ConWindow::accounting(bool on) { // cache accounting settings accountingEnabled = on; - volumeAccountingEnabled = gpppdata.VolAcctEnabled(); + volumeAccountingEnabled = PPPData::data()->VolAcctEnabled(); // delete old layout if(tl1 != 0) delete tl1; @@ -132,9 +132,9 @@ void ConWindow::accounting(bool on) { tl->addSpacing(20); QGridLayout *l1; int vol_lines = 0; - if(gpppdata.VolAcctEnabled()) + if(PPPData::data()->VolAcctEnabled()) vol_lines = 1; if(accountingEnabled) l1 = new QGridLayout(4 + vol_lines, 2, 5); @@ -238,11 +238,11 @@ void ConWindow::startClock() { seconds = 0; hours = 0; QString title ; - title = gpppdata.accname(); + title = PPPData::data()->accname(); - if(gpppdata.get_show_clock_on_caption()){ + if(PPPData::data()->get_show_clock_on_caption()){ title += " 00:00" ; } this->setCaption(title); @@ -264,9 +264,9 @@ void ConWindow::stopClock() { void ConWindow::timeclick() { QString tooltip = i18n("Connection: %1\n" "Connected at: %2\n" "Time connected: %3") - .arg(gpppdata.accname()).arg(info2->text()) + .arg(PPPData::data()->accname()).arg(info2->text()) .arg(time_string2); if(accountingEnabled) tooltip += i18n("\nSession Bill: %1\nTotal Bill: %2") @@ -274,9 +274,9 @@ void ConWindow::timeclick() { // volume accounting if(volumeAccountingEnabled) { volinfo->setEnabled(TRUE); - int bytes = gpppdata.totalBytes(); + int bytes = PPPData::data()->totalBytes(); volinfo->setText(prettyPrintVolume(bytes)); } seconds++; @@ -304,16 +304,16 @@ void ConWindow::timeclick() { else time_string2.sprintf("%02d:%02d:%02d",hours,minutes,seconds); - caption_string = gpppdata.accname(); + caption_string = PPPData::data()->accname(); caption_string += " "; caption_string += time_string; timelabel2->setText(time_string2); - if(gpppdata.get_show_clock_on_caption() && (seconds == 1)){ + if(PPPData::data()->get_show_clock_on_caption() && (seconds == 1)){ // we update the Caption only once per minute not every second // otherwise I get a flickering icon this->setCaption(caption_string); } @@ -327,9 +327,9 @@ void ConWindow::closeEvent( QCloseEvent *e ){ // conwindow since this is our last connection kppp. // if we lost it we could only kill the program by hand to get on with life. e->ignore(); - if(gpppdata.get_dock_into_panel()) + if(PPPData::data()->get_dock_into_panel()) dock(); } |