From kde-commits Wed Apr 30 18:01:16 2008 From: Anne-Marie Mahfouf Date: Wed, 30 Apr 2008 18:01:16 +0000 To: kde-commits Subject: extragear/plasma/applets/frame Message-Id: <1209578476.096196.7072.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=120957848507982 SVN commit 802810 by annma: fixes but still crashes M +4 -6 frame.cpp --- trunk/extragear/plasma/applets/frame/frame.cpp #802809:802810 @@ -170,7 +170,7 @@ void Frame::createConfigurationInterface(KConfigDialog *parent) { if ( !m_configDialog ) { - m_configDialog = new ConfigDialog( 0 ); + m_configDialog = new ConfigDialog( parent ); KService::List services = KServiceTypeTrader::self()->query( "PlasmaPoTD/Plugin"); foreach (KService::Ptr service, services) { @@ -178,15 +178,13 @@ const QVariant *service_identifier = new QVariant ( service->property( "X-KDE-PlasmaPoTDProvider-Identifier", QVariant::String ).toString() ); m_configDialog->ui.potdComboBox->insertItem( m_configDialog->ui.potdComboBox->count(), *service_name, *service_identifier ); } - - connect( m_configDialog, SIGNAL( applyClicked() ), this, SLOT( configAccepted() ) ); - connect( m_configDialog, SIGNAL( okClicked() ), this, SLOT( configAccepted() ) ); - - parent->setCaption( i18nc( "@title:window", "Configure Frame" ) ); + parent->setButtons( KDialog::Ok | KDialog::Cancel | KDialog::Apply); parent->addPage( m_configDialog, parent->windowTitle(), icon() ); parent->setDefaultButton( KDialog::Ok ); parent->showButtonSeparator( true ); + connect( parent, SIGNAL( applyClicked() ), this, SLOT( configAccepted() ) ); + connect( parent, SIGNAL( okClicked() ), this, SLOT( configAccepted() ) ); } connect(m_configDialog->ui.removeDirButton, SIGNAL(clicked()), this, SLOT(removeDir())); connect(m_configDialog->ui.addDirButton, SIGNAL(clicked()), this, SLOT(addDir()));