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 ) | |||
74 | clocktimer = new QTimer(this); | 74 | clocktimer = new QTimer(this); |
75 | connect(clocktimer, SIGNAL(timeout()), SLOT(timeclick())); | 75 | connect(clocktimer, SIGNAL(timeout()), SLOT(timeclick())); |
76 | 76 | ||
77 | // read window position from config file | 77 | // read window position from config file |
78 | int p_x, p_y; | 78 | // int p_x, p_y; |
79 | gpppdata.winPosConWin(p_x, p_y); | 79 | // PPPData::data()->winPosConWin(p_x, p_y); |
80 | setGeometry(p_x, p_y, 320, 110); | 80 | // setGeometry(p_x, p_y, 320, 110); |
81 | } | 81 | } |
82 | 82 | ||
83 | ConWindow::~ConWindow() { | 83 | ConWindow::~ConWindow() { |
84 | stopClock(); | 84 | stopClock(); |
@@ -87,9 +87,9 @@ ConWindow::~ConWindow() { | |||
87 | // save window position when window was closed | 87 | // save window position when window was closed |
88 | bool ConWindow::event(QEvent *e) { | 88 | bool ConWindow::event(QEvent *e) { |
89 | if (e->type() == QEvent::Hide) | 89 | if (e->type() == QEvent::Hide) |
90 | { | 90 | { |
91 | gpppdata.setWinPosConWin(x(), y()); | 91 | // PPPData::data()->setWinPosConWin(x(), y()); |
92 | return true; | 92 | return true; |
93 | } | 93 | } |
94 | else | 94 | else |
95 | return QWidget::event(e); | 95 | return QWidget::event(e); |
@@ -117,9 +117,9 @@ QString ConWindow::prettyPrintVolume(unsigned int n) { | |||
117 | 117 | ||
118 | void ConWindow::accounting(bool on) { | 118 | void ConWindow::accounting(bool on) { |
119 | // cache accounting settings | 119 | // cache accounting settings |
120 | accountingEnabled = on; | 120 | accountingEnabled = on; |
121 | volumeAccountingEnabled = gpppdata.VolAcctEnabled(); | 121 | volumeAccountingEnabled = PPPData::data()->VolAcctEnabled(); |
122 | 122 | ||
123 | // delete old layout | 123 | // delete old layout |
124 | if(tl1 != 0) | 124 | if(tl1 != 0) |
125 | delete tl1; | 125 | delete tl1; |
@@ -132,9 +132,9 @@ void ConWindow::accounting(bool on) { | |||
132 | tl->addSpacing(20); | 132 | tl->addSpacing(20); |
133 | QGridLayout *l1; | 133 | QGridLayout *l1; |
134 | 134 | ||
135 | int vol_lines = 0; | 135 | int vol_lines = 0; |
136 | if(gpppdata.VolAcctEnabled()) | 136 | if(PPPData::data()->VolAcctEnabled()) |
137 | vol_lines = 1; | 137 | vol_lines = 1; |
138 | 138 | ||
139 | if(accountingEnabled) | 139 | if(accountingEnabled) |
140 | l1 = new QGridLayout(4 + vol_lines, 2, 5); | 140 | l1 = new QGridLayout(4 + vol_lines, 2, 5); |
@@ -238,11 +238,11 @@ void ConWindow::startClock() { | |||
238 | seconds = 0; | 238 | seconds = 0; |
239 | hours = 0; | 239 | hours = 0; |
240 | QString title ; | 240 | QString title ; |
241 | 241 | ||
242 | title = gpppdata.accname(); | 242 | title = PPPData::data()->accname(); |
243 | 243 | ||
244 | if(gpppdata.get_show_clock_on_caption()){ | 244 | if(PPPData::data()->get_show_clock_on_caption()){ |
245 | title += " 00:00" ; | 245 | title += " 00:00" ; |
246 | } | 246 | } |
247 | this->setCaption(title); | 247 | this->setCaption(title); |
248 | 248 | ||
@@ -264,9 +264,9 @@ void ConWindow::stopClock() { | |||
264 | void ConWindow::timeclick() { | 264 | void ConWindow::timeclick() { |
265 | QString tooltip = i18n("Connection: %1\n" | 265 | QString tooltip = i18n("Connection: %1\n" |
266 | "Connected at: %2\n" | 266 | "Connected at: %2\n" |
267 | "Time connected: %3") | 267 | "Time connected: %3") |
268 | .arg(gpppdata.accname()).arg(info2->text()) | 268 | .arg(PPPData::data()->accname()).arg(info2->text()) |
269 | .arg(time_string2); | 269 | .arg(time_string2); |
270 | 270 | ||
271 | if(accountingEnabled) | 271 | if(accountingEnabled) |
272 | tooltip += i18n("\nSession Bill: %1\nTotal Bill: %2") | 272 | tooltip += i18n("\nSession Bill: %1\nTotal Bill: %2") |
@@ -274,9 +274,9 @@ void ConWindow::timeclick() { | |||
274 | // volume accounting | 274 | // volume accounting |
275 | if(volumeAccountingEnabled) { | 275 | if(volumeAccountingEnabled) { |
276 | 276 | ||
277 | volinfo->setEnabled(TRUE); | 277 | volinfo->setEnabled(TRUE); |
278 | int bytes = gpppdata.totalBytes(); | 278 | int bytes = PPPData::data()->totalBytes(); |
279 | volinfo->setText(prettyPrintVolume(bytes)); | 279 | volinfo->setText(prettyPrintVolume(bytes)); |
280 | } | 280 | } |
281 | 281 | ||
282 | seconds++; | 282 | seconds++; |
@@ -304,16 +304,16 @@ void ConWindow::timeclick() { | |||
304 | 304 | ||
305 | else | 305 | else |
306 | time_string2.sprintf("%02d:%02d:%02d",hours,minutes,seconds); | 306 | time_string2.sprintf("%02d:%02d:%02d",hours,minutes,seconds); |
307 | 307 | ||
308 | caption_string = gpppdata.accname(); | 308 | caption_string = PPPData::data()->accname(); |
309 | caption_string += " "; | 309 | caption_string += " "; |
310 | caption_string += time_string; | 310 | caption_string += time_string; |
311 | 311 | ||
312 | 312 | ||
313 | timelabel2->setText(time_string2); | 313 | timelabel2->setText(time_string2); |
314 | 314 | ||
315 | if(gpppdata.get_show_clock_on_caption() && (seconds == 1)){ | 315 | if(PPPData::data()->get_show_clock_on_caption() && (seconds == 1)){ |
316 | // we update the Caption only once per minute not every second | 316 | // we update the Caption only once per minute not every second |
317 | // otherwise I get a flickering icon | 317 | // otherwise I get a flickering icon |
318 | this->setCaption(caption_string); | 318 | this->setCaption(caption_string); |
319 | } | 319 | } |
@@ -327,9 +327,9 @@ void ConWindow::closeEvent( QCloseEvent *e ){ | |||
327 | // conwindow since this is our last connection kppp. | 327 | // conwindow since this is our last connection kppp. |
328 | // if we lost it we could only kill the program by hand to get on with life. | 328 | // if we lost it we could only kill the program by hand to get on with life. |
329 | e->ignore(); | 329 | e->ignore(); |
330 | 330 | ||
331 | if(gpppdata.get_dock_into_panel()) | 331 | if(PPPData::data()->get_dock_into_panel()) |
332 | dock(); | 332 | dock(); |
333 | } | 333 | } |
334 | 334 | ||
335 | 335 | ||