diff --git a/src/config/advancedpagewidget.cpp b/src/config/advancedpagewidget.cpp index 57ccbf8..14d43bd 100644 --- a/src/config/advancedpagewidget.cpp +++ b/src/config/advancedpagewidget.cpp @@ -1,62 +1,95 @@ /************************************************************************* * Copyright (C) 2010 by Volker Lanz * * Copyright (C) 2016 by Andrius Štikonas * + * Copyright (C) 2018 by Caio Carvalho * * * * 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 3 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, see .* *************************************************************************/ #include "config/advancedpagewidget.h" #include #include #include +#include #include #include +#include AdvancedPageWidget::AdvancedPageWidget(QWidget* parent) : QWidget(parent) { setupUi(this); setupDialog(); + + raidConfigFilePath->clear(); + raidConfigFilePath->insert(SoftwareRAID::raidConfigurationFilePath()); + + connect(selectRaidFileButton, &QPushButton::clicked, this, &AdvancedPageWidget::searchForRaidConfigFile); } QString AdvancedPageWidget::backend() const { const auto backends = CoreBackendManager::self()->list(); for (const auto &backend : backends) if (backend.name() == comboBackend().currentText()) return backend.pluginId(); return QString(); } void AdvancedPageWidget::setBackend(const QString& name) { const auto backends = CoreBackendManager::self()->list(); for (const auto &backend : backends) if (backend.pluginId() == name) comboBackend().setCurrentIndex(comboBackend().findText(backend.name())); } void AdvancedPageWidget::setupDialog() { const auto backends = CoreBackendManager::self()->list(); for (const auto &backend : backends) comboBackend().addItem(backend.name()); setBackend(Config::backend()); } + +QString AdvancedPageWidget::raidConfigurationFile() const +{ + return raidConfigFilePath->text(); +} + +void AdvancedPageWidget::searchForRaidConfigFile() +{ + QPointer dialog = new QFileDialog(this, QStringLiteral("Select Software RAID configuration file"), + QStringLiteral("/")); + + dialog->setFileMode(QFileDialog::FileMode::ExistingFile); + dialog->setNameFilter(QStringLiteral("Configuration files (*.conf)")); + + auto updateConfig = [this](const QString& file){ + if (!file.isEmpty()) { + raidConfigFilePath->clear(); + raidConfigFilePath->insert(file); + } + }; + + connect(dialog, &QFileDialog::fileSelected, updateConfig); + + dialog->exec(); +} diff --git a/src/config/advancedpagewidget.h b/src/config/advancedpagewidget.h index 621efa0..9acbb78 100644 --- a/src/config/advancedpagewidget.h +++ b/src/config/advancedpagewidget.h @@ -1,53 +1,59 @@ /************************************************************************* * Copyright (C) 2010 by Volker Lanz * * Copyright (C) 2016 by Andrius Štikonas * + * Copyright (C) 2018 by Caio Carvalho * * * * 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 3 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, see .* *************************************************************************/ #if !defined(ADVANCEDPAGEWIDGET_H) #define ADVANCEDPAGEWIDGET_H #include "ui_configurepageadvanced.h" #include #include class QString; class QComboBox; class AdvancedPageWidget : public QWidget, public Ui::ConfigurePageAdvanced { public: AdvancedPageWidget(QWidget* parent); public: QComboBox& comboBackend() { return *m_ComboBackend; } const QComboBox& comboBackend() const { return *m_ComboBackend; } QString backend() const; void setBackend(const QString& name); + QString raidConfigurationFile() const; + +protected Q_SLOTS: + void searchForRaidConfigFile(); + private: void setupDialog(); }; #endif diff --git a/src/config/configureoptionsdialog.cpp b/src/config/configureoptionsdialog.cpp index ddc4f6b..2c339db 100644 --- a/src/config/configureoptionsdialog.cpp +++ b/src/config/configureoptionsdialog.cpp @@ -1,162 +1,166 @@ /************************************************************************* * Copyright (C) 2010 by Volker Lanz * * Copyright (C) 2016 by Andrius Štikonas * * * * 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 3 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, see .* *************************************************************************/ #include "config/configureoptionsdialog.h" #include "config/generalpagewidget.h" #include "config/filesystemcolorspagewidget.h" #include "config/advancedpagewidget.h" #include #include #include #include #include #include "util/guihelpers.h" #include "ui_configurepagefilesystemcolors.h" #include #include #include #include #include #include +#include ConfigureOptionsDialog::ConfigureOptionsDialog(QWidget* parent, const OperationStack& ostack, const QString& name) : KConfigDialog(parent, name, Config::self()), m_GeneralPageWidget(new GeneralPageWidget(this)), m_FileSystemColorsPageWidget(new FileSystemColorsPageWidget(this)), m_AdvancedPageWidget(new AdvancedPageWidget(this)), m_OperationStack(ostack) { setFaceType(List); KPageWidgetItem* item = nullptr; item = addPage(&generalPageWidget(), xi18nc("@title:tab general application settings", "General"), QString(), i18n("General Settings")); item->setIcon(QIcon::fromTheme(QStringLiteral("partitionmanager")).pixmap(IconSize(KIconLoader::Desktop))); connect(&generalPageWidget().comboDefaultFileSystem(), qOverload(&QComboBox::activated), this, &ConfigureOptionsDialog::onComboDefaultFileSystemActivated); connect(generalPageWidget().radioButton, &QRadioButton::toggled, this, &ConfigureOptionsDialog::onShredSourceActivated); item = addPage(&fileSystemColorsPageWidget(), xi18nc("@title:tab", "File System Colors"), QString(), i18n("File System Color Settings")); item->setIcon(QIcon::fromTheme(QStringLiteral("format-fill-color")).pixmap(IconSize(KIconLoader::Desktop))); item = addPage(&advancedPageWidget(), xi18nc("@title:tab advanced application settings", "Advanced"), QString(), i18n("Advanced Settings")); item->setIcon(QIcon::fromTheme(QStringLiteral("configure")).pixmap(IconSize(KIconLoader::Desktop))); connect(&advancedPageWidget().comboBackend(), qOverload(&QComboBox::activated), this, &ConfigureOptionsDialog::onComboDefaultFileSystemActivated); KConfigGroup kcg(KSharedConfig::openConfig(), "configureOptionsDialogs"); restoreGeometry(kcg.readEntry("Geometry", QByteArray())); } /** Destroys a ConfigureOptionsDialog instance */ ConfigureOptionsDialog::~ConfigureOptionsDialog() { KConfigGroup kcg(KSharedConfig::openConfig(), "configureOptionsDialog"); kcg.writeEntry("Geometry", saveGeometry()); } void ConfigureOptionsDialog::updateSettings() { KConfigDialog::updateSettings(); bool changed = false; if (generalPageWidget().defaultFileSystem() != static_cast(Config::defaultFileSystem())) { Config::setDefaultFileSystem(static_cast(generalPageWidget().defaultFileSystem())); changed = true; } if (generalPageWidget().radioButton->isChecked() != (Config::shredSource() == Config::EnumShredSource::random)) { qDebug() << "updateSettings: " << generalPageWidget().kcfg_shredSource->checkedId(); Config::setShredSource(generalPageWidget().kcfg_shredSource->checkedId()); changed = true; } if (advancedPageWidget().backend() != Config::backend()) { Config::setBackend(advancedPageWidget().backend()); changed = true; } + if (advancedPageWidget().raidConfigurationFile() != SoftwareRAID::raidConfigurationFilePath()) + SoftwareRAID::setRaidConfigurationFilePath(advancedPageWidget().raidConfigurationFile()); + if (changed) emit KConfigDialog::settingsChanged(i18n("General Settings")); } bool ConfigureOptionsDialog::hasChanged() { bool result = KConfigDialog::hasChanged(); KConfigSkeletonItem* kcItem = Config::self()->findItem(QStringLiteral("defaultFileSystem")); result = result || !kcItem->isEqual(static_cast(generalPageWidget().defaultFileSystem())); result = result || (generalPageWidget().kcfg_shredSource->checkedId() != Config::shredSource()); if (advancedPageWidget().isVisible()) { kcItem = Config::self()->findItem(QStringLiteral("backend")); result = result || !kcItem->isEqual(advancedPageWidget().backend()); } return result; } bool ConfigureOptionsDialog::isDefault() { bool result = KConfigDialog::isDefault(); if (result) { const bool useDefaults = Config::self()->useDefaults(true); result = !hasChanged(); Config::self()->useDefaults(useDefaults); } return result; } void ConfigureOptionsDialog::updateWidgetsDefault() { bool useDefaults = Config::self()->useDefaults(true); generalPageWidget().setDefaultFileSystem(GuiHelpers::defaultFileSystem()); generalPageWidget().radioButton->setChecked(true); if (advancedPageWidget().isVisible()) advancedPageWidget().setBackend(CoreBackendManager::defaultBackendName()); Config::self()->useDefaults(useDefaults); } void ConfigureOptionsDialog::onComboBackendActivated(int) { Q_ASSERT(advancedPageWidget().isVisible()); if (operationStack().size() == 0 || KMessageBox::warningContinueCancel(this, xi18nc("@info", "Do you really want to change the backend?" "This will also rescan devices and thus clear the list of pending operations."), xi18nc("@title:window", "Really Change Backend?"), KGuiItem(xi18nc("@action:button", "Change the Backend"), QStringLiteral("arrow-right")), KGuiItem(xi18nc("@action:button", "Do Not Change the Backend"), QStringLiteral("dialog-cancel")), QStringLiteral("reallyChangeBackend")) == KMessageBox::Continue) { settingsChangedSlot(); } else advancedPageWidget().setBackend(CoreBackendManager::defaultBackendName()); } diff --git a/src/config/configurepageadvanced.ui b/src/config/configurepageadvanced.ui index 96b5e5a..4cc6d8a 100644 --- a/src/config/configurepageadvanced.ui +++ b/src/config/configurepageadvanced.ui @@ -1,110 +1,156 @@ ConfigurePageAdvanced 0 0 - 449 + 511 420 - - + + + 16777215 + 420 + + + + 0 1 Backend - Active backend: + Acti&ve backend: m_ComboBackend - + + + + Software RAID configuration + + + + + + Configuration file: + + + raidConfigFilePath + + + + + + + + + true + + + true + + + + + + + Select File + + + + + + + + + 0 1 Units - + - Preferred unit: + Preferred &unit: m_ComboBackend Byte KiB MiB GiB TiB PiB EiB