diff --git a/source/controler.cc b/source/controler.cc new file mode 100644 index 0000000..e69de29 diff --git a/source/controler.h b/source/controler.h new file mode 100644 index 0000000..e69de29 diff --git a/source/ubl-settings-diskquota.cc b/source/ubl-settings-diskquota.cc index 956c210..af9fcc1 100755 --- a/source/ubl-settings-diskquota.cc +++ b/source/ubl-settings-diskquota.cc @@ -519,25 +519,6 @@ void MainWindow::event() { QuotasEditWindow->show(); } -string MainWindow::format_str_size(Gtk::SpinButton* spb, Gtk::ComboBoxText* combo_box) { - string value = ""; - int num = spb->get_value(); - int index = combo_box->get_active_row_number(); - value = to_string(num); - if (num == 0) { - return value; - } - if (index == 1) { - value += "M"; - } - else if (index == 2) { - value += "G"; - } - else if (index == 3) { - value += "T"; - } - return value; -} void MainWindow::wrapper_settings_quotas_temp(string save_user_or_group) { struct partition_cmd _struct_partition_cmd = this->wrapper_settings_quotas(); string device = _struct_partition_cmd.device; @@ -552,6 +533,7 @@ void MainWindow::wrapper_settings_quotas_temp(string save_user_or_group) { obj_quotas_sys.format_cmd_quotas_ubconfig(_struct_quota); } + void MainWindow::save_quotegroupSaveButton() { if (sys_or_ubconfig == "ubconfig") { if (save_user_or_group == "usrquota") { @@ -571,22 +553,18 @@ void MainWindow::save_quotegroupSaveButton() { } } - - - - struct partition_cmd MainWindow::wrapper_settings_quotas() { string str_parted = quotegroupDeviceCombo->get_active_text(); string value = ""; if (quotegroupSizeSoftLimitCheck->get_active()) { - value = format_str_size(quotegroupSizeSoftLimitSpin, quotegroupSizeSoftLimitCombo); + value = Utils::format_str_size(quotegroupSizeSoftLimitSpin->get_value(), quotegroupSizeSoftLimitCombo->get_active_row_number()); value += ":"; } else { value += "0:"; } if (quotegroupSizeHardLimitCheck->get_active()) { - value += format_str_size(quotegroupSizeHardLimitSpin, quotegroupSizeHardLimitCombo); + value += Utils::format_str_size(quotegroupSizeHardLimitSpin->get_value(), quotegroupSizeHardLimitCombo->get_active_row_number()); value += ":"; } else { diff --git a/source/ubl-settings-diskquota.h b/source/ubl-settings-diskquota.h index 978da6b..e9b4e89 100644 --- a/source/ubl-settings-diskquota.h +++ b/source/ubl-settings-diskquota.h @@ -237,7 +237,6 @@ class MainWindow : public Gtk::ApplicationWindow { void off_quota_system(Gtk::ComboBoxText* combo_box, string quota_type); void wrapper_save_system_cfg(); void wrapper_save_global_cfg(); - string format_str_size(Gtk::SpinButton* spb, Gtk::ComboBoxText* combo_box); void wrapper_save_all_cfg(); void init_dict(string flag_load); void set_data_cfg(); diff --git a/source/util.cc b/source/util.cc index 8d8c496..09ed1f5 100644 --- a/source/util.cc +++ b/source/util.cc @@ -1,6 +1,24 @@ #include "util.h" namespace Utils { + +string format_str_size(int num, int index) { + string value = ""; + value = to_string(num); + if (num == 0) { + return value; + } + if (index == 1) { + value += "M"; + } + else if (index == 2) { + value += "G"; + } + else if (index == 3) { + value += "T"; + } + return value; +} array, 5> read_csv(const string& filename) { array, 5> array_vectors; diff --git a/source/util.h b/source/util.h index 603e9a3..2415ba8 100644 --- a/source/util.h +++ b/source/util.h @@ -16,6 +16,7 @@ struct Passwd { int uid; }; +string format_str_size(int num, int index); std::array, 5> read_csv(const std::string& filename); std::string call(std::string cmd); vector find_all(string &str_ntp, string substr);