diff --git a/source/view/filters.c b/source/view/filters.c index 446388a..97bfff7 100644 --- a/source/view/filters.c +++ b/source/view/filters.c @@ -44,12 +44,13 @@ filters_window *get_widget_filters() { return filters_widgets; } -void filters_show(GtkWidget *self) { +void filters_show(GtkWidget *self, char* glade_path) { if (filters_widgets != NULL) { gtk_widget_show_all(filters_widgets->Window); } else { - + filters_setup_window(glade_path); + gtk_widget_show_all(filters_widgets->Window); } } \ No newline at end of file diff --git a/source/view/filters.h b/source/view/filters.h index 9794374..fdfd409 100644 --- a/source/view/filters.h +++ b/source/view/filters.h @@ -33,6 +33,6 @@ void filters_event(filters_window *widgets); void filters_localization(filters_window *widgets); void filters_on_hide_subwindow(GtkWidget *self); filters_window *get_widget_filters(); -void filters_show(GtkWidget *self); +void filters_show(GtkWidget *self, char* glade_path); void filters_destroy(GtkWidget *self); #endif \ No newline at end of file diff --git a/source/view/ubl-settings-resourcequota.c b/source/view/ubl-settings-resourcequota.c index 2d0680d..1042dda 100644 --- a/source/view/ubl-settings-resourcequota.c +++ b/source/view/ubl-settings-resourcequota.c @@ -164,10 +164,10 @@ void info_show(GtkWidget *self) { } void event_all(main_window *widgets) { - g_signal_connect(G_OBJECT(widgets->btnShowFilters),"clicked",G_CALLBACK(filters_show),NULL); - g_signal_connect(G_OBJECT(widgets->btnAdd),"clicked",G_CALLBACK(add_show),NULL); - g_signal_connect(G_OBJECT(widgets->btnEdit),"clicked",G_CALLBACK(edit_show),NULL); - g_signal_connect(G_OBJECT(widgets->btnInfo),"clicked",G_CALLBACK(info_show),NULL); + g_signal_connect(G_OBJECT(widgets->btnShowFilters),"clicked",G_CALLBACK(filters_show), glade_path); + g_signal_connect(G_OBJECT(widgets->btnAdd),"clicked",G_CALLBACK(add_show), glade_path); + g_signal_connect(G_OBJECT(widgets->btnEdit),"clicked",G_CALLBACK(edit_show), glade_path); + g_signal_connect(G_OBJECT(widgets->btnInfo),"clicked",G_CALLBACK(info_show), glade_path); } void main_event(main_window *widgets) { @@ -259,9 +259,9 @@ int main(int argc, char *argv[]){ main_window *widgets = setup_window(); - filters_window *widget_filters = filters_setup_window(glade_path); - add_window *add_widgets = add_setup_window(glade_path); - edit_window *edit_widgets = edit_setup_window(glade_path); + filters_setup_window(glade_path); + add_setup_window(glade_path); + edit_setup_window(glade_path); event_all(widgets); main_event(widgets); yon_ubl_header_setup(widgets->HeadOverlay,widgets->HeadBox,widgets->HeadImage,banner_path); diff --git a/source/view/view_add.c b/source/view/view_add.c index 2c92ec3..d8948f9 100644 --- a/source/view/view_add.c +++ b/source/view/view_add.c @@ -37,12 +37,13 @@ add_window *get_widget_add() { return add_widgets; } -void add_show(GtkWidget *self) { +void add_show(GtkWidget *self, char* glade_path) { if (add_widgets != NULL) { gtk_widget_show_all(add_widgets->Window); } else { - + add_setup_window(glade_path); + gtk_widget_show_all(add_widgets->Window); } } \ No newline at end of file diff --git a/source/view/view_add.h b/source/view/view_add.h index fb4de5e..b2ec263 100644 --- a/source/view/view_add.h +++ b/source/view/view_add.h @@ -25,6 +25,6 @@ void add_event(add_window *widgets); void add_localization(add_window *widgets); void add_on_hide_subwindow(GtkWidget *self); add_window *get_widget_add(); -void add_show(GtkWidget *self); +void add_show(GtkWidget *self, char* glade_path); void add_destroy(GtkWidget *self); #endif \ No newline at end of file diff --git a/source/view/view_edit.c b/source/view/view_edit.c index edbc652..e4c95fd 100644 --- a/source/view/view_edit.c +++ b/source/view/view_edit.c @@ -36,12 +36,13 @@ edit_window *get_widget_edit() { return edit_widgets; } -void edit_show(GtkWidget *self) { +void edit_show(GtkWidget *self, char* glade_path) { if (edit_widgets != NULL) { gtk_widget_show_all(edit_widgets->Window); } else { - + edit_setup_window(glade_path); + gtk_widget_show_all(edit_widgets->Window); } } \ No newline at end of file diff --git a/source/view/view_edit.h b/source/view/view_edit.h index 024b08c..0001ced 100644 --- a/source/view/view_edit.h +++ b/source/view/view_edit.h @@ -25,6 +25,6 @@ void edit_event(edit_window *widgets); void edit_localization(edit_window *widgets); void edit_on_hide_subwindow(GtkWidget *self); edit_window *get_widget_edit(); -void edit_show(GtkWidget *self); +void edit_show(GtkWidget *self, char* glade_path); void edit_destroy(GtkWidget *self); #endif \ No newline at end of file diff --git a/ubl-settings-resourcequota.glade b/ubl-settings-resourcequota.glade index a8d9205..a3734b0 100644 --- a/ubl-settings-resourcequota.glade +++ b/ubl-settings-resourcequota.glade @@ -133,7 +133,7 @@ True False start - ubl-settings-resourcequota + Configuring CPU and RAM quota settings for groups and users of the system 0 @@ -658,7 +658,8 @@ translated and supported by community. - Quota volume + Quota +volume True @@ -670,7 +671,8 @@ translated and supported by community. - Soft RAM limit, (volume) + Soft RAM limit, +(volume) True @@ -682,7 +684,8 @@ translated and supported by community. - Hard RAM limit, (volume) + Hard RAM limit, +(volume) True @@ -694,7 +697,9 @@ translated and supported by community. - Swap file limit (volume) + Swap file +limit +(volume) True @@ -706,7 +711,8 @@ translated and supported by community. - CPU limit (%) + CPU limit +(%) True @@ -718,7 +724,9 @@ translated and supported by community. - I/O limit (read) + I/O +limit +(read) True @@ -730,7 +738,9 @@ translated and supported by community. - I/O limit (write) + I/O +limit +(write) True @@ -2757,7 +2767,6 @@ translated and supported by community. 5 5 5 - label False @@ -2775,7 +2784,6 @@ translated and supported by community. 5 5 5 - *** False diff --git a/ubl-settings-resourcequota_ru.po b/ubl-settings-resourcequota_ru.po index 0a16e05..143cd7b 100644 --- a/ubl-settings-resourcequota_ru.po +++ b/ubl-settings-resourcequota_ru.po @@ -88,6 +88,27 @@ msgstr "Лимит I/O (запись)" msgid "Filters" msgstr "Фильтры" +msgid "Quota\nvolume" +msgstr "Объем\nквотирования" + +msgid "Soft RAM limit,\n(volume)" +msgstr "Мягкий лимит ОЗУ,\n(объём)" + +msgid "Hard RAM limit,\n(volume)" +msgstr "Жёсткий лимит ОЗУ,\n(объём)" + +msgid "Swap file\nlimit\n(volume)" +msgstr "Лимит файлов\nподкачки\n(объём)" + +msgid "CPU limit\n(%)" +msgstr "Лимит ЦПУ (%)" + +msgid "I/O\nlimit\n(read)" +msgstr "Лимит\nI/O\n(чтение)" + +msgid "I/O\nlimit\n(write)" +msgstr "Лимит\nI/O\n(запись)" + msgid "List quotas" msgstr "Список квот" @@ -278,4 +299,7 @@ msgstr "Успешно записана глобальная конфигура msgid "Local configuration saving succseeded." msgstr "Успешно записана локальная конфигурация" +msgid "Configuring CPU and RAM quota settings for groups and users of the system" +msgstr "Настройка параметров квот процессорного времени и ОЗУ для групп и пользователей системы" +