From e07e6e4de2742f846f0dfae05d6cd287b99fbe53 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 10 May 2023 11:00:21 +0600 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=BE=D0=BA=D0=BD=D0=BE=20=D1=84=D0=B8?= =?UTF-8?q?=D0=BB=D1=8C=D1=82=D1=80=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-diskquota.cc | 13 ++++--------- source/ubl-settings-diskquota.h | 5 ++--- ubl-settings-diskquota.glade | 31 +------------------------------ 3 files changed, 7 insertions(+), 42 deletions(-) diff --git a/source/ubl-settings-diskquota.cc b/source/ubl-settings-diskquota.cc index 7c93043..c5f36d5 100755 --- a/source/ubl-settings-diskquota.cc +++ b/source/ubl-settings-diskquota.cc @@ -218,12 +218,10 @@ void MainWindow::lacalization() { filtersSoftSizeFilterCheckbox->set_label(str_soft_limit_size); filtersHardSizeFilterCheckbox->set_label(str_hard_limit_size); filtersHardSizeDelayFilterCheckbox->set_label(str_deferring_hard_limit_size); - filtersHardSizeActivationFilterCheckbox->set_label(str_hard_activation_size); filtersFilesFilterCheckbox->set_label(str_files); filtersSoftFilesFilterCheckbox->set_label(str_soft_restriction_files); filtersHardFilesFilterCheckbox->set_label(str_severe_limitation_files); filtersHardFilesDelayFilterCheckbox->set_label(str_deferring_limit_files); - filtersHardFilesActivationFilterCheckbox->set_label(str_hard_limit_time); quotegroupDeviceLabel->set_text(str_device); quotegroupDiskQuotasLabel->set_text(str_disk_quotas_device); quotegroupGroupQuotasLabel->set_text(str_group_quotas_device); @@ -382,13 +380,10 @@ void MainWindow::get_builder() { builder->get_widget("filtersSoftSizeFilterCheckbox", filtersSoftSizeFilterCheckbox); builder->get_widget("filtersHardSizeFilterCheckbox", filtersHardSizeFilterCheckbox); builder->get_widget("filtersHardSizeDelayFilterCheckbox", filtersHardSizeDelayFilterCheckbox); - builder->get_widget("filtersHardSizeActivationFilterCheckbox", filtersHardSizeActivationFilterCheckbox); builder->get_widget("filtersFilesFilterCheckbox", filtersFilesFilterCheckbox); builder->get_widget("filtersSoftFilesFilterCheckbox", filtersSoftFilesFilterCheckbox); builder->get_widget("filtersHardFilesFilterCheckbox", filtersHardFilesFilterCheckbox); builder->get_widget("filtersHardFilesDelayFilterCheckbox", filtersHardFilesDelayFilterCheckbox); - builder->get_widget("filtersHardFilesActivationFilterCheckbox", filtersHardFilesActivationFilterCheckbox); - builder->get_widget("filtersHardFilesActivationFilterCheckbox", filtersHardFilesActivationFilterCheckbox); builder->get_widget("btnLoadGlob", btnLoadGlob); builder->get_widget("btnLoadLocal", btnLoadLocal); builder->get_widget("btnSynopsis", btnSynopsis); @@ -483,9 +478,9 @@ void MainWindow::event() { btnCancelHelp->signal_clicked().connect([&]() {wndShowWeb->hide();}); chkAlwaysOpenHelp->signal_toggled().connect([&]() {flag_open_browser = true;}); btnReadHelp->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::open_browser)); - btnFilterGroups->signal_clicked().connect([&]() {this->groupsFilters_show();}); - btnFilterUsers->signal_clicked().connect([&]() {this->groupsFilters_show();}); - btnFilterProject->signal_clicked().connect([&]() {this->groupsFilters_show();}); + btnFilterGroups->signal_clicked().connect([&]() {this->filters_show();}); + btnFilterUsers->signal_clicked().connect([&]() {this->filters_show();}); + btnFilterProject->signal_clicked().connect([&]() {this->filters_show();}); quotegroupSaveButton->signal_clicked().connect([&]() {}); btnLoadGlob->signal_activate().connect([&]() {this->load_global_cfg();}); btnLoadLocal->signal_activate().connect([&]() {this->load_system_cfg();}); @@ -651,7 +646,7 @@ struct partition_cmd MainWindow::wrapper_settings_quotas() { return _struct_partition_cmd; } -void MainWindow::groupsFilters_show() { +void MainWindow::filters_show() { FiltersWindow->show_all(); } diff --git a/source/ubl-settings-diskquota.h b/source/ubl-settings-diskquota.h index cc5ac49..82a4d95 100644 --- a/source/ubl-settings-diskquota.h +++ b/source/ubl-settings-diskquota.h @@ -259,8 +259,7 @@ class MainWindow : public Gtk::ApplicationWindow { Gtk::CheckButton *filtersFilesFilterCheckbox; Gtk::CheckButton *filtersSoftFilesFilterCheckbox; Gtk::CheckButton *filtersHardFilesFilterCheckbox; - Gtk::CheckButton *filtersHardFilesDelayFilterCheckbox; - Gtk::CheckButton *filtersHardFilesActivationFilterCheckbox; + Gtk::CheckButton *filtersHardFilesDelayFilterCheckbox; Gtk::TreeView *groupsQuotasTree; Gtk::TreeView *usersQuotasTree; Gtk::TreeView *ProjectQuotasTree; @@ -389,7 +388,7 @@ class MainWindow : public Gtk::ApplicationWindow { void entry_combo_box_temp(Gtk::ComboBoxText *combo_box, Gtk::Label *label); void synopsis_show(); void info_status_app(string stule); - void groupsFilters_show(); + void filters_show(); void init_tree_view(); void template_open_browser(); void open_browser(); diff --git a/ubl-settings-diskquota.glade b/ubl-settings-diskquota.glade index 0b369d1..32bb829 100644 --- a/ubl-settings-diskquota.glade +++ b/ubl-settings-diskquota.glade @@ -141,21 +141,7 @@ False True - 5 - - - - - Hard limit (size) activation time - True - True - False - start - True - - - False - True + end 5 @@ -234,21 +220,6 @@ 10 - - - Hard limit (file) activation time - True - True - False - start - True - - - False - True - 11 - -