mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-12 12:54:29 +00:00
Port to QDialog
This commit is contained in:
parent
a76cb4c67f
commit
422dc4e921
|
@ -64,7 +64,6 @@
|
||||||
#include <KFileItemListProperties>
|
#include <KFileItemListProperties>
|
||||||
#include <KRun>
|
#include <KRun>
|
||||||
#include <KShell>
|
#include <KShell>
|
||||||
#include <kstatusbar.h>
|
|
||||||
#include <KStandardAction>
|
#include <KStandardAction>
|
||||||
#include <KToggleAction>
|
#include <KToggleAction>
|
||||||
#include <KUrlNavigator>
|
#include <KUrlNavigator>
|
||||||
|
|
|
@ -28,16 +28,27 @@
|
||||||
#include <KLocalizedString>
|
#include <KLocalizedString>
|
||||||
#include <QLabel>
|
#include <QLabel>
|
||||||
#include <QVBoxLayout>
|
#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_descriptionLabel(0),
|
||||||
m_configWidget(0)
|
m_configWidget(0)
|
||||||
|
|
||||||
{
|
{
|
||||||
setCaption(i18nc("@title:window", "Configure Shown Data"));
|
setWindowTitle(i18nc("@title:window", "Configure Shown Data"));
|
||||||
setButtons(KDialog::Ok | KDialog::Cancel);
|
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
|
||||||
setDefaultButton(KDialog::Ok);
|
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",
|
m_descriptionLabel = new QLabel(i18nc("@label::textbox",
|
||||||
"Select which data should "
|
"Select which data should "
|
||||||
|
@ -55,18 +66,20 @@ FileMetaDataConfigurationDialog::FileMetaDataConfigurationDialog(QWidget* parent
|
||||||
QVBoxLayout* topLayout = new QVBoxLayout(mainWidget);
|
QVBoxLayout* topLayout = new QVBoxLayout(mainWidget);
|
||||||
topLayout->addWidget(m_descriptionLabel);
|
topLayout->addWidget(m_descriptionLabel);
|
||||||
topLayout->addWidget(m_configWidget);
|
topLayout->addWidget(m_configWidget);
|
||||||
setMainWidget(mainWidget);
|
mainLayout->addWidget(mainWidget);
|
||||||
|
mainLayout->addWidget(buttonBox);
|
||||||
|
|
||||||
|
|
||||||
const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
|
const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
|
||||||
"FileMetaDataConfigurationDialog");
|
"FileMetaDataConfigurationDialog");
|
||||||
restoreDialogSize(dialogConfig);
|
KWindowConfig::restoreWindowSize(windowHandle(), dialogConfig);
|
||||||
}
|
}
|
||||||
|
|
||||||
FileMetaDataConfigurationDialog::~FileMetaDataConfigurationDialog()
|
FileMetaDataConfigurationDialog::~FileMetaDataConfigurationDialog()
|
||||||
{
|
{
|
||||||
KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
|
KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
|
||||||
"FileMetaDataConfigurationDialog");
|
"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();
|
||||||
m_configWidget->save();
|
accept();
|
||||||
accept();
|
|
||||||
} else {
|
|
||||||
KDialog::slotButtonClicked(button);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void FileMetaDataConfigurationDialog::setDescription(const QString& description)
|
void FileMetaDataConfigurationDialog::setDescription(const QString& description)
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
#ifndef FILEMETADATACONFIGURATIONDIALOG_H
|
#ifndef FILEMETADATACONFIGURATIONDIALOG_H
|
||||||
#define FILEMETADATACONFIGURATIONDIALOG_H
|
#define FILEMETADATACONFIGURATIONDIALOG_H
|
||||||
|
|
||||||
#include <KDialog>
|
#include <QDialog>
|
||||||
#include <KFileItem>
|
#include <KFileItem>
|
||||||
#include "config-baloo.h"
|
#include "config-baloo.h"
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ class QLabel;
|
||||||
* @brief Dialog which allows to configure which meta data should be shown
|
* @brief Dialog which allows to configure which meta data should be shown
|
||||||
* in the KFileMetaDataWidget.
|
* in the KFileMetaDataWidget.
|
||||||
*/
|
*/
|
||||||
class FileMetaDataConfigurationDialog : public KDialog
|
class FileMetaDataConfigurationDialog : public QDialog
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
|
@ -67,8 +67,7 @@ public:
|
||||||
QString description() const;
|
QString description() const;
|
||||||
|
|
||||||
protected slots:
|
protected slots:
|
||||||
virtual void slotButtonClicked(int button);
|
void slotAccepted();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QLabel* m_descriptionLabel;
|
QLabel* m_descriptionLabel;
|
||||||
#ifndef HAVE_BALOO
|
#ifndef HAVE_BALOO
|
||||||
|
|
Loading…
Reference in a new issue