From ce27e1a48d35ad3c290df7968f566c5282152e37 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Fri, 14 Jan 2011 19:55:55 +0000 Subject: Move the FileMetaDataConfigurationDialog from "settings" to "panels/information", as it is not used anymore for the tooltips and only in the information panel. svn path=/trunk/KDE/kdebase/apps/; revision=1214480 --- src/CMakeLists.txt | 2 +- .../filemetadataconfigurationdialog.cpp | 93 ++++++++++++++++++++++ .../information/filemetadataconfigurationdialog.h | 69 ++++++++++++++++ src/panels/information/informationpanelcontent.cpp | 2 +- src/settings/filemetadataconfigurationdialog.cpp | 93 ---------------------- src/settings/filemetadataconfigurationdialog.h | 70 ---------------- src/settings/general/behaviorsettingspage.cpp | 1 - 7 files changed, 164 insertions(+), 166 deletions(-) create mode 100644 src/panels/information/filemetadataconfigurationdialog.cpp create mode 100644 src/panels/information/filemetadataconfigurationdialog.h delete mode 100644 src/settings/filemetadataconfigurationdialog.cpp delete mode 100644 src/settings/filemetadataconfigurationdialog.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a8bcce252..e7ac06c63 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -18,7 +18,6 @@ set(dolphinprivate_LIB_SRCS settings/additionalinfodialog.cpp settings/applyviewpropsjob.cpp settings/dolphinsettings.cpp - settings/filemetadataconfigurationdialog.cpp settings/viewpropertiesdialog.cpp settings/viewpropsprogressinfo.cpp views/additionalinfoaccessor.cpp @@ -103,6 +102,7 @@ set(dolphin_SRCS dolphincontextmenu.cpp filterbar/filterbar.cpp main.cpp + panels/information/filemetadataconfigurationdialog.cpp panels/information/informationpanel.cpp panels/information/informationpanelcontent.cpp panels/information/pixmapviewer.cpp diff --git a/src/panels/information/filemetadataconfigurationdialog.cpp b/src/panels/information/filemetadataconfigurationdialog.cpp new file mode 100644 index 000000000..04ff9a91b --- /dev/null +++ b/src/panels/information/filemetadataconfigurationdialog.cpp @@ -0,0 +1,93 @@ +/*************************************************************************** + * Copyright (C) 2010 by Peter Penz * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * + ***************************************************************************/ + +#include "filemetadataconfigurationdialog.h" + +#include +#include +#include +#include + +FileMetaDataConfigurationDialog::FileMetaDataConfigurationDialog(QWidget* parent) : + KDialog(parent), + m_descriptionLabel(0), + m_configWidget(0) + +{ + setCaption(i18nc("@title:window", "Configure Shown Data")); + setButtons(KDialog::Ok | KDialog::Cancel); + setDefaultButton(KDialog::Ok); + + + m_descriptionLabel = new QLabel(i18nc("@label::textbox", + "Select which data should " + "be shown:"), this); + m_descriptionLabel->setWordWrap(true); + + m_configWidget = new KFileMetaDataConfigurationWidget(this); + + QWidget* mainWidget = new QWidget(this); + QVBoxLayout* topLayout = new QVBoxLayout(mainWidget); + topLayout->addWidget(m_descriptionLabel); + topLayout->addWidget(m_configWidget); + setMainWidget(mainWidget); + + const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), + "FileMetaDataConfigurationDialog"); + restoreDialogSize(dialogConfig); +} + +FileMetaDataConfigurationDialog::~FileMetaDataConfigurationDialog() +{ + KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), + "FileMetaDataConfigurationDialog"); + saveDialogSize(dialogConfig, KConfigBase::Persistent); +} + +void FileMetaDataConfigurationDialog::setItems(const KFileItemList& items) +{ + m_configWidget->setItems(items); +} + +KFileItemList FileMetaDataConfigurationDialog::items() const +{ + return m_configWidget->items(); +} + +void FileMetaDataConfigurationDialog::slotButtonClicked(int button) +{ + if (button == KDialog::Ok) { + m_configWidget->save(); + accept(); + } else { + KDialog::slotButtonClicked(button); + } +} + +void FileMetaDataConfigurationDialog::setDescription(const QString& description) +{ + m_descriptionLabel->setText(description); +} + +QString FileMetaDataConfigurationDialog::description() const +{ + return m_descriptionLabel->text(); +} + +#include "filemetadataconfigurationdialog.moc" diff --git a/src/panels/information/filemetadataconfigurationdialog.h b/src/panels/information/filemetadataconfigurationdialog.h new file mode 100644 index 000000000..dd9265c25 --- /dev/null +++ b/src/panels/information/filemetadataconfigurationdialog.h @@ -0,0 +1,69 @@ +/*************************************************************************** + * Copyright (C) 2010 by Peter Penz * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * + ***************************************************************************/ + +#ifndef FILEMETADATACONFIGURATIONDIALOG_H +#define FILEMETADATACONFIGURATIONDIALOG_H + +#include +#include + +class QLabel; +class KFileMetaDataConfigurationWidget; + +/** + * @brief Dialog which allows to configure which meta data should be shown + * in the KFileMetaDataWidget. + */ +class FileMetaDataConfigurationDialog : public KDialog +{ + Q_OBJECT + +public: + explicit FileMetaDataConfigurationDialog(QWidget* parent = 0); + virtual ~FileMetaDataConfigurationDialog(); + + /** + * Sets the items, for which the visibility of the meta data should + * be configured. Note that the visibility of the meta data is not + * bound to the items itself, the items are only used to determine + * which meta data should be configurable. For example when a JPEG image + * is set as item, it will be configurable which EXIF data should be + * shown. If an audio file is set as item, it will be configurable + * whether the artist, album name, ... should be shown. + */ + void setItems(const KFileItemList& items); + KFileItemList items() const; + + /** + * Sets the description that is shown above the list + * of meta data. Per default the translated text for + * "Select which data should be shown." is set. + */ + void setDescription(const QString& description); + QString description() const; + +protected slots: + virtual void slotButtonClicked(int button); + +private: + QLabel* m_descriptionLabel; + KFileMetaDataConfigurationWidget* m_configWidget; +}; + +#endif diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp index f8a72fb70..591c47ff7 100644 --- a/src/panels/information/informationpanelcontent.cpp +++ b/src/panels/information/informationpanelcontent.cpp @@ -49,8 +49,8 @@ #include #include "dolphin_informationpanelsettings.h" +#include "filemetadataconfigurationdialog.h" #include "settings/dolphinsettings.h" -#include "settings/filemetadataconfigurationdialog.h" #include "phononwidget.h" #include "pixmapviewer.h" diff --git a/src/settings/filemetadataconfigurationdialog.cpp b/src/settings/filemetadataconfigurationdialog.cpp deleted file mode 100644 index 04ff9a91b..000000000 --- a/src/settings/filemetadataconfigurationdialog.cpp +++ /dev/null @@ -1,93 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2010 by Peter Penz * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - ***************************************************************************/ - -#include "filemetadataconfigurationdialog.h" - -#include -#include -#include -#include - -FileMetaDataConfigurationDialog::FileMetaDataConfigurationDialog(QWidget* parent) : - KDialog(parent), - m_descriptionLabel(0), - m_configWidget(0) - -{ - setCaption(i18nc("@title:window", "Configure Shown Data")); - setButtons(KDialog::Ok | KDialog::Cancel); - setDefaultButton(KDialog::Ok); - - - m_descriptionLabel = new QLabel(i18nc("@label::textbox", - "Select which data should " - "be shown:"), this); - m_descriptionLabel->setWordWrap(true); - - m_configWidget = new KFileMetaDataConfigurationWidget(this); - - QWidget* mainWidget = new QWidget(this); - QVBoxLayout* topLayout = new QVBoxLayout(mainWidget); - topLayout->addWidget(m_descriptionLabel); - topLayout->addWidget(m_configWidget); - setMainWidget(mainWidget); - - const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), - "FileMetaDataConfigurationDialog"); - restoreDialogSize(dialogConfig); -} - -FileMetaDataConfigurationDialog::~FileMetaDataConfigurationDialog() -{ - KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), - "FileMetaDataConfigurationDialog"); - saveDialogSize(dialogConfig, KConfigBase::Persistent); -} - -void FileMetaDataConfigurationDialog::setItems(const KFileItemList& items) -{ - m_configWidget->setItems(items); -} - -KFileItemList FileMetaDataConfigurationDialog::items() const -{ - return m_configWidget->items(); -} - -void FileMetaDataConfigurationDialog::slotButtonClicked(int button) -{ - if (button == KDialog::Ok) { - m_configWidget->save(); - accept(); - } else { - KDialog::slotButtonClicked(button); - } -} - -void FileMetaDataConfigurationDialog::setDescription(const QString& description) -{ - m_descriptionLabel->setText(description); -} - -QString FileMetaDataConfigurationDialog::description() const -{ - return m_descriptionLabel->text(); -} - -#include "filemetadataconfigurationdialog.moc" diff --git a/src/settings/filemetadataconfigurationdialog.h b/src/settings/filemetadataconfigurationdialog.h deleted file mode 100644 index 6cbfc6cc2..000000000 --- a/src/settings/filemetadataconfigurationdialog.h +++ /dev/null @@ -1,70 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2010 by Peter Penz * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - ***************************************************************************/ - -#ifndef FILEMETADATACONFIGURATIONDIALOG_H -#define FILEMETADATACONFIGURATIONDIALOG_H - -#include -#include -#include - -class QLabel; -class KFileMetaDataConfigurationWidget; - -/** - * @brief Dialog which allows to configure which meta data should be shown - * in the KFileMetaDataWidget. - */ -class LIBDOLPHINPRIVATE_EXPORT FileMetaDataConfigurationDialog : public KDialog -{ - Q_OBJECT - -public: - explicit FileMetaDataConfigurationDialog(QWidget* parent = 0); - virtual ~FileMetaDataConfigurationDialog(); - - /** - * Sets the items, for which the visibility of the meta data should - * be configured. Note that the visibility of the meta data is not - * bound to the items itself, the items are only used to determine - * which meta data should be configurable. For example when a JPEG image - * is set as item, it will be configurable which EXIF data should be - * shown. If an audio file is set as item, it will be configurable - * whether the artist, album name, ... should be shown. - */ - void setItems(const KFileItemList& items); - KFileItemList items() const; - - /** - * Sets the description that is shown above the list - * of meta data. Per default the translated text for - * "Select which data should be shown." is set. - */ - void setDescription(const QString& description); - QString description() const; - -protected slots: - virtual void slotButtonClicked(int button); - -private: - QLabel* m_descriptionLabel; - KFileMetaDataConfigurationWidget* m_configWidget; -}; - -#endif diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp index 542fa1093..6d9fa9c0e 100644 --- a/src/settings/general/behaviorsettingspage.cpp +++ b/src/settings/general/behaviorsettingspage.cpp @@ -21,7 +21,6 @@ #include "behaviorsettingspage.h" #include "dolphin_generalsettings.h" -#include #include #include -- cgit v1.3