kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-11-05 18:47:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Ported to new KDialog/KPageWidget/KPageDialog

Browse source 
svn path=/trunk/KDE/kdebase/konqueror/; revision=551107
This commit is contained in:
Tobias Koenig 2006-06-13 17:41:00 +00:00
parent 6e44b61800
commit 42fec54d36
40 changed files with 266 additions and 201 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
kdepasswd/kcm/chfacedlg.cpp
View file

@ -56,8 +56,15 @@
* TODO: It would be nice if the widget were in a .ui
*/
ChFaceDlg::ChFaceDlg(const QString& picsdir, QWidget *parent, const char *name, bool modal)
: KDialogBase( Swallow, 0, parent, name, modal, i18n("Change your Face"), Ok|Cancel, Ok, true )
: KDialog( parent )
{
setObjectName( name );
setModal( modal );
setCaption( i18n("Change your Face") );
setButtons( Ok|Cancel );
setDefaultButton( Ok );
enableButtonSeparator( true );
QWidget *page = new QWidget(this);
setMainWidget( page );

10
kdepasswd/kcm/chfacedlg.h
View file

@ -29,16 +29,14 @@
#define CHFACEDLG_H
#include <QObject>
//Added by qt3to4:
#include <QPixmap>
#include <kdialogbase.h>
#include <kdialog.h>
#include <k3iconview.h> // declaration below
enum FacePerm { adminOnly = 1, adminFirst = 2, userFirst = 3, userOnly = 4};
class KDialogBase;
class ChFaceDlg : public KDialogBase
class ChFaceDlg : public KDialog
{
Q_OBJECT
public:
@ -57,7 +55,7 @@ public:
private Q_SLOTS:
void slotFaceWidgetSelectionChanged( Q3IconViewItem *item )
{ enableButtonOK( !item->pixmap()->isNull() ); }
{ enableButton( Ok, !item->pixmap()->isNull() ); }
void slotGetCustomImage();
//void slotSaveCustomImage();

3
kdialog/klistboxdialog.cpp
View file

@ -27,9 +27,10 @@
#include "klocale.h"
KListBoxDialog::KListBoxDialog(const QString &text, QWidget *parent)
: KDialog( parent, QString(), KDialog::Ok|KDialog::Cancel )
: KDialog( parent )
{
setModal(true);
setButtons( Ok | Cancel );
enableButtonSeparator(true);
KVBox *page = new KVBox(this);

12
kdialog/widgets.cpp
View file

@ -91,7 +91,9 @@ bool Widgets::passwordBox(QWidget *parent, const QString& title, const QString&
int Widgets::textBox(QWidget *parent, int width, int height, const QString& title, const QString& file)
{
// KTextBox dlg(parent, 0, true, width, height, file);
KDialog dlg( parent, title, KDialog::Ok );
KDialog dlg( parent );
dlg.setCaption( title );
dlg.setButtons( KDialog::Ok );
dlg.setModal( true );
kapp->setTopWidget( &dlg );
@ -128,7 +130,9 @@ int Widgets::textBox(QWidget *parent, int width, int height, const QString& titl
int Widgets::textInputBox(QWidget *parent, int width, int height, const QString& title, const QStringList& args, QString &result)
{
// KTextBox dlg(parent, 0, true, width, height, file);
KDialog dlg( parent, title, KDialog::Ok );
KDialog dlg( parent );
dlg.setCaption( title );
dlg.setButtons( KDialog::Ok );
dlg.setModal( true );
kapp->setTopWidget( &dlg );
@ -162,7 +166,9 @@ int Widgets::textInputBox(QWidget *parent, int width, int height, const QString&
bool Widgets::comboBox(QWidget *parent, const QString& title, const QString& text, const QStringList& args,
const QString& defaultEntry, QString &result)
{
KDialog dlg( parent, title, KDialog::Ok|KDialog::Cancel );
KDialog dlg( parent );
dlg.setCaption( title );
dlg.setButtons( KDialog::Ok|KDialog::Cancel );
dlg.setModal( true );
dlg.setDefaultButton( KDialog::Ok );

23
kfind/kfinddlg.cpp
View file

@ -24,24 +24,29 @@
#include "kfinddlg.moc"
KfindDlg::KfindDlg(const KUrl & url, QWidget *parent, const char *name)
: KDialogBase( Plain, QString(),
User1 | User2 | Apply | Close | Help, Apply,
parent, name, true, true,
KStdGuiItem::stop(),
KStdGuiItem::saveAs())
: KDialog( parent )
{
setButtons( User1 | User2 | Apply | Close | Help );
setDefaultButton( Apply );
setObjectName( name );
setModal( true );
enableButtonSeparator( true );
setButtonGuiItem( User1, KStdGuiItem::stop() );
setButtonGuiItem( User2, KStdGuiItem::saveAs() );
setButtonGuiItem( Apply, KStdGuiItem::find());
QWidget::setWindowTitle( i18n("Find Files/Folders" ) );
setButtonBoxOrientation(Qt::Vertical);
setButtonsOrientation(Qt::Vertical);
enableButton(Apply, true); // Enable "Find"
enableButton(User1, false); // Disable "Stop"
enableButton(User2, false); // Disable "Save As..."
setButtonGuiItem(KDialog::Apply, KStdGuiItem::find());
isResultReported = false;
QFrame *frame = plainPage();
QFrame *frame = new QFrame;
setMainWidget( frame );
// create tabwidget
tabWidget = new KfindTabWidget( frame, "dialog");

4
kfind/kfinddlg.h
View file

@ -7,7 +7,7 @@
#ifndef KFINDDLG_H
#define KFINDDLG_H
#include <kdialogbase.h>
#include <kdialog.h>
#include <kdirlister.h>
#include <kdirwatch.h>
@ -20,7 +20,7 @@ class KfindTabWidget;
class KfindWindow;
class KStatusBar;
class KfindDlg: public KDialogBase
class KfindDlg: public KDialog
{
Q_OBJECT

99
konqueror/konq_extensionmanager.cc
View file

@ -45,19 +45,27 @@ public:
};
KonqExtensionManager::KonqExtensionManager(QWidget *parent, KonqMainWindow *mainWindow, KParts::ReadOnlyPart* activePart) :
KDialogBase(Plain, i18n("Configure"), Default | Cancel | Apply | Ok | User1,
Ok, parent, "extensionmanager", false, true, KStdGuiItem::reset())
KDialog( parent )
{
setCaption( i18n("Configure") );
setButtons( Default | Cancel | Apply | Ok | User1 );
setButtonGuiItem( User1, KStdGuiItem::reset() );
setObjectName( "extensionmanager" );
enableButtonSeparator( true );
d = new KonqExtensionManagerPrivate;
showButton(User1, false);
setChanged(false);
setInitialSize(QSize(640, 480));
QVBoxLayout *vb = new QVBoxLayout(plainPage());
QFrame *page = new QFrame( this );
setMainWidget( page );
QVBoxLayout *vb = new QVBoxLayout( page );
vb->setAutoAdd(true);
vb->setSpacing( 0 );
d->pluginSelector = new KPluginSelector(plainPage());
d->pluginSelector = new KPluginSelector( page );
setMainWidget(d->pluginSelector);
connect(d->pluginSelector, SIGNAL(changed(bool)), this, SLOT(setChanged(bool)));
connect(d->pluginSelector, SIGNAL(configCommitted(const QByteArray &)),
@ -74,6 +82,11 @@ KonqExtensionManager::KonqExtensionManager(QWidget *parent, KonqMainWindow *main
d->pluginSelector->addPlugins(instance->instanceName(), i18n("Tools"), "Tools", instance->config());
d->pluginSelector->addPlugins(instance->instanceName(), i18n("Statusbar"), "Statusbar", instance->config());
}
connect( this, SIGNAL( okClicked() ), SLOT( slotOk() ) );
connect( this, SIGNAL( applyClicked() ), SLOT( slotApply() ) );
connect( this, SIGNAL( defaultClicked() ), SLOT( slotDefault() ) );
connect( this, SIGNAL( user1Clicked() ), SLOT( slotUser1() ) );
}
KonqExtensionManager::~KonqExtensionManager()
@ -87,60 +100,60 @@ void KonqExtensionManager::setChanged(bool c)
enableButton(Apply, c);
}
void KonqExtensionManager::slotDefault()
{
d->pluginSelector->defaults();
setChanged(false);
}
void KonqExtensionManager::slotUser1()
{
d->pluginSelector->load();
setChanged(false);
}
void KonqExtensionManager::apply()
{
if(d->isChanged)
{
{
d->pluginSelector->save();
setChanged(false);
if( d->mainWindow )
{
KParts::Plugin::loadPlugins(d->mainWindow, d->mainWindow, KGlobal::instance());
QList<KParts::Plugin*> plugins = KParts::Plugin::pluginObjects(d->mainWindow);
for (int i = 0; i < plugins.size(); ++i) {
d->mainWindow->factory()->addClient(plugins.at(i));
}
}
if ( d->activePart )
{
KParts::Plugin::loadPlugins( d->activePart, d->activePart, d->activePart->instance() );
QList<KParts::Plugin*> plugins = KParts::Plugin::pluginObjects( d->activePart );
for (int i = 0; i < plugins.size(); ++i) {
d->activePart->factory()->addClient(plugins.at(i));
}
}
}
}
void KonqExtensionManager::slotApply()
{
apply();
setChanged(false);
if( d->mainWindow )
{
KParts::Plugin::loadPlugins(d->mainWindow, d->mainWindow, KGlobal::instance());
QList<KParts::Plugin*> plugins = KParts::Plugin::pluginObjects(d->mainWindow);
for (int i = 0; i < plugins.size(); ++i) {
d->mainWindow->factory()->addClient(plugins.at(i));
}
}
if ( d->activePart )
{
KParts::Plugin::loadPlugins( d->activePart, d->activePart, d->activePart->instance() );
QList<KParts::Plugin*> plugins = KParts::Plugin::pluginObjects( d->activePart );
for (int i = 0; i < plugins.size(); ++i) {
d->activePart->factory()->addClient(plugins.at(i));
}
}
}
}
void KonqExtensionManager::slotOk()
{
emit okClicked();
apply();
accept();
apply();
accept();
}
void KonqExtensionManager::slotApply()
{
apply();
}
void KonqExtensionManager::slotDefault()
{
d->pluginSelector->defaults();
setChanged(false);
}
void KonqExtensionManager::slotUser1()
{
d->pluginSelector->load();
setChanged(false);
}
void KonqExtensionManager::show()
{
d->pluginSelector->load();
KDialogBase::show();
KDialog::show();
}
#include "konq_extensionmanager.moc"

12
konqueror/konq_extensionmanager.h
View file

@ -18,7 +18,7 @@
#ifndef KONQEXTENSIONMANAGER_H
#define KONQEXTENSIONMANAGER_H
#include <kdialogbase.h>
#include <kdialog.h>
class KonqExtensionManagerPrivate;
class KonqMainWindow;
@ -31,7 +31,7 @@ namespace KParts { class ReadOnlyPart; }
* @author Martijn Klingens <klingens@kde.org>
* @author Arend van Beelen jr. <arend@auton.nl>
*/
class KonqExtensionManager : public KDialogBase
class KonqExtensionManager : public KDialog
{
Q_OBJECT
@ -44,10 +44,10 @@ class KonqExtensionManager : public KDialogBase
public Q_SLOTS:
void setChanged(bool c);
virtual void slotDefault();
virtual void slotUser1();
virtual void slotApply();
virtual void slotOk();
void slotOk();
void slotApply();
void slotDefault();
void slotUser1();
virtual void show();
private:

24
konqueror/konq_profiledlg.cc
View file

@ -68,17 +68,23 @@ KonqProfileItem::KonqProfileItem( K3ListView *parent, const QString & text )
{
}
#define BTN_RENAME KDialogBase::User1
#define BTN_DELETE KDialogBase::User2
#define BTN_SAVE KDialogBase::User3
#define BTN_RENAME KDialog::User1
#define BTN_DELETE KDialog::User2
#define BTN_SAVE KDialog::User3
KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const QString & preselectProfile, QWidget *parent )
: KDialogBase( parent, "konq_profile_dialog", true, i18n( "Profile Management" ),
KDialogBase::Close | BTN_RENAME | BTN_DELETE | BTN_SAVE, BTN_SAVE, true,
KGuiItem( i18n( "&Rename Profile" ) ),
KGuiItem( i18n( "&Delete Profile" ), "editdelete"),
KStdGuiItem::save() )
: KDialog( parent )
{
setObjectName( "konq_profile_dialog" );
setModal( true );
setCaption( i18n( "Profile Management" ) );
setButtons( Close | BTN_RENAME | BTN_DELETE | BTN_SAVE );
setDefaultButton( BTN_SAVE );
enableButtonSeparator( true );
setButtonGuiItem( BTN_RENAME, KGuiItem( i18n( "&Rename Profile" ) ) );
setButtonGuiItem( BTN_DELETE, KGuiItem( i18n( "&Delete Profile" ), "editdelete" ) );
setButtonGuiItem( BTN_SAVE, KStdGuiItem::save() );
m_pViewManager = manager;
KVBox* box = new KVBox( this );
@ -231,7 +237,7 @@ void KonqProfileDlg::slotSelectionChanged( Q3ListViewItem * item )
void KonqProfileDlg::slotTextChanged( const QString & text )
{
enableButton( KDialogBase::User3, !text.isEmpty() );
enableButton( KDialog::User3, !text.isEmpty() );
// If we type the name of a profile, select it in the list

4
konqueror/konq_profiledlg.h
View file

@ -20,7 +20,7 @@
#ifndef __konq_profiledlg_h__
#define __konq_profiledlg_h__
#include <kdialogbase.h>
#include <kdialog.h>
#include <q3listview.h>
#include <QMap>
@ -46,7 +46,7 @@ public:
QString m_profileName;
};
class KonqProfileDlg : public KDialogBase
class KonqProfileDlg : public KDialog
{
Q_OBJECT
public:

8
konqueror/settings/css/kcmcss.cpp
View file

@ -30,8 +30,12 @@ K_EXPORT_COMPONENT_FACTORY( kcm_css, CSSFactory("kcmcss") )
CSSConfig::CSSConfig(QWidget *parent, const QStringList &)
: KCModule(CSSFactory::instance(), parent)
{
customDialogBase = new KDialogBase(this, "customCSSDialog", true, QString(),
KDialogBase::Close, KDialogBase::Close, true );
customDialogBase = new KDialog(this);
customDialogBase->setObjectName( "customCSSDialog" );
customDialogBase->setModal( true );
customDialogBase->setButtons( KDialog::Close );
customDialogBase->setDefaultButton( KDialog::Close );
customDialogBase->enableButtonSeparator( true );
customDialog = new CSSCustomDialog(customDialogBase);
customDialogBase->setMainWidget(customDialog);
configDialog = new CSSConfigDialog(this);

4
konqueror/settings/css/kcmcss.h
View file

@ -26,7 +26,7 @@
class CSSConfigDialog;
class CSSCustomDialog;
class KDialogBase;
class KDialog;
class CSSConfig : public KCModule
@ -52,7 +52,7 @@ private:
CSSConfigDialog *configDialog;
CSSCustomDialog *customDialog;
KDialogBase *customDialogBase;
KDialog *customDialogBase;
};

27
konqueror/settings/filetypes/keditfiletype.cpp
View file

@ -39,16 +39,20 @@
#endif
FileTypeDialog::FileTypeDialog( KMimeType::Ptr mime )
: KDialogBase( 0L, 0, false, QString(), /* Help | */ Cancel | Apply | Ok,
Ok, false )
: KDialog( 0 )
{
setButtons( Cancel | Apply | Ok );
enableButtonSeparator( false );
init( mime, false );
}
FileTypeDialog::FileTypeDialog( KMimeType::Ptr mime, bool newItem )
: KDialogBase( 0L, 0, false, QString(), /* Help | */ Cancel | Apply | Ok,
Ok, false )
: KDialog( 0 )
{
setButtons( Cancel | Apply | Ok );
enableButtonSeparator( false );
init( mime, newItem );
}
@ -67,6 +71,9 @@ void FileTypeDialog::init( KMimeType::Ptr mime, bool newItem )
enableButton(Apply, false);
connect( KSycoca::self(), SIGNAL( databaseChanged() ), SLOT( slotDatabaseChanged() ) );
connect( this, SIGNAL( okClicked() ), SLOT( slotOk() ) );
connect( this, SIGNAL( applyClicked() ), SLOT( slotApply() ) );
}
void FileTypeDialog::save()
@ -77,17 +84,17 @@ void FileTypeDialog::save()
}
}
void FileTypeDialog::slotApply()
{
save();
}
void FileTypeDialog::slotOk()
{
save();
accept();
}
void FileTypeDialog::slotApply()
{
save();
}
void FileTypeDialog::clientChanged(bool state)
{
// enable/disable buttons
@ -177,7 +184,7 @@ int main(int argc, char ** argv)
dlg.setCaption( i18n("Edit File Type %1", mime->name()) );
else {
dlg.setCaption( i18n("Create New File Type %1", mime->name()) );
dlg.enableButton( KDialogBase::Apply, true );
dlg.enableButton( KDialog::Apply, true );
}
app.setMainWidget( &dlg );
dlg.show(); // non-modal

9
konqueror/settings/filetypes/keditfiletype.h
View file

@ -18,14 +18,14 @@
#ifndef __keditfiletype_h
#define __keditfiletype_h
#include <kdialogbase.h>
#include <kdialog.h>
#include <kmimetype.h>
class TypesListItem;
class FileTypeDetails;
// A dialog for ONE file type to be edited.
class FileTypeDialog : public KDialogBase
class FileTypeDialog : public KDialog
{
Q_OBJECT
public:
@ -33,11 +33,8 @@ public:
FileTypeDialog( KMimeType::Ptr mime, bool newItem );
protected Q_SLOTS:
//virtual void slotDefault();
//virtual void slotUser1(); // Reset
virtual void slotApply();
virtual void slotOk();
virtual void slotApply();
void clientChanged(bool state);
void slotDatabaseChanged();

8
konqueror/settings/filetypes/kserviceselectdlg.cpp
View file

@ -25,9 +25,13 @@
#include <QLabel>
KServiceSelectDlg::KServiceSelectDlg( const QString& /*serviceType*/, const QString& /*value*/, QWidget *parent )
: KDialogBase( parent, "serviceSelectDlg", true,
i18n( "Add Service" ), Ok|Cancel, Ok )
: KDialog( parent )
{
setObjectName( "serviceSelectDlg" );
setModal( true );
setCaption( i18n( "Add Service" ) );
setButtons( Ok | Cancel );
KVBox *vbox = new KVBox ( this );
vbox->setSpacing( KDialog::spacingHint() );

4
konqueror/settings/filetypes/kserviceselectdlg.h
View file

@ -18,10 +18,10 @@
#ifndef __kserviceselectdlg_h
#define __kserviceselectdlg_h
#include <kdialogbase.h>
#include <kdialog.h>
#include <kservice.h>
#include <klistbox.h>
class KServiceSelectDlg : public KDialogBase
class KServiceSelectDlg : public KDialog
{
Q_OBJECT
public:

12
konqueror/settings/filetypes/newtypedlg.cpp
View file

@ -15,10 +15,16 @@
NewTypeDialog::NewTypeDialog(QStringList groups,
QWidget *parent, const char *name)
: KDialogBase(parent, name, true, i18n( "Create New File Type" ),
Ok|Cancel, Ok, true)
: KDialog( parent )
{
QFrame *main = makeMainWidget();
setObjectName( name );
setModal( true );
setCaption( i18n( "Create New File Type" ) );
setButtons( Ok | Cancel );
enableButtonSeparator( true );
QFrame *main = new QFrame( this );
setMainWidget( main );
QVBoxLayout *topl = new QVBoxLayout(main);
topl->setSpacing(spacingHint());

5
konqueror/settings/filetypes/newtypedlg.h
View file

@ -3,7 +3,8 @@
#include <QString>
#include <QStringList>
#include <kdialogbase.h>
#include <kdialog.h>
class KLineEdit;
class QComboBox;
@ -13,7 +14,7 @@ class QComboBox;
* a combobox for choosing the group and a line-edit
* for entering the name of the file type
*/
class NewTypeDialog : public KDialogBase
class NewTypeDialog : public KDialog
{
public:
NewTypeDialog(QStringList groups, QWidget *parent = 0,

6
konqueror/settings/kio/kenvvarproxydlg.cpp
View file

@ -279,7 +279,7 @@ bool KEnvVarProxyDlg::validate()
return m_bHasValidData;
}
void KEnvVarProxyDlg::slotOk()
void KEnvVarProxyDlg::accept()
{
if ( !validate() )
{
@ -298,11 +298,11 @@ void KEnvVarProxyDlg::slotOk()
"actual value http://localhost:3128.</qt>");
KMessageBox::detailedError( this, msg, details,
i18n("Invalid Proxy Setup") );
i18n("Invalid Proxy Setup") );
return;
}
KDialogBase::slotOk ();
KDialog::accept();
}
#include "kenvvarproxydlg.moc"

2
konqueror/settings/kio/kenvvarproxydlg.h
View file

@ -39,7 +39,7 @@ public:
virtual void setProxyData( const KProxyData &data );
protected Q_SLOTS:
virtual void slotOk();
virtual void accept();
void showValue();
void verifyPressed();

4
konqueror/settings/kio/kmanualproxydlg.cpp
View file

@ -323,12 +323,8 @@ void KManualProxyDlg::copyDown()
void KManualProxyDlg::slotOk()
{
//qDebug("m_bHasValidData: %s" , m_bHasValidData ? "true" : "false");
if ( m_bHasValidData || validate() )
{
KDialogBase::slotOk();
m_bHasValidData = true;
}
}
bool KManualProxyDlg::handleDuplicate( const QString& site )

8
konqueror/settings/kio/kproxydlgbase.cpp
View file

@ -58,8 +58,14 @@ void KProxyData::init()
KProxyDialogBase::KProxyDialogBase( QWidget* parent, const char* name,
bool modal, const QString &caption )
:KDialogBase( parent, name, modal, caption, Ok|Cancel, Ok, true )
: KDialog( parent )
{
setObjectName( name );
setModal( modal );
setCaption( caption );
setButtons( Ok|Cancel );
enableButtonSeparator( true );
m_bHasValidData = false;
}

4
konqueror/settings/kio/kproxydlgbase.h
View file

@ -26,7 +26,7 @@
#include <QString>
#include <QStringList>
#include <kdialogbase.h>
#include <kdialog.h>
#include <kprotocolmanager.h>
class KProxyData
@ -49,7 +49,7 @@ private:
};
class KProxyDialogBase : public KDialogBase
class KProxyDialogBase : public KDialog
{
public:
KProxyDialogBase( QWidget* parent = 0, const char* name = 0,

8
konqueror/settings/kio/policydlg.cpp
View file

@ -58,8 +58,14 @@ public:
PolicyDlg::PolicyDlg (const QString& caption, QWidget *parent,
const char *name)
: KDialogBase(parent, name, true, caption, Ok|Cancel, Ok, true)
: KDialog( parent )
{
setObjectName( name );
setModal( true );
setCaption( caption );
setButtons( Ok|Cancel );
enableButtonSeparator( true );
m_dlgUI = new PolicyDlgUI (this);
setMainWidget(m_dlgUI);

4
konqueror/settings/kio/policydlg.h
View file

@ -21,7 +21,7 @@
#include <QString>
#include <kdialogbase.h>
#include <kdialog.h>
class QPushButton;
@ -63,7 +63,7 @@ public:
}
};
class PolicyDlg : public KDialogBase
class PolicyDlg : public KDialog
{
Q_OBJECT

27
konqueror/settings/konqhtml/advancedTabDialog.cpp
View file

@ -34,23 +34,22 @@
#include "main.h"
advancedTabDialog::advancedTabDialog(QWidget* parent, KConfig* config, const char* name)
: KDialogBase(KDialogBase::Plain,
i18n("Advanced Options"),
KDialogBase::Ok |
KDialogBase::Apply |
KDialogBase::Cancel,
KDialogBase::Ok,
parent,
name,
true, true),
: KDialog( parent ),
m_pConfig(config)
{
setCaption( i18n("Advanced Options") );
setObjectName( name );
setModal( true );
enableButtonSeparator( true );
connect(this, SIGNAL(applyClicked()),
this, SLOT(save()));
connect(this, SIGNAL(okClicked()),
this, SLOT(save()));
actionButton(Apply)->setEnabled(false);
QFrame* page = plainPage();
enableButton(Apply, false);
QFrame* page = new QFrame( this );
setMainWidget( page );
QVBoxLayout* layout = new QVBoxLayout(page);
m_advancedWidget = new advancedTabOptions(page);
layout->addWidget(m_advancedWidget);
@ -85,7 +84,7 @@ void advancedTabDialog::load()
m_pConfig->setGroup("Notification Messages");
m_advancedWidget->m_pTabConfirm->setChecked( !m_pConfig->hasKey("MultipleTabConfirm") );
actionButton(Apply)->setEnabled(false);
enableButton(Apply, false);
}
void advancedTabDialog::save()
@ -108,12 +107,12 @@ void advancedTabDialog::save()
#if 0
KApplication::kApplication()->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
#endif
actionButton(Apply)->setEnabled(false);
enableButton(Apply, false);
}
void advancedTabDialog::changed()
{
actionButton(Apply)->setEnabled(true);
enableButton(Apply, true);
}
#include "advancedTabDialog.moc"

4
konqueror/settings/konqhtml/advancedTabDialog.h
View file

@ -20,11 +20,11 @@
#ifndef __ADVANCEDTABDIALOG_H
#define __ADVANCEDTABDIALOG_H
#include <kdialogbase.h>
#include <kdialog.h>
class advancedTabOptions;
class advancedTabDialog : public KDialogBase
class advancedTabDialog : public KDialog
{
Q_OBJECT

9
konqueror/settings/konqhtml/pluginopts.cpp
View file

@ -100,9 +100,12 @@ KPluginOptions::KPluginOptions( KConfig* config, QString group, KInstance *inst,
globalGB->setLayout(vbox);
domainSpecificDlg = new KDialogBase(KDialogBase::Swallow,
i18n("Domain-Specific Policies"),KDialogBase::Close,
KDialogBase::Close,this,"domainSpecificDlg", true);
domainSpecificDlg = new KDialog( this );
domainSpecificDlg->setCaption( i18n("Domain-Specific Policies") );
domainSpecificDlg->setButtons( KDialog::Close );
domainSpecificDlg->setDefaultButton( KDialog::Close );
domainSpecificDlg->setObjectName( "domainSpecificDlg" );
domainSpecificDlg->setModal( true );
domainSpecific = new PluginDomainListView(config,group,this,domainSpecificDlg);
domainSpecific->setMinimumSize(320,200);

4
konqueror/settings/konqhtml/pluginopts.h
View file

@ -26,7 +26,7 @@ class QBoxLayout;
class QLabel;
class QProgressDialog;
class QSlider;
class KDialogBase;
class KDialog;
class KPluginOptions;
class KProcIO;
namespace Ui {
@ -136,7 +136,7 @@ private:
QLabel *priorityLabel;
PluginPolicies global_policies;
PluginDomainListView *domainSpecific;
KDialogBase *domainSpecificDlg;
KDialog *domainSpecificDlg;
/******************************************************************************/
protected:

10
konqueror/settings/konqhtml/policydlg.cpp
View file

@ -16,10 +16,16 @@
#include "policies.h"
PolicyDialog::PolicyDialog( Policies *policies, QWidget *parent, const char *name )
: KDialogBase(parent, name, true, QString(), Ok|Cancel, Ok, true),
: KDialog(parent),
policies(policies)
{
QFrame *main = makeMainWidget();
setObjectName( name );
setModal( true );
setButtons( Ok|Cancel );
enableButtonSeparator( true );
QFrame *main = new QFrame( this );
setMainWidget( main );
insertIdx = 1; // index where to insert additional panels
topl = new QVBoxLayout(main);

4
konqueror/settings/konqhtml/policydlg.h
View file

@ -5,7 +5,7 @@
#ifndef _POLICYDLG_H
#define _POLICYDLG_H
#include <kdialogbase.h>
#include <kdialog.h>
#include <QLineEdit>
#include <QStringList>
@ -29,7 +29,7 @@ class Policies;
*
* @author unknown
*/
class PolicyDialog : public KDialogBase
class PolicyDialog : public KDialog
{
Q_OBJECT

24
konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
View file

@ -358,7 +358,7 @@ void KonqSidebarBookmarkModule::slotProperties(KonqSidebarBookmarkItem *bi)
QString folder = bookmark.isGroup() ? QString() : bookmark.url().pathOrUrl();
BookmarkEditDialog dlg( bookmark.fullText(), folder, 0, 0,
i18n("Bookmark Properties") );
if ( dlg.exec() != KDialogBase::Accepted )
if ( dlg.exec() != KDialog::Accepted )
return;
makeTextNodeMod(bookmark, "title", dlg.finalTitle());
@ -523,12 +523,16 @@ KonqSidebarBookmarkItem * KonqSidebarBookmarkModule::findByAddress( const QStrin
// Borrowed&modified from KBookmarkMenu...
BookmarkEditDialog::BookmarkEditDialog(const QString& title, const QString& url,
QWidget * parent, const char * name, const QString& caption )
: KDialogBase(parent, name, true, caption,
(Ok|Cancel),
Ok, false, KGuiItem()),
: KDialog( parent ),
m_title(0), m_location(0)
{
setButtonOK( i18n( "&Update" ) );
setObjectName( name );
setModal( true );
setCaption( caption );
setButtons( Ok|Cancel );
enableButtonSeparator( false );
setButtonText( Ok, i18n( "&Update" ) );
QWidget *main = new QWidget( this );
setMainWidget( main );
@ -556,16 +560,6 @@ BookmarkEditDialog::BookmarkEditDialog(const QString& title, const QString& url,
main->setMinimumSize( 300, 0 );
}
void BookmarkEditDialog::slotOk()
{
accept();
}
void BookmarkEditDialog::slotCancel()
{
reject();
}
QString BookmarkEditDialog::finalUrl() const
{
if (m_location!=0)

14
konqueror/sidebar/trees/bookmark_module/bookmark_module.h
View file

@ -19,17 +19,17 @@
#ifndef bookmark_module_h
#define bookmark_module_h
#include <QDropEvent>
#include <QMap>
#include <QObject>
//Added by qt3to4:
#include <QDropEvent>
#include <konq_sidebartreemodule.h>
#include <kbookmark.h>
#include <kdialogbase.h>
class KonqSidebarBookmarkItem;
#include <kdialog.h>
class KActionCollection;
class KLineEdit;
class KonqSidebarBookmarkItem;
/**
* This module displays bookmarks in the tree
@ -77,7 +77,7 @@ private:
QMap<QString, bool> m_folderOpenState;
};
class BookmarkEditDialog : public KDialogBase
class BookmarkEditDialog : public KDialog
{
Q_OBJECT
@ -89,10 +89,6 @@ public:
QString finalUrl() const;
QString finalTitle() const;
protected Q_SLOTS:
void slotOk();
void slotCancel();
private:
KLineEdit *m_title, *m_location;
};

1
konqueror/sidebar/trees/history_module/history_module.cpp
View file

@ -44,7 +44,6 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree
: QObject( 0L ), KonqSidebarTreeModule( parentTree ),
m_dict( 349 ),
m_topLevelItem( 0L ),
m_dlg( 0L ),
m_initialized( false )
{
setObjectName( name );

2
konqueror/sidebar/trees/history_module/history_module.h
View file

@ -31,7 +31,6 @@
#include "history_item.h"
class KActionCollection;
class KDialogBase;
class KonqSidebarHistorySettings;
class KonqSidebarTree;
class KonqSidebarTreeItem;
@ -96,7 +95,6 @@ private:
KActionCollection *m_collection;
KDialogBase *m_dlg;
QPixmap m_folderClosed;
QPixmap m_folderOpen;
bool m_initialized;

12
konqueror/sidebar/web_module/web_module.cpp
View file

@ -84,9 +84,13 @@ QWidget *KonqSideBarWebModule::getWidget() {
}
void KonqSideBarWebModule::setAutoReload(){
KDialogBase dlg(0, "", true, i18n("Set Refresh Timeout (0 disables)"),
KDialogBase::Ok|KDialogBase::Cancel);
KHBox *hbox = dlg.makeHBoxMainWidget();
KDialog dlg( 0 );
dlg.setModal( true );
dlg.setCaption( i18n("Set Refresh Timeout (0 disables)" ) );
dlg.setButtons( KDialog::Ok | KDialog::Cancel );
KHBox *hbox = new KHBox( &dlg );
dlg.setMainWidget( hbox );
QSpinBox *mins = new QSpinBox( hbox );
mins->setRange(0, 120);
@ -100,7 +104,7 @@ void KonqSideBarWebModule::setAutoReload(){
mins->setValue( ( seconds - secs->value() ) / 60 );
}
if( dlg.exec() == QDialog::Accepted ) {
if( dlg.exec() == KDialog::Accepted ) {
int msec = ( mins->value() * 60 + secs->value() ) * 1000;
reloadTimeout = msec;
KSimpleConfig ksc(_desktopName);

7
kwrite/kwritemain.cpp
View file

@ -791,13 +791,17 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
KWriteEditorChooser::KWriteEditorChooser(QWidget *):
KDialog(0, i18n("Choose Editor Component"), KDialog::Ok|KDialog::Cancel)
KDialog( 0 )
{
setCaption( i18n("Choose Editor Component") );
setButtons( Ok | Cancel );
setDefaultButton(KDialog::Cancel);
m_chooser = new KTextEditor::EditorChooser(this);
resizeLayout(m_chooser, 0, spacingHint());
setMainWidget(m_chooser);
m_chooser->readAppSetting();
connect( this, SIGNAL( okClicked() ), SLOT( slotOk() ) );
}
KWriteEditorChooser::~KWriteEditorChooser()
@ -807,7 +811,6 @@ KWriteEditorChooser::~KWriteEditorChooser()
void KWriteEditorChooser::slotOk()
{
m_chooser->writeAppSetting();
slotButtonClicked(KDialog::Ok);
}
// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;

24
lib/konq/knewmenu.cc
View file

@ -522,28 +522,28 @@ void KNewMenu::slotResult( KJob * job )
//////////
KUrlDesktopFileDlg::KUrlDesktopFileDlg( const QString& textFileName, const QString& textUrl )
: KDialogBase( Plain, QString(), Ok|Cancel|User1, Ok, 0L /*parent*/, 0L, true,
true, KStdGuiItem::clear() )
KUrlDesktopFileDlg::KUrlDesktopFileDlg( const QString& textFileName, const QString& textUrl, QWidget *parent = 0 )
: KDialog( parent )
{
initDialog( textFileName, QString(), textUrl, QString() );
}
setModal( true );
setButtons( Ok | Cancel | User1 );
setButtonGuiItem( User1, KStdGuiItem::clear() );
enableButtonSeparator( true );
KUrlDesktopFileDlg::KUrlDesktopFileDlg( const QString& textFileName, const QString& textUrl, QWidget *parent )
: KDialogBase( Plain, QString(), Ok|Cancel|User1, Ok, parent, 0L, true,
true, KStdGuiItem::clear() )
{
initDialog( textFileName, QString(), textUrl, QString() );
}
void KUrlDesktopFileDlg::initDialog( const QString& textFileName, const QString& defaultName, const QString& textUrl, const QString& defaultUrl )
{
QVBoxLayout * topLayout = new QVBoxLayout( plainPage() );
QFrame *plainPage = new QFrame( this );
setMainWidget( plainPage );
QVBoxLayout * topLayout = new QVBoxLayout( plainPage );
topLayout->setMargin( 0 );
topLayout->setSpacing( spacingHint() );
// First line: filename
KHBox * fileNameBox = new KHBox( plainPage() );
KHBox * fileNameBox = new KHBox( plainPage );
topLayout->addWidget( fileNameBox );
QLabel * label = new QLabel( textFileName, fileNameBox );
@ -556,7 +556,7 @@ void KUrlDesktopFileDlg::initDialog( const QString& textFileName, const QString&
SLOT(slotNameTextChanged(const QString&)) );
// Second line: url
KHBox * urlBox = new KHBox( plainPage() );
KHBox * urlBox = new KHBox( plainPage );
topLayout->addWidget( urlBox );
label = new QLabel( textUrl, urlBox );
m_urlRequester = new KUrlRequester( defaultUrl, urlBox);

7
lib/konq/knewmenu.h
View file

@ -26,7 +26,7 @@
#include <QList>
#include <kactionmenu.h>
#include <kactionmenu.h>
#include <kdialogbase.h>
#include <kdialog.h>
#include <kurl.h>
#include <libkonq_export.h>
@ -189,12 +189,11 @@ private:
* Basically a merge of KLineEditDlg and KUrlRequesterDlg ;)
* @author David Faure <faure@kde.org>
*/
class KUrlDesktopFileDlg : public KDialogBase
class KUrlDesktopFileDlg : public KDialog
{
Q_OBJECT
public:
KUrlDesktopFileDlg( const QString& textFileName, const QString& textUrl );
KUrlDesktopFileDlg( const QString& textFileName, const QString& textUrl, QWidget *parent );
KUrlDesktopFileDlg( const QString& textFileName, const QString& textUrl, QWidget *parent = 0 );
virtual ~KUrlDesktopFileDlg() {}
/**

5
lib/konq/konq_bgnddlg.cc
View file

@ -43,9 +43,10 @@ KonqBgndDialog::KonqBgndDialog( QWidget* parent,
const QString& pixmapFile,
const QColor& theColor,
const QColor& defaultColor )
: KDialog( parent, i18n("Background Settings"), Ok|Cancel, Qt::Dialog )
: KDialog( parent, Qt::Dialog )
{
setModal(false);
setCaption( i18n("Background Settings") );
setButtons( Ok | Cancel );
QWidget* page = new QWidget( this );
setMainWidget( page );