diff --git a/locale/ubinstall-gtk.pot b/locale/ubinstall-gtk.pot
index 7ba8133..80d4e26 100644
--- a/locale/ubinstall-gtk.pot
+++ b/locale/ubinstall-gtk.pot
@@ -388,7 +388,7 @@ msgid "Restore missing or corrupted system files. Users data is not affected"
msgstr ""
#: source/ubl-strings.h:88
-msgid "User data only"
+msgid "User data restore"
msgstr ""
#: source/ubl-strings.h:89
@@ -1903,6 +1903,15 @@ msgid ""
"network or the Internet (even over slow connection channels)."
msgstr ""
+msgid "File system label"
+msgstr ""
+
+msgid "Flags"
+msgstr ""
+
+msgid "Mount point"
+msgstr ""
+
msgid "About"
msgstr ""
diff --git a/locale/ubinstall-gtk_ru.po b/locale/ubinstall-gtk_ru.po
index a5743d3..e0d518b 100644
--- a/locale/ubinstall-gtk_ru.po
+++ b/locale/ubinstall-gtk_ru.po
@@ -251,7 +251,7 @@ msgstr "Метка"
#: source/ubl-strings.h:63
msgid "Size"
-msgstr "Общий размер"
+msgstr "Размер"
#: source/ubl-strings.h:64
msgid "Free"
@@ -401,7 +401,7 @@ msgid "Restore missing or corrupted system files. Users data is not affected"
msgstr "Восстановление отсутствующих или поврежденных системных файлов. Данные пользователей не затрагиваются"
#: source/ubl-strings.h:88
-msgid "User data only"
+msgid "User data restore"
msgstr "Только пользовательские данные"
#: source/ubl-strings.h:89
@@ -504,7 +504,7 @@ msgstr "Раздел"
#: source/ubl-strings.h:119
msgid "Capacity"
-msgstr "Объём"
+msgstr "Размер"
#: source/ubl-strings.h:120
msgid "Free space"
@@ -2047,6 +2047,15 @@ msgstr ""
msgid "About"
msgstr "О программе"
+msgid "File system label"
+msgstr "Метка файловой системы"
+
+msgid "Flags"
+msgstr "Флаги"
+
+msgid "Mount point"
+msgstr "Точка монтирования"
+
msgid "Documentation"
msgstr "Справка"
diff --git a/source/ubinstall-gtk-installation.c b/source/ubinstall-gtk-installation.c
index 37e505e..645db17 100644
--- a/source/ubinstall-gtk-installation.c
+++ b/source/ubinstall-gtk-installation.c
@@ -327,8 +327,8 @@ void on_device_selection_changed(GtkWidget *self, main_window *widgets){
yon_char_remove_last_symbol(partitions[i],'\n');
int parsed_size;
config_str parsed = yon_char_parse(partitions[i],&parsed_size,";");
- if (!strcmp(parsed[0],"part")){
- char *name = parsed[1];
+ if (!strcmp(parsed[1],"part")){
+ char *name = parsed[2];
if (strstr(name,disk_path)){
char *capacity = NULL;
long capacity_long = 0;
@@ -336,33 +336,54 @@ void on_device_selection_changed(GtkWidget *self, main_window *widgets){
long free_space_long = 0;
char *fs_type = NULL;
char *label = NULL;
+ char *fs_label = NULL;
+ char *mount_point = NULL;
+ char *flags = NULL;
if (parsed_size>2){
char sizemod='\0';
- capacity_long = atol(parsed[2]);
+ capacity_long = atol(parsed[3]);
char *temp = yon_char_from_double(yon_size_long_convert_automatic(capacity_long,&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])){
+ // if (parsed_size>8&&!yon_char_is_empty(parsed[8])){
+ // char sizemod='\0';
+ // free_space_long = capacity_long-atol(parsed[8]);
+ // char *temp = yon_char_from_double(yon_size_long_convert_automatic(free_space_long,&sizemod));
+ // char *size_str = yon_size_get_name_from_letter(sizemod);
+ // capacity = yon_char_unite(temp," ", size_str,parsed_size>9?" ":NULL,parsed[9],NULL);
+ // free(temp);
+ // }
+ if (parsed_size>4){
+ fs_type = parsed[4];
+ }
+ if (parsed_size>5){
+ label = parsed[5];
+ }
+ if (parsed_size>8&&!yon_char_is_empty(parsed[8])){
+ long used_cap = capacity_long-atol(parsed[8]);
+ long capacity_persent = ((double)used_cap/(double)capacity_long)*100;
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));
+ char *temp = yon_char_from_double(yon_size_long_convert_automatic(used_cap,&sizemod));
char *size_str = yon_size_get_name_from_letter(sizemod);
- capacity = yon_char_unite(temp," ", size_str,NULL);
- free(temp);
+ free_space = yon_char_unite(temp, " ",size_str," (",yon_char_from_long(capacity_persent),"%",")",NULL);
+
}
- if (parsed_size>3){
- fs_type = parsed[3];
+ if (parsed_size>6){
+ fs_label = parsed[6];
}
- if (parsed_size>4){
- label = parsed[4];
+ if (parsed_size>7){
+ mount_point = parsed[7];
+ }
+ if (parsed_size>10){
+ flags = parsed[10];
}
gtk_list_store_append(widgets->PartitionsList,&iter);
- gtk_list_store_set(widgets->PartitionsList,&iter,0,name,1,capacity,2,free_space,3,fs_type,4,label,5,capacity_long,6,free_space_long,9,disk_path,-1);
+ gtk_list_store_set(widgets->PartitionsList,&iter,0,name,1,capacity,2,free_space,3,fs_type,4,label,5,capacity_long,6,free_space_long,9,disk_path,9,mount_point,10,fs_label,11,flags,-1);
}
yon_char_parsed_free(parsed,parsed_size);
}
diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c
index 147f4af..4ab91f0 100644
--- a/source/ubinstall-gtk.c
+++ b/source/ubinstall-gtk.c
@@ -914,7 +914,7 @@ void yon_main_window_create(main_window *widgets){
if (access(path,F_OK)){
fullscreen = 1;
g_thread_new("fullscreen",(GThreadFunc)yon_maximize,widgets);
-
+
}
yon_window_config_load(path);
yon_window_config_add_instant_parameter("fullscreen","window",&fullscreen,YON_TYPE_BOOLEAN);
diff --git a/source/ubl-strings.h b/source/ubl-strings.h
index 2a9e060..f458a96 100644
--- a/source/ubl-strings.h
+++ b/source/ubl-strings.h
@@ -82,7 +82,7 @@ NULL)
#define SEPARATE_INSTALL_LABEL _("Installing OS components and user data on different disk partitions")
#define OS_ONLY_HEAD_LABEL _("System restore")
#define OS_ONLY_LABEL _("Restore missing or corrupted system files. Users data is not affected")
-#define USER_DATA_HEAD_LABEL _("User data only")
+#define USER_DATA_HEAD_LABEL _("User data restore")
#define USER_DATA_LABEL _("Installing only user data without OS components")
#define KEYBOARD__LABEL _("Keyboard layout language")
@@ -458,6 +458,9 @@ NULL)
// #define _LABEL _("Packager")
// #define _LABEL _("Build Date")
// #define _LABEL _("Validated By")
+// #define REBOOT_LABEL _("File system label")
+// #define REBOOT_LABEL _("Flags")
+// #define REBOOT_LABEL _("Mount point")
#define slide_1_title _("Product ecosystem")
#define slide_1_text _("Developed by a team of professionals and successfully presented on the market.\n\
diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade
index 61a2ce5..898ae6a 100644
--- a/ubinstall-gtk.glade
+++ b/ubinstall-gtk.glade
@@ -263,7 +263,11 @@
-
+
+
+
+
+
@@ -914,7 +918,6 @@ agreement
True
False
left
- False
+
+
+
+
+
+
+
+
+