[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/plasma/applets/frame
From: Anne-Marie Mahfouf <annma () kde ! org>
Date: 2008-04-30 16:12:02
Message-ID: 1209571922.915986.776.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 802787 by annma:
make config dialog appear
M +2 -10 configdialog.cpp
M +1 -1 configdialog.h
M +8 -1 frame.cpp
M +1 -1 frame.h
--- trunk/extragear/plasma/applets/frame/configdialog.cpp #802786:802787
@@ -25,17 +25,9 @@
#include "picture.h"
ConfigDialog::ConfigDialog( QWidget *parent )
- : KDialog( parent )
+ : QWidget( parent )
{
- setCaption( i18nc( "@title:window", "Configure Frame" ) );
-
- setButtons( Ok | Cancel | Apply );
- setDefaultButton( Ok );
- showButtonSeparator( true );
-
- QWidget *widget = new QWidget();
- ui.setupUi(widget);
- setMainWidget(widget);
+ ui.setupUi(this);
ui.addDirButton->setIcon(KIcon("list-add"));
ui.removeDirButton->setIcon(KIcon("list-remove"));
--- trunk/extragear/plasma/applets/frame/configdialog.h #802786:802787
@@ -24,7 +24,7 @@
#include "ui_config.h"
-class ConfigDialog : public KDialog
+class ConfigDialog : public QWidget
{
Q_OBJECT
public:
--- trunk/extragear/plasma/applets/frame/frame.cpp #802786:802787
@@ -37,6 +37,7 @@
#include <KDebug>
#include <KLocale>
#include <KColorButton>
+#include <KConfigDialog>
#include <KComboBox>
#include <KSharedConfig>
#include <KStandardDirs>
@@ -166,7 +167,7 @@
}
}
-void Frame::createConfigurationInterface()
+void Frame::createConfigurationInterface(KConfigDialog *parent)
{
if ( !m_configDialog ) {
m_configDialog = new ConfigDialog( 0 );
@@ -180,6 +181,12 @@
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(m_configDialog->ui.removeDirButton, SIGNAL(clicked()), this, SLOT(removeDir()));
connect(m_configDialog->ui.addDirButton, SIGNAL(clicked()), this, SLOT(addDir()));
--- trunk/extragear/plasma/applets/frame/frame.h #802786:802787
@@ -52,7 +52,7 @@
QSizeF contentSizeHint() const;
public slots:
- void createConfigurationInterface();
+ void createConfigurationInterface( KConfigDialog *parent );
void dataUpdated( const QString &name, const Plasma::DataEngine::Data &data );
protected Q_SLOTS:
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic