From kde-commits Sun Nov 25 21:49:44 2007 From: Kevin Krammer Date: Sun, 25 Nov 2007 21:49:44 +0000 To: kde-commits Subject: KDE/kdenetwork/kppp Message-Id: <1196027384.871852.27830.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=119602739608466 SVN commit 741570 by krake: deprecated-- M +6 -6 edit.cpp M +6 -4 general.cpp M +2 -2 kpppwidget.cpp M +5 -5 modemcmds.cpp M +8 -5 pppstatdlg.cpp --- trunk/KDE/kdenetwork/kppp/edit.cpp #741569:741570 @@ -88,9 +88,9 @@ del = new QPushButton(i18n("&Remove"), this); up = new QPushButton(this); - up->setIconSet(BarIconSet("go-up")); + up->setIcon(KIcon("go-up")); down = new QPushButton(this); - down->setIconSet(BarIconSet("go-down")); + down->setIcon(KIcon("go-down")); lpn1->addWidget(add); lpn1->addWidget(del); lpn1->addStretch(1); @@ -145,7 +145,7 @@ store_password = new QCheckBox(i18n("Store &password"), this); store_password->setChecked(true); - tl->addMultiCellWidget(store_password, 4, 4, 0, 1, Qt::AlignRight); + tl->addWidget(store_password, 4, 0, 1, 2, Qt::AlignRight); store_password->setWhatsThis( i18n("

When this is turned on, your ISP password\n" "will be saved in kppp's config file, so\n" @@ -186,7 +186,7 @@ pppdargs = new QPushButton(i18n("Customize &pppd Arguments..."), this); connect(pppdargs, SIGNAL(clicked()), SLOT(pppdargsbutton())); - tl->addMultiCellWidget(pppdargs, 7, 7, 0, 1, Qt::AlignCenter); + tl->addWidget(pppdargs, 7, 0, 1, 2, Qt::AlignCenter); // Set defaults if editing an existing connection if(!isnewaccount) { @@ -712,7 +712,7 @@ "&Disable existing DNS servers during connection"), this); exdnsdisabled_toggle->setChecked(gpppdata.exDNSDisabled()); - tl->addMultiCellWidget(exdnsdisabled_toggle, 6, 6, 0, 1, Qt::AlignCenter); + tl->addWidget(exdnsdisabled_toggle, 6, 0, 1, 2, Qt::AlignCenter); exdnsdisabled_toggle->setWhatsThis( i18n("

When this option is selected, all DNS\n" "servers specified in /etc/resolv.conf are\n" @@ -914,7 +914,7 @@ connect(remove, SIGNAL(clicked()), SLOT(removeButton())); tl->addWidget(bbox); - QHBoxLayout *l12 = new QHBoxLayout(0); + QHBoxLayout *l12 = new QHBoxLayout; tl->addLayout(l12); stl = new Q3ListBox(parent); stl->setVScrollBarMode( Q3ScrollView::AlwaysOff ); --- trunk/KDE/kdenetwork/kppp/general.cpp #741569:741570 @@ -75,7 +75,8 @@ KIntNumInput *pppdTimeout = new KIntNumInput(gpppdata.pppdTimeout(), parent); pppdTimeout->setLabel(i18n("pppd &timeout:")); - pppdTimeout->setRange(1, TIMEOUT_SIZE, 5, true); + pppdTimeout->setRange(1, TIMEOUT_SIZE, 5); + pppdTimeout->setSliderEnabled(true); pppdTimeout->setSuffix(i18n(" sec")); connect(pppdTimeout, SIGNAL(valueChanged(int)), SLOT(pppdtimeoutchanged(int))); @@ -379,7 +380,7 @@ modemlockfile->setChecked(gpppdata.modemLockFile()); /* connect(modemlockfile, SIGNAL(toggled(bool)), SLOT(modemlockfilechanged(bool)));*/ - tl->addMultiCellWidget(modemlockfile, 5, 5, 0, 1); + tl->addWidget(modemlockfile, 5, 0, 1, 2); // l12->addStretch(1); modemlockfile->setWhatsThis( i18n("

To prevent other programs from accessing the\n" @@ -400,7 +401,7 @@ modemtimeout->setSuffix(i18n(" sec")); /* connect(modemtimeout, SIGNAL(valueChanged(int)), SLOT(modemtimeoutchanged(int)));*/ - tl->addMultiCellWidget(modemtimeout, 6, 6, 0, 1); + tl->addWidget(modemtimeout, 6, 0, 1, 2); modemtimeout->setWhatsThis( i18n("This specifies how long kppp waits for a\n" @@ -491,7 +492,8 @@ busywait = new KIntNumInput(gpppdata.busyWait(), this); busywait->setLabel(i18n("B&usy wait:")); - busywait->setRange(0, 300, 5, true); + busywait->setRange(0, 300, 5); + busywait->setSliderEnabled(true); busywait->setSuffix(i18n(" sec")); // connect(busywait, SIGNAL(valueChanged(int)), SLOT(busywaitchanged(int))); l1->addWidget(busywait); --- trunk/KDE/kdenetwork/kppp/kpppwidget.cpp #741569:741570 @@ -226,7 +226,7 @@ connect( help_b, SIGNAL(clicked()), SLOT(helpbutton())); KHelpMenu *helpMenu = new KHelpMenu(this, KGlobal::mainComponent().aboutData(), true); - help_b->setPopup((QMenu*)helpMenu->menu()); + help_b->setMenu((QMenu*)helpMenu->menu()); if(help_b->sizeHint().width() > minw) minw = help_b->sizeHint().width(); @@ -397,7 +397,7 @@ void KPPPWidget::prepareSetupDialog() { if(tabWindow == 0) { - tabWindow = new KPageDialog( kapp->mainWidget()); + tabWindow = new KPageDialog( this ); tabWindow->setCaption( i18n("KPPP Configuration") ); tabWindow->setButtons( KDialog::Ok|KDialog::Cancel ); tabWindow->setDefaultButton( KDialog::Ok ); --- trunk/KDE/kdenetwork/kppp/modemcmds.cpp #741569:741570 @@ -73,7 +73,7 @@ QGridLayout *l1 = new QGridLayout(); tl->addLayout(l1); box = new Q3GroupBox(dummyWidget, "box"); - l1->addMultiCellWidget(box, row++, GRIDROWS, 0, 3); + l1->addWidget(box, row++, 0, GRIDROWS + 1, 4); // put slider and label into a separate H-Box QHBoxLayout *l2 = new QHBoxLayout; @@ -86,7 +86,7 @@ preinitslider->setMaximum(300); preinitslider->setPageStep(1); preinitslider->setValue(0); - + preinitslider->setFixedHeight(preinitslider->sizeHint().height()); connect(preinitslider, SIGNAL(valueChanged(int)), lpreinitslider, SLOT(setNum(int))); @@ -114,7 +114,7 @@ initslider->setMaximum(300); initslider->setPageStep(1); initslider->setValue(1); // was zero before the Qt4 port. - + initslider->setFixedHeight(initslider->sizeHint().height()); connect(initslider, SIGNAL(valueChanged(int)), linitslider, SLOT(setNum(int))); @@ -134,7 +134,7 @@ durationslider->setMaximum(255); durationslider->setPageStep(1); durationslider->setValue(1); // was 0 before the Qt4 port - + durationslider->setFixedHeight(durationslider->sizeHint().height()); connect(durationslider, SIGNAL(valueChanged(int)), ldurationslider, SLOT(setNum(int))); @@ -254,7 +254,7 @@ slider->setMaximum(255); slider->setPageStep(1); slider->setValue(0); - + slider->setFixedHeight(slider->sizeHint().height()); connect(slider, SIGNAL(valueChanged(int)), lslider, SLOT(setNum(int))); --- trunk/KDE/kdenetwork/kppp/pppstatdlg.cpp #741569:741570 @@ -71,7 +71,7 @@ QGridLayout *l1 = new QGridLayout(); tl->addLayout(l1, 1); box = new Q3GroupBox(i18n("Statistics"), this); - l1->addMultiCellWidget(box, 0, 3, 0, 3); + l1->addWidget(box, 0, 0, 4, 4); l1->addItem(new QSpacerItem(0, fontMetrics().lineSpacing() - 10), 0, 0); l1->setRowStretch(1, 1); l1->setColumnStretch(1, 1); @@ -178,10 +178,13 @@ graph = new QLabel(this); graph->setFrameStyle(QFrame::Box | QFrame::Sunken); - l1->addMultiCellWidget(graph, 2, 2, 1, 2); + l1->addWidget(graph, 2, 1, 1, 2); graph->setMinimumWidth(300); graph->setFixedHeight(76+4); - graph->setBackgroundColor(bg); + + QPalette palette; + palette.setColor(graph->backgroundRole(), bg); + graph->setPalette(palette); } cancelbutton = new KPushButton(KStandardGuiItem::close(),this); @@ -258,7 +261,7 @@ QPixmap pm(graph->width() - 4, graph->height() - 4); QPainter p; - pm.fill(graph->backgroundColor()); + pm.fill(graph->palette().color(graph->backgroundRole())); p.begin(&pm); int x; @@ -304,7 +307,7 @@ QString s = i18n("%1 (max. %2) kb/sec", KGlobal::locale()->formatNumber((float)last_max / 1024.0, 1), KGlobal::locale()->formatNumber((float)max / 1024.0, 1)); - p.drawText(0, 0, pm.width(), 2*8, Qt::AlignRight|Qt::AlignVCenter, s, -1, &r); + p.drawText(0, 0, pm.width(), 2*8, Qt::AlignRight|Qt::AlignVCenter, s, &r); p.drawLine(0, 8, r.left() - 8, 8); p.end();