public/admc
1
0
Fork 0
mirror of https://github.com/altlinux/admc.git synced 2025-02-09 01:57:26 +03:00
Code Issues Projects Releases Wiki Activity

get rid of edit_widget()

Browse Source 
in query dialogs
make pass-through f-ns
This commit is contained in:
Dmitry Degtyarev 2021-11-03 14:37:07 +04:00
parent de76de770f
commit 821945699b
6 changed files with 75 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/admc/console_impls/query_folder_impl.cpp
View File

@ -28,7 +28,6 @@
#include "create_query_folder_dialog.h"
#include "create_query_item_dialog.h"
#include "edit_query_folder_dialog.h"
#include "edit_query_item_widget.h"
#include "globals.h"
#include "settings.h"
#include "utils.h"
@ -121,13 +120,12 @@ void QueryFolderImpl::on_create_query_item() {
}
void QueryFolderImpl::on_create_query_item_accepted() {
EditQueryItemWidget *edit_widget = create_query_item_dialog->edit_widget();
const QString name = edit_widget->name();
const QString description = edit_widget->description();
const QString filter = edit_widget->filter();
const QString base = edit_widget->base();
const QByteArray filter_state = edit_widget->filter_state();
const bool scope_is_children = edit_widget->scope_is_children();
const QString name = create_query_item_dialog->name();
const QString description = create_query_item_dialog->description();
const QString filter = create_query_item_dialog->filter();
const QString base = create_query_item_dialog->base();
const QByteArray filter_state = create_query_item_dialog->filter_state();
const bool scope_is_children = create_query_item_dialog->scope_is_children();
const QModelIndex parent_index = console->get_selected_item(ItemType_QueryItem);
console_query_item_create(console, name, description, filter, filter_state, base, scope_is_children, parent_index);

18
src/admc/console_impls/query_item_impl.cpp
View File

@ -27,7 +27,6 @@
#include "console_widget/results_view.h"
#include "create_query_item_dialog.h"
#include "edit_query_item_dialog.h"
#include "edit_query_item_widget.h"
#include "globals.h"
#include "settings.h"
#include "utils.h"
@ -264,27 +263,24 @@ void QueryItemImpl::on_edit_query_item() {
const QList<QString> sibling_name_list = get_sibling_name_list(parent_index, index);
edit_query_item_dialog->set_sibling_name_list(sibling_name_list);
EditQueryItemWidget *edit_widget = edit_query_item_dialog->edit_widget();
QString name;
QString description;
bool scope_is_children;
QByteArray filter_state;
get_query_item_data(index, &name, &description, &scope_is_children, &filter_state);
edit_widget->set_data(name, description, scope_is_children, filter_state);
edit_query_item_dialog->set_data(name, description, scope_is_children, filter_state);
edit_query_item_dialog->open();
}
void QueryItemImpl::on_edit_query_item_accepted() {
EditQueryItemWidget *edit_widget = edit_query_item_dialog->edit_widget();
const QString name = edit_widget->name();
const QString description = edit_widget->description();
const QString filter = edit_widget->filter();
const QString base = edit_widget->base();
const QByteArray filter_state = edit_widget->filter_state();
const bool scope_is_children = edit_widget->scope_is_children();
const QString name = edit_query_item_dialog->name();
const QString description = edit_query_item_dialog->description();
const QString filter = edit_query_item_dialog->filter();
const QString base = edit_query_item_dialog->base();
const QByteArray filter_state = edit_query_item_dialog->filter_state();
const bool scope_is_children = edit_query_item_dialog->scope_is_children();
const QModelIndex index = console->get_selected_item(ItemType_QueryItem);
const QList<QStandardItem *> row = console->get_row(index);

24
src/admc/create_query_item_dialog.cpp
View File

@ -37,8 +37,28 @@ void CreateQueryItemDialog::init(AdConfig *adconfig) {
ui->edit_query_widget->init(adconfig);
}
EditQueryItemWidget *CreateQueryItemDialog::edit_widget() const {
return ui->edit_query_widget;
QString CreateQueryItemDialog::name() const {
return ui->edit_query_widget->name();
}
QString CreateQueryItemDialog::description() const {
return ui->edit_query_widget->description();
}
QString CreateQueryItemDialog::filter() const {
return ui->edit_query_widget->filter();
}
QString CreateQueryItemDialog::base() const {
return ui->edit_query_widget->base();
}
bool CreateQueryItemDialog::scope_is_children() const {
return ui->edit_query_widget->scope_is_children();
}
QByteArray CreateQueryItemDialog::filter_state() const {
return ui->edit_query_widget->filter_state();
}
void CreateQueryItemDialog::set_sibling_name_list(const QList<QString> &list) {

7
src/admc/create_query_item_dialog.h
View File

@ -41,7 +41,12 @@ public:
void init(AdConfig *adconfig);
EditQueryItemWidget *edit_widget() const;
QString name() const;
QString description() const;
QString filter() const;
QString base() const;
bool scope_is_children() const;
QByteArray filter_state() const;
void set_sibling_name_list(const QList<QString> &list);

28
src/admc/edit_query_item_dialog.cpp
View File

@ -37,8 +37,32 @@ void EditQueryItemDialog::init(AdConfig *adconfig) {
ui->edit_query_item_widget->init(adconfig);
}
EditQueryItemWidget *EditQueryItemDialog::edit_widget() const {
return ui->edit_query_item_widget;
void EditQueryItemDialog::set_data(const QString &name, const QString &description, const bool scope_is_children, const QByteArray &filter_state) {
return ui->edit_query_item_widget->set_data(name, description, scope_is_children, filter_state);
}
QString EditQueryItemDialog::name() const {
return ui->edit_query_item_widget->name();
}
QString EditQueryItemDialog::description() const {
return ui->edit_query_item_widget->description();
}
QString EditQueryItemDialog::filter() const {
return ui->edit_query_item_widget->filter();
}
QString EditQueryItemDialog::base() const {
return ui->edit_query_item_widget->base();
}
bool EditQueryItemDialog::scope_is_children() const {
return ui->edit_query_item_widget->scope_is_children();
}
QByteArray EditQueryItemDialog::filter_state() const {
return ui->edit_query_item_widget->filter_state();
}
void EditQueryItemDialog::set_sibling_name_list(const QList<QString> &sibling_name_list_arg) {

9
src/admc/edit_query_item_dialog.h
View File

@ -41,7 +41,14 @@ public:
void init(AdConfig *adconfig);
EditQueryItemWidget *edit_widget() const;
void set_data(const QString &name, const QString &description, const bool scope_is_children, const QByteArray &filter_state);
QString name() const;
QString description() const;
QString filter() const;
QString base() const;
bool scope_is_children() const;
QByteArray filter_state() const;
void set_sibling_name_list(const QList<QString> &sibling_name_list_arg);