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

Modules page size label added

Browse Source
pull/284/head
Ivan Dmitrievich Yartsev 2 months ago
parent a9ad0ec8d4
commit f0d37f8237
6 changed files with 99 additions and 15 deletions
Show Stats Download Patch File Download Diff File

52
source/ubinstall-gtk-components.c
Unescape View File

@ -329,10 +329,47 @@ int yon_software_save(main_window *widgets){
return 1; return 1;
} }
int yon_software_check_packages_size(GtkWidget *, main_window *widgets){
long pacman_size = 0;
{
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->AdditionalComponentsList));
GList *listiter;
for (listiter=list;listiter;listiter=listiter->next){
os_row *row = g_object_get_data(G_OBJECT(listiter->data),"kernel_row");
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->InstallCheck))){
long cur_size = yon_packages_get_installed_size(YON_PACKAGES_ALL,row->name);
pacman_size += cur_size;
}
}
}
{
GtkTreeIter iter;
GtkTreeModel *model = GTK_TREE_MODEL(widgets->PacmanSoftwareChosenList);
for_iter(model, &iter){
char *name;
gtk_tree_model_get(model,&iter,1,&name,-1);
long size = yon_packages_get_installed_size(YON_PACKAGES_ALL,name);
pacman_size+=size;
}
char *overall_str = NULL;
if (pacman_size){
overall_str = yon_size_long_convert_automatic_to_string(pacman_size);
} else {
overall_str = yon_char_unite("0 ",yon_size_get_name_from_letter('K'),NULL);
}
gtk_label_set_text(GTK_LABEL(widgets->AdditionalComponentsOverallSizeLabel),overall_str);
if (!yon_char_is_empty(overall_str)) free(overall_str);
}
return 1;
}
gboolean yon_software_insert(struct row_data *row_input){ gboolean yon_software_insert(struct row_data *row_input){
os_row *row = yon_os_row_new(); os_row *row = yon_os_row_new();
main_window *widgets = row_input->widgets; main_window *widgets = row_input->widgets;
g_signal_connect(G_OBJECT(row->InstallCheck),"toggled",G_CALLBACK(yon_software_check_packages_size),widgets);
gtk_list_box_insert(GTK_LIST_BOX(widgets->AdditionalComponentsList),row->row,-1); gtk_list_box_insert(GTK_LIST_BOX(widgets->AdditionalComponentsList),row->row,-1);
yon_os_row_setup(row,row_input->name,row_input->version,row_input->tags,_(row_input->description),NULL,row_input->size); yon_os_row_setup(row,row_input->name,row_input->version,row_input->tags,_(row_input->description),NULL,row_input->size);
@ -384,25 +421,14 @@ void yon_software_init(main_window *widgets){
row->widgets=widgets; row->widgets=widgets;
g_idle_add((GSourceFunc)yon_software_insert,row); g_idle_add((GSourceFunc)yon_software_insert,row);
} }
// GList *languages = yon_packages_search_all("ubm-.*");
// for (iter=languages;iter;iter=iter->next){
// char *name = (char*)iter->data;
// yon_packages_info *info_struct = yon_package(YON_PACKAGES_ALL,name);
// struct row_data *row = malloc(sizeof(struct row_data));
// row->version = info_struct->version;
// row->name = info_struct->package_name;
// row->tags = info_struct->groups;
// row->description = info_struct->description;
// row->widgets=widgets;
// g_idle_add((GSourceFunc)yon_software_insert,row);
// yon_packages_info_struct_free(info_struct);
// }
g_idle_add((GSourceFunc)yon_spinner_switch_off,widgets->OSSpinner); g_idle_add((GSourceFunc)yon_spinner_switch_off,widgets->OSSpinner);
yon_char_parsed_free(base,base_size); yon_char_parsed_free(base,base_size);
yon_software_check_packages_size(NULL,widgets);
return ; return ;
} }
int yon_pacman_software_save(main_window *widgets){ int yon_pacman_software_save(main_window *widgets){
if (!yon_installation_check_packages_size(widgets)) return 0;
GtkTreeIter iter; GtkTreeIter iter;
GtkTreeModel *model = GTK_TREE_MODEL(widgets->PacmanSoftwareChosenList); GtkTreeModel *model = GTK_TREE_MODEL(widgets->PacmanSoftwareChosenList);
char *config_parameter = config(packages_parameter); char *config_parameter = config(packages_parameter);

2
source/ubinstall-gtk-config-hub.c
Unescape View File

@ -273,6 +273,7 @@ void yon_flow_box_clear(GtkFlowBox *target){
void yon_configuration_hub_init(main_window *widgets){ void yon_configuration_hub_init(main_window *widgets){
gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(widgets->ConfigHubRebootCombo)); gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(widgets->ConfigHubRebootCombo));
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widgets->ConfigHubRebootCombo),NULL,DEFAULT_LABEL); gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widgets->ConfigHubRebootCombo),NULL,DEFAULT_LABEL);
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widgets->ConfigHubRebootCombo),"close",CLOSE_INSTALLER_LABEL);
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widgets->ConfigHubRebootCombo),"reboot",REBOOT_LABEL); gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widgets->ConfigHubRebootCombo),"reboot",REBOOT_LABEL);
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widgets->ConfigHubRebootCombo),"shutdown",SHUTDOWN_LABEL); gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widgets->ConfigHubRebootCombo),"shutdown",SHUTDOWN_LABEL);
char *finish_string = config(finish_parameter); char *finish_string = config(finish_parameter);
@ -282,7 +283,6 @@ void yon_configuration_hub_init(main_window *widgets){
} else { } else {
gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ConfigHubRebootCombo),0); gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ConfigHubRebootCombo),0);
} }
gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ConfigHubRebootCombo),0);
yon_flow_box_clear(GTK_FLOW_BOX(widgets->HubPersonalListBox)); yon_flow_box_clear(GTK_FLOW_BOX(widgets->HubPersonalListBox));
yon_flow_box_clear(GTK_FLOW_BOX(widgets->HubSystemListBox)); yon_flow_box_clear(GTK_FLOW_BOX(widgets->HubSystemListBox));
yon_flow_box_clear(GTK_FLOW_BOX(widgets->HubPackagesListBox)); yon_flow_box_clear(GTK_FLOW_BOX(widgets->HubPackagesListBox));

1
source/ubinstall-gtk.c
Unescape View File

@ -513,6 +513,7 @@ void yon_main_window_create(main_window *widgets){
widgets->KeyboardNumLockCombo = yon_gtk_builder_get_widget(builder,"KeyboardNumLockCombo"); widgets->KeyboardNumLockCombo = yon_gtk_builder_get_widget(builder,"KeyboardNumLockCombo");
widgets->AdditionalComponentsList = yon_gtk_builder_get_widget(builder,"AdditionalComponentsList"); widgets->AdditionalComponentsList = yon_gtk_builder_get_widget(builder,"AdditionalComponentsList");
widgets->AdditionalComponentsOverallSizeLabel = yon_gtk_builder_get_widget(builder,"AdditionalComponentsOverallSizeLabel");
widgets->InstallationProgress = yon_gtk_builder_get_widget(builder,"InstallationProgress"); widgets->InstallationProgress = yon_gtk_builder_get_widget(builder,"InstallationProgress");
widgets->InstallationLabel = yon_gtk_builder_get_widget(builder,"InstallationLabel"); widgets->InstallationLabel = yon_gtk_builder_get_widget(builder,"InstallationLabel");

2
source/ubinstall-gtk.h
Unescape View File

@ -616,6 +616,7 @@ typedef struct
GtkWidget *DocumentationMenuItem; GtkWidget *DocumentationMenuItem;
GtkWidget *AdditionalComponentsList; GtkWidget *AdditionalComponentsList;
GtkWidget *AdditionalComponentsOverallSizeLabel;
GtkWidget *GrubInstallRadio; GtkWidget *GrubInstallRadio;
GtkWidget *GrubUpdateRadio; GtkWidget *GrubUpdateRadio;
@ -1557,3 +1558,4 @@ void yon_advanced_part_clean_config();
void yon_advanced_part_to_data(advanced_part_widgets *part, advanced_part_data *data); void yon_advanced_part_to_data(advanced_part_widgets *part, advanced_part_data *data);
void yon_advanced_part_save_part(advanced_part_data *data); void yon_advanced_part_save_part(advanced_part_data *data);
void yon_advanced_part_remove_for_part(const char *part_name, main_window *widgets); void yon_advanced_part_remove_for_part(const char *part_name, main_window *widgets);
int yon_software_check_packages_size(GtkWidget *, main_window *widgets);

1
source/ubl-strings.h
Unescape View File

@ -286,6 +286,7 @@ NULL)
#define LOAD_GLOBAL_LABEL yon_char_get_localised_from_lib("Load global configuration") #define LOAD_GLOBAL_LABEL yon_char_get_localised_from_lib("Load global configuration")
#define LOAD_LABEL yon_char_get_localised_from_lib("Load") #define LOAD_LABEL yon_char_get_localised_from_lib("Load")
#define CLOSE_INSTALLER_LABEL _("Close installer")
#define REBOOT_LABEL _("Reboot") #define REBOOT_LABEL _("Reboot")
#define SHUTDOWN_LABEL _("Shudown") #define SHUTDOWN_LABEL _("Shudown")
#define FINISH_ACTION_LABEL _("After successful installation:") #define FINISH_ACTION_LABEL _("After successful installation:")

54
ubinstall-gtk.glade
Unescape View File

@ -3290,6 +3290,60 @@ Select a different installation source.</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="spacing">5</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="spacing">5</property>
<child>
<object class="GtkLabel" id="AdditionalComponentsOverallSizeLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack-type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label22">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Overall size:</property>
<property name="xalign">1</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack-type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack-type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="position">9</property> <property name="position">9</property>

Write Preview
Loading…
Cancel
Save