Port to QDialog

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index f44d3236fc7fccc0b577090b6f42ce04e951ea22..49c234606d86e82fb72bc9a70def53239006ec72 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -64,7 +64,6 @@
 #include <KFileItemListProperties>
 #include <KRun>
 #include <KShell>
 #include <KFileItemListProperties>
 #include <KRun>
 #include <KShell>

-#include <kstatusbar.h>

 #include <KStandardAction>
 #include <KToggleAction>
 #include <KUrlNavigator>
 #include <KStandardAction>
 #include <KToggleAction>
 #include <KUrlNavigator>

diff --git a/src/panels/information/filemetadataconfigurationdialog.cpp b/src/panels/information/filemetadataconfigurationdialog.cpp
index 08723bc0c3365e7ca481d6e04df993cb9fe80e7f..2f8c160378c796b9a1800b78ed561cd32748101d 100644 (file)
--- a/src/panels/information/filemetadataconfigurationdialog.cpp
+++ b/src/panels/information/filemetadataconfigurationdialog.cpp
@@ -28,16 +28,27 @@
 #include <KLocalizedString>
 #include <QLabel>
 #include <QVBoxLayout>
 #include <KLocalizedString>
 #include <QLabel>
 #include <QVBoxLayout>

+#include <KConfigGroup>
+#include <KWindowConfig>
+#include <QDialogButtonBox>
+#include <QPushButton>

 
 FileMetaDataConfigurationDialog::FileMetaDataConfigurationDialog(QWidget* parent) :
 
 FileMetaDataConfigurationDialog::FileMetaDataConfigurationDialog(QWidget* parent) :

-    KDialog(parent),
+    QDialog(parent),

     m_descriptionLabel(0),
     m_configWidget(0)
 
 {
     m_descriptionLabel(0),
     m_configWidget(0)
 
 {

-    setCaption(i18nc("@title:window", "Configure Shown Data"));
-    setButtons(KDialog::Ok | KDialog::Cancel);
-    setDefaultButton(KDialog::Ok);
+    setWindowTitle(i18nc("@title:window", "Configure Shown Data"));
+    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    setLayout(mainLayout);
+    QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
+    okButton->setDefault(true);
+    okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
+    connect(buttonBox, SIGNAL(accepted()), this, SLOT(slotAccepted()));
+    connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+    buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);

 
     m_descriptionLabel = new QLabel(i18nc("@label::textbox",
                                           "Select which data should "
 
     m_descriptionLabel = new QLabel(i18nc("@label::textbox",
                                           "Select which data should "


@@ -55,18 +66,20 @@ FileMetaDataConfigurationDialog::FileMetaDataConfigurationDialog(QWidget* parent
     QVBoxLayout* topLayout = new QVBoxLayout(mainWidget);
     topLayout->addWidget(m_descriptionLabel);
     topLayout->addWidget(m_configWidget);
     QVBoxLayout* topLayout = new QVBoxLayout(mainWidget);
     topLayout->addWidget(m_descriptionLabel);
     topLayout->addWidget(m_configWidget);

-    setMainWidget(mainWidget);
+    mainLayout->addWidget(mainWidget);
+    mainLayout->addWidget(buttonBox);
+    

 
     const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
                                     "FileMetaDataConfigurationDialog");
 
     const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
                                     "FileMetaDataConfigurationDialog");

-    restoreDialogSize(dialogConfig);
+    KWindowConfig::restoreWindowSize(windowHandle(), dialogConfig);

 }
 
 FileMetaDataConfigurationDialog::~FileMetaDataConfigurationDialog()
 {
     KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
                               "FileMetaDataConfigurationDialog");
 }
 
 FileMetaDataConfigurationDialog::~FileMetaDataConfigurationDialog()
 {
     KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
                               "FileMetaDataConfigurationDialog");

-    saveDialogSize(dialogConfig, KConfigBase::Persistent);
+    KWindowConfig::saveWindowSize(windowHandle(), dialogConfig);

 }
 
 void FileMetaDataConfigurationDialog::setItems(const KFileItemList& items)
 }
 
 void FileMetaDataConfigurationDialog::setItems(const KFileItemList& items)


@@ -79,14 +92,10 @@ KFileItemList FileMetaDataConfigurationDialog::items() const
     return m_configWidget->items();
 }
 
     return m_configWidget->items();
 }
 

-void FileMetaDataConfigurationDialog::slotButtonClicked(int button)
+void FileMetaDataConfigurationDialog::slotAccepted()

 {
 {

-    if (button == KDialog::Ok) {
-        m_configWidget->save();
-        accept();
-    } else {
-        KDialog::slotButtonClicked(button);
-    }
+    m_configWidget->save();
+    accept();

 }
 
 void FileMetaDataConfigurationDialog::setDescription(const QString& description)
 }
 
 void FileMetaDataConfigurationDialog::setDescription(const QString& description)

diff --git a/src/panels/information/filemetadataconfigurationdialog.h b/src/panels/information/filemetadataconfigurationdialog.h
index a3ce9548bbf6b69274af6f7bd9fbefadc6d41994..13562ef5ceb78a95c56b93fcdc00cc3eeb5fe165 100644 (file)
--- a/src/panels/information/filemetadataconfigurationdialog.h
+++ b/src/panels/information/filemetadataconfigurationdialog.h
@@ -20,7 +20,7 @@
 #ifndef FILEMETADATACONFIGURATIONDIALOG_H
 #define FILEMETADATACONFIGURATIONDIALOG_H
 
 #ifndef FILEMETADATACONFIGURATIONDIALOG_H
 #define FILEMETADATACONFIGURATIONDIALOG_H
 

-#include <KDialog>
+#include <QDialog>

 #include <KFileItem>
 #include "config-baloo.h"
 
 #include <KFileItem>
 #include "config-baloo.h"
 


@@ -38,7 +38,7 @@ class QLabel;
  * @brief Dialog which allows to configure which meta data should be shown
  *        in the KFileMetaDataWidget.
  */
  * @brief Dialog which allows to configure which meta data should be shown
  *        in the KFileMetaDataWidget.
  */

-class FileMetaDataConfigurationDialog : public KDialog
+class FileMetaDataConfigurationDialog : public QDialog

 {
     Q_OBJECT
 
 {
     Q_OBJECT
 


@@ -67,8 +67,7 @@ public:
     QString description() const;
 
 protected slots:
     QString description() const;
 
 protected slots:

-    virtual void slotButtonClicked(int button);
-
+    void slotAccepted();

 private:
     QLabel* m_descriptionLabel;
 #ifndef HAVE_BALOO
 private:
     QLabel* m_descriptionLabel;
 #ifndef HAVE_BALOO