Исправлено окно фильтры

pull/13/head
Igor Belitskiy 2 years ago
parent 63e921c951
commit e07e6e4de2

@ -218,12 +218,10 @@ void MainWindow::lacalization() {
filtersSoftSizeFilterCheckbox->set_label(str_soft_limit_size); filtersSoftSizeFilterCheckbox->set_label(str_soft_limit_size);
filtersHardSizeFilterCheckbox->set_label(str_hard_limit_size); filtersHardSizeFilterCheckbox->set_label(str_hard_limit_size);
filtersHardSizeDelayFilterCheckbox->set_label(str_deferring_hard_limit_size); filtersHardSizeDelayFilterCheckbox->set_label(str_deferring_hard_limit_size);
filtersHardSizeActivationFilterCheckbox->set_label(str_hard_activation_size);
filtersFilesFilterCheckbox->set_label(str_files); filtersFilesFilterCheckbox->set_label(str_files);
filtersSoftFilesFilterCheckbox->set_label(str_soft_restriction_files); filtersSoftFilesFilterCheckbox->set_label(str_soft_restriction_files);
filtersHardFilesFilterCheckbox->set_label(str_severe_limitation_files); filtersHardFilesFilterCheckbox->set_label(str_severe_limitation_files);
filtersHardFilesDelayFilterCheckbox->set_label(str_deferring_limit_files); filtersHardFilesDelayFilterCheckbox->set_label(str_deferring_limit_files);
filtersHardFilesActivationFilterCheckbox->set_label(str_hard_limit_time);
quotegroupDeviceLabel->set_text(str_device); quotegroupDeviceLabel->set_text(str_device);
quotegroupDiskQuotasLabel->set_text(str_disk_quotas_device); quotegroupDiskQuotasLabel->set_text(str_disk_quotas_device);
quotegroupGroupQuotasLabel->set_text(str_group_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("filtersSoftSizeFilterCheckbox", filtersSoftSizeFilterCheckbox);
builder->get_widget("filtersHardSizeFilterCheckbox", filtersHardSizeFilterCheckbox); builder->get_widget("filtersHardSizeFilterCheckbox", filtersHardSizeFilterCheckbox);
builder->get_widget("filtersHardSizeDelayFilterCheckbox", filtersHardSizeDelayFilterCheckbox); builder->get_widget("filtersHardSizeDelayFilterCheckbox", filtersHardSizeDelayFilterCheckbox);
builder->get_widget("filtersHardSizeActivationFilterCheckbox", filtersHardSizeActivationFilterCheckbox);
builder->get_widget("filtersFilesFilterCheckbox", filtersFilesFilterCheckbox); builder->get_widget("filtersFilesFilterCheckbox", filtersFilesFilterCheckbox);
builder->get_widget("filtersSoftFilesFilterCheckbox", filtersSoftFilesFilterCheckbox); builder->get_widget("filtersSoftFilesFilterCheckbox", filtersSoftFilesFilterCheckbox);
builder->get_widget("filtersHardFilesFilterCheckbox", filtersHardFilesFilterCheckbox); builder->get_widget("filtersHardFilesFilterCheckbox", filtersHardFilesFilterCheckbox);
builder->get_widget("filtersHardFilesDelayFilterCheckbox", filtersHardFilesDelayFilterCheckbox); builder->get_widget("filtersHardFilesDelayFilterCheckbox", filtersHardFilesDelayFilterCheckbox);
builder->get_widget("filtersHardFilesActivationFilterCheckbox", filtersHardFilesActivationFilterCheckbox);
builder->get_widget("filtersHardFilesActivationFilterCheckbox", filtersHardFilesActivationFilterCheckbox);
builder->get_widget("btnLoadGlob", btnLoadGlob); builder->get_widget("btnLoadGlob", btnLoadGlob);
builder->get_widget("btnLoadLocal", btnLoadLocal); builder->get_widget("btnLoadLocal", btnLoadLocal);
builder->get_widget("btnSynopsis", btnSynopsis); builder->get_widget("btnSynopsis", btnSynopsis);
@ -483,9 +478,9 @@ void MainWindow::event() {
btnCancelHelp->signal_clicked().connect([&]() {wndShowWeb->hide();}); btnCancelHelp->signal_clicked().connect([&]() {wndShowWeb->hide();});
chkAlwaysOpenHelp->signal_toggled().connect([&]() {flag_open_browser = true;}); chkAlwaysOpenHelp->signal_toggled().connect([&]() {flag_open_browser = true;});
btnReadHelp->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::open_browser)); btnReadHelp->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::open_browser));
btnFilterGroups->signal_clicked().connect([&]() {this->groupsFilters_show();}); btnFilterGroups->signal_clicked().connect([&]() {this->filters_show();});
btnFilterUsers->signal_clicked().connect([&]() {this->groupsFilters_show();}); btnFilterUsers->signal_clicked().connect([&]() {this->filters_show();});
btnFilterProject->signal_clicked().connect([&]() {this->groupsFilters_show();}); btnFilterProject->signal_clicked().connect([&]() {this->filters_show();});
quotegroupSaveButton->signal_clicked().connect([&]() {}); quotegroupSaveButton->signal_clicked().connect([&]() {});
btnLoadGlob->signal_activate().connect([&]() {this->load_global_cfg();}); btnLoadGlob->signal_activate().connect([&]() {this->load_global_cfg();});
btnLoadLocal->signal_activate().connect([&]() {this->load_system_cfg();}); btnLoadLocal->signal_activate().connect([&]() {this->load_system_cfg();});
@ -651,7 +646,7 @@ struct partition_cmd MainWindow::wrapper_settings_quotas() {
return _struct_partition_cmd; return _struct_partition_cmd;
} }
void MainWindow::groupsFilters_show() { void MainWindow::filters_show() {
FiltersWindow->show_all(); FiltersWindow->show_all();
} }

@ -260,7 +260,6 @@ class MainWindow : public Gtk::ApplicationWindow {
Gtk::CheckButton *filtersSoftFilesFilterCheckbox; Gtk::CheckButton *filtersSoftFilesFilterCheckbox;
Gtk::CheckButton *filtersHardFilesFilterCheckbox; Gtk::CheckButton *filtersHardFilesFilterCheckbox;
Gtk::CheckButton *filtersHardFilesDelayFilterCheckbox; Gtk::CheckButton *filtersHardFilesDelayFilterCheckbox;
Gtk::CheckButton *filtersHardFilesActivationFilterCheckbox;
Gtk::TreeView *groupsQuotasTree; Gtk::TreeView *groupsQuotasTree;
Gtk::TreeView *usersQuotasTree; Gtk::TreeView *usersQuotasTree;
Gtk::TreeView *ProjectQuotasTree; 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 entry_combo_box_temp(Gtk::ComboBoxText *combo_box, Gtk::Label *label);
void synopsis_show(); void synopsis_show();
void info_status_app(string stule); void info_status_app(string stule);
void groupsFilters_show(); void filters_show();
void init_tree_view(); void init_tree_view();
void template_open_browser(); void template_open_browser();
void open_browser(); void open_browser();

@ -141,21 +141,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">5</property> <property name="pack-type">end</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="filtersHardSizeActivationFilterCheckbox">
<property name="label" translatable="yes">Hard limit (size) activation time</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="halign">start</property>
<property name="draw-indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">5</property> <property name="position">5</property>
</packing> </packing>
</child> </child>
@ -234,21 +220,6 @@
<property name="position">10</property> <property name="position">10</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkCheckButton" id="filtersHardFilesActivationFilterCheckbox">
<property name="label" translatable="yes">Hard limit (file) activation time</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="halign">start</property>
<property name="draw-indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">11</property>
</packing>
</child>
</object> </object>
</child> </child>
<child type="titlebar"> <child type="titlebar">

Loading…
Cancel
Save