From 57a75b88e1030d1362fc4f27dcdda52713d3e3df Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 30 Aug 2023 09:14:04 +0600 Subject: [PATCH 01/16] Localisation error fixes --- ubl-settings-diskquota_ru.po | 3 --- 1 file changed, 3 deletions(-) diff --git a/ubl-settings-diskquota_ru.po b/ubl-settings-diskquota_ru.po index 34c7107..69bbf3e 100644 --- a/ubl-settings-diskquota_ru.po +++ b/ubl-settings-diskquota_ru.po @@ -456,6 +456,3 @@ msgstr "Добавить" msgid "Update" msgstr "Обновить" - -msgid "Save" -msgstr "Сохранить" \ No newline at end of file -- 2.35.1 From d37e6e2ba8349dcdb79f0e4d3cfdced7ec313176 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 30 Aug 2023 09:14:47 +0600 Subject: [PATCH 02/16] Added update button --- .gitignore | 3 ++- source/controler.c | 6 ++++++ source/model/philos_utils.h | 1 + source/ubl-settings-diskquota.c | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8879ccd..aa6b482 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ compile/ *# terminal-commands/ source/ubl-cmake.h -vgcore* \ No newline at end of file +vgcore* +.install.sh \ No newline at end of file diff --git a/source/controler.c b/source/controler.c index 75b8b33..35b01e1 100644 --- a/source/controler.c +++ b/source/controler.c @@ -299,6 +299,11 @@ void device_remove() { } +void device_update(){ + device_device_config_free(get_device_vec()); + vector_init(get_device_vec()); +} + void user_remove() { if (note_selected == 0) { GtkTreeIter iter; @@ -469,6 +474,7 @@ void control_event(main_window* _config_main_gui, custom_window* _config_custom_ g_signal_connect(G_OBJECT(_config_custom_gui->device.btnEdit), "clicked", G_CALLBACK(wrapper_edit_view_device_show), glade_path); g_signal_connect(G_OBJECT(_config_custom_gui->device.btnAdd), "clicked", G_CALLBACK(wrapper_add_view_device_show), glade_path); g_signal_connect(G_OBJECT(_config_custom_gui->device.btnDel),"clicked",G_CALLBACK(device_remove), glade_path); + g_signal_connect(G_OBJECT(_config_custom_gui->device.Update),"clicked",G_CALLBACK(device_update), NULL); } diff --git a/source/model/philos_utils.h b/source/model/philos_utils.h index 267205e..fd8e64d 100644 --- a/source/model/philos_utils.h +++ b/source/model/philos_utils.h @@ -87,6 +87,7 @@ typedef struct { GtkWidget* btnEdit; GtkWidget* btnDel; GtkWidget* btnFilter; + GtkWidget* Update; GtkWidget* lblSetNameDevice; } hotebook; typedef struct { diff --git a/source/ubl-settings-diskquota.c b/source/ubl-settings-diskquota.c index d617d8c..65cfc92 100644 --- a/source/ubl-settings-diskquota.c +++ b/source/ubl-settings-diskquota.c @@ -236,6 +236,7 @@ custom_window *setup_window_custom(custom_window* custom_widgets, GtkBuilder *bu custom_widgets->device.btnAdd = yon_gtk_builder_get_widget(builder,"btnAddDevice"); custom_widgets->device.btnDel = yon_gtk_builder_get_widget(builder,"btnDelDevice"); custom_widgets->device.tree_view = yon_gtk_builder_get_widget(builder,"DeviceQuotasTree"); + custom_widgets->device.Update = yon_gtk_builder_get_widget(builder,"btnUpdateDevices"); custom_widgets->device.liststore = GTK_LIST_STORE(gtk_builder_get_object(builder, "liststoreDevice")); GList *list = gtk_tree_view_get_columns(GTK_TREE_VIEW(custom_widgets->treeViewGeneral)); -- 2.35.1 From c405a3a998e3c232495a2734a490dfb2c258a3a7 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 30 Aug 2023 09:32:29 +0600 Subject: [PATCH 03/16] Changed find icon --- Makefile | 1 + ...x.ubl-settings-diskquota.zoom-symbolic.svg | 160 ++++++++++++++++++ ubl-settings-diskquota.glade | 2 +- 3 files changed, 162 insertions(+), 1 deletion(-) create mode 100644 com.ublinux.ubl-settings-diskquota.zoom-symbolic.svg diff --git a/Makefile b/Makefile index f309614..6bde63d 100644 --- a/Makefile +++ b/Makefile @@ -124,6 +124,7 @@ install: check uninstall @install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg" + @install -Dm644 -t "${DESTDIR}/share/icons/hicolor/scalable/actions/" "com.ublinux.${PKGNAME}.zoom-symbolic.svg" @install -Dm644 -t "${DESTDIR}/usr/share/polkit-1/actions/" "${CMAKE_BUILD_DIR}/com.ublinux.${PKGNAME}${PKGIDENT}.policy" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.funnel-symbolic.svg" @ldconfig -n /usr/local/lib diff --git a/com.ublinux.ubl-settings-diskquota.zoom-symbolic.svg b/com.ublinux.ubl-settings-diskquota.zoom-symbolic.svg new file mode 100644 index 0000000..c5011ec --- /dev/null +++ b/com.ublinux.ubl-settings-diskquota.zoom-symbolic.svg @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + diff --git a/ubl-settings-diskquota.glade b/ubl-settings-diskquota.glade index d8aebec..ce2cdec 100644 --- a/ubl-settings-diskquota.glade +++ b/ubl-settings-diskquota.glade @@ -862,7 +862,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False - zoom-fit-symbolic + com.ublinux.ubl-settings-diskquota.zoom-symbolic False -- 2.35.1 From af52f391c24e8b3d96ddc64c66923b85c9fa0ca7 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 30 Aug 2023 11:00:48 +0600 Subject: [PATCH 04/16] Fixed double warning window --- source/view_temp_u_g_p.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/source/view_temp_u_g_p.c b/source/view_temp_u_g_p.c index cefd227..163b568 100644 --- a/source/view_temp_u_g_p.c +++ b/source/view_temp_u_g_p.c @@ -601,23 +601,27 @@ int check_save() { char* value3 = (char*)gtk_entry_get_text(GTK_ENTRY(temp_widgets->quotegroupFilesSoftLimitSpin)); char* value4 = (char*)gtk_entry_get_text(GTK_ENTRY(temp_widgets->quotegroupFilesHardLimitSpin)); int menu_id = 0; - if (strcmp(set_add_edit, "add")==0) { - menu_id = gtk_combo_box_get_active(GTK_COMBO_BOX(temp_widgets->UserDeviceCombo)); - if (menu_id == -1) { - show_warning_no_fill(STR_ERROR_NO_SELECTED_DISK); - } + if (strcmp(gtk_entry_get_text(GTK_ENTRY(temp_widgets->entryUser)),"")==0){ + show_warning_no_fill(STR_ERROR_LIST_USER_NULL); + return 0; } - if (!active1 && !active2 && !active3 && !active4) { + else if (!active1 && !active2 && !active3 && !active4) { show_warning_no_fill(STR_ERROR_ENTRY_VALUE_VOLUME_OR_FILES); return 0; } - if (menu_id == -1 || ((!strcmp(value1, "0") || !strcmp(value1, "")) && active1) + else if (menu_id == -1 || ((!strcmp(value1, "0") || !strcmp(value1, "")) && active1) || ((!strcmp(value2, "0") || !strcmp(value2, "")) && active2) || ((!strcmp(value3, "0") || !strcmp(value3, "")) && active3) || ((!strcmp(value4, "0") || !strcmp(value4, "")) && active4)) { show_warning_no_fill(STR_ERROR_ENTRY_VALUE_VOLUME_OR_FILES); return 0; } + else if (strcmp(set_add_edit, "add")==0) { + menu_id = gtk_combo_box_get_active(GTK_COMBO_BOX(temp_widgets->UserDeviceCombo)); + if (menu_id == -1) { + show_warning_no_fill(STR_ERROR_NO_SELECTED_DISK); + } + } return 1; } @@ -684,7 +688,6 @@ int wrapper_check_save() { if (check_save()) { return 1; } - show_warning_no_fill(STR_ERROR_LIST_USER_NULL); return 0; } } -- 2.35.1 From 020c77402e86bc306d0ccf03a91944ff2d2164bf Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 30 Aug 2023 12:03:48 +0600 Subject: [PATCH 05/16] Width of colums depends on label width --- source/controler.c | 6 ++++++ source/model/ubl-utils.c | 5 +++++ source/model/ubl-utils.h | 2 ++ source/ubl-settings-diskquota.c | 2 +- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/source/controler.c b/source/controler.c index 35b01e1..f444f85 100644 --- a/source/controler.c +++ b/source/controler.c @@ -601,5 +601,11 @@ int main(int argc, char *argv[]){ tree_view_select_group(NULL); tree_view_select_project(NULL); tree_view_select_device(NULL); + + GList *list = gtk_tree_view_get_columns(GTK_TREE_VIEW(cfg_custom_gui.treeViewGeneral)); + for (int i = 0; i < g_list_length(list); i++){ + // yon_window_config_add_listener(g_list_nth_data(list,i),yon_char_append("general_tree",yon_char_from_int(i)),"fixed-width",YON_TYPE_INT); + yon_gtk_column_minimal_fixed_size_set((GtkTreeViewColumn*)g_list_nth_data(list,i)); + } gtk_main(); } \ No newline at end of file diff --git a/source/model/ubl-utils.c b/source/model/ubl-utils.c index ac34d72..7b2c610 100644 --- a/source/model/ubl-utils.c +++ b/source/model/ubl-utils.c @@ -1709,6 +1709,11 @@ int yon_gtk_combo_box_text_find(GtkWidget *combo_box, char *text_to_find){ } return -1; } +void yon_gtk_column_minimal_fixed_size_set(GtkTreeViewColumn *column){ + int width= gtk_tree_view_column_get_width(column); + gtk_tree_view_column_set_min_width(column,width); +} + /**yon_dictionary_gtk_pack_start_multiple_widgets(GtkBox *destination, gboolean expand, gboolean fill, int padding, ...) * [EN] * diff --git a/source/model/ubl-utils.h b/source/model/ubl-utils.h index 841561f..7c9599f 100644 --- a/source/model/ubl-utils.h +++ b/source/model/ubl-utils.h @@ -262,6 +262,8 @@ int yon_gtk_combo_box_fill(GtkWidget *combo, char **parameters,int size); int yon_gtk_combo_box_text_find(GtkWidget *combo_box, char *text_to_find); +void yon_gtk_column_minimal_fixed_size_set(GtkTreeViewColumn *column); + int yon_gtk_icon_view_hide_empty(dictionary *icon_view_segment); int yon_dictionary_gtk_pack_start_multiple_widgets(GtkBox *destination, gboolean expand, gboolean fill, int padding, ...); diff --git a/source/ubl-settings-diskquota.c b/source/ubl-settings-diskquota.c index 65cfc92..134ec20 100644 --- a/source/ubl-settings-diskquota.c +++ b/source/ubl-settings-diskquota.c @@ -239,12 +239,12 @@ custom_window *setup_window_custom(custom_window* custom_widgets, GtkBuilder *bu custom_widgets->device.Update = yon_gtk_builder_get_widget(builder,"btnUpdateDevices"); custom_widgets->device.liststore = GTK_LIST_STORE(gtk_builder_get_object(builder, "liststoreDevice")); + GList *list = gtk_tree_view_get_columns(GTK_TREE_VIEW(custom_widgets->treeViewGeneral)); for (int i = 0; i < g_list_length(list); i++){ yon_window_config_add_listener(g_list_nth_data(list,i),yon_char_append("general_tree",yon_char_from_int(i)),"fixed-width",YON_TYPE_INT); } g_list_free(list); - list = gtk_tree_view_get_columns(GTK_TREE_VIEW(custom_widgets->device.tree_view)); for (int i = 0; i < g_list_length(list); i++){ yon_window_config_add_listener(g_list_nth_data(list,i),yon_char_append("device_tree",yon_char_from_int(i)),"fixed-width",YON_TYPE_INT); -- 2.35.1 From 186551bdbd64110a17fe3e66fd98236083a0929a Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 30 Aug 2023 12:23:04 +0600 Subject: [PATCH 06/16] All tables got minimal column sizes from localized column names --- source/controler.c | 25 ++++++++++++++++++++++++- source/ubl-settings-diskquota.c | 6 ++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/source/controler.c b/source/controler.c index f444f85..f6f1ed2 100644 --- a/source/controler.c +++ b/source/controler.c @@ -604,8 +604,31 @@ int main(int argc, char *argv[]){ GList *list = gtk_tree_view_get_columns(GTK_TREE_VIEW(cfg_custom_gui.treeViewGeneral)); for (int i = 0; i < g_list_length(list); i++){ - // yon_window_config_add_listener(g_list_nth_data(list,i),yon_char_append("general_tree",yon_char_from_int(i)),"fixed-width",YON_TYPE_INT); yon_gtk_column_minimal_fixed_size_set((GtkTreeViewColumn*)g_list_nth_data(list,i)); } + g_list_free(list); + list = gtk_tree_view_get_columns(GTK_TREE_VIEW(cfg_custom_gui.device.tree_view)); + for (int i = 0; i < g_list_length(list); i++){ + yon_gtk_column_minimal_fixed_size_set((GtkTreeViewColumn*)g_list_nth_data(list,i)); + } + g_list_free(list); + + list = gtk_tree_view_get_columns(GTK_TREE_VIEW(cfg_custom_gui.user.tree_view)); + for (int i = 0; i < g_list_length(list); i++){ + yon_gtk_column_minimal_fixed_size_set((GtkTreeViewColumn*)g_list_nth_data(list,i)); + } + g_list_free(list); + + list = gtk_tree_view_get_columns(GTK_TREE_VIEW(cfg_custom_gui.group.tree_view)); + for (int i = 0; i < g_list_length(list); i++){ + yon_gtk_column_minimal_fixed_size_set((GtkTreeViewColumn*)g_list_nth_data(list,i)); + } + g_list_free(list); + + list = gtk_tree_view_get_columns(GTK_TREE_VIEW(cfg_custom_gui.project.tree_view)); + for (int i = 0; i < g_list_length(list); i++){ + yon_gtk_column_minimal_fixed_size_set((GtkTreeViewColumn*)g_list_nth_data(list,i)); + } + g_list_free(list); gtk_main(); } \ No newline at end of file diff --git a/source/ubl-settings-diskquota.c b/source/ubl-settings-diskquota.c index 134ec20..0080ac8 100644 --- a/source/ubl-settings-diskquota.c +++ b/source/ubl-settings-diskquota.c @@ -172,6 +172,7 @@ main_window *setup_window(main_window* widgets, custom_window* custom_widgets){ widgets->DocumentationMenuItem = yon_ubl_menu_item_documentation_new(DOCUMENTATION_LABEL); // yon_gtk_builder_get_widget(builder,"DocumentationMenuItem"); widgets->AboutMenuItem = yon_ubl_menu_item_about_new(ABOUT_LABEL); // yon_gtk_builder_get_widget(builder,"AboutMenuItem"); + gtk_window_set_title(GTK_WINDOW(widgets->Window),TITLE_LABEL); GtkWidget *menu = yon_gtk_builder_get_widget(builder,"menu2"); gtk_menu_shell_append(GTK_MENU_SHELL(menu),widgets->DocumentationMenuItem); gtk_menu_shell_append(GTK_MENU_SHELL(menu),widgets->AboutMenuItem); @@ -243,29 +244,34 @@ custom_window *setup_window_custom(custom_window* custom_widgets, GtkBuilder *bu GList *list = gtk_tree_view_get_columns(GTK_TREE_VIEW(custom_widgets->treeViewGeneral)); for (int i = 0; i < g_list_length(list); i++){ yon_window_config_add_listener(g_list_nth_data(list,i),yon_char_append("general_tree",yon_char_from_int(i)),"fixed-width",YON_TYPE_INT); + yon_gtk_column_minimal_fixed_size_set((GtkTreeViewColumn*)g_list_nth_data(list,i)); } g_list_free(list); list = gtk_tree_view_get_columns(GTK_TREE_VIEW(custom_widgets->device.tree_view)); for (int i = 0; i < g_list_length(list); i++){ yon_window_config_add_listener(g_list_nth_data(list,i),yon_char_append("device_tree",yon_char_from_int(i)),"fixed-width",YON_TYPE_INT); + yon_gtk_column_minimal_fixed_size_set((GtkTreeViewColumn*)g_list_nth_data(list,i)); } g_list_free(list); list = gtk_tree_view_get_columns(GTK_TREE_VIEW(custom_widgets->user.tree_view)); for (int i = 0; i < g_list_length(list); i++){ yon_window_config_add_listener(g_list_nth_data(list,i),yon_char_append("user_tree",yon_char_from_int(i)),"fixed-width",YON_TYPE_INT); + yon_gtk_column_minimal_fixed_size_set((GtkTreeViewColumn*)g_list_nth_data(list,i)); } g_list_free(list); list = gtk_tree_view_get_columns(GTK_TREE_VIEW(custom_widgets->group.tree_view)); for (int i = 0; i < g_list_length(list); i++){ yon_window_config_add_listener(g_list_nth_data(list,i),yon_char_append("group_tree",yon_char_from_int(i)),"fixed-width",YON_TYPE_INT); + yon_gtk_column_minimal_fixed_size_set((GtkTreeViewColumn*)g_list_nth_data(list,i)); } g_list_free(list); list = gtk_tree_view_get_columns(GTK_TREE_VIEW(custom_widgets->project.tree_view)); for (int i = 0; i < g_list_length(list); i++){ yon_window_config_add_listener(g_list_nth_data(list,i),yon_char_append("project_tree",yon_char_from_int(i)),"fixed-width",YON_TYPE_INT); + yon_gtk_column_minimal_fixed_size_set((GtkTreeViewColumn*)g_list_nth_data(list,i)); } g_list_free(list); -- 2.35.1 From d3f760437eafd03f6fee948ec9cdc31c2c9fd9c3 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 30 Aug 2023 12:31:21 +0600 Subject: [PATCH 07/16] Fixed localisation --- source/ubl-strings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ubl-strings.h b/source/ubl-strings.h index b786276..4010889 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -93,7 +93,7 @@ #define STR_ERROR_PROJECT_NAME_ENTER_VALUE _("Project name required field") #define STR_ERROR_LIST_USER_NULL _("The list of users is empty") #define STR_ERROR_NO_SELECTED_DISK _("To save, you need to select a disk") -#define STR_ERROR_ENTRY_VALUE_VOLUME_OR_FILES _("Insert at leat one value before saving") +#define STR_ERROR_ENTRY_VALUE_VOLUME_OR_FILES _("Insert at least one value before saving") #define STR_ERROR_PATH_IS_DISK_FALSE _("The selected directory is not located on the target device") #define ADD_LABEL _("Add") -- 2.35.1 From 4ecaa9fe235e188d4d2c0929f7ffbddcb8680328 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 30 Aug 2023 15:18:49 +0600 Subject: [PATCH 08/16] UI paddings were reworked --- ubl-settings-diskquota.glade | 2455 ++++++++++++---------------------- 1 file changed, 867 insertions(+), 1588 deletions(-) diff --git a/ubl-settings-diskquota.glade b/ubl-settings-diskquota.glade index ce2cdec..9c7e8d4 100644 --- a/ubl-settings-diskquota.glade +++ b/ubl-settings-diskquota.glade @@ -379,6 +379,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. process-stop-symbolic + -1 + -1 False False True @@ -419,6 +421,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + 300 True False vertical @@ -558,11 +561,51 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. False emblem-synchronizing-symbolic + + True + False + com.ublinux.ubl-settings-diskquota.funnel-symbolic + + + True + False + document-edit-symbolic + + + True + False + document-edit-symbolic + + + True + False + com.ublinux.ubl-settings-diskquota.funnel-symbolic + + + True + False + document-edit-symbolic + + + True + False + com.ublinux.ubl-settings-diskquota.funnel-symbolic + True False value-increase-symbolic + + True + False + document-edit-symbolic + + + True + False + com.ublinux.ubl-settings-diskquota.zoom-symbolic + True False @@ -577,33 +620,28 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. False start False + True True com.ublinux.ubl-settings-diskquota True False - 5 - 5 5 5 5 5 vertical + 5 True False + 5 True False - 5 - 5 - 5 - 5 - 5 - 5 Device: 0 @@ -617,12 +655,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False - 5 - 5 - 5 - 5 - 5 - 5 True @@ -660,28 +692,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False vertical + 5 True False vertical - - - + 5 True False + 5 True False - 5 - 5 - 5 - 5 - 5 - 5 Quota use status: 0 @@ -695,12 +721,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False - 5 - 5 - 5 - 5 - 5 - 5 0 @@ -716,23 +736,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 1 - - - True False + 5 True False - 5 - 5 - 5 - 5 - 5 - 5 UserGropProject: 0 @@ -746,12 +758,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True True - 5 - 5 - 5 - 5 - 5 - 5 entrycompletion4 @@ -765,17 +771,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True True True - 5 - 5 - 5 - 5 - 5 - 5 True False - edit-find-symbolic + com.ublinux.ubl-settings-diskquota.zoom-symbolic @@ -797,23 +797,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False vertical - - - + 5 True False + 5 True False - 5 - 5 - 5 - 5 - 5 - 5 Catalog: 0 @@ -827,12 +820,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True True - 5 - 5 - 5 - 5 - 5 - 5 255 entrycompletion1 @@ -844,46 +831,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + Review True True True - 5 - 5 - 5 - 5 - 5 - 5 - - - True - False - center - - - True - False - com.ublinux.ubl-settings-diskquota.zoom-symbolic - - - False - True - 0 - - - - - True - False - Review - - - False - True - 1 - - - - + image21 False @@ -895,12 +847,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False - 5 - 5 - 5 - 5 - 5 - 5 label @@ -916,9 +862,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 1 - - - False @@ -930,20 +873,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False + 5 True False + 5 True False - 5 - 5 - 5 - 5 - 5 - 5 Project ID: 0 @@ -959,12 +898,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True True False - 5 - 5 - 5 - 5 - 5 - 5 True @@ -984,12 +917,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True True - 5 - 5 - 5 - 5 - 5 - 5 5 entrycompletion2 number @@ -1004,12 +931,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False - 5 - 5 - 5 - 5 - 5 - 5 label 0 @@ -1025,12 +946,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True True True - 5 - 5 - 5 - 5 - 5 - 5 False @@ -1046,23 +961,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 5 - - - True False + 5 True False - 5 - 5 - 5 - 5 - 5 - 5 Project Name: 0 @@ -1076,12 +983,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True True - 5 - 5 - 5 - 5 - 5 - 5 12 entrycompletion3 @@ -1098,9 +999,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 7 - - - False @@ -1112,16 +1010,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False + 5 True True False - 5 - 5 - 5 - 5 - 5 0.019999999552965164 in @@ -1137,16 +1031,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False vertical + 5 True False - 5 - 5 - 5 - 5 - 5 - 5 Soft limit 0 @@ -1195,10 +1084,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False - 5 - 5 - 5 - 5 0 0 @@ -1225,12 +1110,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False - 5 - 5 - 5 - 5 - 5 - 5 Hard limit 0 @@ -1280,10 +1159,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False - 5 - 5 - 5 - 5 0 0 @@ -1314,12 +1189,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False - 5 - 5 - 5 - 5 - 5 - 5 Size @@ -1334,11 +1203,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False - 5 - 5 - 5 - 5 - 5 0.019999999552965164 in @@ -1354,16 +1218,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False vertical + 5 True False - 5 - 5 - 5 - 5 - 5 - 5 Soft limit 0 @@ -1410,10 +1269,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False - 5 - 5 - 5 - 5 files @@ -1433,12 +1288,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False - 5 - 5 - 5 - 5 - 5 - 5 Hard limit 0 @@ -1485,10 +1334,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False - 5 - 5 - 5 - 5 files @@ -1512,12 +1357,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False - 5 - 5 - 5 - 5 - 5 - 5 Files @@ -1561,12 +1400,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True True True - 5 - 5 - 5 - 5 - 5 - 5 True @@ -1581,12 +1414,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True True True - 5 - 5 - 5 - 5 - 5 - 5 image4 @@ -1652,26 +1479,26 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False + 5 + 5 + 5 + 5 vertical True False vertical + 5 True False + 5 True False - 5 - 5 - 5 - 5 - 5 - 5 Device: @@ -1684,12 +1511,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False - 5 - 5 - 5 - 5 - 5 - 5 True @@ -1699,14 +1520,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - True False - 5 - 5 - 5 - 5 - 5 - 5 0 @@ -1727,20 +1541,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False vertical + 5 True False + 5 True False - 5 - 5 - 5 - 5 - 5 - 5 Quota use status: 0 @@ -1754,12 +1564,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False - 5 - 5 - 5 - 5 - 5 - 5 1 1 @@ -1786,16 +1590,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False vertical + 5 True False - 5 - 5 - 5 - 5 - 5 - 5 0.019999999552965164 0.5899999737739563 in @@ -1803,29 +1602,23 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False + 5 + 5 + 5 True False - 5 - 5 - 5 - 5 - 5 + 5 True False + 5 True True - 5 - 5 - 5 - 5 - 5 - 5 4 0 adjustment35 @@ -1840,12 +1633,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False - 5 - 5 - 5 - 5 - 5 - 5 weeks 0 @@ -1866,16 +1653,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False + 5 True True - 5 - 5 - 5 - 5 - 5 - 5 4 0 adjustment34 @@ -1890,12 +1672,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False - 5 - 5 - 5 - 5 - 5 - 5 days 0 @@ -1916,16 +1692,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False + 5 True True - 5 - 5 - 5 - 5 - 5 - 5 4 0 adjustment33 @@ -1940,12 +1711,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False - 5 - 5 - 5 - 5 - 5 - 5 hours 0 @@ -1966,16 +1731,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False + 5 True True - 5 - 5 - 5 - 5 - 5 - 5 4 0 adjustment32 @@ -1990,12 +1750,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False - 5 - 5 - 5 - 5 - 5 - 5 minutes 0 @@ -2034,41 +1788,29 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False - 5 - 5 - 5 - 5 - 5 - 5 0.019999999552965164 in True False + 5 + 5 + 5 True False - 5 - 5 - 5 - 5 - 5 + 5 True False + 5 True True - 5 - 5 - 5 - 5 - 5 - 5 4 0 adjustment5 @@ -2083,12 +1825,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False - 5 - 5 - 5 - 5 - 5 - 5 weeks 0 @@ -2109,16 +1845,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False + 5 True True - 5 - 5 - 5 - 5 - 5 - 5 4 0 adjustment7 @@ -2133,12 +1864,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False - 5 - 5 - 5 - 5 - 5 - 5 days 0 @@ -2159,16 +1884,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False + 5 True True - 5 - 5 - 5 - 5 - 5 - 5 4 0 adjustment9 @@ -2183,12 +1903,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False - 5 - 5 - 5 - 5 - 5 - 5 hours 0 @@ -2209,16 +1923,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False + 5 True True - 5 - 5 - 5 - 5 - 5 - 5 4 0 adjustment11 @@ -2233,12 +1942,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False - 5 - 5 - 5 - 5 - 5 - 5 minutes 0 @@ -2292,6 +1995,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False vertical + 5 True @@ -2306,12 +2010,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True True True - 5 - 5 - 5 - 5 - 5 - 5 True @@ -2326,12 +2024,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True True True - 5 - 5 - 5 - 5 - 5 - 5 image5 @@ -2480,6 +2172,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 5 5 vertical + 5 Name @@ -2487,7 +2180,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False start - 5 True @@ -2500,13 +2192,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False + start vertical + 5 Device True True False + start 0 True @@ -2522,6 +2217,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True True False + start True @@ -2536,6 +2232,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True True False + start True @@ -2601,7 +2298,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False end - 5 5 True @@ -3061,29 +2757,29 @@ translated and supported by community. True False + 5 + 5 + 5 + 4 vertical True False vertical + 5 True False vertical + 5 Withdraw all users True True False - 5 - 5 - 5 - 5 - 5 - 5 True @@ -3170,12 +2866,6 @@ translated and supported by community. True True True - 5 - 5 - 5 - 5 - 5 - 5 True @@ -3190,12 +2880,6 @@ translated and supported by community. True True True - 5 - 5 - 5 - 5 - 5 - 5 image3 @@ -3428,12 +3112,6 @@ translated and supported by community. True False - 5 - 5 - 5 - 5 - 5 - 5 True True vertical @@ -3441,12 +3119,6 @@ translated and supported by community. True False - 5 - 5 - 5 - 5 - 5 - 5 True True vertical @@ -3454,8 +3126,6 @@ translated and supported by community. True False - 5 - 5 5 5 5 @@ -3471,6 +3141,8 @@ translated and supported by community. True False + 5 + 5 vertical @@ -3479,249 +3151,240 @@ translated and supported by community. True always - + True - False - none + True + liststoreGeneral + 0 - - True - True - liststoreGeneral - 0 - - - + + True + fixed + 0 + 15 + Status + True - - True - fixed - 15 - Status - True - - - - 0 - - - + + + 0 + + + + + + True + fixed + 15 + Quotas - - True - fixed - 15 - Quotas - - - - 1 - - - + + + 1 + + + + + + True + fixed + 15 + Quota type + True - - True - fixed - 15 - Quota type - True - - - word - - - 2 - - + + word + + 2 + - - - True - fixed - 15 - Device/ + + + + + True + fixed + 15 + Device/ Project - True - - - - 3 - - - + True + + + + 3 + + + + + + True + fixed + 15 + Users + True - - True - fixed - 15 - Users - True - - - word - - - 4 - - + + word + + 4 + + + + + + True + fixed + 15 + Groups + True - - True - fixed - 15 - Groups - True - - - word - - - 5 - - + + word + + 5 + + + + + + True + fixed + 15 + Projects + True - - True - fixed - 15 - Projects - True - - - word - - - 6 - - + + word + + 6 + - - - True - fixed - 15 - Soft + + + + + True + fixed + 15 + Soft restriction (volume) - True - - - word - - - 7 - - + True + + + word + + 7 + - - - True - fixed - 15 - Hard + + + + + True + fixed + 15 + Hard limit (volume) - True - - - word - - - 8 - - + True + + + word + + 8 + - - - True - fixed - 15 - Postponing + + + + + True + fixed + 15 + Postponing the hard limit (volume) - True - - - word - - - 9 - - + True + + + word + + 9 + - - - True - fixed - 15 - Soft + + + + + True + fixed + 15 + Soft restriction (files) - True - - - word - - - 10 - - + True + + + word + + 10 + - - - True - fixed - 15 - Hard + + + + + True + fixed + 15 + Hard limit (files) - True - - - word - - - 11 - - + True + + + word + + 11 + - - - True - autosize - 15 - Postponing + + + + + True + autosize + 15 + Postponing the hard limit (files) - True - - - word - - - 12 - - + True + + + word + + 12 + @@ -3750,155 +3413,136 @@ limit True False + 5 + 5 vertical + 5 100 True True - + True - False - none + True + liststoreDevice + 0 - - True - False - vertical + + True + fixed + 15 + Status + True + + + + 0 + + + + + + + True + fixed + 15 + Device + True - - True - True - liststoreDevice - 0 - - - - - - True - fixed - 15 - Status - True - - - - 0 - - - - - - - True - fixed - 15 - Device - True - - - - 1 - - - - - - - True - fixed - 15 - Mount + + + 1 + + + + + + + True + fixed + 15 + Mount point - True - - - word - - - 2 - - - - - - - True - fixed - 15 - FS - True - - - word - - - 3 - - - - - - - True - fixed - 15 - Name - True - - - word - - - 4 - - - - - - - True - fixed - 15 - The postponement period + True + + + word + + + 2 + + + + + + + True + fixed + 15 + FS + True + + + word + + + 3 + + + + + + + True + fixed + 15 + Name + True + + + word + + + 4 + + + + + + + True + fixed + 15 + The postponement period for exceeding the volume - True - - - word - - - 5 - - - - - - - True - autosize - 15 - The delay period + True + + + word + + + 5 + + + + + + + True + autosize + 15 + The delay period for exceeding files - True - - - word - - - 6 - - - - + True + + + word - - True - True - 2 - + + 6 + @@ -3915,22 +3559,19 @@ for exceeding files True False + 5 + 5 True False + 5 gtk-delete True True True - 5 - 5 - 5 - 5 - 5 - 5 True @@ -3941,51 +3582,11 @@ for exceeding files + Edit True True True - 5 - 5 - 5 - 5 - 5 - 5 - - - True - False - - - True - False - 5 - 5 - document-edit-symbolic - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - Edit - - - False - True - 1 - - - - + image16 False @@ -3999,12 +3600,6 @@ for exceeding files True True True - 5 - 5 - 5 - 5 - 5 - 5 image2 @@ -4019,12 +3614,6 @@ for exceeding files True True True - 5 - 5 - 5 - 5 - 5 - 5 image13 @@ -4069,187 +3658,168 @@ for exceeding files True False + 5 + 5 vertical + 5 100 True True - + True - False - none + True + liststoreUser + 0 - - True - False - vertical + + True + fixed + 15 + Name + True + + + word + + + 0 + + + + + + + True + fixed + 15 + Device + True - - True - True - liststoreUser - 0 - - - - - - True - fixed - 15 - Name - True - - - word - - - 0 - - - - - - - True - fixed - 15 - Device - True - - - - 1 - - - - - - - True - fixed - 15 - Soft + + + 1 + + + + + + + True + fixed + 15 + Soft restriction (volume) - True - - - word - - - 2 - - - - - - - True - fixed - 15 - Hard + True + + + word + + + 2 + + + + + + + True + fixed + 15 + Hard limit (volume) - True - - - word - - - 3 - - - - - - - True - fixed - 15 - Postponing + True + + + word + + + 3 + + + + + + + True + fixed + 15 + Postponing the hard limit (volume) - True - - - word - - - 4 - - - - - - - True - fixed - 15 - Soft + True + + + word + + + 4 + + + + + + + True + fixed + 15 + Soft restriction (files) - True - - - word - - - 5 - - - - - - - True - fixed - 15 - Hard + True + + + word + + + 5 + + + + + + + True + fixed + 15 + Hard limit (files) - True - - - word - - - 6 - - - - - - - True - autosize - 15 - Postponing + True + + + word + + + 6 + + + + + + + True + autosize + 15 + Postponing the hard limit (files) - True - - - word - - - 7 - - - - + True + + + word - - True - True - 2 - + + 7 + @@ -4266,49 +3836,16 @@ limit True False + 5 + 5 + 5 + Filters True True True - 5 - 5 - 5 - 5 - 5 - 5 - - - True - False - - - True - False - com.ublinux.ubl-settings-diskquota.funnel-symbolic - - - False - True - 0 - - - - - True - False - 5 - 5 - Filters - - - False - True - 1 - - - - + image17 False @@ -4320,18 +3857,13 @@ limit True False + 5 gtk-delete True True True - 5 - 5 - 5 - 5 - 5 - 5 True @@ -4342,51 +3874,11 @@ limit + Edit True True True - 5 - 5 - 5 - 5 - 5 - 5 - - - True - False - - - True - False - 5 - 5 - document-edit-symbolic - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - Edit - - - False - True - 1 - - - - + image18 False @@ -4400,12 +3892,6 @@ limit True True True - 5 - 5 - 5 - 5 - 5 - 5 image10 @@ -4450,6 +3936,8 @@ limit True False + 5 + 5 vertical @@ -4457,180 +3945,158 @@ limit True True - + True - False - none + True + liststoreGroups + 0 - - True - False - vertical + + True + fixed + 15 + Name + True + + + word + + + 0 + + + + + + + True + fixed + 15 + Device + True - - True - True - liststoreGroups - 0 - - - - - - True - fixed - 15 - Name - True - - - word - - - 0 - - - - - - - True - fixed - 15 - Device - True - - - - 1 - - - - - - - True - fixed - 15 - Soft + + + 1 + + + + + + + True + fixed + 15 + Soft restriction (volume) - True - - - word - - - 2 - - - - - - - True - fixed - 15 - Hard + True + + + word + + + 2 + + + + + + + True + fixed + 15 + Hard limit (volume) - True - - - word - - - 3 - - - - - - - True - fixed - 15 - Postponing + True + + + word + + + 3 + + + + + + + True + fixed + 15 + Postponing the hard limit (volume) - True - - - word - - - 4 - - - - - - - True - fixed - 15 - Soft + True + + + word + + + 4 + + + + + + + True + fixed + 15 + Soft restriction (files) - True - - - word - - - 5 - - - - - - - True - fixed - 15 - Hard + True + + + word + + + 5 + + + + + + + True + fixed + 15 + Hard limit (files) - True - - - word - - - 6 - - - - - - - True - autosize - 15 - Postponing + True + + + word + + + 6 + + + + + + + True + autosize + 15 + Postponing the hard limit (files) - True - - - word - - - 7 - - - - + True + + + word - - True - True - 2 - + + 7 + @@ -4647,49 +4113,16 @@ limit True False + 5 + 5 + 5 + Filters True True True - 5 - 5 - 5 - 5 - 5 - 5 - - - True - False - - - True - False - com.ublinux.ubl-settings-diskquota.funnel-symbolic - - - False - True - 0 - - - - - True - False - 5 - 5 - Filters - - - False - True - 1 - - - - + image19 False @@ -4701,18 +4134,13 @@ limit True False + 5 gtk-delete True True True - 5 - 5 - 5 - 5 - 5 - 5 True @@ -4723,51 +4151,11 @@ limit + Edit True True True - 5 - 5 - 5 - 5 - 5 - 5 - - - True - False - - - True - False - 5 - 5 - document-edit-symbolic - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - Edit - - - False - True - 1 - - - - + image20 False @@ -4781,12 +4169,6 @@ limit True True True - 5 - 5 - 5 - 5 - 5 - 5 image11 @@ -4832,217 +4214,198 @@ limit True False + 5 + 5 vertical + 5 100 True True - + True - False - none + True + liststoreProject + 0 - - True - False - vertical + + True + fixed + 15 + Device + True + + + + 0 + + + + + + + True + fixed + 15 + Catalog + True + + + + 1 + + + + + + + True + fixed + 15 + ID + True + + + word + + + 2 + + + + + + + True + fixed + 15 + Project Name + True - - True - True - liststoreProject - 0 - - - - - - True - fixed - 15 - Device - True - - - - 0 - - - - - - - True - fixed - 15 - Catalog - True - - - - 1 - - - - - - - True - fixed - 15 - ID - True - - - word - - - 2 - - - - - - - True - fixed - 15 - Project Name - True - - - - 3 - - - - - - - True - fixed - 15 - Soft + + + 3 + + + + + + + True + fixed + 15 + Soft restriction (volume) - True - - - word - - - 4 - - - - - - - True - fixed - 15 - Hard + True + + + word + + + 4 + + + + + + + True + fixed + 15 + Hard limit (volume) - True - - - word - - - 5 - - - - - - - True - fixed - 15 - Postponing + True + + + word + + + 5 + + + + + + + True + fixed + 15 + Postponing the hard limit (volume) - True - - - word - - - 6 - - - - - - - True - fixed - 15 - Soft + True + + + word + + + 6 + + + + + + + True + fixed + 15 + Soft restriction (files) - True - - - word - - - 7 - - - - - - - True - fixed - 15 - Hard + True + + + word + + + 7 + + + + + + + True + fixed + 15 + Hard limit (files) - True - - - word - - - 8 - - - - - - - True - autosize - 15 - Postponing + True + + + word + + + 8 + + + + + + + True + autosize + 15 + Postponing the hard limit (files) - True - - - word - - - 9 - - - - + True + + + word - - True - True - 2 - + + 9 + @@ -5059,49 +4422,16 @@ limit True False + 5 + 5 + 6 + Filters True True True - 5 - 5 - 5 - 5 - 5 - 5 - - - True - False - - - True - False - com.ublinux.ubl-settings-diskquota.funnel-symbolic - - - False - True - 0 - - - - - True - False - 5 - 5 - Filters - - - False - True - 1 - - - - + image14 False @@ -5113,18 +4443,13 @@ limit True False + 5 gtk-delete True True True - 5 - 5 - 5 - 5 - 5 - 5 True @@ -5135,51 +4460,11 @@ limit + Edit True True True - 5 - 5 - 5 - 5 - 5 - 5 - - - True - False - - - True - False - 5 - 5 - document-edit-symbolic - - - False - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - Edit - - - False - True - 1 - - - - + image15 False @@ -5193,12 +4478,6 @@ limit True True True - 5 - 5 - 5 - 5 - 5 - 5 image12 -- 2.35.1 From 1130e1fed5d7b25c6ff336dd95b9106f2d118ba8 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 31 Aug 2023 09:36:23 +0600 Subject: [PATCH 09/16] design update --- source/controler.c | 5 ++++- ubl-settings-diskquota.glade | 11 ----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/source/controler.c b/source/controler.c index f6f1ed2..bc601de 100644 --- a/source/controler.c +++ b/source/controler.c @@ -510,10 +510,11 @@ int main(int argc, char *argv[]){ {"socket-ext-id", 1,0, 'e'}, {"socket-trd-id", 1,0, 't'}, {"debug", 0,0, 'd'}, + {"clean-config", 0,0, 'c'}, { NULL, 0, NULL, 0 } }; for (int i=0;i1 - - - False - 0 - - - False - True - 2 - - False -- 2.35.1 From 4edc14c8a3b6fe99ff8f952caaaeb299ae77853b Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 31 Aug 2023 09:38:56 +0600 Subject: [PATCH 10/16] Combo box length fixed --- ubl-settings-diskquota.glade | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/ubl-settings-diskquota.glade b/ubl-settings-diskquota.glade index cd7365e..391c518 100644 --- a/ubl-settings-diskquota.glade +++ b/ubl-settings-diskquota.glade @@ -662,24 +662,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 1 - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - 0 - - - False - True - 2 - - True @@ -3145,6 +3127,9 @@ translated and supported by community. True liststoreGeneral 0 + + + True @@ -3417,6 +3402,9 @@ limit True liststoreDevice 0 + + + True @@ -3662,6 +3650,9 @@ for exceeding files True liststoreUser 0 + + + True @@ -3939,6 +3930,9 @@ limit True liststoreGroups 0 + + + True @@ -4218,6 +4212,9 @@ limit True liststoreProject 0 + + + True -- 2.35.1 From 11e15e452502658b296543f070a85ba46f7f1ac5 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 31 Aug 2023 09:41:46 +0600 Subject: [PATCH 11/16] Fixed unfound icon --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6bde63d..1c7419b 100644 --- a/Makefile +++ b/Makefile @@ -124,7 +124,7 @@ install: check uninstall @install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg" - @install -Dm644 -t "${DESTDIR}/share/icons/hicolor/scalable/actions/" "com.ublinux.${PKGNAME}.zoom-symbolic.svg" + @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "com.ublinux.${PKGNAME}.zoom-symbolic.svg" @install -Dm644 -t "${DESTDIR}/usr/share/polkit-1/actions/" "${CMAKE_BUILD_DIR}/com.ublinux.${PKGNAME}${PKGIDENT}.policy" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.funnel-symbolic.svg" @ldconfig -n /usr/local/lib -- 2.35.1 From 9bd6e51a404a625b331de5148fd2890f7c5cddab Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 31 Aug 2023 10:00:53 +0600 Subject: [PATCH 12/16] Update button has been fixed - now it updates devices properly --- source/controler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/controler.c b/source/controler.c index bc601de..745aa9d 100644 --- a/source/controler.c +++ b/source/controler.c @@ -474,7 +474,7 @@ void control_event(main_window* _config_main_gui, custom_window* _config_custom_ g_signal_connect(G_OBJECT(_config_custom_gui->device.btnEdit), "clicked", G_CALLBACK(wrapper_edit_view_device_show), glade_path); g_signal_connect(G_OBJECT(_config_custom_gui->device.btnAdd), "clicked", G_CALLBACK(wrapper_add_view_device_show), glade_path); g_signal_connect(G_OBJECT(_config_custom_gui->device.btnDel),"clicked",G_CALLBACK(device_remove), glade_path); - g_signal_connect(G_OBJECT(_config_custom_gui->device.Update),"clicked",G_CALLBACK(device_update), NULL); + g_signal_connect(G_OBJECT(_config_custom_gui->device.Update),"clicked",G_CALLBACK(device_disk_parsed), NULL); } -- 2.35.1 From d412924b2e9d58e5dc2294319d3cb525ba6def3b Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 31 Aug 2023 10:05:17 +0600 Subject: [PATCH 13/16] Makefile reversed --- Makefile | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index 1c7419b..eae48d9 100644 --- a/Makefile +++ b/Makefile @@ -9,10 +9,8 @@ CMAKE_COMMAND = cmake CMAKE_SOURCE_DIR = $(MAKEFILE_PATH)source CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile DEPENDS = /bin/cmake -PREFIX ?= /usr/local +PREFIX ?= /usr PKGNAME = $(MAKEFILE_DIR) -FILE_VER = source/${PKGNAME}.h -PKGIDENT=$(subst /,-,${PREFIX}) default_target: all @@ -23,16 +21,11 @@ all: init build init: @echo "Initialize ..."; \ if [ -d ".git" ]; then \ - LATEST_TAG=$$(git describe --abbrev=0 --tags | sed 's/^v//'); \ - if [ -z "$${LATEST_TAG}" ]; \ - then \ - LATEST_TAG=$$"0.0"; \ - echo "$${LATEST_TAG} is empty"; \ - fi; \ + LATEST_TAG=$$(git describe --tags | sed 's/^v//'); \ else \ - LATEST_TAG="Development"; \ + LATEST_TAG="0.0"; \ fi; \ - sed -r "s/^(string version_application).*/\1 = \"$${LATEST_TAG}\";/" -i ${FILE_VER}; \ + sed -r "s/^(string version_application = ).*/\1\"$${LATEST_TAG}\";/" -i source/${PKGNAME}.cc; \ echo "-- Build path: ${CMAKE_BUILD_DIR}" depend: @@ -71,8 +64,7 @@ check: build: depend prepare @echo "Build ..."; \ - $(MAKE_COMMAND) --directory=${CMAKE_BUILD_DIR}; \ - sed -r "s/^(string version_application).*/\1;/" -i ${FILE_VER}; \ + make --directory=${CMAKE_BUILD_DIR}; \ echo "Build: OK" uninstall: @@ -80,7 +72,7 @@ uninstall: @for FILE_PO in $(wildcard *.po); do \ LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \ FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \ - PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ + PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ $(RM) "$${PATH_FILE_MO}"; \ done @for SIZE in 16x16 32x32 48x48 scalable; do \ @@ -94,8 +86,10 @@ uninstall: done @$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}" @$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop" + @$(RM) "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/logo-background.png" + @$(RM) "${DESTDIR}${PREFIX}/share/polkit-1/actions/com.ublinux.${PKGNAME}.policy" @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg" - @$(RM) "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.policy" + @$(RM) -rd "${DESTDIR}${PREFIX}/share/${PKGNAME}" @if [ -z ${DESTDIR} ]; then \ [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ update-desktop-database --quiet &>/dev/null || true; \ @@ -107,9 +101,9 @@ install: check uninstall @echo "Install ..." @for FILE_PO in $(wildcard *.po); do \ LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \ - install -dm755 "${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES"; \ + install -dm755 "${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES"; \ FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \ - PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ + PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ echo "$${FILE_PO}"; \ msgfmt "$${FILE_PO}" -v -f -o "$${PATH_FILE_MO}"; \ done @@ -117,17 +111,20 @@ install: check uninstall install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \ rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \ done + @install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg" - @cp ./com.ublinux.${PKGNAME}.policy ./compile/com.ublinux.${PKGNAME}${PKGIDENT}.policy - @sed -e 's+/usr/bin+${PREFIX}/bin+' -e 's+.run+${PKGIDENT}.run+g' ./compile/com.ublinux.${PKGNAME}${PKGIDENT}.policy -i @install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}" + @install -dm755 "${DESTDIR}${PREFIX}/share/applications" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop" + @install -dm755 "${DESTDIR}${PREFIX}/share/polkit-1/actions" + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/polkit-1/actions/" "com.ublinux.${PKGNAME}.policy" + @install -dm755 "${DESTDIR}${PREFIX}/share/${PKGNAME}"/{ui,css,images} + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/ui/" "${PKGNAME}.glade" + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/css/" "${PKGNAME}.css" + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/" "logo-background.png" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "com.ublinux.${PKGNAME}.zoom-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/polkit-1/actions/" "${CMAKE_BUILD_DIR}/com.ublinux.${PKGNAME}${PKGIDENT}.policy" - @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.funnel-symbolic.svg" - @ldconfig -n /usr/local/lib + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.funnel.svg" @if [ -z ${DESTDIR} ]; then \ [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ update-desktop-database --quiet &>/dev/null || true; \ @@ -153,4 +150,4 @@ help: echo "... compile"; \ echo "... install"; \ echo "... uninstall"; \ - echo "... clean" \ No newline at end of file + echo "... clean" -- 2.35.1 From 5e58af96a59a147c8b596786479cd1295aa8ba77 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 31 Aug 2023 10:06:41 +0600 Subject: [PATCH 14/16] Makefile reversed --- Makefile | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index eae48d9..04c4243 100644 --- a/Makefile +++ b/Makefile @@ -8,24 +8,20 @@ MAKEFILE_PATH := $(dir $(MAKEFILE_FILEPATH)) CMAKE_COMMAND = cmake CMAKE_SOURCE_DIR = $(MAKEFILE_PATH)source CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile +FILE_VERSION = VERSION.md DEPENDS = /bin/cmake PREFIX ?= /usr PKGNAME = $(MAKEFILE_DIR) default_target: all -.PHONY: all init depend debug prepare check build uninstall install clean help +.PHONY: all init depend debug prepare check build uninstall install clean up_ver help all: init build init: @echo "Initialize ..."; \ - if [ -d ".git" ]; then \ - LATEST_TAG=$$(git describe --tags | sed 's/^v//'); \ - else \ - LATEST_TAG="0.0"; \ - fi; \ - sed -r "s/^(string version_application = ).*/\1\"$${LATEST_TAG}\";/" -i source/${PKGNAME}.cc; \ + sed -r "s/^(string version_application = ).*/\1\"$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2)\";/" -i source/view/${PKGNAME}.cc; \ echo "-- Build path: ${CMAKE_BUILD_DIR}" depend: @@ -124,7 +120,7 @@ install: check uninstall @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/" "logo-background.png" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg" - @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.funnel.svg" + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.ubl-settings-diskquota.funnel.svg" @if [ -z ${DESTDIR} ]; then \ [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ update-desktop-database --quiet &>/dev/null || true; \ @@ -141,6 +137,14 @@ clean: echo "Clean: OK"; \ fi +up_ver: + @CURRENT=$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2); \ + MAJOR=$$(cut -d. -f1 <<< $${CURRENT}); \ + MINOR=$$(cut -d. -f2 <<< $${CURRENT}); \ + VER="$${MAJOR}.$$(($${MINOR}+1))"; \ + sed "s/VERSION *[[:digit:]]*.*/VERSION $${VER}/" -i ${FILE_VERSION}; \ + echo "Updated version to VERSION.md: $${CURRENT} to $${VER}" + help: @echo "The following are some of the valid targets for this Makefile:"; \ echo "... all (the default if no target is provided)"; \ @@ -150,4 +154,5 @@ help: echo "... compile"; \ echo "... install"; \ echo "... uninstall"; \ - echo "... clean" + echo "... clean"; \ + echo "... up_ver" \ No newline at end of file -- 2.35.1 From d326d2745b2a62fcabe9c79d9015c217d35f84df Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 31 Aug 2023 10:10:38 +0600 Subject: [PATCH 15/16] Makefile reversed --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 04c4243..20db54e 100644 --- a/Makefile +++ b/Makefile @@ -120,7 +120,6 @@ install: check uninstall @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/" "logo-background.png" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg" - @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.ubl-settings-diskquota.funnel.svg" @if [ -z ${DESTDIR} ]; then \ [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ update-desktop-database --quiet &>/dev/null || true; \ -- 2.35.1 From 935c2aacb179a98c77be129ef8fb6bfac1856f6b Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 31 Aug 2023 10:22:39 +0600 Subject: [PATCH 16/16] Makefile update --- Makefile | 58 +++++++++++++++++++++++++------------------------------- 1 file changed, 26 insertions(+), 32 deletions(-) diff --git a/Makefile b/Makefile index 20db54e..3dc725e 100644 --- a/Makefile +++ b/Makefile @@ -8,20 +8,29 @@ MAKEFILE_PATH := $(dir $(MAKEFILE_FILEPATH)) CMAKE_COMMAND = cmake CMAKE_SOURCE_DIR = $(MAKEFILE_PATH)source CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile -FILE_VERSION = VERSION.md DEPENDS = /bin/cmake -PREFIX ?= /usr +PREFIX ?= /usr/local PKGNAME = $(MAKEFILE_DIR) +FILE_VER = source/${PKGNAME}.h +PKGIDENT = $(subst /,-,$(subst /usr,,${PREFIX})) default_target: all -.PHONY: all init depend debug prepare check build uninstall install clean up_ver help +.PHONY: all init depend debug prepare check build uninstall install clean help all: init build init: @echo "Initialize ..."; \ - sed -r "s/^(string version_application = ).*/\1\"$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2)\";/" -i source/view/${PKGNAME}.cc; \ + if [ -d ".git" ]; then \ + LATEST_TAG=$$(git describe --abbrev=0 --tags | sed 's/^v//'); \ + if [ -z "$${LATEST_TAG}" ]; then \ + LATEST_TAG="0.0"; \ + fi; \ + else \ + LATEST_TAG="Development"; \ + fi; \ + sed -r "s/^(string version_application).*/\1 = \"$${LATEST_TAG}\";/" -i ${FILE_VER}; \ echo "-- Build path: ${CMAKE_BUILD_DIR}" depend: @@ -60,7 +69,8 @@ check: build: depend prepare @echo "Build ..."; \ - make --directory=${CMAKE_BUILD_DIR}; \ + $(MAKE_COMMAND) --directory=${CMAKE_BUILD_DIR}; \ + sed -r "s/^(string version_application).*/\1;/" -i ${FILE_VER}; \ echo "Build: OK" uninstall: @@ -68,7 +78,7 @@ uninstall: @for FILE_PO in $(wildcard *.po); do \ LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \ FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \ - PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ + PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ $(RM) "$${PATH_FILE_MO}"; \ done @for SIZE in 16x16 32x32 48x48 scalable; do \ @@ -82,10 +92,8 @@ uninstall: done @$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}" @$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop" - @$(RM) "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/logo-background.png" - @$(RM) "${DESTDIR}${PREFIX}/share/polkit-1/actions/com.ublinux.${PKGNAME}.policy" @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg" - @$(RM) -rd "${DESTDIR}${PREFIX}/share/${PKGNAME}" + @$(RM) "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.policy" @if [ -z ${DESTDIR} ]; then \ [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ update-desktop-database --quiet &>/dev/null || true; \ @@ -97,9 +105,9 @@ install: check uninstall @echo "Install ..." @for FILE_PO in $(wildcard *.po); do \ LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \ - install -dm755 "${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES"; \ + install -dm755 "${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES"; \ FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \ - PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ + PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ echo "$${FILE_PO}"; \ msgfmt "$${FILE_PO}" -v -f -o "$${PATH_FILE_MO}"; \ done @@ -107,19 +115,14 @@ install: check uninstall install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \ rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \ done - @install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg" - @install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}" - @install -dm755 "${DESTDIR}${PREFIX}/share/applications" - @install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop" - @install -dm755 "${DESTDIR}${PREFIX}/share/polkit-1/actions" - @install -Dm644 -t "${DESTDIR}${PREFIX}/share/polkit-1/actions/" "com.ublinux.${PKGNAME}.policy" - @install -dm755 "${DESTDIR}${PREFIX}/share/${PKGNAME}"/{ui,css,images} - @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/ui/" "${PKGNAME}.glade" - @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/css/" "${PKGNAME}.css" - @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/" "logo-background.png" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg" + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.funnel-symbolic.svg" + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop" + @install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}" + @install -Dm644 "com.ublinux.${PKGNAME}.policy" "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.policy" + @sed -e '\|annotate key=|s|/usr/bin|${PREFIX}/bin|' -e '/action id=/s/\.run/${PKGIDENT}\.run/' -i ${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.policy @if [ -z ${DESTDIR} ]; then \ [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ update-desktop-database --quiet &>/dev/null || true; \ @@ -136,22 +139,13 @@ clean: echo "Clean: OK"; \ fi -up_ver: - @CURRENT=$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2); \ - MAJOR=$$(cut -d. -f1 <<< $${CURRENT}); \ - MINOR=$$(cut -d. -f2 <<< $${CURRENT}); \ - VER="$${MAJOR}.$$(($${MINOR}+1))"; \ - sed "s/VERSION *[[:digit:]]*.*/VERSION $${VER}/" -i ${FILE_VERSION}; \ - echo "Updated version to VERSION.md: $${CURRENT} to $${VER}" - help: @echo "The following are some of the valid targets for this Makefile:"; \ echo "... all (the default if no target is provided)"; \ echo "... init"; \ echo "... debug"; \ echo "... prepare"; \ - echo "... compile"; \ + echo "... build"; \ echo "... install"; \ echo "... uninstall"; \ - echo "... clean"; \ - echo "... up_ver" \ No newline at end of file + echo "... clean" \ No newline at end of file -- 2.35.1