Fixed source switch fix

pull/207/head
parent 4bdf1a5da2
commit e3f1278259

@ -164,7 +164,8 @@ void on_bootloader_user_add(GtkWidget *, main_window *widgets){
void yon_menu_open_submenu(yon_menu_window *window, yon_menu_item *item){
int size;
config_str options = yon_config_load(get_menus_entry_command,&size);
textdomain("ublinux-init-grub-functions");
bind_textdomain_codeset("ublinux-init-grub-functions","UTF-8");
for (int i=1;i<size;i++){
yon_char_remove_last_symbol(options[i],'\n');
int parsed_size;
@ -183,7 +184,8 @@ void yon_menu_open_submenu(yon_menu_window *window, yon_menu_item *item){
yon_char_parsed_free(name_parsed,name_size);
yon_char_parsed_free(parsed,parsed_size);
}
textdomain(LocaleName);
bind_textdomain_codeset(LocaleName,"UTF-8");
}
void yon_menu_ungrab(yon_menu_window *window){
@ -242,7 +244,7 @@ yon_menu_window *yon_menu_window_open(GtkWidget *, main_window *widgets){
int size;
config_str options = yon_config_load(get_menus_entry_command,&size);
GHashTable *created = g_hash_table_new(g_str_hash,g_str_equal);
textdomain("ublinux-init-grub-functions");
bind_textdomain_codeset("ublinux-init-grub-functions","UTF-8");
for (int i=1;i<size;i++){
yon_char_remove_last_symbol(options[i],'\n');
int parsed_size;
@ -272,7 +274,7 @@ yon_menu_window *yon_menu_window_open(GtkWidget *, main_window *widgets){
}
}
}
textdomain(LocaleName);
bind_textdomain_codeset(LocaleName,"UTF-8");
g_hash_table_unref(created);
yon_char_parsed_free(options,size);
gtk_window_set_transient_for(GTK_WINDOW(window->MenuWindow), GTK_WINDOW(widgets->MainWindow));

@ -38,12 +38,14 @@ enum YON_PAGES yon_page_get_next(main_window *widgets, enum YON_PAGES page){
case YON_PAGE_INSTALLATION: return YON_PAGE_COMPLETION; break;
case YON_PAGE_CONFIGURE_SAVE:
break;
case YON_PAGE_CONFIGURE_END:
gtk_main_quit();
exit(0);
break;
case YON_PAGE_COMPLETED:
case YON_PAGE_INSTALL_ERROR:
case YON_PAGE_CONFIGURE_END:
case YON_PAGE_RECOVERY_COMPLETION:
case YON_PAGE_COMPLETION:
on_reboot_accepted(widgets);
break;
// default:return YON_PAGE_WELCOME;

@ -18,7 +18,7 @@ void yon_source_update(source_window *window){
GList *iter;
for (iter = list; iter; iter = iter->next){
source_element *element = (source_element*)g_object_get_data(G_OBJECT(iter->data),"source_element");
if (!iter->next){
if (!iter->next&&!element->AddButton){
GtkWidget *button = gtk_button_new_from_icon_name(add_icon_path,GTK_ICON_SIZE_BUTTON);
g_signal_connect(G_OBJECT(button),"clicked",G_CALLBACK(on_source_add),window);
gtk_box_pack_end(GTK_BOX(element->MainBox),button,0,0,0);
@ -26,12 +26,18 @@ void yon_source_update(source_window *window){
gtk_style_context_add_class(gtk_widget_get_style_context(button),"thin");
gtk_style_context_add_class(gtk_widget_get_style_context(button),"instant");
gtk_widget_show(button);
} else {
} else if (iter->next){
if (element->AddButton) {
gtk_widget_destroy(element->AddButton);
element->AddButton = NULL;
}
}
if (!iter->next&&!iter->prev){
gtk_widget_hide(element->RemoveButton);
} else {
gtk_widget_show(element->RemoveButton);
}
}
}

Loading…
Cancel
Save