Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions dconfig-center/common/valuehandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -309,12 +309,7 @@ ConfigGetter* ValueHandler::createManager()
if (tmp->createManager(appid, fileName, subpath)) {
return tmp;
}
} else {
auto tmp = new FileHandler(this);
if (tmp->createManager(appid, fileName, subpath)) {
qDebug() << QString("using FileHandler to get value for appid=%1, resource=%2, subpath=%3.").arg(appid, fileName, subpath);
return tmp;
}
delete tmp; // 创建失败,释放内存
}
qWarning() << QString("get value handler error for appid=%1, resource=%2, subpath=%3.").arg(appid, fileName, subpath);
return nullptr;
Expand Down
16 changes: 16 additions & 0 deletions dconfig-center/dde-dconfig-editor/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,10 @@ void MainWindow::onCustomResourceMenuRequested(const QString &appid, const QStri
connect(resetCmdAction, &QAction::triggered, this, [this, appid, resource, subpath] {
QScopedPointer<ValueHandler> getter(new ValueHandler(appid, resource, subpath));
QScopedPointer<ConfigGetter> manager(getter->createManager());
if (!manager) {
qWarning() << "Failed to create manager for reset command";
return;
}
const auto keys = manager->keyList();
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
for (const auto &item : std::as_const(keys)) {
Expand Down Expand Up @@ -607,6 +611,10 @@ void Content::onCustomContextMenuRequested(QWidget *widget, const QString &appid
{
m_getter.reset(new ValueHandler(appid, resource, subpath));
QScopedPointer<ConfigGetter> manager(m_getter->createManager());
if (!manager) {
qWarning() << "Failed to create manager for context menu";
return;
}
const QString &value = qvariantToCmd(manager.get()->value(key));
const QString &description = manager.get()->description(key, m_language);

Expand Down Expand Up @@ -654,6 +662,10 @@ void Content::onCustomContextMenuRequested(QWidget *widget, const QString &appid

connect(resetCmdAction, &QAction::triggered, this, [this, key, widget] {
QScopedPointer<ConfigGetter> manager(m_getter->createManager());
if (!manager) {
qWarning() << "Failed to create manager for reset";
return;
}
const auto &old = manager->value(key);
manager->reset(key);
if (auto contentWidget = qobject_cast<KeyContent *>(widget)) {
Expand Down Expand Up @@ -796,6 +808,10 @@ HistoryDialog::HistoryDialog(QWidget *parent)
{

QScopedPointer<ConfigGetter> manager(handler.createManager());
if (!manager) {
qWarning() << "Failed to create manager for history";
return;
}
if (manager) {

const auto &key = historyView->model()->data(index, ConfigUserRole + 5).toString();
Expand Down
Loading