Applications
/
ubinstall-gtk
8
0
Fork 1
Code Issues 11 Pull Requests 1 Packages Projects Releases Wiki Activity

Design changes; Partitions tables changes

Browse Source
pull/228/head
Ivan Dmitrievich Yartsev 3 months ago
parent 06892dd8c7
commit e2c349a88c
6 changed files with 384 additions and 121 deletions
Show Stats Download Patch File Download Diff File

11
locale/ubinstall-gtk.pot
Unescape View File

@ -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 ""

15
locale/ubinstall-gtk_ru.po
Unescape View File

@ -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 "Справка"

47
source/ubinstall-gtk-installation.c
Unescape View File

@ -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);
}

2
source/ubinstall-gtk.c
Unescape View File

@ -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);

5
source/ubl-strings.h
Unescape View File

@ -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\

425
ubinstall-gtk.glade
Unescape View File

@ -263,7 +263,11 @@
<column type="gboolean"/>
<!-- column-name Activatable -->
<column type="gboolean"/>
<!-- column-name SourceDevice -->
<!-- column-name MountPoint -->
<column type="gchararray"/>
<!-- column-name FileSystemLabel -->
<column type="gchararray"/>
<!-- column-name Flags -->
<column type="gchararray"/>
</columns>
</object>
@ -914,7 +918,6 @@ agreement</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="tab-pos">left</property>
<property name="show-tabs">False</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
@ -8304,7 +8307,40 @@ or continue working in the system Live environment.</property>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Capacity</property>
<property name="title" translatable="yes">File system</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">3</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Label</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">4</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">File system label</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">10</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Size</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
@ -8326,22 +8362,22 @@ or continue working in the system Live environment.</property>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">File system</property>
<property name="title" translatable="yes">Flags</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">3</attribute>
<attribute name="text">11</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Label</property>
<property name="title" translatable="yes">Mount point</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">4</attribute>
<attribute name="text">9</attribute>
</attributes>
</child>
</object>
@ -9012,7 +9048,40 @@ or continue working in the system Live environment.</property>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Capacity</property>
<property name="title" translatable="yes">File system</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">3</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Label</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">4</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">File system label</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">10</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Size</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
@ -9034,22 +9103,22 @@ or continue working in the system Live environment.</property>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">File system</property>
<property name="title" translatable="yes">Flags</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">3</attribute>
<attribute name="text">11</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Label</property>
<property name="title" translatable="yes">Mount point</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">4</attribute>
<attribute name="text">9</attribute>
</attributes>
</child>
</object>
@ -9700,98 +9769,118 @@ separately into the selected partition.</property>
</packing>
</child>
<child>
<object class="GtkFrame">
<object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label-xalign">0</property>
<property name="can-focus">True</property>
<property name="shadow-type">in</property>
<property name="min-content-height">128</property>
<child>
<object class="GtkAlignment">
<object class="GtkTreeView" id="AdvancedPartitionTree">
<property name="height-request">125</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="model">PartitionsList</property>
<property name="search-column">0</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
</child>
<child>
<object class="GtkTreeView" id="AdvancedPartitionTree">
<property name="height-request">125</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="model">PartitionsList</property>
<property name="search-column">0</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
<object class="GtkTreeViewColumn">
<child>
<object class="GtkCellRendererToggle" id="AdvancedPartChosenCell"/>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Section</property>
<child>
<object class="GtkTreeViewColumn">
<child>
<object class="GtkCellRendererToggle" id="AdvancedPartChosenCell"/>
<attributes>
<attribute name="sensitive">8</attribute>
<attribute name="active">7</attribute>
</attributes>
</child>
</object>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">File system</property>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Section</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">3</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Label</property>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Capacity</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">1</attribute>
</attributes>
</child>
</object>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">4</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">File system label</property>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Free space</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">2</attribute>
</attributes>
</child>
</object>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">10</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Size</property>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">File system</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">3</attribute>
</attributes>
</child>
</object>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">1</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Free space</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">2</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Flags</property>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Label</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">4</attribute>
</attributes>
</child>
</object>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">11</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Mount point</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">9</attribute>
</attributes>
</child>
</object>
</child>
</object>
</child>
<child type="label_item">
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
@ -11181,7 +11270,40 @@ separately into the selected partition.</property>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Capacity</property>
<property name="title" translatable="yes">File system</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">3</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Label</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">4</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">File system label</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">10</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Size</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
@ -11203,22 +11325,22 @@ separately into the selected partition.</property>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">File system</property>
<property name="title" translatable="yes">Flags</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">3</attribute>
<attribute name="text">11</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Label</property>
<property name="title" translatable="yes">Mount point</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">4</attribute>
<attribute name="text">9</attribute>
</attributes>
</child>
</object>
@ -11594,7 +11716,40 @@ separately into the selected partition.</property>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Capacity</property>
<property name="title" translatable="yes">File system</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">3</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Label</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">4</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">File system label</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">10</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Size</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
@ -11616,22 +11771,22 @@ separately into the selected partition.</property>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">File system</property>
<property name="title" translatable="yes">Flags</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">3</attribute>
<attribute name="text">11</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Label</property>
<property name="title" translatable="yes">Mount point</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">4</attribute>
<attribute name="text">9</attribute>
</attributes>
</child>
</object>
@ -12000,7 +12155,40 @@ separately into the selected partition.</property>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Capacity</property>
<property name="title" translatable="yes">File system</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">3</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Label</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">4</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">File system label</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">10</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Size</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
@ -12022,22 +12210,22 @@ separately into the selected partition.</property>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">File system</property>
<property name="title" translatable="yes">Flags</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">3</attribute>
<attribute name="text">11</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Label</property>
<property name="title" translatable="yes">Mount point</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">4</attribute>
<attribute name="text">9</attribute>
</attributes>
</child>
</object>
@ -12808,7 +12996,40 @@ separately into the selected partition.</property>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Capacity</property>
<property name="title" translatable="yes">File system</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">3</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Label</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">4</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">File system label</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">10</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Size</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
@ -12830,22 +13051,22 @@ separately into the selected partition.</property>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">File system</property>
<property name="title" translatable="yes">Flags</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">3</attribute>
<attribute name="text">11</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Label</property>
<property name="title" translatable="yes">Mount point</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">4</attribute>
<attribute name="text">9</attribute>
</attributes>
</child>
</object>

Write Preview
Loading…
Cancel
Save