From 9e87bd429e4e36b32dae606074bf7008ce865c24 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Thu, 11 May 2023 10:21:05 +0600 Subject: [PATCH] fix --- #ubl-settings-diskquota.glade# | 2 +- source/ubl-settings-diskquota.cc | 13 ++++++++----- source/ubl-settings-diskquota.h | 8 ++++---- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/#ubl-settings-diskquota.glade# b/#ubl-settings-diskquota.glade# index d9c3497..fbde303 100644 --- a/#ubl-settings-diskquota.glade# +++ b/#ubl-settings-diskquota.glade# @@ -24,7 +24,7 @@ 5 vertical - + Name True True diff --git a/source/ubl-settings-diskquota.cc b/source/ubl-settings-diskquota.cc index 3d1fa3d..4eecfcb 100755 --- a/source/ubl-settings-diskquota.cc +++ b/source/ubl-settings-diskquota.cc @@ -30,6 +30,7 @@ void MainWindow::settings() { map_device = obj_device.get_parted(); this->filling_device_combo_box_template(groupsDeviceCombo, map_device); this->filling_device_combo_box_template(usersDeviceCombo, map_device); + this->filling_device_combo_box_template(usersProjectCombo, map_device); this->init_tree_view(); this->init_spin_all(); check_limit(quotegroupSizeSoftLimitCheck @@ -176,7 +177,7 @@ void MainWindow::init_tree_view_general() { } void MainWindow::view_add_columns(Gtk::TreeView &treeView) { - treeView.append_column(str_name, m_columns.name); + treeView.append_column_editable(str_name, m_columns.name); treeView.append_column_editable(str_quotas, m_columns.quotas); treeView.append_column(str_size, m_columns.size); treeView.append_column(str_tw_soft_limit, m_columns.soft_limit_size); @@ -265,6 +266,7 @@ void MainWindow::lacalization() { lblSetDevice->set_text(str_device); lblQuotasStatus->set_text(str_quota_status); lblSetUGP->set_text(""); + lblQuotasStatus->set_text(_("Quota use status:")); this->fill_in_pow_memory(quotegroupSizeSoftLimitCombo); this->fill_in_pow_memory(quotegroupSizeHardLimitCombo); @@ -639,6 +641,11 @@ void MainWindow::filters_show() { FiltersWindow->show_all(); } +void MainWindow::set_data_cfg() { + // TODO: + // Написать функцию +} + void MainWindow::check_limit(Gtk::CheckButton *check_button, Gtk::SpinButton *spin, Gtk::ComboBoxText *combo_box) { spin->set_sensitive(check_button->get_active()); combo_box->set_sensitive(check_button->get_active()); @@ -707,10 +714,6 @@ void MainWindow::load_system_cfg() { map_gui_cfg = map_system_cfg; } -void MainWindow::set_data_cfg() { - // TODO: - // Написать функцию -} void MainWindow::wrapper_save_global_cfg() { this->set_data_cfg(); if (this->save_template("boot", "global")) { diff --git a/source/ubl-settings-diskquota.h b/source/ubl-settings-diskquota.h index e4edc1c..8fb3938 100644 --- a/source/ubl-settings-diskquota.h +++ b/source/ubl-settings-diskquota.h @@ -139,10 +139,10 @@ #define path_resources "/usr/share/ubl-settings-diskquota" #define path_img_head_background "/usr/share/ubl-settings-diskquota/images/logo-background.png" #define no_recognized _("Argument not recognized\n") -#define global_load "ubconfig --default --source global get boot" -#define system_load "ubconfig --default --source system get boot" -#define global_save "ubconfig --target global set boot " -#define system_save "ubconfig --target system set boot " +#define global_load "ubconfig --default --source global --noexecute get boot" +#define system_load "ubconfig --default --source system --noexecute get boot" +#define global_save "ubconfig --target global --noexecute set boot " +#define system_save "ubconfig --target system --noexecute set boot " #define global_remove "ubconfig --target global --noexecute set/remove boot " #define system_remove "ubconfig --target system --noexecute set/remove boot " #define str_quota_status "Quota use status:"