From 0c6b87bb2c390a81c53a08071186c01c512866de Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Wed, 4 Feb 2026 13:53:33 +0600 Subject: [PATCH] Tables sizes translations --- source/ubinstall-gtk-installation.c | 25 ++++++++++++++++++++++--- source/ubinstall-gtk.h | 3 ++- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/source/ubinstall-gtk-installation.c b/source/ubinstall-gtk-installation.c index 14b2466..6240408 100644 --- a/source/ubinstall-gtk-installation.c +++ b/source/ubinstall-gtk-installation.c @@ -1,5 +1,15 @@ #include "ubinstall-gtk.h" +char *yon_size_get_name_from_letter(char letter){ + switch (letter){ + case 'K': return yon_char_new(KB_LABEL); break; + case 'M': return yon_char_new(MB_LABEL); break; + case 'G': return yon_char_new(GB_LABEL); break; + case 'T': return yon_char_new(TB_LABEL); break; + } + return NULL; +} + int yon_install_common_save(main_window *widgets){ GtkTreeModel *model; GtkTreeIter iter; @@ -283,14 +293,16 @@ void on_device_selection_changed(GtkWidget *self, main_window *widgets){ capacity_long = atol(parsed[2]); char *temp = yon_char_from_double(yon_size_long_convert_automatic(capacity_long,&sizemod)); - capacity = yon_char_append_c(temp,sizemod); + char *size_str = yon_size_get_name_from_letter(sizemod); + capacity = yon_char_unite(temp," ", size_str,NULL); free(temp); } if (parsed_size>7&&!yon_char_is_empty(parsed[7])){ char sizemod='\0'; free_space_long = capacity_long-atol(parsed[7]); char *temp = yon_char_from_double(yon_size_long_convert_automatic(free_space_long,&sizemod)); - free_space = yon_char_append_c(temp,sizemod); + char *size_str = yon_size_get_name_from_letter(sizemod); + capacity = yon_char_unite(temp," ", size_str,NULL); free(temp); } if (parsed_size>3){ @@ -335,7 +347,14 @@ void yon_devices_setup(main_window *widgets){ json_object_object_get_ex(device, "serial", &serial); gtk_list_store_append(widgets->DevicesList,&iter); - gtk_list_store_set(widgets->DevicesList,&iter,0,json_object_get_string(path),1,json_object_get_string(model),2,json_object_get_string(serial),3,json_object_get_string(size),4,json_object_get_string(vendor),6,1,-1); + char *size_string = yon_char_new(json_object_get_string(size)); + char *size_str = yon_size_get_name_from_letter(size_string[strlen(size_string)-1]); + size_string[strlen(size_string)-1] = '\0'; + char *size_final_string = yon_char_unite(size_string," ",size_str,NULL); + gtk_list_store_set(widgets->DevicesList,&iter,0,json_object_get_string(path),1,json_object_get_string(model),2,json_object_get_string(serial),3,size_final_string,4,json_object_get_string(vendor),6,1,-1); + free(size_string); + free(size_str); + free(size_final_string); } yon_char_parsed_free(parsed,size); diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index 3810a6c..76b7c80 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -1482,4 +1482,5 @@ void yon_licence_load(main_window *widgets); void on_network_removed(GtkWidget *,network_info *info); char *yon_bootloader_get_os_name(char *parameter); gboolean on_region_refilter(GtkTreeModel* model, GtkTreeIter* iter, main_window *widgets); -void on_region_entry_changed(GtkWidget *, main_window *widgets); \ No newline at end of file +void on_region_entry_changed(GtkWidget *, main_window *widgets); +char *yon_size_get_name_from_letter(char letter); \ No newline at end of file