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

Fixes

Browse Source
pull/109/head
Ivan Dmitrievich Yartsev 2 weeks ago
parent 9a169e6f19
commit 22fcc5fcda
No known key found for this signature in database
GPG Key ID: FF1D842BF4DDE92B
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File

9
source/ubinstall-gtk-advanced.c
Unescape View File

@ -789,9 +789,10 @@ void on_advanced_virtual_device_changed(GtkWidget *, main_window *widgets){
if (!yon_char_is_empty(device)&&!yon_char_is_empty(parsed[2])&!strcmp(parsed[2],device)){ if (!yon_char_is_empty(device)&&!yon_char_is_empty(parsed[2])&!strcmp(parsed[2],device)){
cur_device = parsed; cur_device = parsed;
gtk_label_set_text(GTK_LABEL(widgets->AdvancedVirtualDeviceLabel),parsed[1]); gtk_label_set_text(GTK_LABEL(widgets->AdvancedVirtualDeviceLabel),parsed[1]);
} } else {
yon_char_parsed_free(parsed,parsed_size); yon_char_parsed_free(parsed,parsed_size);
} }
}
if (!yon_char_is_empty(device)){ if (!yon_char_is_empty(device)){
GtkTreeIter iter; GtkTreeIter iter;
GtkTreeModel *model = GTK_TREE_MODEL(widgets->DevicesList); GtkTreeModel *model = GTK_TREE_MODEL(widgets->DevicesList);
@ -801,14 +802,14 @@ void on_advanced_virtual_device_changed(GtkWidget *, main_window *widgets){
gtk_tree_model_get(model,&iter,5,&status,-1); gtk_tree_model_get(model,&iter,5,&status,-1);
if (status) active_devices++; if (status) active_devices++;
} }
if (atoi(cur_device[3])<active_devices){ if (atoi(cur_device[3])>active_devices){
yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),COUNT_INVALID_LABEL(cur_device[4]),5,BACKGROUND_IMAGE_INFO_TYPE); yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),COUNT_INVALID_LABEL(cur_device[3]),5,BACKGROUND_IMAGE_INFO_TYPE);
yon_ubl_status_highlight_incorrect(widgets->AdvancedVirtualDeviceCombo); yon_ubl_status_highlight_incorrect(widgets->AdvancedVirtualDeviceCombo);
yon_char_parsed_free(cur_device,4); yon_char_parsed_free(cur_device,4);
return; return;
} }
if (atoi(cur_device[4])%active_devices==0){ if (atoi(cur_device[4])%active_devices!=0){
yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),PARITY_INVALID_LABEL(cur_device[4]),5,BACKGROUND_IMAGE_INFO_TYPE); yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),PARITY_INVALID_LABEL(cur_device[4]),5,BACKGROUND_IMAGE_INFO_TYPE);
yon_ubl_status_highlight_incorrect(widgets->AdvancedVirtualDeviceCombo); yon_ubl_status_highlight_incorrect(widgets->AdvancedVirtualDeviceCombo);
yon_char_parsed_free(cur_device,4); yon_char_parsed_free(cur_device,4);

5
source/ubinstall-gtk-page-switch.c
Unescape View File

@ -29,6 +29,11 @@ enum YON_PAGES yon_page_get_next(main_window *widgets, enum YON_PAGES page){
case YON_PAGE_RECOVERY_GRUB_UPDATE: return main_config.configure_mode?YON_PAGE_INSTALLATION:YON_PAGE_INSTALLATION_BEGIN; break; case YON_PAGE_RECOVERY_GRUB_UPDATE: return main_config.configure_mode?YON_PAGE_INSTALLATION:YON_PAGE_INSTALLATION_BEGIN; break;
case YON_PAGE_RECOVERY_OS_ONLY: return main_config.configure_mode?YON_PAGE_INSTALLATION:YON_PAGE_INSTALLATION_BEGIN; break; case YON_PAGE_RECOVERY_OS_ONLY: return main_config.configure_mode?YON_PAGE_INSTALLATION:YON_PAGE_INSTALLATION_BEGIN; break;
case YON_PAGE_RECOVERY_USRDATA_ONLY: return main_config.configure_mode?YON_PAGE_INSTALLATION:YON_PAGE_INSTALLATION_BEGIN; break; case YON_PAGE_RECOVERY_USRDATA_ONLY: return main_config.configure_mode?YON_PAGE_INSTALLATION:YON_PAGE_INSTALLATION_BEGIN; break;
case YON_PAGE_COMPLETED:
case YON_PAGE_INSTALL_ERROR:
case YON_PAGE_CONFIGURE_END:
on_reboot_accepted(widgets);
break;
default:return YON_PAGE_WELCOME; default:return YON_PAGE_WELCOME;
} }
return YON_PAGE_WELCOME; return YON_PAGE_WELCOME;

4
source/ubl-strings.h
Unescape View File

@ -214,8 +214,8 @@
#define SAVE_AND_EXIT_LABEL _("Save and exit") #define SAVE_AND_EXIT_LABEL _("Save and exit")
#define NO_LABEL _("No") #define NO_LABEL _("No")
#define PARITY_INVALID_LABEL(target) yon_char_unite(_("Cu"),target) #define PARITY_INVALID_LABEL(target) yon_char_unite(_("Cu"),target,NULL)
#define COUNT_INVALID_LABEL(target) yon_char_unite(_("Cu"),target) #define COUNT_INVALID_LABEL(target) yon_char_unite(_("Cues"),target,NULL)
// #define _LABEL _("New section at") // #define _LABEL _("New section at")
// #define _LABEL _("\"/ublinux-data/\" user data section") // #define _LABEL _("\"/ublinux-data/\" user data section")

Write Preview
Loading…
Cancel
Save