Source window changes

pull/170/head
parent f94e68a207
commit c01c9f721f

@ -70,7 +70,6 @@ void on_configuration_hub_selected(GtkWidget* self, main_window *widgets){
GList *list = NULL; GList *list = NULL;
list = g_list_prepend(list,widgets->HubPackagesListBox); list = g_list_prepend(list,widgets->HubPackagesListBox);
list = g_list_prepend(list,widgets->HubSystemListBox); list = g_list_prepend(list,widgets->HubSystemListBox);
list = g_list_prepend(list,widgets->HubHardwareListBox);
list = g_list_prepend(list,widgets->HubPersonalListBox); list = g_list_prepend(list,widgets->HubPersonalListBox);
list = g_list_reverse(list); list = g_list_reverse(list);
GList *iter; GList *iter;
@ -118,11 +117,9 @@ void yon_configuration_hub_resize(main_window *widgets){
int max_width=0; int max_width=0;
int max_height=0; int max_height=0;
yon_configuration_hub_section_get_max_size(GTK_FLOW_BOX(widgets->HubPersonalListBox),&max_width,&max_height); yon_configuration_hub_section_get_max_size(GTK_FLOW_BOX(widgets->HubPersonalListBox),&max_width,&max_height);
yon_configuration_hub_section_get_max_size(GTK_FLOW_BOX(widgets->HubHardwareListBox),&max_width,&max_height);
yon_configuration_hub_section_get_max_size(GTK_FLOW_BOX(widgets->HubSystemListBox),&max_width,&max_height); yon_configuration_hub_section_get_max_size(GTK_FLOW_BOX(widgets->HubSystemListBox),&max_width,&max_height);
yon_configuration_hub_section_get_max_size(GTK_FLOW_BOX(widgets->HubPackagesListBox),&max_width,&max_height); yon_configuration_hub_section_get_max_size(GTK_FLOW_BOX(widgets->HubPackagesListBox),&max_width,&max_height);
yon_configuration_hub_section_set_max_size(GTK_FLOW_BOX(widgets->HubPersonalListBox),max_width,max_height); yon_configuration_hub_section_set_max_size(GTK_FLOW_BOX(widgets->HubPersonalListBox),max_width,max_height);
yon_configuration_hub_section_set_max_size(GTK_FLOW_BOX(widgets->HubHardwareListBox),max_width,max_height);
yon_configuration_hub_section_set_max_size(GTK_FLOW_BOX(widgets->HubSystemListBox),max_width,max_height); yon_configuration_hub_section_set_max_size(GTK_FLOW_BOX(widgets->HubSystemListBox),max_width,max_height);
yon_configuration_hub_section_set_max_size(GTK_FLOW_BOX(widgets->HubPackagesListBox),max_width,max_height); yon_configuration_hub_section_set_max_size(GTK_FLOW_BOX(widgets->HubPackagesListBox),max_width,max_height);
} }
@ -175,13 +172,7 @@ void yon_flow_box_clear(GtkFlowBox *target){
void yon_configuration_hub_init(main_window *widgets){ void yon_configuration_hub_init(main_window *widgets){
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->HubHardwareListBox));
yon_flow_box_clear(GTK_FLOW_BOX(widgets->HubPackagesListBox)); yon_flow_box_clear(GTK_FLOW_BOX(widgets->HubPackagesListBox));
yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPackagesListBox),KERNEL_LABEL,kernel_icon_path,YON_PAGE_KERNEL);
yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPackagesListBox),KERNEL_ADDON_LABEL,kernel_icon_path,YON_PAGE_KERNEL_ADDON);
yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPackagesListBox),SOFTWARE_LABEL,"com.ublinux.ubl-settings-update",YON_PAGE_SOFTWARE);
yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPackagesListBox),PACMAN_SOFTWARE_LABEL,"com.ublinux.ubl-settings-repomanager",YON_PAGE_PACMAN_SOFTWARE);
yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPackagesListBox),PACKAGES_SECTION_LABEL,"com.ublinux.ubl-settings-repomanager",YON_PAGE_PACKAGES);
yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPersonalListBox),REGION_ICON_LABEL,"com.ublinux.ubl-settings-system",YON_PAGE_REGION); yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPersonalListBox),REGION_ICON_LABEL,"com.ublinux.ubl-settings-system",YON_PAGE_REGION);
yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPersonalListBox),LOCALE_LANGUAGE_LABEL,"com.ublinux.ubl-settings-system",YON_PAGE_LANGUAGE); yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPersonalListBox),LOCALE_LANGUAGE_LABEL,"com.ublinux.ubl-settings-system",YON_PAGE_LANGUAGE);
yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPersonalListBox),KEYBOARD_TAB_LABEL,"com.ublinux.ubl-settings-keyboard",YON_PAGE_KEYBOARD); yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPersonalListBox),KEYBOARD_TAB_LABEL,"com.ublinux.ubl-settings-keyboard",YON_PAGE_KEYBOARD);
@ -189,5 +180,10 @@ void yon_configuration_hub_init(main_window *widgets){
yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubSystemListBox),STARTUP_LABEL,"com.ublinux.ubl-settings-info",YON_PAGE_STARTUP); yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubSystemListBox),STARTUP_LABEL,"com.ublinux.ubl-settings-info",YON_PAGE_STARTUP);
yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubSystemListBox),BOOTLOADER_LABEL,"com.ublinux.ubl-settings-bootloader",YON_PAGE_BOOTLOADER); yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubSystemListBox),BOOTLOADER_LABEL,"com.ublinux.ubl-settings-bootloader",YON_PAGE_BOOTLOADER);
yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubSystemListBox),NETWORK_LABEL,"com.ublinux.ubl-settings-multiseat",YON_PAGE_NETWORK); yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubSystemListBox),NETWORK_LABEL,"com.ublinux.ubl-settings-multiseat",YON_PAGE_NETWORK);
yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPackagesListBox),KERNEL_LABEL,kernel_icon_path,YON_PAGE_KERNEL);
yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPackagesListBox),KERNEL_ADDON_LABEL,kernel_icon_path,YON_PAGE_KERNEL_ADDON);
yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPackagesListBox),PACKAGES_SECTION_LABEL,"com.ublinux.ubl-settings-repomanager",YON_PAGE_PACKAGES);
yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPackagesListBox),SOFTWARE_LABEL,"com.ublinux.ubl-settings-update",YON_PAGE_SOFTWARE);
yon_configuration_hub_add(GTK_FLOW_BOX(widgets->HubPackagesListBox),PACMAN_SOFTWARE_LABEL,"com.ublinux.ubl-settings-repomanager",YON_PAGE_PACMAN_SOFTWARE);
yon_configuration_hub_resize(widgets); yon_configuration_hub_resize(widgets);
} }

@ -137,7 +137,7 @@ void yon_install_slider_init(main_window *widgets){
yon_install_slider_update(widgets); yon_install_slider_update(widgets);
gtk_overlay_add_overlay(GTK_OVERLAY(widgets->InstallationSliderArrowsOverlay),widgets->NextInstallationSliderImage); gtk_overlay_add_overlay(GTK_OVERLAY(widgets->InstallationSliderArrowsOverlay),widgets->NextInstallationSliderImage);
gtk_overlay_add_overlay(GTK_OVERLAY(widgets->InstallationSliderArrowsOverlay),widgets->PrevInstallationSliderImage); gtk_overlay_add_overlay(GTK_OVERLAY(widgets->InstallationSliderArrowsOverlay),widgets->PrevInstallationSliderImage);
g_timeout_add_seconds(10,(GSourceFunc)on_install_slider_slide,widgets); g_timeout_add_seconds(5,(GSourceFunc)on_install_slider_slide,widgets);
} }
gboolean on_install_slider_slide_proceed(main_window *widgets){ gboolean on_install_slider_slide_proceed(main_window *widgets){

@ -120,6 +120,7 @@ void yon_navigation_buttons_set_sensetiveness(main_window *widgets){
case YON_PAGE_INSTALLATION: case YON_PAGE_INSTALLATION:
gtk_widget_set_sensitive(widgets->NextButton,0); gtk_widget_set_sensitive(widgets->NextButton,0);
gtk_widget_set_sensitive(widgets->BackButton,0); gtk_widget_set_sensitive(widgets->BackButton,0);
gtk_widget_set_sensitive(widgets->CancelInstallButton,1);
break; break;
case YON_PAGE_CONFIGURE_END: case YON_PAGE_CONFIGURE_END:
gtk_button_set_label(GTK_BUTTON(widgets->NextButton),SAVE_AND_EXIT_LABEL); gtk_button_set_label(GTK_BUTTON(widgets->NextButton),SAVE_AND_EXIT_LABEL);

@ -31,10 +31,16 @@ source_element *yon_source_element_new(){
g_signal_connect(G_OBJECT(element->PathButton),"clicked",G_CALLBACK(on_source_choose),element); g_signal_connect(G_OBJECT(element->PathButton),"clicked",G_CALLBACK(on_source_choose),element);
g_signal_connect(G_OBJECT(element->TypeCombo),"changed",G_CALLBACK(on_source_changed),element); g_signal_connect(G_OBJECT(element->TypeCombo),"changed",G_CALLBACK(on_source_changed),element);
g_object_set_data(G_OBJECT(element->PathButton),"combo",element->TypeCombo); g_object_set_data(G_OBJECT(element->PathButton),"combo",element->TypeCombo);
g_object_set_data(G_OBJECT(element->MainBox),"source_element",element);
g_object_set_data(G_OBJECT(element->PathButton),"target_combo",element->TypeCombo); g_object_set_data(G_OBJECT(element->PathButton),"target_combo",element->TypeCombo);
g_object_set_data(G_OBJECT(element->TypeCombo),"target",element->DeviceCombo); g_object_set_data(G_OBJECT(element->TypeCombo),"target",element->DeviceCombo);
g_object_set_data(G_OBJECT(element->TypeCombo),"button",element->PathButton); g_object_set_data(G_OBJECT(element->TypeCombo),"button",element->PathButton);
g_object_set_data(G_OBJECT(element->TypeCombo),"combo",element->PathEntry); g_object_set_data(G_OBJECT(element->TypeCombo),"combo",element->PathEntry);
gtk_widget_set_sensitive(element->DeviceCombo,0);
gtk_widget_set_sensitive(element->TypeCombo,0);
gtk_widget_set_sensitive(element->PathEntry,0);
gtk_widget_set_sensitive(element->PathButton,0);
gtk_widget_hide(element->PathButton);
int size; int size;
config_str parts = yon_config_load(get_parts_and_devices_command, &size); config_str parts = yon_config_load(get_parts_and_devices_command, &size);
for (int i=0;i<size;i++){ for (int i=0;i<size;i++){
@ -144,6 +150,53 @@ void on_source_accept(GtkWidget *,source_window *window){
if (!yon_char_is_empty(creation_path)){ if (!yon_char_is_empty(creation_path)){
yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),SOURCE_CREATE_ONGOING_ERROR_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),SOURCE_CREATE_ONGOING_ERROR_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
} }
char *sources_list = NULL;
GList *list = gtk_container_get_children(GTK_CONTAINER(window->AddBox));
GList *iter;
for (iter=list;iter;iter=iter->next){
source_element *element = NULL;
element = g_object_get_data(G_OBJECT(iter->data),"source_element");
switch(gtk_combo_box_get_active(GTK_COMBO_BOX(element->TypeCombo))){
case 0:{
char *cur = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(element->DeviceCombo));
if (yon_char_check_element(sources_list,cur,",")){
yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),VALUE_REPEAT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
yon_ubl_status_highlight_incorrect(element->DeviceCombo);
return;
}
char *temp = yon_char_append_element(sources_list,cur,",");
if (!yon_char_is_empty(sources_list)) free(sources_list);
sources_list = temp;
} break;
case 1:{
char *cur = (char*)gtk_entry_get_text(GTK_ENTRY(element->PathEntry));
if (yon_char_check_element(sources_list,cur,",")){
yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),VALUE_REPEAT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
yon_ubl_status_highlight_incorrect(element->DeviceCombo);
return;
}
char *temp = yon_char_append_element(sources_list,cur,",");
if (!yon_char_is_empty(sources_list)) free(sources_list);
sources_list = temp;
} break;
case 2:{
char *cur = (char*)gtk_entry_get_text(GTK_ENTRY(element->PathEntry));
if (yon_char_check_element(sources_list,cur,",")){
yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),VALUE_REPEAT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
yon_ubl_status_highlight_incorrect(element->DeviceCombo);
return;
}
char *temp = yon_char_append_element(sources_list,cur,",");
if (!yon_char_is_empty(sources_list)) free(sources_list);
sources_list = temp;
} break;
}
}
if (!yon_char_is_empty(sources_list)){
yon_config_register(source_parameter,source_parameter_command,sources_list);
} else {
yon_config_remove_by_key(source_parameter);
}
int size; int size;
config_str paths = NULL; config_str paths = NULL;
dictionary *dict; dictionary *dict;
@ -161,7 +214,6 @@ void on_source_accept(GtkWidget *,source_window *window){
return; return;
} }
char *parameter_string = yon_char_parsed_to_string(paths,(int)size,","); char *parameter_string = yon_char_parsed_to_string(paths,(int)size,",");
yon_config_register(source_parameter,source_parameter_command,parameter_string);
free(parameter_string); free(parameter_string);
on_subwindow_close(window->Window); on_subwindow_close(window->Window);
@ -208,6 +260,18 @@ source_window *yon_source_window_new(){
g_object_set_data(G_OBJECT(window->TypeCombo),"target",window->DeviceCombo); g_object_set_data(G_OBJECT(window->TypeCombo),"target",window->DeviceCombo);
g_object_set_data(G_OBJECT(window->TypeCombo),"button",window->PathButton); g_object_set_data(G_OBJECT(window->TypeCombo),"button",window->PathButton);
g_object_set_data(G_OBJECT(window->TypeCombo),"combo",window->PathEntry); g_object_set_data(G_OBJECT(window->TypeCombo),"combo",window->PathEntry);
{
char *config_parameter = config(source_parameter);
if (window->sources){
yon_dictionary_free_all(window->sources,NULL);
}
int size;
config_str parsed = yon_char_parse(config_parameter,&size,",");
for (int i=0;i<size;i++){
yon_dictionary_add_or_create_if_exists_with_data(window->sources,parsed[i],NULL);
}
yon_char_parsed_free(parsed,size);
}
int size; int size;
config_str parts = yon_config_load(get_parts_and_devices_command, &size); config_str parts = yon_config_load(get_parts_and_devices_command, &size);
for (int i=0;i<size;i++){ for (int i=0;i<size;i++){
@ -225,16 +289,6 @@ source_window *yon_source_window_new(){
void on_source_clicked(GtkWidget *,main_window *widgets){ void on_source_clicked(GtkWidget *,main_window *widgets){
source_window *window = yon_source_window_new(); source_window *window = yon_source_window_new();
char *sources = config(source_parameter);
if (!yon_char_is_empty(sources)&&strcmp(sources,"auto")){
gtk_switch_set_active(GTK_SWITCH(window->AutoSwitch),0);
int size;
config_str parsed = yon_char_parse(sources,&size,",");
for (int i=0;i<size;i++){
yon_dictionary_add_or_create_if_exists_with_data(window->sources,parsed[i],NULL);
}
yon_char_parsed_free(parsed,size);
}
g_object_set_data(G_OBJECT(window->Window),"widgets",widgets); g_object_set_data(G_OBJECT(window->Window),"widgets",widgets);
yon_source_update(window); yon_source_update(window);
gtk_widget_show(window->Window); gtk_widget_show(window->Window);

@ -853,7 +853,6 @@ void yon_main_window_create(main_window *widgets){
widgets->PackagesList = GTK_TREE_STORE(gtk_builder_get_object(builder,"Packages")); widgets->PackagesList = GTK_TREE_STORE(gtk_builder_get_object(builder,"Packages"));
widgets->HubPersonalListBox = yon_gtk_builder_get_widget(builder,"HubPersonalListBox"); widgets->HubPersonalListBox = yon_gtk_builder_get_widget(builder,"HubPersonalListBox");
widgets->HubHardwareListBox = yon_gtk_builder_get_widget(builder,"HubHardwareListBox");
widgets->HubSystemListBox = yon_gtk_builder_get_widget(builder,"HubSystemListBox"); widgets->HubSystemListBox = yon_gtk_builder_get_widget(builder,"HubSystemListBox");
widgets->HubPackagesListBox = yon_gtk_builder_get_widget(builder,"HubPackagesListBox"); widgets->HubPackagesListBox = yon_gtk_builder_get_widget(builder,"HubPackagesListBox");
@ -991,11 +990,9 @@ void yon_main_window_create(main_window *widgets){
g_signal_connect(G_OBJECT(widgets->PackagesChosenCell),"toggled",G_CALLBACK(yon_on_packages_chosen),widgets); g_signal_connect(G_OBJECT(widgets->PackagesChosenCell),"toggled",G_CALLBACK(yon_on_packages_chosen),widgets);
g_signal_connect(G_OBJECT(widgets->HubPersonalListBox),"child-activated",G_CALLBACK(on_configuration_hub_open),widgets); g_signal_connect(G_OBJECT(widgets->HubPersonalListBox),"child-activated",G_CALLBACK(on_configuration_hub_open),widgets);
g_signal_connect(G_OBJECT(widgets->HubHardwareListBox),"child-activated",G_CALLBACK(on_configuration_hub_open),widgets);
g_signal_connect(G_OBJECT(widgets->HubSystemListBox),"child-activated",G_CALLBACK(on_configuration_hub_open),widgets); g_signal_connect(G_OBJECT(widgets->HubSystemListBox),"child-activated",G_CALLBACK(on_configuration_hub_open),widgets);
g_signal_connect(G_OBJECT(widgets->HubPackagesListBox),"child-activated",G_CALLBACK(on_configuration_hub_open),widgets); g_signal_connect(G_OBJECT(widgets->HubPackagesListBox),"child-activated",G_CALLBACK(on_configuration_hub_open),widgets);
g_signal_connect(G_OBJECT(widgets->HubPersonalListBox),"selected-children-changed",G_CALLBACK(on_configuration_hub_selected),widgets); g_signal_connect(G_OBJECT(widgets->HubPersonalListBox),"selected-children-changed",G_CALLBACK(on_configuration_hub_selected),widgets);
g_signal_connect(G_OBJECT(widgets->HubHardwareListBox),"selected-children-changed",G_CALLBACK(on_configuration_hub_selected),widgets);
g_signal_connect(G_OBJECT(widgets->HubSystemListBox),"selected-children-changed",G_CALLBACK(on_configuration_hub_selected),widgets); g_signal_connect(G_OBJECT(widgets->HubSystemListBox),"selected-children-changed",G_CALLBACK(on_configuration_hub_selected),widgets);
g_signal_connect(G_OBJECT(widgets->HubPackagesListBox),"selected-children-changed",G_CALLBACK(on_configuration_hub_selected),widgets); g_signal_connect(G_OBJECT(widgets->HubPackagesListBox),"selected-children-changed",G_CALLBACK(on_configuration_hub_selected),widgets);

@ -48,6 +48,7 @@
#define kernel_icon_path "com.ublinux.ubl-settings-kernel" #define kernel_icon_path "com.ublinux.ubl-settings-kernel"
#define untoggled_icon_path "com.ublinux.libublsettingsui-gtk3.untoggled-symbolic" #define untoggled_icon_path "com.ublinux.libublsettingsui-gtk3.untoggled-symbolic"
#define toggled_icon_path "com.ublinux.libublsettingsui-gtk3.toggled-symbolic" #define toggled_icon_path "com.ublinux.libublsettingsui-gtk3.toggled-symbolic"
#define add_icon_path "com.ublinux.libublsettingsui-gtk3.increase-symbolic"
#define LocalePath "/usr/share/locale" #define LocalePath "/usr/share/locale"
#define LocaleName "ubinstall-gtk" #define LocaleName "ubinstall-gtk"
@ -739,7 +740,6 @@ typedef struct {
// Configuration hub slide section // Configuration hub slide section
GtkWidget *HubPersonalListBox; GtkWidget *HubPersonalListBox;
GtkWidget *HubHardwareListBox;
GtkWidget *HubSystemListBox; GtkWidget *HubSystemListBox;
GtkWidget *HubPackagesListBox; GtkWidget *HubPackagesListBox;

@ -260,7 +260,7 @@ NULL)
#define AVAILABLE_LOCALES_LABEL _("Available locales in the system:") #define AVAILABLE_LOCALES_LABEL _("Available locales in the system:")
#define SYSTEM_LOCALE_LABEL _("System locale") #define SYSTEM_LOCALE_LABEL _("System locale")
#define LOCALE_LABEL _("Locale") #define LOCALE_LABEL _("Locale")
#define LOCALE_LANGUAGE_LABEL _("Language") #define LOCALE_LANGUAGE_LABEL _("System language")
#define TERRITORY_LABEL _("Territory") #define TERRITORY_LABEL _("Territory")
#define LANGUAGE_TITLE_INFO_LABEL _("Specify your preferred system languages") #define LANGUAGE_TITLE_INFO_LABEL _("Specify your preferred system languages")
#define REMOVE_LOCALE_TOOLTIP_LABEL _("Remove locale") #define REMOVE_LOCALE_TOOLTIP_LABEL _("Remove locale")
@ -268,12 +268,12 @@ NULL)
#define PERSONAL_SECTION_LABEL _("Personal") #define PERSONAL_SECTION_LABEL _("Personal")
#define HARDWARE_SECTION_LABEL _("Hardware") #define HARDWARE_SECTION_LABEL _("Hardware")
#define SYSTEM_SECTION_LABEL _("System") #define SYSTEM_SECTION_LABEL _("System")
#define PACKAGES_SECTION_LABEL _("Packages") #define PACKAGES_SECTION_LABEL _("Installing Modules")
#define KERNEL_LABEL _("Kernel") #define KERNEL_LABEL _("Kernel")
#define KERNEL_ADDON_LABEL _("Kernel addons") #define KERNEL_ADDON_LABEL _("Kernel addons")
#define SOFTWARE_LABEL _("Choose additional components") #define SOFTWARE_LABEL _("Installing software by groups")
#define PACMAN_SOFTWARE_LABEL _("Choose additional components") #define PACMAN_SOFTWARE_LABEL _("Installing Packages")
#define REGION_ICON_LABEL _("Region") #define REGION_ICON_LABEL _("Location")
#define STARTUP_LABEL _("Startup services") #define STARTUP_LABEL _("Startup services")
#define BOOTLOADER_LABEL _("Boot load") #define BOOTLOADER_LABEL _("Boot load")
#define NETWORK_LABEL _("Network") #define NETWORK_LABEL _("Network")

@ -47,8 +47,8 @@
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">15</property> <property name="margin-top">5</property>
<property name="margin-bottom">15</property> <property name="margin-bottom">5</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">5</property> <property name="spacing">5</property>
<child> <child>
@ -139,33 +139,6 @@
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hscrollbar-policy">never</property>
<property name="shadow-type">in</property>
<child>
<object class="GtkViewport">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
@ -246,9 +219,36 @@
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="pack-type">end</property> <property name="pack-type">end</property>
<property name="position">0</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hscrollbar-policy">never</property>
<property name="shadow-type">in</property>
<child>
<object class="GtkViewport">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child> <child>
<object class="GtkBox" id="AddBox"> <object class="GtkBox" id="AddBox">
<property name="visible">True</property> <property name="visible">True</property>

@ -758,7 +758,6 @@ agreement</property>
<property name="margin-top">5</property> <property name="margin-top">5</property>
<property name="margin-bottom">5</property> <property name="margin-bottom">5</property>
<property name="tab-pos">left</property> <property name="tab-pos">left</property>
<property name="show-tabs">False</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
@ -1999,7 +1998,7 @@ agreement</property>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Configuring the system</property> <property name="label" translatable="yes">Setting the system</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<attributes> <attributes>
@ -2129,54 +2128,6 @@ agreement</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Hardware</property>
<property name="xalign">0</property>
<attributes>
<attribute name="size" value="13312"/>
</attributes>
<style>
<class name="separatorBottom"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFlowBox" id="HubHardwareListBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="homogeneous">True</property>
<property name="column-spacing">5</property>
<property name="row-spacing">5</property>
<property name="max-children-per-line">150</property>
<property name="activate-on-single-click">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
@ -2235,7 +2186,7 @@ agreement</property>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Packages</property> <property name="label" translatable="yes">Modules and packages</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<attributes> <attributes>
<attribute name="size" value="13312"/> <attribute name="size" value="13312"/>
@ -2824,7 +2775,7 @@ agreement</property>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Selecting additional installation components</property> <property name="label" translatable="yes">Installing Modules</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<attributes> <attributes>
@ -2844,7 +2795,7 @@ agreement</property>
<object class="GtkLabel" id="WelcomeInfoLabel6"> <object class="GtkLabel" id="WelcomeInfoLabel6">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Selecting software from the installation media</property> <property name="label" translatable="yes">Selecting software modules to install from the repository. Internet access is required</property>
<property name="justify">center</property> <property name="justify">center</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
@ -3014,7 +2965,7 @@ agreement</property>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Selecting additional components and software</property> <property name="label" translatable="yes">Installing Packages</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<attributes> <attributes>
@ -3034,7 +2985,7 @@ agreement</property>
<object class="GtkLabel" id="WelcomeInfoLabel7"> <object class="GtkLabel" id="WelcomeInfoLabel7">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Search and select the software you need to install by package name. Internet access required</property> <property name="label" translatable="yes">Selecting software packages to install from the repository. Internet access is required</property>
<property name="justify">center</property> <property name="justify">center</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
@ -6155,7 +6106,7 @@ agreement</property>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Additional system components</property> <property name="label" translatable="yes">Installing software by groups</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<attributes> <attributes>
@ -6175,7 +6126,7 @@ agreement</property>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Configuring the installation of additional components</property> <property name="label" translatable="yes">Selecting the software group to install from the repository. Internet access is required</property>
<property name="justify">center</property> <property name="justify">center</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>

Loading…
Cancel
Save