diff --git a/source/ubl-settings-resourcequota.c b/source/ubl-settings-resourcequota.c index 19b2df8..a2d925b 100644 --- a/source/ubl-settings-resourcequota.c +++ b/source/ubl-settings-resourcequota.c @@ -112,6 +112,7 @@ void config_init(){ main_config.lock_load_global=0; main_config.lock_save_global=0; main_config.lock_save_local=0; + main_config.size_tree_view = 0; } main_window *setup_window(){ @@ -134,6 +135,7 @@ main_window *setup_window(){ widgets->btnMainShowAllEmpty = yon_gtk_builder_get_widget(builder,"btnMainShowAllEmpty"); widgets->btnMainShowCoreStream = yon_gtk_builder_get_widget(builder,"btnMainShowCoreStream"); + main_config.list = GTK_LIST_STORE(gtk_builder_get_object(builder, "liststore")); widgets->vteInformation = yon_gtk_builder_get_widget(builder,"vteInformation"); widgets->vteDispatcher = yon_gtk_builder_get_widget(builder,"vteDispatcher"); widgets->vteProcesses = yon_gtk_builder_get_widget(builder,"vteProcesses"); @@ -302,36 +304,35 @@ void tree_view_select(GtkWidget *self, main_window *widgets) { } } -void wrapper_tree_view_add(GtkWidget *self, main_window *widgets){ - yon_ubl_status_box_render(STR_QUOTAS_ADD, BACKGROUND_IMAGE_FAIL_TYPE); - add_show(NULL, glade_path); -} - void tree_view_add(int index) { - yon_char_parsed_append(main_config.type_quota, &main_config.size_tree_view, add_get_quota_object()); + main_config.type_quota= yon_char_parsed_append(main_config.type_quota, &main_config.size_tree_view, add_get_quota_object()); char* text = " "; - yon_char_parsed_append(main_config.quota_volume, &main_config.size_tree_view, text ); - yon_char_parsed_append(main_config.soft_raw_limit, &main_config.size_tree_view, add_get_soft()); - yon_char_parsed_append(main_config.hard_raw_limit, &main_config.size_tree_view, add_get_hard()); - yon_char_parsed_append(main_config.swap, &main_config.size_tree_view, add_get_limit_swap()); - yon_char_parsed_append(main_config.cpu_limit, &main_config.size_tree_view, add_get_limit_cpu()); - yon_char_parsed_append(main_config.i_o_limit_read, &main_config.size_tree_view, add_get_read_device()); - yon_char_parsed_append(main_config.i_o_limit_write, &main_config.size_tree_view, add_get_write_device()); + main_config.size_tree_view--; + main_config.quota_volume = yon_char_parsed_append(main_config.quota_volume, &main_config.size_tree_view, text ); + main_config.size_tree_view--; + main_config.soft_raw_limit = yon_char_parsed_append(main_config.soft_raw_limit, &main_config.size_tree_view, add_get_soft()); + main_config.size_tree_view--; + main_config.hard_raw_limit = yon_char_parsed_append(main_config.hard_raw_limit, &main_config.size_tree_view, add_get_hard()); + main_config.size_tree_view--; + main_config.swap = yon_char_parsed_append(main_config.swap, &main_config.size_tree_view, add_get_limit_swap()); + main_config.size_tree_view--; + main_config.cpu_limit = yon_char_parsed_append(main_config.cpu_limit, &main_config.size_tree_view, add_get_limit_cpu()); + main_config.size_tree_view--; + main_config.i_o_limit_read = yon_char_parsed_append(main_config.i_o_limit_read, &main_config.size_tree_view, add_get_read_device()); + main_config.size_tree_view--; + main_config.i_o_limit_write = yon_char_parsed_append(main_config.i_o_limit_write, &main_config.size_tree_view, add_get_write_device()); GtkTreeIter iter; gtk_list_store_append(main_config.list,&iter); - gtk_list_store_set(main_config.list,&iter,main_config.type_quota[index], - main_config.quota_volume[index], - main_config.soft_raw_limit[index], - main_config.hard_raw_limit[index], - main_config.swap[index], - main_config.cpu_limit[index], - main_config.i_o_limit_read[index], - main_config.i_o_limit_write[index]); + gtk_list_store_set(main_config.list,&iter,0,main_config.type_quota[index], + 1,main_config.quota_volume[index], + 2,main_config.soft_raw_limit[index], + 3,main_config.hard_raw_limit[index], + 4,main_config.swap[index], + 5,main_config.cpu_limit[index], + 6,main_config.i_o_limit_read[index], + 7,main_config.i_o_limit_write[index],-1); } void tree_view_edit(int index) { - char* text = " "; - main_config.type_quota[index] = edit_get_quota_object(); - main_config.quota_volume[index] = text; main_config.soft_raw_limit[index] = edit_get_soft(); main_config.hard_raw_limit[index] = edit_get_hard(); main_config.swap[index] = edit_get_limit_swap(); @@ -339,14 +340,14 @@ void tree_view_edit(int index) { main_config.i_o_limit_read[index] = edit_get_read_device(); main_config.i_o_limit_write[index] = edit_get_write_device(); GtkTreeIter iter; - gtk_list_store_set(main_config.list,&iter,main_config.type_quota[index], - main_config.quota_volume[index], - main_config.soft_raw_limit[index], - main_config.hard_raw_limit[index], - main_config.swap[index], - main_config.cpu_limit[index], - main_config.i_o_limit_read[index], - main_config.i_o_limit_write[index]); + gtk_list_store_set(main_config.list, &iter, main_config.type_quota[index], + main_config.quota_volume[index], + main_config.soft_raw_limit[index], + main_config.hard_raw_limit[index], + main_config.swap[index], + main_config.cpu_limit[index], + main_config.i_o_limit_read[index], + main_config.i_o_limit_write[index]); } /* void yon_gtk_list_store_fill_with_proprietaries(GtkListStore *list){ @@ -410,7 +411,7 @@ void main_event(main_window *widgets) { g_signal_connect(G_OBJECT(widgets->AboutMenuItem),"activate",G_CALLBACK(on_about),NULL); g_signal_connect(G_OBJECT(widgets->btnShowFilters),"clicked",G_CALLBACK(wrapper_filters_show), NULL); - g_signal_connect(G_OBJECT(widgets->btnAdd),"clicked",G_CALLBACK(wrapper_tree_view_add), widgets); + g_signal_connect(G_OBJECT(widgets->btnAdd),"clicked",G_CALLBACK(wrapper_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); g_signal_connect(G_OBJECT(widgets->btnUpdateDispatcher),"clicked",G_CALLBACK(main_update_dispatcher), NULL); @@ -429,6 +430,15 @@ void main_event(main_window *widgets) { g_signal_connect(G_OBJECT(widgets->SaveLocalMenuItem),"activate",G_CALLBACK(),NULL); */ } +void wrapper_add_show(GtkWidget *self) { + add_show(NULL, glade_path); + g_signal_connect(G_OBJECT(get_widget_add()->btnSaveAddSave), "clicked", G_CALLBACK(main_add_btn_save), NULL); +} +void main_add_btn_save() { + tree_view_add(main_config.size_tree_view); + add_on_destroy_subwindow(get_widget_add()->Window); +} + void wrapper_filters_show(GtkWidget *self) { filters_show(self, glade_path); g_signal_connect(G_OBJECT(get_widget_filters()->btnFiltersSave),"clicked",G_CALLBACK(main_visible_columns), NULL); diff --git a/source/ubl-settings-resourcequota.h b/source/ubl-settings-resourcequota.h index 7931dd3..70293ad 100644 --- a/source/ubl-settings-resourcequota.h +++ b/source/ubl-settings-resourcequota.h @@ -53,7 +53,6 @@ typedef struct { int lock_load_global; GtkListStore *list; - GtkListStore *list2; render_data status_render; config_str type_quota; config_str quota_volume; @@ -153,5 +152,6 @@ void main_cbx_2_event(); void tree_view_delete(GtkWidget *self, main_window *widgets); void tree_view_select(GtkWidget *self, main_window *widgets); void tree_view_add(int index); -void wrapper_tree_view_add(GtkWidget *self, main_window *widgets); -void tree_view_edit(int index); \ No newline at end of file +void tree_view_edit(int index); +void main_add_btn_save(); +void wrapper_add_show(GtkWidget *self); \ No newline at end of file diff --git a/source/ubl-utils.c b/source/ubl-utils.c index a6fdafe..54851cd 100644 --- a/source/ubl-utils.c +++ b/source/ubl-utils.c @@ -964,8 +964,7 @@ char* philos_get_size_bite(GtkWidget* chk_button, GtkWidget* spin, GtkWidget* co if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(chk_button))) { char* size_prifics = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(combo_box_text)); int size_bite = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin)); - char* str_size_bite = yon_char_from_int(size_bite); - char* str_size_bute = yon_char_unite(str_size_bite, " ", str_size_bite, NULL); + char* str_size_bute = yon_char_unite(yon_char_from_int(size_bite), " ", size_prifics, NULL); return str_size_bute; } else { diff --git a/source/view_add.c b/source/view_add.c index 1bc5774..96a3ccb 100644 --- a/source/view_add.c +++ b/source/view_add.c @@ -55,7 +55,7 @@ void add_init_windows() { } void add_event(add_window *widgets) { - g_signal_connect(G_OBJECT(widgets->btnAddCancel),"clicked",G_CALLBACK(add_on_hide_subwindow),NULL); + g_signal_connect(G_OBJECT(widgets->btnAddCancel),"clicked",G_CALLBACK(add_on_destroy_subwindow),NULL); g_signal_connect(G_OBJECT(widgets->Window), "destroy", G_CALLBACK(add_destroy), NULL); g_signal_connect(G_OBJECT(widgets->chkSoftRestrictionAdd), "toggled", G_CALLBACK(add_init_windows), NULL); g_signal_connect(G_OBJECT(widgets->chkSevereRestrictionAdd), "toggled", G_CALLBACK(add_init_windows), NULL); @@ -80,7 +80,7 @@ void add_localization(add_window *widgets) { } -void add_on_hide_subwindow(GtkWidget *self) { +void add_on_destroy_subwindow(GtkWidget *self) { gtk_widget_destroy(gtk_widget_get_toplevel(self)); add_widgets = NULL; @@ -91,30 +91,42 @@ add_window *get_widget_add() { } void add_show(GtkWidget *self, char* glade_path) { - add_update_combo_box(); if (add_widgets != NULL) { + add_update_combo_box(); gtk_widget_show_all(add_widgets->Window); + } else { add_setup_window(glade_path); + add_update_combo_box(); gtk_widget_show_all(add_widgets->Window); } } char* add_get_select_device() { - return gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(add_widgets->cbtAddDevice)); + char* text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(add_widgets->cbtAddDevice)); + if (text != NULL) { + return text; + } + else { + char* str = (char*)malloc(sizeof(char*)*2); + str[0] = '-'; + str[1] = '\0'; + return str; + } + } char* add_get_read_device() { - return philos_get_size_bite(add_widgets->chbAddRead, add_widgets->spiSevereRestrictionAdd, - add_widgets->cmSevereRestrictionAdd); + return philos_get_size_bite(add_widgets->chbAddRead, add_widgets->spinAddRead, + add_widgets->cbtAddRead); } char* add_get_write_device() { - return philos_get_size_bite(add_widgets->chbAddWrite, add_widgets->spinAddRead, - add_widgets->cbtAddRead); + return philos_get_size_bite(add_widgets->chbAddWrite, add_widgets->spinAddWrite, + add_widgets->cbtAddWrite); } char* add_get_soft() { - return philos_get_size_bite(add_widgets->chkSoftRestrictionAdd, add_widgets->spinAddWrite, - add_widgets->cbtAddWrite); + return philos_get_size_bite(add_widgets->chkSoftRestrictionAdd, add_widgets->spiSevereRestrictionAdd, + add_widgets->cmSevereRestrictionAdd); } char* add_get_hard() { return philos_get_size_bite(add_widgets->chkSevereRestrictionAdd, add_widgets->spinSevereRestrictionAdd, @@ -133,8 +145,8 @@ char* add_get_limit_cpu() { } } char* add_get_limit_swap() { - return philos_get_size_bite(add_widgets->spinPaddingFLAdd, add_widgets->spinPaddingFLAdd, - add_widgets->spinPaddingFLAdd); + return philos_get_size_bite(add_widgets->chkPaddingFLAdd, add_widgets->spinPaddingFLAdd, + add_widgets->cmbPaddingFLAdd); } char* add_get_quota_object() { return gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(add_widgets->cbxAddQuotaObj)); diff --git a/source/view_add.h b/source/view_add.h index 82b084b..54537de 100644 --- a/source/view_add.h +++ b/source/view_add.h @@ -51,7 +51,7 @@ typedef struct { add_window *add_setup_window(char* glade_path); void add_event(add_window *widgets); void add_localization(add_window *widgets); -void add_on_hide_subwindow(GtkWidget *self); +void add_on_destroy_subwindow(GtkWidget *self); add_window *get_widget_add(); void add_show(GtkWidget *self, char* glade_path); void add_destroy(GtkWidget *self); diff --git a/ubl-settings-resourcequota.glade b/ubl-settings-resourcequota.glade index d798a15..262599c 100644 --- a/ubl-settings-resourcequota.glade +++ b/ubl-settings-resourcequota.glade @@ -189,60 +189,40 @@ 1 10 - - True - False - dialog-information-symbolic + + 1023 + 1 + 10 - - True - False - dialog-question-symbolic + + 100 + 1 + 10 - - True - False - False - - - imagemenuitem - True - False - image2 - False - - - - - - imagemenuitem - True - False - image1 - False - - - + + 1023 + 1 + 10 - - True - False - process-stop-symbolic + + 1023 + 1 + 10 - - True - False - emblem-ok-symbolic + + 100 + 1 + 10 - + + 100 + 1 + 10 + + False + start False - 450 - dialog-question-symbolic True @@ -254,20 +234,21 @@ 5 5 vertical - 10 True False - + True False - start - 20 - 20 - dialog-question-symbolic - 6 + 5 + 5 + 5 + 5 + 5 + 5 + Quota object False @@ -276,77 +257,24 @@ - + + 100 True False - vertical - - - True - False - start - 10 - 5 - Would you like to read documentation in the Web? - True - 0 - - - - - - - False - True - 0 - - - - - True - False - start - start - 10 - 10 - You will be redirected to documentation website where documentation is -translated and supported by community. - True - 0 - - - - False - True - 1 - - - - - Always redirect to online documentation - True - True - False - end - True - - - - False - True - end - 2 - - - + 5 + 5 + 5 + 5 + 5 + 5 + 0 + 0 + + User + Group + Process + Slice + True @@ -354,263 +282,37 @@ translated and supported by community. 1 - - - - True - True - 0 - - - - - True - False - 30 - True - - - Cancel - True - True - True - image8 - - - - True - True - 0 - - - - Read Online + True - True - True - image9 - + False + 5 + 5 + 5 + 5 + 5 + 5 - True + False True - 1 + 2 False True - 1 + 0 - - - - - True - False - True - - - True - False - UBLinux Settings - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - False - False - - - True - False - - - - - - True - False - - - - - - True - False - False - - - True - False - - - - - - True - False - - - - - - True - False - True - - - - - - 640 - 500 - False - 800 - 600 - com.ublinux.ubl-settings-resourcequota - - - True - False - vertical - - + + True False vertical - - True - False - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - 25 - - - False - True - 0 - - - - - True - False - start - 5 - 5 - 5 - 5 - 6 - 6 - - - - - - - False - True - 1 - - - - - False - True - 0 - - - - - True - False - vertical - - - 81 - True - False - - - True - False - start - - - -1 - - - - - False - True - 0 - - - - - False - True - 1 - - - - + True False 5 @@ -619,162 +321,37 @@ translated and supported by community. 5 5 5 - True - True - vertical + 0.019999999552965164 + in - + True False - 5 - 5 - 5 - 5 - 5 - 5 - True - True - vertical + 12 - + True - True + False True False vertical - + True - True - in - - - True - False - - - True - True - liststore - 0 - - - - - - Type quota - True - - - - 0 - - - - - - - Quota -volume - True - - - - 1 - - - - - - - Soft RAM limit, -(volume) - True - - - - 2 - - - - - - - Hard RAM limit, -(volume) - True - - - - 3 - - - - - - - Swap file -limit -(volume) - True - - - - 4 - - - - - - - CPU limit -(%) - True - - - - 5 - - - - - - - I/O -limit -(read) - True - - - - 6 - - - - - - - I/O -limit -(write) - True - - - - 7 - - - - - - - - + False + 5 + 5 + 5 + 5 + 5 + 5 + Soft Restriction + 0 - True + False True 0 @@ -784,49 +361,19 @@ limit True False - + True True - True + False 5 5 5 5 5 5 + True - - True - False - - - True - False - com.ublinux.ubl-settings-resourcequota.funnel - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - Filters - - - False - True - 1 - - - + @@ -836,221 +383,277 @@ limit - + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + adjustment4 + + + False + True + 1 + - + True - True - True + False 5 5 5 5 5 5 - - - True - False - - - True - False - tab-new-symbolic - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - Add - - - False - True - 1 - - - - + 0 + 0 + + Kb + Mb + Gb + Tb + False True - end 2 + + + False + True + 1 + + + + + True + True + 0 + + + + + True + False + vertical + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + Severe Restriction + 0 + + + False + True + 0 + + + + + True + False - + True True - True + False 5 5 5 5 5 5 + True - - True - False - - - True - False - error-correct-symbolic - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - Edit - - - False - True - 1 - - - + False True - end - 3 + 0 - + True True - True 5 5 5 5 5 5 - - - True - False - - - True - False - software-remove-symbolic - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - Remove - - - False - True - 1 - - - - + adjustment6 False True - end - 4 + 1 - + True - True - True + False 5 5 5 5 5 5 - - - True - False - - - True - False - dialog-information-symbolic - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - Information - - - False - True - 1 - - - - + 0 + 0 + + Kb + Mb + Gb + Tb + False True - end - 5 + 2 + + False + True + 1 + + + + + True + True + 1 + + + + + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + RAM limit + + + + + False + True + 0 + + + + + True + False + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + 0.019999999552965164 + in + + + True + False + 12 + + + True + False + + + True + True + False + 5 + 5 + 5 + 5 + 5 + 5 + True + + + + + + False + True + 0 + + + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + adjustment7 + + + False + True + 1 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + 0 + 0 + + Kb + Mb + Gb + Tb + + False True @@ -1059,103 +662,63 @@ limit - - - True - False - List quotas - - - False - - + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + Paging file limit + + + + + True + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + 0.019999999552965164 + in + + + True + False + 12 - + True False - vertical - + True - False - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - Update every - - - False - True - 0 - - - - - True - True - 5 - 5 - 5 - 5 - 5 - 5 - adjustment1 - - - False - True - 1 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - seconds - - - False - True - 2 - - + True + False + 5 + 5 + 5 + 5 + 5 + 5 + True - - True - True - True - 5 - 5 - 5 - 5 - 5 - 5 - - - True - False - reload - - - - - True - True - 3 - + @@ -1165,112 +728,110 @@ limit - + True - False - - - True - False - True - natural - adjustment3 - natural - UTF-8 - True - False - - - True - True - 0 - - - - - True - False - vertical - adjustment3 - - - False - True - 1 - - + True + 5 + 5 + 5 + 5 + 5 + 5 + adjustment5 - True + False True 1 + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + % + + + False + True + 2 + + - - 1 - - - - - True - False - Dispatcher - - - 1 - False - + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + CPU limit + + + + + True + True + 1 + + + + + False + True + 1 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + 0.019999999552965164 + in + + + True + False + 12 + + + True + False + vertical True False - vertical - + True False - - - All groups including empty - True - True - False - 5 - 5 - 5 - 5 - 5 - 5 - True - - - False - True - 0 - - - - - Core streams - True - True - False - 5 - 5 - 5 - 5 - 5 - 5 - True - - - False - True - 1 - - + 5 + 5 + 5 + 5 + 5 + 5 + Device: + 0 False @@ -1279,72 +840,32 @@ limit - + True False - - - True - False - True - natural - adjustment2 - natural - UTF-8 - True - False - - - True - True - 0 - - - - - True - False - vertical - adjustment2 - - - False - True - 1 - - - True + False True 1 - 2 - - - - - True - False - Processes - - - 2 - False + False + True + 0 True False - vertical - + True False + vertical True @@ -1355,7 +876,8 @@ limit 5 5 5 - View properties for + Read + 0 False @@ -1364,50 +886,84 @@ limit - + True False - 5 - 5 - 5 - 5 - 5 - 5 - 0 - 0 - - User - Group - Process - Slice - + + + True + True + False + 5 + 5 + 5 + 5 + 4 + 5 + True + + + + + + False + True + 0 + + + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + adjustment8 + + + False + True + 1 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + 0 + 0 + + Kb + Mb + Gb + Tb + + + + False + True + 2 + + - True + False True 1 - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - - - True - True - 2 - - - False + True True 0 @@ -1416,30 +972,95 @@ limit True False + vertical - - True - False - True - natural - adjustment3 - natural - UTF-8 - True - False + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + Write + 0 - True + False True 0 - + True False - vertical - adjustment3 + + + True + True + False + 5 + 5 + 5 + 5 + 5 + 5 + True + + + + + + False + True + 0 + + + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + adjustment9 + + + False + True + 1 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + 0 + 0 + + Kb + Mb + Gb + Tb + + + + False + True + 2 + + False @@ -1456,33 +1077,27 @@ limit - 3 - - - - - True - False - Information - - - 3 - False + False + True + 1 - - True - True - 0 - - - False - True - 0 - + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + Input/Output limit of block devices + @@ -1491,69 +1106,93 @@ limit 2 + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + 0.019999999552965164 + in + + + True + False + 12 + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + + + + + + + True + False + Manual input (for advanced users) + + + + + False + True + 3 + + - True + False True - 0 + 1 - - - - - True - False - True - - - True - False - 5 - 5 - 5 - 5 - 2 - ubl-settings-resourcequota - - - - - - - - True - False - 5 - 5 - 5 - 5 - 6 - 6 - 32 - com.ublinux.ubl-settings-resourcequota - - - + True False - + + True + False + + + False + True + 0 + + + + True True - False True - menuSave + 5 + 5 + 5 + 5 + 5 + 5 True False - + True False - Save + gtk-stop False @@ -1562,10 +1201,14 @@ limit - + True False - pan-down-symbolic + 5 + 5 + 5 + 5 + Cancel False @@ -1573,64 +1216,36 @@ limit 1 - - - - - False - True - 0 - - - - - True - True - True - False - True - True - menuAbout - none - - + - False True + end 1 - - - end - 1 - - - - - True - False - + True True - False True - menuLoad + 5 + 5 + 5 + 5 + 5 + 5 True False - + True False - Load + gtk-save False @@ -1639,10 +1254,14 @@ limit - + True False - pan-down-symbolic + 5 + 5 + 5 + 5 + Save False @@ -1656,123 +1275,7 @@ limit False True - 0 - - - - - 2 - - - - - - - - vertical - - - - - - - - False - start - False - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - vertical - - - Type quota - True - True - False - start - True - - - False - True - 2 - - - - - Quota volume - True - True - False - start - True - - - False - True - 3 - - - - - Soft RAM limit, (volume) - True - True - False - start - True - - - False - True - 4 - - - - - True - False - end - 5 - 5 - True - - - gtk-cancel - True - True - True - center - True - - - False - True - 0 - - - - - gtk-save - True - True - True - center - True - - - False - True + end 1 @@ -1780,83 +1283,7 @@ limit False True - end - 5 - - - - - Hard RAM limit, (volume) - True - True - False - start - True - - - False - True - 6 - - - - - Swap file limit (volume) - True - True - False - start - True - - - False - True - 7 - - - - - CPU limit (%) - True - True - False - start - True - - - False - True - 8 - - - - - I/O limit (write) - True - True - False - start - True - - - False - True - 8 - - - - - I/O limit (read) - True - True - False - start - True - - - False - True - 9 + 2 @@ -1867,10 +1294,10 @@ limit False True - + True False - Filters + Settings quotas - Adding @@ -1888,7 +1315,7 @@ limit - + False start False @@ -1926,8 +1353,7 @@ limit - - 100 + True False 5 @@ -1936,23 +1362,15 @@ limit 5 5 5 - 0 - 0 - - User - Group - Process - Slice - - True + False True 1 - + True False 5 @@ -2030,7 +1448,7 @@ limit True False - + True True False @@ -2042,10 +1460,7 @@ limit 5 True - - True - True - + @@ -2055,7 +1470,25 @@ limit - + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + adjustment4 + + + False + True + 1 + + + + True False 5 @@ -2076,7 +1509,7 @@ limit False True - 1 + 2 @@ -2122,7 +1555,7 @@ limit True False - + True True False @@ -2134,10 +1567,7 @@ limit 5 True - - True - True - + @@ -2147,7 +1577,25 @@ limit - + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + adjustment6 + + + False + True + 1 + + + + True False 5 @@ -2235,7 +1683,7 @@ limit True False - + True True False @@ -2247,10 +1695,7 @@ limit 5 True - - True - True - + @@ -2260,7 +1705,25 @@ limit - + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + adjustment7 + + + False + True + 1 + + + + True False 5 @@ -2281,7 +1744,7 @@ limit False True - 1 + 2 @@ -2326,11 +1789,11 @@ limit False 12 - + True False - + True True False @@ -2342,10 +1805,7 @@ limit 5 True - - True - True - + @@ -2355,7 +1815,25 @@ limit - + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + adjustment5 + + + False + True + 1 + + + + True False 5 @@ -2369,7 +1847,7 @@ limit False True - 1 + 2 @@ -2449,9 +1927,9 @@ limit - + True - True + False 5 5 5 @@ -2505,7 +1983,7 @@ limit True False - + True True False @@ -2517,10 +1995,7 @@ limit 5 True - - True - True - + @@ -2530,7 +2005,25 @@ limit - + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + adjustment9 + + + False + True + 1 + + + + True False 5 @@ -2551,7 +2044,7 @@ limit False True - 1 + 2 @@ -2597,7 +2090,7 @@ limit True False - + True True False @@ -2609,10 +2102,7 @@ limit 5 True - - True - True - + @@ -2622,7 +2112,25 @@ limit - + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + adjustment8 + + + False + True + 1 + + + + True False 5 @@ -2643,7 +2151,7 @@ limit False True - 1 + 2 @@ -2688,69 +2196,297 @@ limit False True - 2 + 2 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + 0.019999999552965164 + in + + + True + False + 12 + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + + + + + + + True + False + Manual input (for advanced users) + + + + + False + True + 3 + + + + + False + True + 1 + + + + + True + False + + + True + False + + + False + True + 0 + + + + + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 + + + True + False + + + True + False + gtk-stop + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + Cancel + + + False + True + 1 + + + + + + + False + True + end + 1 - + True - False + True + True 5 5 5 5 5 5 - 0.019999999552965164 - in - + True False - 12 - + True - True + False + gtk-save + + + False + True + 0 + + + + + True + False 5 5 5 5 - 5 - 5 + Save + + False + True + 1 + - - - True - False - Manual input (for advanced users) - - False True - 3 + end + 1 False True - 1 + 2 + + + + + True + False + True + + + True + False + Settings quotas - Editing + + + + + + + + True + False + 32 + com.ublinux.ubl-settings-resourcequota + 5 + + + + + + + True + False + dialog-information-symbolic + + + True + False + dialog-question-symbolic + + + True + False + False + + + imagemenuitem + True + False + image2 + False + + + + + + imagemenuitem + True + False + image1 + False + + + + + + True + False + process-stop-symbolic + + + True + False + emblem-ok-symbolic + + + False + False + 450 + dialog-question-symbolic + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + vertical + 10 True False - + True False + start + 20 + 20 + dialog-question-symbolic + 6 False @@ -2759,108 +2495,131 @@ limit - + + True + False + vertical + + + True + False + start + 10 + 5 + Would you like to read documentation in the Web? + True + 0 + + + + + + + False + True + 0 + + + + + True + False + start + start + 10 + 10 + You will be redirected to documentation website where documentation is +translated and supported by community. + True + 0 + + + + False + True + 1 + + + + + Always redirect to online documentation + True + True + False + end + True + + + + False + True + end + 2 + + + + + + True + True + 1 + + + + + + True + True + 0 + + + + + True + False + 30 + True + + + Cancel True True True - 5 - 5 - 5 - 5 - 5 - 5 - - - True - False - - - True - False - gtk-stop - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - Cancel - - - False - True - 1 - - - - + image8 + - False + True True - end - 1 + 0 - + + Read Online True True True - 5 - 5 - 5 - 5 - 5 - 5 - - - True - False - - - True - False - gtk-save - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - Save - - - False - True - 1 - - - - + image9 + - False + True True - end 1 @@ -2868,68 +2627,166 @@ limit False True - 2 + 1 - + True False True - + True False - Settings quotas - Adding + UBLinux Settings - - - True - False - 32 - com.ublinux.ubl-settings-resourcequota - 5 - - - + + + + + + + + + + + + + + + + + + + + + + True False - start - False + False - + + True + False + + + + + + True + False + + + + + + True + False + False + + + True + False + + + + + + True + False + + + + + + True + False + True + + + + + + 640 + 500 + False + 800 + 600 + com.ublinux.ubl-settings-resourcequota + + True False - 5 - 5 - 5 - 5 - 5 - 5 vertical True False + vertical - + True False - 5 - 5 - 5 - 5 - 5 - 5 - Quota object + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + 25 + + + False + True + 0 + + + + + True + False + start + 5 + 5 + 5 + 5 + 6 + 6 + + + + + + + False + True + 1 + + False @@ -2938,15 +2795,32 @@ limit - + True False - 5 - 5 - 5 - 5 - 5 - 5 + vertical + + + 81 + True + False + + + True + False + start + + + -1 + + + + + False + True + 0 + + False @@ -2955,36 +2829,7 @@ limit - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - - - False - True - 2 - - - - - False - True - 0 - - - - - True - False - vertical - - + True False 5 @@ -2993,37 +2838,162 @@ limit 5 5 5 - 0.019999999552965164 - in + True + True + vertical - + True False - 12 + 5 + 5 + 5 + 5 + 5 + 5 + True + True + vertical - + True - False + True True False vertical - + True - False - 5 - 5 - 5 - 5 - 5 - 5 - Soft Restriction - 0 + True + in + + + True + False + + + True + True + liststore + 0 + + + + + + Type quota + True + + + + 0 + + + + + + + Quota +object + True + + + + 1 + + + + + + + Soft RAM limit, +(volume) + True + + + + 2 + + + + + + + Hard RAM limit, +(volume) + True + + + + 3 + + + + + + + Swap file +limit +(volume) + True + + + + 4 + + + + + + + CPU limit +(%) + True + + + + 5 + + + + + + + I/O +limit +(read) + True + + + + 6 + + + + + + + I/O +limit +(write) + True + + + + 7 + + + + + + + + - False + True True 0 @@ -3033,115 +3003,311 @@ limit True False - + + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 + + + True + False + + + True + False + com.ublinux.ubl-settings-resourcequota.funnel + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + Filters + + + False + True + 1 + + + + + + + False + True + 0 + + + + + + + True True - False + True 5 5 5 5 5 5 - True - + True - True + False + + + True + False + tab-new-symbolic + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + Add + + + False + True + 1 + + False True - 0 + end + 2 - + True - False + True + True 5 5 5 5 5 5 - 0 - 0 - - Kb - Mb - Gb - Tb - + + + True + False + + + True + False + error-correct-symbolic + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + Edit + + + False + True + 1 + + + + False True - 1 + end + 3 + + + + + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 + + + True + False + + + True + False + software-remove-symbolic + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + Remove + + + False + True + 1 + + + + + + + False + True + end + 4 + + + + + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 + + + True + False + + + True + False + dialog-information-symbolic + + + False + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + Information + + + False + True + 1 + + + + + + + False + True + end + 5 False True - 1 + 2 - - True - True - 0 - - - + + True False - vertical - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - Severe Restriction - 0 - - - False - True - 0 - - + List quotas + + + False + + + + + True + False + vertical - + True False - + True - True - False + False 5 5 5 5 5 5 - True - - - True - True - - + Update every False @@ -3150,7 +3316,25 @@ limit - + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + adjustment1 + + + False + True + 1 + + + + True False 5 @@ -3159,14 +3343,7 @@ limit 5 5 5 - 0 - 0 - - Kb - Mb - Gb - Tb - + seconds False @@ -3174,86 +3351,30 @@ limit 2 - - - False - True - 1 - - - - - True - True - 1 - - - - - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - RAM limit - - - - - False - True - 0 - - - - - True - False - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - 0.019999999552965164 - in - - - True - False - 12 - - - True - False - - - True - True - False - 5 - 5 - 5 - 5 - 5 - 5 - True - + True True + True + 5 + 5 + 5 + 5 + 5 + 5 + + + True + False + reload + + + + True + True + 3 + @@ -3263,187 +3384,112 @@ limit - + True False - 5 - 5 - 5 - 5 - 5 - 5 - 0 - 0 - - Kb - Mb - Gb - Tb - - - - False - True - 1 - - - - - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - Paging file limit - - - - - True - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - 0.019999999552965164 - in - - - True - False - 12 - - - True - False - - - True - True - False - 5 - 5 - 5 - 5 - 5 - 5 - True - + True + False True + natural + adjustment3 + natural + UTF-8 + True + False - - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - % + + True + True + 0 + + + + + True + False + vertical + adjustment3 + + + False + True + 1 + + - False + True True 1 + + 1 + + + + + True + False + Dispatcher + + + 1 + False + - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - CPU limit - - - - - True - True - 1 - - - - - False - True - 1 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - 0.019999999552965164 - in - - - True - False - 12 - - - True - False - vertical True False + vertical - + True False - 5 - 5 - 5 - 5 - 5 - 5 - Device: - 0 + + + All groups including empty + True + True + False + 5 + 5 + 5 + 5 + 5 + 5 + True + + + False + True + 0 + + + + + Core streams + True + True + False + 5 + 5 + 5 + 5 + 5 + 5 + True + + + False + True + 1 + + False @@ -3452,15 +3498,40 @@ limit - + True - True - 5 - 5 - 5 - 5 - 5 - 5 + False + + + True + False + True + natural + adjustment2 + natural + UTF-8 + True + False + + + True + True + 0 + + + + + True + False + vertical + adjustment2 + + + False + True + 1 + + True @@ -3470,20 +3541,29 @@ limit - False - True - 0 + 2 + + + + + True + False + Processes + + + 2 + False True False + vertical - + True False - vertical True @@ -3494,8 +3574,7 @@ limit 5 5 5 - Read - 0 + View properties for False @@ -3504,69 +3583,50 @@ limit - + True False - - - True - True - False - 5 - 5 - 5 - 5 - 4 - 5 - True - - - True - True - - - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - 0 - 0 - - Kb - Mb - Gb - Tb - - - - False - True - 1 - - + 5 + 5 + 5 + 5 + 5 + 5 + 0 + 0 + + User + Group + Process + Slice + - False + True True 1 + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + + + True + True + 2 + + - True + False True 0 @@ -3575,80 +3635,30 @@ limit True False - vertical - + True - False - 5 - 5 - 5 - 5 - 5 - 5 - Write - 0 + False + True + natural + adjustment3 + natural + UTF-8 + True + False - False + True True 0 - + True False - - - True - True - False - 5 - 5 - 5 - 5 - 5 - 5 - True - - - True - True - - - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - 0 - 0 - - Kb - Mb - Gb - Tb - - - - False - True - 1 - - + vertical + adjustment3 False @@ -3665,27 +3675,33 @@ limit - False - True - 1 + 3 + + + + + True + False + Information + + + 3 + False + + True + True + 0 + - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - Input/Output limit of block devices - + + False + True + 0 + @@ -3694,93 +3710,69 @@ limit 2 - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - 0.019999999552965164 - in - - - True - False - 12 - - - True - True - 5 - 5 - 5 - 5 - 5 - 5 - - - - - - - True - False - Manual input (for advanced users) - - - - - False - True - 3 - - - False + True True - 1 + 0 + + + + + True + False + True + + + True + False + 5 + 5 + 5 + 5 + 2 + ubl-settings-resourcequota + + + + + - + + True + False + 5 + 5 + 5 + 5 + 6 + 6 + 32 + com.ublinux.ubl-settings-resourcequota + + + + True False - - True - False - - - False - True - 0 - - - - + True True + False True - 5 - 5 - 5 - 5 - 5 - 5 + menuSave True False - + True False - gtk-stop + Save False @@ -3789,14 +3781,10 @@ limit - + True False - 5 - 5 - 5 - 5 - Cancel + pan-down-symbolic False @@ -3810,30 +3798,58 @@ limit False True - end + 0 + + + + + True + True + True + False + True + True + menuAbout + none + + + + + + + False + True 1 + + + end + 1 + + + + + True + False - + True True + False True - 5 - 5 - 5 - 5 - 5 - 5 + menuLoad True False - + True False - gtk-save + Load False @@ -3842,14 +3858,10 @@ limit - + True False - 5 - 5 - 5 - 5 - Save + pan-down-symbolic False @@ -3863,17 +3875,209 @@ limit False True - end - 1 + 0 + + 2 + + + + + + + + vertical + + + + + + + + False + start + False + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + vertical + + + Type quota + True + True + False + start + True + False True 2 + + + Quota volume + True + True + False + start + True + + + False + True + 3 + + + + + Soft RAM limit, (volume) + True + True + False + start + True + + + False + True + 4 + + + + + True + False + end + 5 + 5 + True + + + gtk-cancel + True + True + True + center + True + + + False + True + 0 + + + + + gtk-save + True + True + True + center + True + + + False + True + 1 + + + + + False + True + end + 5 + + + + + Hard RAM limit, (volume) + True + True + False + start + True + + + False + True + 6 + + + + + Swap file limit (volume) + True + True + False + start + True + + + False + True + 7 + + + + + CPU limit (%) + True + True + False + start + True + + + False + True + 8 + + + + + I/O limit (write) + True + True + False + start + True + + + False + True + 8 + + + + + I/O limit (read) + True + True + False + start + True + + + False + True + 9 + + @@ -3882,10 +4086,10 @@ limit False True - + True False - Settings quotas - Editing + Filters diff --git a/ubl-settings-resourcequota_ru.po b/ubl-settings-resourcequota_ru.po index f75a052..8f1180f 100644 --- a/ubl-settings-resourcequota_ru.po +++ b/ubl-settings-resourcequota_ru.po @@ -165,7 +165,7 @@ msgid "Swap file\nlimit\n(volume)" msgstr "Лимит файлов\nподкачки\n(объём)" msgid "CPU limit\n(%)" -msgstr "Лимит ЦПУ (%)" +msgstr "Лимит ЦПУ\n(%)" msgid "I/O\nlimit\n(read)" msgstr "Лимит\nI/O\n(чтение)" @@ -304,6 +304,9 @@ msgstr "Квоты настроек - Редактирование" msgid "Quota object" msgstr "Объект квоты" +msgid "Quota\nobject" +msgstr "Объект\nквоты" + msgid "RAM limit" msgstr "Лимит ОЗУ" diff --git a/vgcore.39434 b/vgcore.39434 new file mode 100644 index 0000000..71c7475 Binary files /dev/null and b/vgcore.39434 differ