From f0fe679cedb8e4eb66d92c1c409947bd601c9ced Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 6 Sep 2023 15:08:57 +0600 Subject: [PATCH 1/8] Test fix for config loading crash --- source/controler.c | 1 - source/model/load.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/source/controler.c b/source/controler.c index 745aa9d..1341c8b 100644 --- a/source/controler.c +++ b/source/controler.c @@ -574,7 +574,6 @@ int main(int argc, char *argv[]){ filters_init_flag(); control_event(widgets, &cfg_custom_gui); - yon_ubl_header_setup_resource(widgets->HeadOverlay,widgets->HeadBox,widgets->HeadImage,banner_path); yon_ubl_status_box_setup(widgets->StatusIcon,widgets->StatusBox,widgets->StatusLabel); diff --git a/source/model/load.c b/source/model/load.c index 241716b..672c3a8 100644 --- a/source/model/load.c +++ b/source/model/load.c @@ -26,7 +26,7 @@ void load_template_load_cfg(config_all* _all_config, char* cmd) { if (strstr(device, _config_disk->name_disk)) { size_t deferring_size = 0; size_t deferring_file = 0; - disk_status* disk_cfg = malloc(sizeof(disk_status)); + disk_status* disk_cfg = g_malloc0(sizeof(disk_status)); disk_cfg->status = 1; _all_config->v_disk_status.pfVectorAdd(&_all_config->v_disk_status, disk_cfg); disk_cfg->device = yon_char_new(device); @@ -63,7 +63,7 @@ void load_template_load_cfg(config_all* _all_config, char* cmd) { } } if (((strstr(str_value, "enable") || strstr(str_value, "disable")) || yon_char_find_count(str_key, ":") == 1) && flag_find == 0) { - disk_status* disk_cfg = malloc(sizeof(disk_status)); + disk_status* disk_cfg = g_malloc0(sizeof(disk_status)); disk_cfg->deferring_size = 0; disk_cfg->deferring_file = 0; load_pars_values_status(disk_cfg, str_key, str_value); @@ -101,7 +101,7 @@ void load_template_load_cfg(config_all* _all_config, char* cmd) { } else { - config_u_g_p* _config = malloc(sizeof(config_u_g_p)); + config_u_g_p* _config = g_malloc0(sizeof(config_u_g_p)); model_null_str_writing(_config); _config->loaded_keys = yon_char_new(str_key); load_pars_keys(_config, yon_char_new(str_key), index); From 21b3cbe8f8d41e1e48068332e5bd24b4a6a12d9a Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 7 Sep 2023 09:24:23 +0600 Subject: [PATCH 2/8] Modal window fixes --- ubl-settings-diskquota.glade | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ubl-settings-diskquota.glade b/ubl-settings-diskquota.glade index 391c518..4bb2f06 100644 --- a/ubl-settings-diskquota.glade +++ b/ubl-settings-diskquota.glade @@ -2721,6 +2721,8 @@ translated and supported by community. False + False + True 250 400 com.ublinux.ubl-settings-diskquota From 03f0bb63a2fe6a429e1376e30b989f11bc500484 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 7 Sep 2023 09:53:37 +0600 Subject: [PATCH 3/8] Fixed unfound icon --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 3dc725e..aafc22a 100644 --- a/Makefile +++ b/Makefile @@ -115,10 +115,11 @@ 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 -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg" - @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}/usr/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg" + @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg" + @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg" + @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "com.ublinux.${PKGNAME}.funnel-symbolic.svg" + @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "com.ublinux.${PKGNAME}.zoom-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" From 56eed11ba9e3b896f26f0625263333d1c7301fee Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 8 Sep 2023 15:39:32 +0600 Subject: [PATCH 4/8] Missing version at about window has been fixed --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index aafc22a..2ce5c5e 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ init: else \ LATEST_TAG="Development"; \ fi; \ - sed -r "s/^(string version_application).*/\1 = \"$${LATEST_TAG}\";/" -i ${FILE_VER}; \ + sed -r "s/^(static string version_application).*/\1 = \"$${LATEST_TAG}\";/" -i ${FILE_VER}; \ echo "-- Build path: ${CMAKE_BUILD_DIR}" depend: @@ -70,7 +70,7 @@ check: build: depend prepare @echo "Build ..."; \ $(MAKE_COMMAND) --directory=${CMAKE_BUILD_DIR}; \ - sed -r "s/^(string version_application).*/\1;/" -i ${FILE_VER}; \ + sed -r "s/^(static string version_application).*/\1;/" -i ${FILE_VER}; \ echo "Build: OK" uninstall: From 0ea7561cc18fcd05bd57478978b2e0a4d6c3cbce Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 8 Sep 2023 15:39:46 +0600 Subject: [PATCH 5/8] Header style fixes --- ubl-settings-diskquota.glade | 1 + 1 file changed, 1 insertion(+) diff --git a/ubl-settings-diskquota.glade b/ubl-settings-diskquota.glade index 4bb2f06..624dfc1 100644 --- a/ubl-settings-diskquota.glade +++ b/ubl-settings-diskquota.glade @@ -94,6 +94,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. center + 90 True False 5 From df51985d5ddf17c36fc57656618866f5665c3489 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 8 Sep 2023 16:29:16 +0600 Subject: [PATCH 6/8] Unsensitive window now becomes sensitive if path is right --- source/view_temp_u_g_p.c | 1 + 1 file changed, 1 insertion(+) diff --git a/source/view_temp_u_g_p.c b/source/view_temp_u_g_p.c index 163b568..5e21898 100644 --- a/source/view_temp_u_g_p.c +++ b/source/view_temp_u_g_p.c @@ -97,6 +97,7 @@ void temp_check_path() { if (strstr(str_disk, _config->device)) { const char* str_path = gtk_entry_get_text(GTK_ENTRY(temp_widgets->entryCatalogProject)); if (strstr(str_path,_config->mount_point)) { + gtk_widget_set_sensitive(temp_widgets->btnSaveTempSave, 1); } else { gtk_widget_set_sensitive(temp_widgets->btnSaveTempSave, 0); From e625020e5d5190c4f901787bd7dc8c0d1ddf790c Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 8 Sep 2023 16:37:24 +0600 Subject: [PATCH 7/8] Fixed error check bug --- source/view_temp_u_g_p.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/view_temp_u_g_p.c b/source/view_temp_u_g_p.c index 5e21898..e6a2667 100644 --- a/source/view_temp_u_g_p.c +++ b/source/view_temp_u_g_p.c @@ -602,7 +602,7 @@ 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(gtk_entry_get_text(GTK_ENTRY(temp_widgets->entryUser)),"")==0){ + if (strcmp(gtk_entry_get_text(GTK_ENTRY(temp_widgets->entryUser)),"")==0&&!strstr(flag_temp_u_g_p,"prjquota")){ show_warning_no_fill(STR_ERROR_LIST_USER_NULL); return 0; } From 52179825f20cf4a7b71c3c3bd08cee57bb175eff Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 8 Sep 2023 17:16:34 +0600 Subject: [PATCH 8/8] Fixed showing of devices at edit window --- ubl-settings-diskquota.glade | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/ubl-settings-diskquota.glade b/ubl-settings-diskquota.glade index 624dfc1..bc93e43 100644 --- a/ubl-settings-diskquota.glade +++ b/ubl-settings-diskquota.glade @@ -638,11 +638,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True False - 5 True False + 5 Device: 0 @@ -663,6 +663,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 1 + + + True + False + + + False + True + 2 + + True