diff --git a/source/var.h b/source/var.h index 0c4104a..63dc0f2 100644 --- a/source/var.h +++ b/source/var.h @@ -59,7 +59,7 @@ extern string version_application; #define str_name _("Name") #define str_size _("Size") #define str_quotas_mode _("Direct control of the file system") -#define str_lb_head _("Configuration of disk quotas parameters for system groups and users") +#define str_lb_head _("Setting user quotas") #define str_soft_limit _("Soft limit") #define str_currently_using _("Currently using:") #define str_currently_using_space _("Currently using: ") diff --git a/source/view/ubl-settings-diskquota.cc b/source/view/ubl-settings-diskquota.cc index 20e5195..47b4373 100755 --- a/source/view/ubl-settings-diskquota.cc +++ b/source/view/ubl-settings-diskquota.cc @@ -416,6 +416,19 @@ void MainWindow::get_builder() { builder->get_widget("btnEditUsers", btnEditUsers); builder->get_widget("btnEditGroups", btnEditGroups); builder->get_widget("usersProjectCombo", usersProjectCombo); + builder->get_widget("boxResize", boxResize); + builder->get_widget("boxGroupsWeeks", boxGroupsWeeks); + builder->get_widget("boxGroupsDays", boxGroupsDays); + builder->get_widget("boxGroupsHours", boxGroupsHours); + builder->get_widget("boxGroupsMinutes", boxGroupsMinutes); + builder->get_widget("boxUsersWeeks", boxUsersWeeks); + builder->get_widget("boxUsersDays", boxUsersDays); + builder->get_widget("boxUsersHours", boxUsersHours); + builder->get_widget("boxUsersMinutes", boxUsersMinutes); + builder->get_widget("boxProjectWeeks", boxProjectWeeks); + builder->get_widget("boxProjectDays", boxProjectDays); + builder->get_widget("boxProjectHours", boxProjectHours); + builder->get_widget("boxProjectMinutes", boxProjectMinutes); } void MainWindow::open_browser() { @@ -459,6 +472,7 @@ void MainWindow::wrapper_load_global() { } void MainWindow::event() { + boxResize->signal_check_resize().connect(sigc::mem_fun(*this, &MainWindow::resize_widget)); btnFilterGroups->signal_clicked().connect([&]() {this->filters_show();}); btnFilterUsers->signal_clicked().connect([&]() {this->filters_show();}); btnFilterProject->signal_clicked().connect([&]() {this->filters_show();}); @@ -493,6 +507,10 @@ void MainWindow::event() { &MainWindow::set_add_tv_g_u_p), str_groups, groupsQuotasTree, row, list_store_groups, obj_tv_g_u_p)); } +void MainWindow::resize_widget() { + // boxGroupsWeeks = boxGroupsWeeks(Gtk::ORIENTATION_HORIZONTAL); +} + void MainWindow::add_quota_show(string name) { obj_view_add->set_label_type_quota(name); obj_view_add->show(); diff --git a/source/view/ubl-settings-diskquota.h b/source/view/ubl-settings-diskquota.h index 25ad831..76f9e9e 100644 --- a/source/view/ubl-settings-diskquota.h +++ b/source/view/ubl-settings-diskquota.h @@ -78,6 +78,7 @@ class MainWindow { Gtk::Widget *boxSave; Gtk::Widget *boxButton; Gtk::Box *boxFuncs; + Gtk::Box* boxResize; Gtk::MenuButton *btnSave; Gtk::MenuButton *btnLoad; Gtk::MenuButton *btnSettings; @@ -166,6 +167,19 @@ class MainWindow { Gtk::Button* btnEditUsers; Gtk::Button* btnEditGroups; + Gtk::Box* boxGroupsWeeks; + Gtk::Box* boxGroupsDays; + Gtk::Box* boxGroupsHours; + Gtk::Box* boxGroupsMinutes; + Gtk::Box* boxUsersWeeks; + Gtk::Box* boxUsersDays; + Gtk::Box* boxUsersHours; + Gtk::Box* boxUsersMinutes; + Gtk::Box* boxProjectWeeks; + Gtk::Box* boxProjectDays; + Gtk::Box* boxProjectHours; + Gtk::Box* boxProjectMinutes; + public: map_str_str* map_gui_cfg = NULL; map_str_str* map_global_cfg = NULL; @@ -208,6 +222,7 @@ class MainWindow { void flag_block_gui(); void lacalization(); void add_CSS(); + void resize_widget(); void get_builder(); void event(); void open_browser(); diff --git a/ubl-settings-diskquota.glade b/ubl-settings-diskquota.glade index 55ccfe9..a28b8ad 100644 --- a/ubl-settings-diskquota.glade +++ b/ubl-settings-diskquota.glade @@ -366,7 +366,7 @@ False vertical - + True False vertical @@ -477,16 +477,30 @@ False vertical - + + 300 True True - liststore1 - - + in + + + True + False + + + True + True + liststore1 + + + + + + - True + False True 0 @@ -512,6 +526,8 @@ True False + 5 + 5 5 5 5 @@ -625,7 +641,7 @@ - + True False vertical @@ -724,7 +740,7 @@ - + True False vertical @@ -823,7 +839,7 @@ - + True False vertical @@ -922,7 +938,7 @@ - + True False vertical @@ -1028,16 +1044,30 @@ - + + 100 True True - liststore1 - - + in + + + True + False + + + True + True + liststore1 + + + + + + - True + False True 2 @@ -1208,6 +1238,7 @@ False True + end 3 @@ -1236,6 +1267,8 @@ True False + 5 + 5 5 5 5 @@ -1348,7 +1381,7 @@ - + True False vertical @@ -1447,7 +1480,7 @@ - + True False vertical @@ -1546,7 +1579,7 @@ - + True False vertical @@ -1643,7 +1676,7 @@ - + True False vertical @@ -1749,16 +1782,30 @@ - + + 100 True True - liststore1 - - + in + + + True + False + + + True + True + liststore1 + + + + + + - True + False True 2 @@ -1929,6 +1976,7 @@ False True + end 3 @@ -1967,6 +2015,12 @@ True False + 5 + 5 + 5 + 5 + 5 + 5 Device: @@ -2005,7 +2059,7 @@ False True - 1 + 0 @@ -2187,8 +2241,6 @@ True False - 5 - 5 vertical True @@ -2237,11 +2289,9 @@ - + True False - 5 - 5 vertical 5 @@ -2338,11 +2388,9 @@ - + True False - 5 - 5 vertical 5 @@ -2439,11 +2487,9 @@ - + True False - 5 - 5 vertical 5 @@ -2538,11 +2584,9 @@ - + True False - 5 - 5 vertical 5 @@ -2642,19 +2686,36 @@ False True - 3 + 1 - + + 100 True True - liststore1 + in + + + True + False + + + True + True + liststore1 + + + + + + + - True + False True - 4 + 3 diff --git a/ubl-settings-diskquota_ru.po b/ubl-settings-diskquota_ru.po index 2880c76..1b3f8cc 100644 --- a/ubl-settings-diskquota_ru.po +++ b/ubl-settings-diskquota_ru.po @@ -4,7 +4,7 @@ # UBLinux Team , 2022 # #, fuzzy -msgid "" +msgid "test" msgstr "" "Project-Id-Version: ublexec 1.0\n" "Report-Msgid-Bugs-To: \n" @@ -15,7 +15,7 @@ msgstr "" "Language: Russian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: 8bit" msgid "ubl-settings-diskquota" msgstr "Дисковые квоты"