diff --git a/source/ubinstall-gtk-installation.c b/source/ubinstall-gtk-installation.c index 9201f23..6cc2b52 100644 --- a/source/ubinstall-gtk-installation.c +++ b/source/ubinstall-gtk-installation.c @@ -313,7 +313,8 @@ void on_device_selection_changed(GtkWidget *self, main_window *widgets){ void yon_devices_setup(main_window *widgets){ GtkTreeIter iter; - if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(widgets->DevicesList),&iter)) return; + // if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(widgets->DevicesList),&iter)) return; + gtk_list_store_clear(widgets->DevicesList); int size; config_str parsed = NULL; parsed = yon_config_load(yon_debug_output("%s\n",get_devices_command),&size); diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index c869b16..eef9ff1 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -377,24 +377,15 @@ void config_init(){ } } -// void on_root_get_root(char *argline){ -// yon_launch(argline); -// } - -// void *on_setup_system_configuration(void *data); - -void on_additional_software_toggled(GtkWidget *, char *, main_window *){ - // GtkTreeIter iter; - // int status; - // gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(widgets->AdditionalSoftwareList),&iter,path); - // gtk_tree_model_get(GTK_TREE_MODEL(widgets->AdditionalSoftwareList),&iter,0,&status,-1); - // gtk_list_store_set(widgets->AdditionalSoftwareList,&iter,0,!status,-1); -} - void on_gparted_open(){ yon_launch_app_with_arguments(open_gparted_command,NULL); } +void on_gparted_update(GtkWidget *, main_window *widgets){ + yon_devices_setup(widgets); + // yon_page_init(widgets,gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->Notebook))); +} + void on_reboot_accepted(main_window *){ g_mutex_lock(&main_config.install_mutex); if (main_config.install_thread){ @@ -661,7 +652,8 @@ void yon_main_window_create(main_window *widgets){ widgets->CommonInstallationFilesystemTypeCombo = yon_gtk_builder_get_widget(builder,"CommonInstallationFilesystemTypeCombo"); widgets->CommonInstallationSectionNameEntry = yon_gtk_builder_get_widget(builder,"CommonInstallationSectionNameEntry"); widgets->CommonFormatSwitch = yon_gtk_builder_get_widget(builder,"CommonFormatSwitch"); - widgets->GpartedCommonButton = yon_gtk_builder_get_widget(builder,"GpartedCommonButton"); + widgets->CommonGpartedButton = yon_gtk_builder_get_widget(builder,"CommonGpartedButton"); + widgets->CommonUpdateGpartedButton = yon_gtk_builder_get_widget(builder,"CommonUpdateGpartedButton"); widgets->SamePlaceDeviceTree = yon_gtk_builder_get_widget(builder,"SamePlaceDeviceTree"); widgets->SamePlacePartTree = yon_gtk_builder_get_widget(builder,"SamePlacePartTree"); @@ -669,7 +661,8 @@ void yon_main_window_create(main_window *widgets){ widgets->SameInstallationFormatRevealer = yon_gtk_builder_get_widget(builder,"SameInstallationFormatRevealer"); widgets->SameInstallationFilesystemTypeCombo = yon_gtk_builder_get_widget(builder,"SameInstallationFilesystemTypeCombo"); widgets->SameInstallationSectionNameEntry = yon_gtk_builder_get_widget(builder,"SameInstallationSectionNameEntry"); - widgets->GpartedSameButton = yon_gtk_builder_get_widget(builder,"GpartedSameButton"); + widgets->SameGpartedButton = yon_gtk_builder_get_widget(builder,"SameGpartedButton"); + widgets->SameUpdateGpartedButton = yon_gtk_builder_get_widget(builder,"SameUpdateGpartedButton"); widgets->NextInstallationFilesystemTypeCombo = yon_gtk_builder_get_widget(builder,"NextInstallationFilesystemTypeCombo"); widgets->NextInstallationFormatSwitch = yon_gtk_builder_get_widget(builder,"NextInstallationFormatSwitch"); @@ -679,10 +672,13 @@ void yon_main_window_create(main_window *widgets){ widgets->NextInstallationSizeTypeSpin = yon_gtk_builder_get_widget(builder,"NextInstallationFormatSizeCombo"); widgets->NextInstallationSysDevicesTree = yon_gtk_builder_get_widget(builder,"NextInstallationSysDevicesTree"); widgets->NextInstallationSysSectionTree = yon_gtk_builder_get_widget(builder,"NextInstallationSysSectionTree"); - widgets->GpartedNextInstallationButton = yon_gtk_builder_get_widget(builder,"GpartedNextInstallationButton"); - + widgets->NextInstallationGPartedButton = yon_gtk_builder_get_widget(builder,"NextInstallationGPartedButton"); + widgets->NextInstallationUpdateGPartedButton = yon_gtk_builder_get_widget(builder,"NextInstallationUpdateGPartedButton"); + widgets->AdvancedDeviceChosenCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"AdvancedDeviceChosenCell")); widgets->AdvancedPartChosenCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"AdvancedPartChosenCell")); + widgets->AdvancedGpartedButton = yon_gtk_builder_get_widget(builder,"AdvancedGpartedButton"); + widgets->AdvancedUpdateGpartedButton = yon_gtk_builder_get_widget(builder,"AdvancedUpdateGpartedButton"); widgets->AdvancedDeviceTree = yon_gtk_builder_get_widget(builder,"AdvancedDeviceTree"); widgets->AdvancedVirtualDeviceCombo = yon_gtk_builder_get_widget(builder,"AdvancedVirtualDeviceCombo"); widgets->AdvancedPartitionTree = yon_gtk_builder_get_widget(builder,"AdvancedPartitionTree"); @@ -703,17 +699,20 @@ void yon_main_window_create(main_window *widgets){ widgets->GrubInstallDevicesTree = yon_gtk_builder_get_widget(builder,"GrubInstallDevicesTree"); widgets->GrubInstallPartitionTree = yon_gtk_builder_get_widget(builder,"GrubInstallPartitionTree"); - widgets->GpartedGrubInstallButton = yon_gtk_builder_get_widget(builder,"GpartedGrubInstallButton"); + widgets->GrubInstallGpartedButton = yon_gtk_builder_get_widget(builder,"GrubInstallGpartedButton"); + widgets->GrubInstallUpdateGpartedButton = yon_gtk_builder_get_widget(builder,"GrubInstallUpdateGpartedButton"); widgets->GrubUpdateDevicesTree = yon_gtk_builder_get_widget(builder,"GrubUpdateDevicesTree"); widgets->GrubUpdatePartitionTree = yon_gtk_builder_get_widget(builder,"GrubUpdatePartitionTree"); - widgets->GpartedGrubUpdateButton = yon_gtk_builder_get_widget(builder,"GpartedGrubUpdateButton"); + widgets->GrubUpdateGpartedButton = yon_gtk_builder_get_widget(builder,"GrubUpdateGpartedButton"); + widgets->GrubUpdateUpdateGpartedButton = yon_gtk_builder_get_widget(builder,"GrubUpdateUpdateGpartedButton"); widgets->OSDevicesTree = yon_gtk_builder_get_widget(builder,"OSDevicesTree"); widgets->OSSpinner = yon_gtk_builder_get_widget(builder,"OSSpinner"); widgets->OSOverlay = yon_gtk_builder_get_widget(builder,"OSOverlay"); widgets->OSSysSectionTree = yon_gtk_builder_get_widget(builder,"OSSysSectionTree"); - widgets->GpartedOSButton = yon_gtk_builder_get_widget(builder,"GpartedOSButton"); + widgets->OSGpartedButton = yon_gtk_builder_get_widget(builder,"OSGpartedButton"); + widgets->OSUpdateGpartedButton = yon_gtk_builder_get_widget(builder,"OSUpdateGpartedButton"); widgets->OSFormatSwitch = yon_gtk_builder_get_widget(builder,"OSFormatSwitch"); widgets->OSRevealer = yon_gtk_builder_get_widget(builder,"OSRevealer"); widgets->OSFormatSizeSpin = yon_gtk_builder_get_widget(builder,"OSFormatSizeSpin"); @@ -726,7 +725,8 @@ void yon_main_window_create(main_window *widgets){ widgets->UserdataDevicesTree = yon_gtk_builder_get_widget(builder,"UserdataDevicesTree"); widgets->UserdataSysSectionTree = yon_gtk_builder_get_widget(builder,"UserdataSysSectionTree"); - widgets->GpartedUserdataButton = yon_gtk_builder_get_widget(builder,"UserdataGpartedButton"); + widgets->UserdataGpartedButton = yon_gtk_builder_get_widget(builder,"UserdataGpartedButton"); + widgets->UserdataUpdateGpartedButton = yon_gtk_builder_get_widget(builder,"UserdataUpdateGpartedButton"); widgets->UserdataFormatSwitch = yon_gtk_builder_get_widget(builder,"UserdataFormatSwitch"); widgets->UserdataRevealer = yon_gtk_builder_get_widget(builder,"UserdataRevealer"); widgets->UserdataFormatSizeSpin = yon_gtk_builder_get_widget(builder,"UserdataFormatSizeSpin"); @@ -903,9 +903,23 @@ void yon_main_window_create(main_window *widgets){ g_signal_connect(G_OBJECT(widgets->ReadFullLogButton),"clicked",G_CALLBACK(on_process_log_view),widgets); g_signal_connect(G_OBJECT(widgets->ReadShortLogButton),"clicked",G_CALLBACK(on_summary_log_view),widgets); - g_signal_connect(G_OBJECT(widgets->GpartedCommonButton),"clicked",G_CALLBACK(on_gparted_open),NULL); - g_signal_connect(G_OBJECT(widgets->GpartedSameButton),"clicked",G_CALLBACK(on_gparted_open),NULL); - g_signal_connect(G_OBJECT(widgets->GpartedNextInstallationButton),"clicked",G_CALLBACK(on_gparted_open),NULL); + g_signal_connect(G_OBJECT(widgets->CommonGpartedButton),"clicked",G_CALLBACK(on_gparted_open),NULL); + g_signal_connect(G_OBJECT(widgets->SameGpartedButton),"clicked",G_CALLBACK(on_gparted_open),NULL); + g_signal_connect(G_OBJECT(widgets->NextInstallationGPartedButton),"clicked",G_CALLBACK(on_gparted_open),NULL); + g_signal_connect(G_OBJECT(widgets->OSGpartedButton),"clicked",G_CALLBACK(on_gparted_open),NULL); + g_signal_connect(G_OBJECT(widgets->UserdataGpartedButton),"clicked",G_CALLBACK(on_gparted_open),NULL); + g_signal_connect(G_OBJECT(widgets->GrubUpdateGpartedButton),"clicked",G_CALLBACK(on_gparted_open),NULL); + g_signal_connect(G_OBJECT(widgets->GrubInstallGpartedButton),"clicked",G_CALLBACK(on_gparted_open),NULL); + g_signal_connect(G_OBJECT(widgets->AdvancedGpartedButton),"clicked",G_CALLBACK(on_gparted_open),NULL); + + g_signal_connect(G_OBJECT(widgets->CommonUpdateGpartedButton),"clicked",G_CALLBACK(on_gparted_update),widgets); + g_signal_connect(G_OBJECT(widgets->SameUpdateGpartedButton),"clicked",G_CALLBACK(on_gparted_update),widgets); + g_signal_connect(G_OBJECT(widgets->NextInstallationUpdateGPartedButton),"clicked",G_CALLBACK(on_gparted_update),widgets); + g_signal_connect(G_OBJECT(widgets->OSUpdateGpartedButton),"clicked",G_CALLBACK(on_gparted_update),widgets); + g_signal_connect(G_OBJECT(widgets->UserdataUpdateGpartedButton),"clicked",G_CALLBACK(on_gparted_update),widgets); + g_signal_connect(G_OBJECT(widgets->GrubUpdateUpdateGpartedButton),"clicked",G_CALLBACK(on_gparted_update),widgets); + g_signal_connect(G_OBJECT(widgets->GrubInstallUpdateGpartedButton),"clicked",G_CALLBACK(on_gparted_update),widgets); + g_signal_connect(G_OBJECT(widgets->AdvancedUpdateGpartedButton),"clicked",G_CALLBACK(on_gparted_update),widgets); // g_signal_connect(G_OBJECT(widgets->MainWindow),"check-resize",G_CALLBACK(on_region_resized),widgets); g_signal_connect(G_OBJECT(widgets->NextButton),"clicked",G_CALLBACK(on_page_next_clicked),widgets); diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index 9244fd8..063a202 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -1,25 +1,24 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include -#ifdef WEBKIT_FOUND - #include -#endif -#include "ubl-strings.h" - - -#define _(String) gettext(String) - +#ifdef WEBKIT_FOUND +#include +#endif +#include "ubl-strings.h" + +#define _(String) gettext(String) + #define glade_path "/com/ublinux/ui/ubinstall-gtk.glade" #define glade_path_ubinstall_keyboard "/com/ublinux/ui/ubinstall-gtk-keyboard.glade" #define glade_path_ubinstall_language "/com/ublinux/ui/ubinstall-gtk-language.glade" @@ -40,22 +39,22 @@ #define glade_locales_path "/com/ublinux/ui/ubinstall-gtk-layouts.glade" #define glade_layouts_path "/com/ublinux/ui/ubinstall-gtk-keyboard-layouts.glade" #define glade_path_slider "/com/ublinux/ui/ubinstall-gtk-slider.glade" - -#define CssPath "/com/ublinux/css/ubinstall-gtk.css" -#define config_path yon_char_unite(yon_ubl_user_get_home_directory(),"/.config/",LocaleName,"/",LocaleName,".conf",NULL) + +#define CssPath "/com/ublinux/css/ubinstall-gtk.css" +#define config_path yon_char_unite(yon_ubl_user_get_home_directory(), "/.config/", LocaleName, "/", LocaleName, ".conf", NULL) #define icon_path "com.ublinux.ubinstall-gtk" #define kernel_icon_path "com.ublinux.ubl-settings-kernel" #define untoggled_icon_path "com.ublinux.libublsettingsui-gtk3.untoggled-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 LocaleName "ubinstall-gtk" - -#define clear_config_both_command "ubconfig remove TEMP_SECTION TEMP_PATAMETER" -#define clear_config_global_command "ubconfig --target global remove TEMP_SECTION TEMP_PATAMETER" -#define clear_config_local_command "ubconfig --target system remove TEMP_SECTION TEMP_PATAMETER" - +#define LocalePath "/usr/share/locale" +#define LocaleName "ubinstall-gtk" + +#define clear_config_both_command "ubconfig remove TEMP_SECTION TEMP_PATAMETER" +#define clear_config_global_command "ubconfig --target global remove TEMP_SECTION TEMP_PATAMETER" +#define clear_config_local_command "ubconfig --target system remove TEMP_SECTION TEMP_PATAMETER" + #define regions_path "/com/ublinux/images/map-time-zone.png" #define keyboard_path "/com/ublinux/images/keyboard.png" #define users_path "/com/ublinux/images/keyboard.png" @@ -82,7 +81,7 @@ #define vfs_list_path "resource:///com/ublinux/csv/vfs-list.csv" #define groups_list_path "resource:///com/ublinux/csv/groups-list.csv" -#define encryptions_list "luks1","luks2" +#define encryptions_list "luks1", "luks2" #define locales_list_command "/usr/share/i18n/locales/" @@ -91,29 +90,28 @@ #define arrow_left_icon_path "com.ublinux.ubinstall-gtk.arrow-left-symbolic" #define arrow_right_icon_path "com.ublinux.ubinstall-gtk.arrow-right-symbolic" -#define slide_repeat_path "/com/ublinux/images/slide-1.png", \ -"/com/ublinux/images/slide-2.png", \ -"/com/ublinux/images/slide-3.png", \ -"/com/ublinux/images/slide-4.png", \ -"/com/ublinux/images/slide-5.png", \ -"/com/ublinux/images/slide-6.png", \ -"/com/ublinux/images/slide-7.png", \ -"/com/ublinux/images/slide-8.png", \ -"/com/ublinux/images/slide-9.png", \ -"/com/ublinux/images/slide-10.png", \ -"/com/ublinux/images/slide-11.png", \ -"/com/ublinux/images/slide-12.png", \ -NULL - +#define slide_repeat_path "/com/ublinux/images/slide-1.png", \ + "/com/ublinux/images/slide-2.png", \ + "/com/ublinux/images/slide-3.png", \ + "/com/ublinux/images/slide-4.png", \ + "/com/ublinux/images/slide-5.png", \ + "/com/ublinux/images/slide-6.png", \ + "/com/ublinux/images/slide-7.png", \ + "/com/ublinux/images/slide-8.png", \ + "/com/ublinux/images/slide-9.png", \ + "/com/ublinux/images/slide-10.png", \ + "/com/ublinux/images/slide-11.png", \ + "/com/ublinux/images/slide-12.png", \ + NULL #define get_modules_command "pacman --color never -Qs ^ubm- | sed -Enr -e 'N;s/\\n/ ;/' -e \"s/^([^\\/]+)\\/([^[:blank:]]+)[[:blank:]]+([^[:blank:]]+)[[:blank:]]+(\\(([^\\)]+)\\)[^\\;]+|[^\\;]*);[[:blank:]]*(.*)/\\2;\\3;\\5;\\6/p\"" #define get_available_modules_command "pacman --color never -Ss ^ubm- | sed -Enr -e 'N;s/\\n/ ;/' -e \"s/^([^\\/]+)\\/([^[:blank:]]+)[[:blank:]]+([^[:blank:]]+)[[:blank:]]+(\\(([^\\)]+)\\)[^\\;]+|[^\\;]*);[[:blank:]]*(.*)/\\2;\\3;\\5;\\6/p\"" -#define get_local_module_info_command(target) yon_char_unite("pacman --color never -Sp $(pacman -Ssq '",target,"') --print-format '%n;%v;%d' | grep -v \"^::\"",NULL); +#define get_local_module_info_command(target) yon_char_unite("pacman --color never -Sp $(pacman -Ssq '", target, "') --print-format '%n;%v;%d' | grep -v \"^::\"", NULL); -#define get_menus_entry_command "/usr/lib/ublinux/scripts/grub-functions exec_get_all_menuentry" +#define get_menus_entry_command "/usr/lib/ublinux/scripts/grub-functions exec_get_all_menuentry2" -#define encrypt_domain_password_command(target) yon_char_unite("echo '",target,"' | base64",NULL) +#define encrypt_domain_password_command(target) yon_char_unite("echo '", target, "' | base64", NULL) #define get_ntp_default_command "ubconfig --default get [network] NTPSERVERS_DEFAULT" #define get_ntp_ru_command "ubconfig --default get [network] NTPSERVERS_RU" @@ -121,9 +119,9 @@ NULL #define get_models_command "sed '/<\\/modelList>/q' /usr/share/X11/xkb/rules/base.xml | grep -E '^ {8,8}|^ {8,8}'|sed -e 's/ *//g' -e 's,,,g' -e 's/ *//g' -e 's,,,g'" #define get_keyboard_models_command "sed -En '/^! model$/,/^ *$/!d;s/[[:blank:]]+([^ ]+)[[:blank:]]+(.*)/\\1|\\2/p' /usr/share/X11/xkb/rules/evdev.lst" -#define check_is_password_hash(password) system(yon_char_unite("/lib/ublinux/functions is_hash_password '", password,"'",NULL)) +#define check_is_password_hash(password) system(yon_char_unite("/lib/ublinux/functions is_hash_password '", password, "'", NULL)) -#define network_value(ip,mask,gateway, dns) g_strdup_printf("ipv4.method manual ipv4.addr %s/%s ipv4.gateway %s ipv4.dns %s",ip,mask,gateway,dns) +#define network_value(ip, mask, gateway, dns) g_strdup_printf("ipv4.method manual ipv4.addr %s/%s ipv4.gateway %s ipv4.dns %s", ip, mask, gateway, dns) #define network_value_auto "ipv4.method auto" #define get_layouts_command "xkbcli list --load-exotic | awk \"\ @@ -154,11 +152,11 @@ layout && /description:/ {\ #define enable_rdp_command "ubconfig --target system set [desktop] AUTOEXEC[@users]='freerdp-server.service'" #define disable_rdp_command "ubconfig --target system remove [desktop] AUTOEXEC[@users]" -#define get_layouts_local_command(layout) yon_char_unite("xkbcli list --load-exotic | awk -v layout=\"",layout,"\" \"BEGIN {layout_pattern = sprintf(\\\"^ *- *layout: *'%s'\\\",layout);matched=0} matched && /variant:/ {match(\\$0, /: *'([^']+)'/, matches);variant = matches[1]} matched && /description:/ {match(\\$0, /: *(.+)/, matches);description = matches[1]} matched && /^ *-/{matched=0; if (variant) printf \\\"%s|%s\\n\\\",variant,description} \\$0 ~ layout_pattern {matched=1;variant=\\\"\\\";description=\\\"\\\";next}\" | sort -u",NULL) +#define get_layouts_local_command(layout) yon_char_unite("xkbcli list --load-exotic | awk -v layout=\"", layout, "\" \"BEGIN {layout_pattern = sprintf(\\\"^ *- *layout: *'%s'\\\",layout);matched=0} matched && /variant:/ {match(\\$0, /: *'([^']+)'/, matches);variant = matches[1]} matched && /description:/ {match(\\$0, /: *(.+)/, matches);description = matches[1]} matched && /^ *-/{matched=0; if (variant) printf \\\"%s|%s\\n\\\",variant,description} \\$0 ~ layout_pattern {matched=1;variant=\\\"\\\";description=\\\"\\\";next}\" | sort -u", NULL) #define get_devices_command "lsblk --noheadings --nodeps -Jo PATH,SIZE,MODEL,VENDOR,SERIAL --exclude 7" #define get_parts_and_devices_command "lsblk --noheadings --bytes -o TYPE,PATH,SIZE,FSTYPE,LABEL,PARTLABEL,MOUNTPOINT,FSUSED,FSUSE% --exclude 7 |awk '{print ($1\";\"$2\";\"$3\";\"$4\";\"$5\";\"$6\";\"$7\";\"$8\";\"$9)}'" -#define AUTOINSTALL(target) yon_char_unite("AUTOINSTALL[",target,"]",NULL) +#define AUTOINSTALL(target) yon_char_unite("AUTOINSTALL[", target, "]", NULL) #define AUTOINSTALL_TYPE_INSTALL "AUTOINSTALL[install_type]" #define AUTOINSTALL_TYPE_INSTALL_command "ubconfig --source global get [autoinstall] AUTOINSTALL[install_type]" @@ -229,14 +227,14 @@ layout && /description:/ {\ #define DOMAIN_admanger_parameter_command "ubconfig --source global get [autoinstall] AUTOINSTALL['ubconfig set [network] DOMAIN[admanger]']" #define USERADD_parameter_all "AUTOINSTALL[ubconfig set [users] USERADD[*]]" #define USERADD_parameter_search "AUTOINSTALL[ubconfig set [users] USERADD[" -#define USERADD_parameter(target) yon_char_unite("AUTOINSTALL[ubconfig set [users] USERADD[",target,"]]",NULL) -#define USERADD_parameter_command(target) yon_char_unite("ubconfig --source global get autoinstall AUTOINSTALL['ubconfig set [users] USERADD[",target,"]']",NULL) +#define USERADD_parameter(target) yon_char_unite("AUTOINSTALL[ubconfig set [users] USERADD[", target, "]]", NULL) +#define USERADD_parameter_command(target) yon_char_unite("ubconfig --source global get autoinstall AUTOINSTALL['ubconfig set [users] USERADD[", target, "]']", NULL) #define KERNEL_BOOT_parameter "AUTOINSTALL[ubconfig set [boot] KERNEL_BOOT]" #define KERNEL_BOOT_parameter_command "ubconfig --source global get autoinstall AUTOINSTALL['ubconfig set [boot] KERNEL_BOOT']" -#define SERVICES_ENABLE_parameter "AUTOINSTALL[ubconfig set [boot] SERVICES_ENABLE]" -#define SERVICES_ENABLE_parameter_command "ubconfig get autoinstall AUTOINSTALL['ubconfig set [boot] SERVICES_ENABLE']" -#define AUTOEXEC_parameter "AUTOINSTALL[ubconfig set [desktop] AUTOEXEC[@users]]" -#define AUTOEXEC_parameter_command "ubconfig get autoinstall AUTOINSTALL['ubconfig set [desktop] AUTOEXEC[@users]']" +#define SERVICES_ENABLE_parameter "AUTOINSTALL[ubconfig set [boot] SERVICES_ENABLE]" +#define SERVICES_ENABLE_parameter_command "ubconfig get autoinstall AUTOINSTALL['ubconfig set [boot] SERVICES_ENABLE']" +#define AUTOEXEC_parameter "AUTOINSTALL[ubconfig set [desktop] AUTOEXEC[@users]]" +#define AUTOEXEC_parameter_command "ubconfig get autoinstall AUTOINSTALL['ubconfig set [desktop] AUTOEXEC[@users]']" #define GRUB_SUPERUSERS_parameter "AUTOINSTALL[ubconfig set [boot] GRUB_SUPERUSERS]" #define GRUB_SUPERUSERS_parameter_command "ubconfig get autoinstall AUTOINSTALL['ubconfig set [boot] GRUB_SUPERUSERS']" #define GRUB_TIMEOUT_parameter "AUTOINSTALL[ubconfig set [boot] GRUB_TIMEOUT]" @@ -245,32 +243,31 @@ layout && /description:/ {\ #define GRUB_DEFAULT_parameter_command "ubconfig get autoinstall AUTOINSTALL['ubconfig set [boot] GRUB_DEFAULT']" #define GRUB_PASSWORD_parameter_search "AUTOINSTALL[ubconfig set [boot] GRUB_PASSWORD[" #define GRUB_PASSWORD_parameter_all "AUTOINSTALL[ubconfig set [boot] GRUB_PASSWORD[*]]" -#define GRUB_PASSWORD_parameter(target) yon_char_unite("AUTOINSTALL[ubconfig set [boot] GRUB_PASSWORD[",target,"]]",NULL) +#define GRUB_PASSWORD_parameter(target) yon_char_unite("AUTOINSTALL[ubconfig set [boot] GRUB_PASSWORD[", target, "]]", NULL) #define GRUB_PASSWORD_parameter_command_all "ubconfig get autoinstall AUTOINSTALL['ubconfig set [boot] GRUB_PASSWORD[*]']" -#define GRUB_PASSWORD_parameter_command(target) yon_char_unite("ubconfig get autoinstall AUTOINSTALL['ubconfig set [boot] GRUB_PASSWORD[",target,"]']",NULL) +#define GRUB_PASSWORD_parameter_command(target) yon_char_unite("ubconfig get autoinstall AUTOINSTALL['ubconfig set [boot] GRUB_PASSWORD[", target, "]']", NULL) #define AUTOLOGINUSER_parameter "AUTOINSTALL[ubconfig set [desktop] AUTOLOGINUSER]" #define AUTOLOGINUSER_parameter_command "ubconfig get autoinstall AUTOINSTALL['ubconfig set [boot] AUTOLOGINUSER']" #define NETWORK_parameter_search "AUTOINSTALL[ubconfig set [network] NETWORK[" -#define NETWORK_parameter(target) yon_char_unite("AUTOINSTALL[ubconfig set [network] NETWORK[",target,"@connmod]]",NULL) -#define NETWORK_devdown_parameter(target) yon_char_unite("AUTOINSTALL[ubconfig set [network] NETWORK[",target,"@devdown]]",NULL) -#define NETWORK_parameter_command(target) yon_char_unite("ubconfig get autoinstall AUTOINSTALL['ubconfig set [network] NETWORK[",target,"@connmod]']",NULL) -#define NETWORK_devdown_parameter_command(target) yon_char_unite("ubconfig get autoinstall AUTOINSTALL['ubconfig set [network] NETWORK[",target,"@devdown]']",NULL) -#define NETWORK(target) yon_char_unite("NETWORK[",target,"@connmod]",NULL) +#define NETWORK_parameter(target) yon_char_unite("AUTOINSTALL[ubconfig set [network] NETWORK[", target, "@connmod]]", NULL) +#define NETWORK_devdown_parameter(target) yon_char_unite("AUTOINSTALL[ubconfig set [network] NETWORK[", target, "@devdown]]", NULL) +#define NETWORK_parameter_command(target) yon_char_unite("ubconfig get autoinstall AUTOINSTALL['ubconfig set [network] NETWORK[", target, "@connmod]']", NULL) +#define NETWORK_devdown_parameter_command(target) yon_char_unite("ubconfig get autoinstall AUTOINSTALL['ubconfig set [network] NETWORK[", target, "@devdown]']", NULL) +#define NETWORK(target) yon_char_unite("NETWORK[", target, "@connmod]", NULL) #define installer_lang_parameter "AUTOINSTALL[installer_lang]" #define installer_lang_parameter_command "ubconfig --source global get [autoinstall] AUTOINSTALL[installer_lang]" #define source_parameter "AUTOINSTALL[source]" #define source_parameter_command "ubconfig --source global get [autoinstall] AUTOINSTALL[source]" -#define save_config_command(parameters) yon_char_unite("ubconfig --target system set [autoinstall] AUTOINSTALL[log]=yes ",parameters, "; nice ubinstall2 --debug autoinstall", NULL) +#define save_config_command(parameters) yon_char_unite("ubconfig --target system set [autoinstall] AUTOINSTALL[log]=yes ", parameters, "; nice ubinstall2 --debug autoinstall", NULL) -#define set_user_config_command(parameters) yon_char_unite("ubconfig --target system set [autoinstall] ",parameters,";nice ubinstall2 autoconfig",NULL) -#define save_additional_config_command(parameters) yon_char_unite("ubconfig --target system set [autoinstall] ",parameters,NULL) +#define set_user_config_command(parameters) yon_char_unite("ubconfig --target system set [autoinstall] ", parameters, ";nice ubinstall2 autoconfig", NULL) +#define save_additional_config_command(parameters) yon_char_unite("ubconfig --target system set [autoinstall] ", parameters, NULL) #define get_default_password_command "ubconfig --raw --conarg --source default get [users] NOSECUREROOTPASSWD" #define open_gparted_command "gparted" - #define PASSWORD_DEFAULT "ublinux" #define start_fast_install_command "ubinstall2 --autoinstall" @@ -283,89 +280,89 @@ layout && /description:/ {\ #define full_log_path "/var/log/ubinstall.log" -#define config_get_command(target) yon_char_unite("ubconfig --source ",target," --conarg get [autoinstall] AUTOINSTALL[*]",NULL) - +#define config_get_command(target) yon_char_unite("ubconfig --source ", target, " --conarg get [autoinstall] AUTOINSTALL[*]", NULL) + #define config_get_default_command "ubconfig --source default --conarg get [autoinstall] AUTOINSTALL[*]" #define config_get_global_only_parameters "" #define config_get_local_only_parameters "" -#define ubconfig_file_create(target) yon_char_unite("ubconfig --target \"",target,"\" create",NULL) +// #define ubconfig_file_create(target) yon_char_unite("ubconfig --target \"", target, "\" create", NULL) -#define default_langs(size) yon_char_parsed_new(size,"en_US.UTF-8","ru_RU.UTF-8",NULL); +#define default_langs(size) yon_char_parsed_new(size, "en_US.UTF-8", "ru_RU.UTF-8", NULL); #define languages_command "while IFS= read -ru3 SELECT_LOCALE; do SELECT_LOCALE=\"${SELECT_LOCALE% *}\"; [[ $(< /usr/share/i18n/locales/${SELECT_LOCALE%.*}) =~ (\"language\"[[:blank:]]*\\\"([^\\\"]*)\\\".*\"territory\"[[:blank:]]*\\\"([^\\\"]*)\\\".*\"country_name\"[[:blank:]]*\\\"([^\\\"]*)\\\".*\"lang_name\"[[:blank:]]*\\\"([^\\\"]*)\\\")|(\"language\"[[:blank:]]*\\\"([^\\\"]*)\\\".*\"territory\"[[:blank:]]*\\\"([^\\\"]*)\\\".*\"lang_name\"[[:blank:]]*\\\"([^\\\"]*)\\\")|(\"language\"[[:blank:]]*\\\"([^\\\"]*)\\\".*\"territory\"[[:blank:]]*\\\"([^\\\"]*)\\\") ]] && echo \"${SELECT_LOCALE}|${BASH_REMATCH[2]}${BASH_REMATCH[7]}${BASH_REMATCH[11]}${BASH_REMATCH[5]:+ (${BASH_REMATCH[5]})}${BASH_REMATCH[9]:+ (${BASH_REMATCH[9]})}|${BASH_REMATCH[3]}${BASH_REMATCH[8]}${BASH_REMATCH[12]}${BASH_REMATCH[4]:+ (${BASH_REMATCH[4]})}\" || echo \"${SELECT_LOCALE}\"; done 3< \"/usr/share/i18n/SUPPORTED\"" -#define get_package_info_command(target) yon_char_append("pacman -Si ",target) +#define get_package_info_command(target) yon_char_append("pacman -Si ", target) #define layouts_command "sed -En '/^! layout$/,/^ *$/!d;s/[[:blank:]]+([^ ]+)[[:blank:]]+(.*)/\\1|\\2/p' /usr/share/X11/xkb/rules/evdev.lst" #define layouts_variant_command "sed -En '/^! variant$/,/^ *$/!d;s/[[:blank:]]+([^ ]+)[[:blank:]]+([^ :]+):[[:blank:]]+(.*)/\\2|\\1|\\3/p' /usr/share/X11/xkb/rules/evdev.lst" #define grp_options_command "sed -En '/^! option$/,/^ *$/!d;s/[[:blank:]]+(grp:[^ ]+)[[:blank:]]+(.*)/\\1|\\2/p' /usr/share/X11/xkb/rules/evdev.lst" #define install_common_parameters \ - AUTOINSTALL_TYPE_INSTALL,\ - AUTOINSTALL_DEVICE,\ - part_format_parameter,\ - part_label_parameter,\ + AUTOINSTALL_TYPE_INSTALL, \ + AUTOINSTALL_DEVICE, \ + part_format_parameter, \ + part_label_parameter, \ part_fs_type_parameter -#define install_part_parameters \ - AUTOINSTALL_TYPE_INSTALL,\ - AUTOINSTALL_DEVICE,\ - part_format_parameter,\ - part_fs_label_parameter,\ - part_parameter,\ - part_fs_type_parameter,\ +#define install_part_parameters \ + AUTOINSTALL_TYPE_INSTALL, \ + AUTOINSTALL_DEVICE, \ + part_format_parameter, \ + part_fs_label_parameter, \ + part_parameter, \ + part_fs_type_parameter, \ part_fs_label_parameter -#define install_next_parameters \ - AUTOINSTALL_TYPE_INSTALL,\ - AUTOINSTALL_DEVICE,\ - part_format_parameter,\ - part_fs_label_parameter,\ - part_parameter,\ - part_fs_type_parameter,\ - part_size_parameter +#define install_next_parameters \ + AUTOINSTALL_TYPE_INSTALL, \ + AUTOINSTALL_DEVICE, \ + part_format_parameter, \ + part_fs_label_parameter, \ + part_parameter, \ + part_fs_type_parameter, \ + part_size_parameter #define install_advanced_parameters \ - AUTOINSTALL_TYPE_INSTALL,\ - AUTOINSTALL_DEVICE,\ - part_format_parameter,\ - part_label_parameter,\ - part_parameter,\ - part_fs_type_parameter,\ - part_size_parameter + AUTOINSTALL_TYPE_INSTALL, \ + AUTOINSTALL_DEVICE, \ + part_format_parameter, \ + part_label_parameter, \ + part_parameter, \ + part_fs_type_parameter, \ + part_size_parameter #define install_grub_install_update_parameters \ - AUTOINSTALL_TYPE_INSTALL,\ - AUTOINSTALL_DEVICE,\ - part_parameter + AUTOINSTALL_TYPE_INSTALL, \ + AUTOINSTALL_DEVICE, \ + part_parameter #define install_system_only_parameters \ - AUTOINSTALL_TYPE_INSTALL,\ - AUTOINSTALL_DEVICE,\ - part_format_parameter,\ - part_label_parameter,\ - part_parameter,\ - part_fs_type_parameter,\ - part_size_parameter,\ + AUTOINSTALL_TYPE_INSTALL, \ + AUTOINSTALL_DEVICE, \ + part_format_parameter, \ + part_label_parameter, \ + part_parameter, \ + part_fs_type_parameter, \ + part_size_parameter, \ part_crypt_parameter #define install_userdata_only_parameters \ - AUTOINSTALL_TYPE_INSTALL,\ - AUTOINSTALL_DEVICE,\ - part_format_parameter,\ - part_label_parameter,\ - part_parameter,\ - part_fs_type_parameter,\ - part_size_parameter,\ + AUTOINSTALL_TYPE_INSTALL, \ + AUTOINSTALL_DEVICE, \ + part_format_parameter, \ + part_label_parameter, \ + part_parameter, \ + part_fs_type_parameter, \ + part_size_parameter, \ part_crypt_parameter -typedef char* string; -__attribute__((unused)) static \ -string version_application; +typedef char *string; +__attribute__((unused)) static string version_application; -enum YON_PAGES { +enum YON_PAGES +{ YON_PAGE_WELCOME = 0, YON_PAGE_LICENCE, YON_PAGE_SECTIONS, @@ -407,13 +404,14 @@ enum YON_PAGES { YON_PAGE_RECOVERY_USRDATA_ONLY }; -typedef struct { +typedef struct +{ template_config_fields - config_str launch_arguments; + config_str launch_arguments; int launch_size; int save_done; int save_configured; - + int install_complete; guint slider_thread; int install_mode; @@ -429,7 +427,7 @@ typedef struct { GMutex install_mutex; GHashTable *languages; - + int arg_size; config_str arg_target; GtkWidget *status_box; @@ -439,34 +437,27 @@ typedef struct { // unsigned int cur_slide; gboolean dry_run; - GtkTreeStore *layouts_store; + GtkTreeStore *layouts_store; - GtkListStore *models_list; - config_str variants_list; - int variants_size; - config_str layouts_list; - int layouts_size; + GtkListStore *models_list; + config_str variants_list; + int variants_size; + config_str layouts_list; + int layouts_size; GList *slides; GList *chosen_slide; gboolean force_scenario; char *os_name; -} config; +} config; extern config main_config; -typedef struct { - GtkWidget *CommonInstallationDevicesTree; - GtkWidget *GpartedCommonButton; - GtkWidget *CommonInstallationFilesystemTypeCombo; - GtkWidget *CommonInstallationSectionNameEntry; - GtkListStore *DevicesList; -} install_common_page; - -typedef struct { +typedef struct +{ GtkBuilder *builder; - GtkListStore *DevicesList; + GtkListStore *DevicesList; GtkListStore *LanguagesList; GtkListStore *LayoutsList; GtkListStore *PartitionsList; @@ -507,7 +498,7 @@ typedef struct { GtkWidget *InstallationLinuxRadio; GtkWidget *InstallationWindowsRadio; GtkWidget *InstallationOptionsRadio; - + // GtkWidget *UserImage; GtkWidget *UserRootNameEntry; GtkWidget *UserRootLoginEntry; @@ -527,13 +518,12 @@ typedef struct { GtkWidget *menu1; GtkWidget *menu2; - GtkWidget *LocaleDefaultSwitch; - GtkWidget *LocaleTree; - GtkWidget *LocaleAddButton; - GtkWidget *LocaleRemoveButton; - GtkCellRenderer *LocaleCell; - GtkListStore *LanguageList; - + GtkWidget *LocaleDefaultSwitch; + GtkWidget *LocaleTree; + GtkWidget *LocaleAddButton; + GtkWidget *LocaleRemoveButton; + GtkCellRenderer *LocaleCell; + GtkListStore *LanguageList; GtkWidget *KeyboardModelCombo; GtkWidget *KeyboardDefaultLayoutsSwitch; @@ -555,7 +545,8 @@ typedef struct { GtkWidget *CommonInstallationFilesystemTypeCombo; GtkWidget *CommonInstallationSectionNameEntry; GtkWidget *CommonFormatSwitch; - GtkWidget *GpartedCommonButton; + GtkWidget *CommonGpartedButton; + GtkWidget *CommonUpdateGpartedButton; GtkWidget *NextInstallationSysDevicesTree; GtkWidget *NextInstallationSysSectionTree; @@ -565,7 +556,8 @@ typedef struct { GtkWidget *NextInstallationSizeTypeSpin; GtkWidget *NextInstallationFilesystemTypeCombo; GtkWidget *NextInstallationSectionNameEntry; - GtkWidget *GpartedNextInstallationButton; + GtkWidget *NextInstallationGPartedButton; + GtkWidget *NextInstallationUpdateGPartedButton; GtkWidget *SamePlaceDeviceTree; GtkWidget *SamePlacePartTree; @@ -573,7 +565,8 @@ typedef struct { GtkWidget *SameInstallationFormatRevealer; GtkWidget *SameInstallationFilesystemTypeCombo; GtkWidget *SameInstallationSectionNameEntry; - GtkWidget *GpartedSameButton; + GtkWidget *SameGpartedButton; + GtkWidget *SameUpdateGpartedButton; GtkWidget *InstallationProgress; GtkWidget *InstallationLabel; @@ -582,7 +575,6 @@ typedef struct { GtkWidget *PackageInstallationLabel; GtkWidget *ReadFullLogButton; - GtkWidget *ConfigurationModeMenuItem; GtkWidget *EnableVNCMenuItem; GtkWidget *EnableRDPMenuItem; @@ -590,22 +582,25 @@ typedef struct { GtkWidget *DocumentationMenuItem; GtkWidget *AdditionalComponentsList; - + GtkWidget *GrubInstallRadio; GtkWidget *GrubUpdateRadio; GtkWidget *SeparateRadio; GtkWidget *OSRadio; GtkWidget *UserDataOnlyRadio; - GtkWidget *GpartedGrubInstallButton; + GtkWidget *GrubInstallGpartedButton; + GtkWidget *GrubInstallUpdateGpartedButton; GtkWidget *GrubInstallDevicesTree; GtkWidget *GrubInstallPartitionTree; - GtkWidget *GpartedGrubUpdateButton; + GtkWidget *GrubUpdateGpartedButton; + GtkWidget *GrubUpdateUpdateGpartedButton; GtkWidget *GrubUpdateDevicesTree; GtkWidget *GrubUpdatePartitionTree; - GtkWidget *GpartedOSButton; + GtkWidget *OSGpartedButton; + GtkWidget *OSUpdateGpartedButton; GtkWidget *OSDevicesTree; GtkWidget *OSSysSectionTree; GtkWidget *OSFormatSwitch; @@ -620,7 +615,8 @@ typedef struct { GtkWidget *OSSpinner; GtkWidget *OSOverlay; - GtkWidget *GpartedUserdataButton; + GtkWidget *UserdataGpartedButton; + GtkWidget *UserdataUpdateGpartedButton; GtkWidget *UserdataDevicesTree; GtkWidget *UserdataSysSectionTree; GtkWidget *UserdataFormatSwitch; @@ -636,15 +632,15 @@ typedef struct { GtkTreeModel *LanguagesFilter; GtkTreeModel *LayoutsFilter; - GdkPixbuf *region_original; - GdkPixbuf *keyboard_original; - GdkPixbuf *user_original; - GdkPixbuf *startup_original; - GdkPixbuf *bootloader_original; - GdkPixbuf *network_original; - GList *slides_original; - float region_height_mult; - + GdkPixbuf *region_original; + GdkPixbuf *keyboard_original; + GdkPixbuf *user_original; + GdkPixbuf *startup_original; + GdkPixbuf *bootloader_original; + GdkPixbuf *network_original; + GList *slides_original; + float region_height_mult; + GtkWidget *RegionSensitiveSwitch; GtkWidget *HostnameSensitiveSwitch; @@ -723,6 +719,8 @@ typedef struct { GtkCellRenderer *AdvancedDeviceChosenCell; GtkCellRenderer *AdvancedPartChosenCell; + GtkWidget *AdvancedGpartedButton; + GtkWidget *AdvancedUpdateGpartedButton; GtkWidget *AdvancedDeviceTree; GtkWidget *AdvancedVirtualDeviceCombo; GtkWidget *AdvancedPartitionTree; @@ -768,14 +766,16 @@ typedef struct { gboolean slider_stop; -} main_window; - -enum ADVANCED_PART_TYPE { +} main_window; + +enum ADVANCED_PART_TYPE +{ ADVANCED_PART_NEW, ADVANCED_PART_EXISTING }; -typedef struct { +typedef struct +{ GtkWidget *MainBox; GtkWidget *SectionLabel; GtkWidget *SystemSectionToggle; @@ -798,17 +798,19 @@ typedef struct { char *part; char *device; } advanced_partition; - -typedef struct { - GtkWidget *Window; - GtkWidget *HeaderLabel; - GtkWidget *AlwaysOpenCheck; - - GtkWidget *CloseButton; - GtkWidget *AcceptButton; -} documentation_confirmation_window; - -typedef struct{ + +typedef struct +{ + GtkWidget *Window; + GtkWidget *HeaderLabel; + GtkWidget *AlwaysOpenCheck; + + GtkWidget *CloseButton; + GtkWidget *AcceptButton; +} documentation_confirmation_window; + +typedef struct +{ GtkWidget *MainWindow; GtkWidget *StatusBox; GtkWidget *headerBar; @@ -818,7 +820,8 @@ typedef struct{ GtkCellRenderer *ActiveToggle; } ubinstall_keyboard_window; -typedef struct{ +typedef struct +{ GtkListStore *liststore1; GtkWidget *MainWindow; GtkWidget *StatusBox; @@ -831,7 +834,8 @@ typedef struct{ GtkCellRenderer *ToggleRenderer; } ubinstall_language_window; -typedef struct{ +typedef struct +{ GtkWidget *CreateGroupWindow; GtkWidget *StatusBox; GtkWidget *UserCancelButton; @@ -844,7 +848,8 @@ typedef struct{ GtkWidget *NoEncriptionCheck; } password_window; -typedef struct { +typedef struct +{ GtkWidget *Window; GtkWidget *ScrollWindow; GtkWidget *StatusBox; @@ -856,7 +861,8 @@ typedef struct { char *command; } log_window; -typedef struct { +typedef struct +{ GtkWidget *Window; GtkWidget *TitleLabel; GtkWidget *TextLabel; @@ -864,7 +870,8 @@ typedef struct { GtkWidget *CancelButton; } confirmation_window; -typedef struct { +typedef struct +{ GtkWidget *MainBox; GtkWidget *TypeCombo; GtkWidget *ConnectionCombo; @@ -879,95 +886,101 @@ typedef struct { GtkWidget *DNSEntry; } network_info; -typedef struct { - GtkWidget *MainBox; - GtkWidget *RemoveButton; - GtkWidget *UsernameEntry; - GtkWidget *LoginEntry; - GtkWidget *PasswordCombo; - GtkWidget *PasswordEntry; - GtkWidget *PasswordButton; +typedef struct +{ + GtkWidget *MainBox; + GtkWidget *RemoveButton; + GtkWidget *UsernameEntry; + GtkWidget *LoginEntry; + GtkWidget *PasswordCombo; + GtkWidget *PasswordEntry; + GtkWidget *PasswordButton; } yon_user_struct; - -typedef struct { - GtkWidget *MenuWindow; - GtkWidget *BackButton; - GtkWidget *ItemsRevealer; - GtkWidget *ItemsListBox; - GtkWidget *ChildrenRevealer; - GtkWidget *ChildrenListBox; - - int seat_grab; - dictionary *menu_items; - char *cur_selection; - int button_pos_x; - int button_pos_y; +typedef struct +{ + GtkWidget *MenuWindow; + GtkWidget *BackButton; + GtkWidget *ItemsRevealer; + GtkWidget *ItemsListBox; + GtkWidget *ChildrenRevealer; + GtkWidget *ChildrenListBox; + + int seat_grab; + dictionary *menu_items; + char *cur_selection; + int button_pos_x; + int button_pos_y; } yon_menu_window; -typedef struct { - GtkWidget *MenuItemBox; - GtkWidget *MenuButton; - GtkWidget *MenuTextLabel; - GtkWidget *NextIconButton; - - char *target; +typedef struct +{ + GtkWidget *MenuItemBox; + GtkWidget *MenuButton; + GtkWidget *MenuTextLabel; + GtkWidget *NextIconButton; + + char *target; - main_window *widgets; - yon_menu_window *window; + main_window *widgets; + yon_menu_window *window; - dictionary *children; + dictionary *children; } yon_menu_item; -typedef struct { - GtkWidget *row; - GtkWidget *RowBox; - GtkWidget *InstallCheck; - GtkWidget *NameLabel; - GtkWidget *DescriptionLabel; - GtkWidget *ModulesLabel; - GtkWidget *TagsBox; - GtkWidget *EnableRadio; - GtkWidget *EnableSeparator; +typedef struct +{ + GtkWidget *row; + GtkWidget *RowBox; + GtkWidget *InstallCheck; + GtkWidget *NameLabel; + GtkWidget *DescriptionLabel; + GtkWidget *ModulesLabel; + GtkWidget *TagsBox; + GtkWidget *EnableRadio; + GtkWidget *EnableSeparator; GtkWidget *TagsSeparator; - char *name; - char *modules; - char *package; + char *name; + char *modules; + char *package; } kernel_row; -typedef struct { - GtkWidget *row; - GtkWidget *RowBox; - GtkWidget *InstallCheck; - GtkWidget *NameLabel; - GtkWidget *DescriptionLabel; - GtkWidget *ModuleLabel; - GtkWidget *PackageLabel; - - char *name; - char *modules; - char *package; +typedef struct +{ + GtkWidget *row; + GtkWidget *RowBox; + GtkWidget *InstallCheck; + GtkWidget *NameLabel; + GtkWidget *DescriptionLabel; + GtkWidget *ModuleLabel; + GtkWidget *PackageLabel; + + char *name; + char *modules; + char *package; } kernel_addon_row; -typedef struct { - GtkWidget *row; - GtkWidget *RowBox; - GtkWidget *InstallCheck; - GtkWidget *NameLabel; - GtkWidget *DescriptionLabel; - GtkWidget *VersionLabel; - GtkWidget *TagsBox; - - char *name; - char *modules; - char *version; - char *tags; - char *description; +typedef struct +{ + GtkWidget *row; + GtkWidget *RowBox; + GtkWidget *InstallCheck; + GtkWidget *NameLabel; + GtkWidget *DescriptionLabel; + GtkWidget *VersionLabel; + GtkWidget *TagsBox; + + char *name; + char *modules; + char *version; + char *tags; + char *description; } os_row; -typedef struct { +typedef struct +{ GtkWidget *Window; GtkWidget *StatusBox; GtkWidget *UnitEntry; @@ -980,30 +993,33 @@ typedef struct { GtkWidget *DescriptionLabel; } startup_service_window; -struct pacman_struct{ - main_window *widgets; - const char *find_package; - gsize packages_size; - config_str packages; +struct pacman_struct +{ + main_window *widgets; + const char *find_package; + gsize packages_size; + config_str packages; }; -typedef struct { +typedef struct +{ GtkWidget *Window; GtkWidget *StatusBox; - GtkWidget *TitleLabel; + GtkWidget *TitleLabel; GtkWidget *AdminCheck; GtkWidget *UsernameEntry; GtkWidget *PasswordEntry; - GtkWidget *PasswordButton; + GtkWidget *PasswordButton; GtkWidget *CancelButton; GtkWidget *AcceptButton; - char *prev_name; + char *prev_name; } bootloader_user_window; -typedef struct { +typedef struct +{ GtkWidget *Window; GtkWidget *StatusBox; GtkWidget *PathEntry; @@ -1012,7 +1028,8 @@ typedef struct { GtkWidget *ChooseButton; } configuration_window; -typedef struct { +typedef struct +{ GtkWidget *Window; GtkWidget *StatusBox; GtkWidget *CancelButton; @@ -1027,99 +1044,107 @@ typedef struct { dictionary *sources; } source_window; - -typedef struct { +typedef struct +{ GtkWidget *MainBox; GtkWidget *TypeCombo; GtkWidget *PathEntry; GtkWidget *DeviceCombo; GtkWidget *PathButton; GtkWidget *RemoveButton; - + } source_element; -enum PART_SOURCE { +enum PART_SOURCE +{ PART_SOURCE_DEVICE, PART_SOURCE_PART, PART_SOURCE_VIRTUAL }; -typedef struct { - char *partition; - char *device; +typedef struct +{ + char *partition; + char *device; int sys_section; int user_section; - gboolean format; - unsigned long size; - char size_letter; - char *part_label; - char *fs_type; - char *fs_label; - char *encryption; - char *encryption_password; + gboolean format; + unsigned long size; + char size_letter; + char *part_label; + char *fs_type; + char *fs_label; + char *encryption; + char *encryption_password; enum PART_SOURCE part_source; advanced_partition *partition_widgets; } advanced_section; -struct row_data { - main_window *widgets; - char *version; - char *name; - char *tags; - char *description; +struct row_data +{ + main_window *widgets; + char *version; + char *name; + char *tags; + char *description; }; -typedef struct { - GtkWidget *Window; - GtkWidget *StatusBox; - GtkWidget *LanguagesTree; +typedef struct +{ + GtkWidget *Window; + GtkWidget *StatusBox; + GtkWidget *LanguagesTree; - GtkWidget *CancelButton; - GtkWidget *AcceptButton; - GtkWidget *ManualEntry; - GtkWidget *LoadingOverlay; - GtkWidget *LoadingSpinner; - GtkCellRenderer *ToggleCell; + GtkWidget *CancelButton; + GtkWidget *AcceptButton; + GtkWidget *ManualEntry; + GtkWidget *LoadingOverlay; + GtkWidget *LoadingSpinner; + GtkCellRenderer *ToggleCell; - GtkListStore *LanguagesList; + GtkListStore *LanguagesList; } language_window; -struct locales_struct { - char *locale; - char *lang; - char *territory; - int chosen; - GtkListStore *list; +struct locales_struct +{ + char *locale; + char *lang; + char *territory; + int chosen; + GtkListStore *list; }; -typedef struct { - GtkWidget *Window; - GtkWidget *StatusBox; - GtkWidget *MainTree; - GtkWidget *CancelButton; - GtkWidget *AcceptButton; - GtkWidget *OptionsFilterCombo; - GtkWidget *OptionsEntry; - GtkCellRenderer *ChosenCell; - GtkTreeStore *list; - GtkListStore *OptionsList; - GtkTreeModel *OptionsFilter; - char *parameters; +typedef struct +{ + GtkWidget *Window; + GtkWidget *StatusBox; + GtkWidget *MainTree; + GtkWidget *CancelButton; + GtkWidget *AcceptButton; + GtkWidget *OptionsFilterCombo; + GtkWidget *OptionsEntry; + GtkCellRenderer *ChosenCell; + GtkTreeStore *list; + GtkListStore *OptionsList; + GtkTreeModel *OptionsFilter; + char *parameters; } layouts_window; -typedef struct { +typedef struct +{ GtkWidget *MainBox; GtkWidget *Image; GtkWidget *Label; enum YON_PAGES page; } config_hub_icon; -typedef struct { - GtkWidget *MainBox; - GtkWidget *TitleImage; - GtkWidget *TitleLabel; - GtkWidget *TextLabel; -}slider_object; +typedef struct +{ + GtkWidget *MainBox; + GtkWidget *TitleImage; + GtkWidget *TitleLabel; + GtkWidget *TextLabel; +} slider_object; void config_init(); main_window *yon_main_window_complete(); @@ -1129,17 +1154,16 @@ ubinstall_keyboard_window *yon_ubinstall_keyboard_new(); void on_password_accept(GtkWidget *self, dictionary *dict); - void yon_interface_update(main_window *widgets); -void on_summary_log_view(GtkWidget *,main_window *widgets); +void on_summary_log_view(GtkWidget *, main_window *widgets); void on_device_selection_changed(GtkWidget *self, main_window *widgets); void on_toggle_button_switch_on(GtkWidget *, GtkToggleButton *toggle); void on_autohostname_sensitiveness_check(GtkWidget *, int status, main_window *widgets); void on_autohostname_check(GtkWidget *, main_window *widgets); -void on_hostname_entry_changed (GtkWidget *, main_window *widgets); +void on_hostname_entry_changed(GtkWidget *, main_window *widgets); gboolean on_install_success(main_window *widgets); @@ -1149,12 +1173,12 @@ gboolean on_install_error(main_window *widgets); void on_reboot_accepted(main_window *widgets); -void on_keyboard_clicked (GtkWidget *, main_window *widgets); -void on_keyboard_accept(GtkWidget *self,main_window *widgets); -void on_layout_toggle(GtkCellRendererToggle*, gchar* path, ubinstall_keyboard_window *window); +void on_keyboard_clicked(GtkWidget *, main_window *widgets); +void on_keyboard_accept(GtkWidget *self, main_window *widgets); +void on_layout_toggle(GtkCellRendererToggle *, gchar *path, ubinstall_keyboard_window *window); void on_language_clicked(GtkWidget *, main_window *widgets); void yon_language_selection_changed(GtkCellRenderer *, char *path, ubinstall_language_window *window); -void on_language_window_accept(GtkWidget *,dictionary *dict); +void on_language_window_accept(GtkWidget *, dictionary *dict); void on_keyboard_removed(GtkWidget *, main_window *widgets); void on_exit_accepted(main_window *widgets); void on_gparted_open(); @@ -1162,22 +1186,22 @@ void on_gparted_open(); void on_separate_installation_changed(GtkWidget *self, main_window *widgets); void on_partition_changed(GtkWidget *self, main_window *widgets); void yon_set_max_size_from_partition(GtkTreeView *table, GtkSpinButton *spin_size, GtkComboBox *size_type); -gboolean on_yon_exit(GtkWidget *,GdkEvent*, main_window *widgets); -void on_locale_changed(GtkWidget *,main_window *); +gboolean on_yon_exit(GtkWidget *, GdkEvent *, main_window *widgets); +void on_locale_changed(GtkWidget *, main_window *); void on_region_changed(GtkComboBox *self, main_window *widgets); void on_page_cancel_clicked(GtkWidget *, main_window *widgets); -int yon_install_options_save(GtkWidget *device_tree, GtkWidget *part_tree,char *mode,main_window *widgets); -void on_process_log_view(GtkWidget *,main_window *widgets); -void yon_read_log(GFileMonitor *,GFile *,GFile *,GFileMonitorEvent ,log_window *window); +int yon_install_options_save(GtkWidget *device_tree, GtkWidget *part_tree, char *mode, main_window *widgets); +void on_process_log_view(GtkWidget *, main_window *widgets); +void yon_read_log(GFileMonitor *, GFile *, GFile *, GFileMonitorEvent, log_window *window); log_window *yon_log_window_new(); void on_log_closed(GtkWidget *, log_window *window); -void on_page_changed(GtkWidget *,GtkWidget *,int page, main_window *widgets); -void yon_installation_progress_update(GFileMonitor *,GFile *,GFile *,GFileMonitorEvent ,main_window *widgets); +void on_page_changed(GtkWidget *, GtkWidget *, int page, main_window *widgets); +void yon_installation_progress_update(GFileMonitor *, GFile *, GFile *, GFileMonitorEvent, main_window *widgets); void *on_config_save(void *data); -void *on_setup_system_configuration(void * data); +void *on_setup_system_configuration(void *data); void yon_install_slider_init(main_window *widgets); -void on_install_slider_next(GtkWidget* ,GdkEventButton *,main_window *widgets); -void on_install_slider_prev(GtkWidget* ,GdkEventButton *,main_window *widgets); +void on_install_slider_next(GtkWidget *, GdkEventButton *, main_window *widgets); +void on_install_slider_prev(GtkWidget *, GdkEventButton *, main_window *widgets); void yon_install_slider_update(main_window *widgets); slider_object *yon_slider_object_new(); void yon_slider_setup(slider_object *slider, char *title, char *icon, char *text_markup); @@ -1189,24 +1213,24 @@ gboolean on_install_slider_hover_highlight_end(GtkWidget *self, GdkEvent *, main // gboolean on_image_slide(void *data); // void on_region_resized(GtkWidget *,main_window *widgets); // int yon_image_resize_from_container(GtkImage *target, GdkPixbuf *pixbuf_unscaled); -void on_configuration_mode_switch(GtkWidget *self,main_window *widgets); +void on_configuration_mode_switch(GtkWidget *self, main_window *widgets); double yon_size_long_convert_automatic(unsigned long bytes, char *size); double yon_size_long_convert_to_mod(double size, char mod); void on_root_get_root(char *argline); void on_config_custom_save(GtkWidget *, main_window *widgets); -void on_config_global_save(GtkWidget *,main_window *widgets); -void on_config_local_save(GtkWidget *,main_window *widgets); -void on_config_global_local_save(GtkWidget *,main_window *widgets); -void on_config_custom_load_last(GtkWidget *,main_window *widgets); -void on_config_custom_load(GtkWidget *,main_window *); -void on_config_global_load(GtkWidget *,main_window *); -void on_config_local_load(GtkWidget *,main_window *widgets); +void on_config_global_save(GtkWidget *, main_window *widgets); +void on_config_local_save(GtkWidget *, main_window *widgets); +void on_config_global_local_save(GtkWidget *, main_window *widgets); +void on_config_custom_load_last(GtkWidget *, main_window *widgets); +void on_config_custom_load(GtkWidget *, main_window *); +void on_config_global_load(GtkWidget *, main_window *); +void on_config_local_load(GtkWidget *, main_window *widgets); void yon_config_save_proceed(char *path, YON_CONFIG_TYPE type); void on_page_next_clicked(GtkWidget *, main_window *widgets); void on_page_prev_clicked(GtkWidget *, main_window *widgets); void yon_load_proceed(YON_CONFIG_TYPE type); void _yon_saving_threaded(char *final_command); -enum YON_PAGES yon_page_get_next(main_window *widgets,enum YON_PAGES page); +enum YON_PAGES yon_page_get_next(main_window *widgets, enum YON_PAGES page); enum YON_PAGES yon_page_get_prev(enum YON_PAGES page); enum YON_PAGES yon_sections_get_next_page(main_window *widgets); enum YON_PAGES yon_recovery_get_next(main_window *widgets); @@ -1231,36 +1255,35 @@ int yon_startup_save(main_window *widgets); network_info *yon_network_info_new(); int yon_install_advanced_save(main_window *widgets); int yon_network_save(main_window *widgets); -void on_connection_add(GtkWidget *,main_window *widgets); +void on_connection_add(GtkWidget *, main_window *widgets); void on_ntp_sync(GtkWidget *, main_window *widgets); int yon_advanced_sections_save(dictionary *dict); void yon_configuration_mode_check(main_window *widgets); -void on_configuration_mode_switch(GtkWidget *self,main_window *widgets); +void on_configuration_mode_switch(GtkWidget *self, main_window *widgets); void *_yon_installation_start(main_window *widgets); int yon_installation_start(main_window *widgets); enum INSTALL_TYPE yon_ubl_get_install_mode(); int yon_user_save(yon_user_struct *user); -void on_user_add(GtkWidget *,main_window *widgets); +void on_user_add(GtkWidget *, main_window *widgets); yon_user_struct *yon_user_struct_new(); -void on_user_remove_clicked(GtkWidget *,yon_user_struct *user); +void on_user_remove_clicked(GtkWidget *, yon_user_struct *user); void yon_password_new(GtkWidget *, yon_user_struct *user); void yon_password_root_new(GtkWidget *, main_window *widgets); yon_menu_item *yon_menu_item_new(); - yon_menu_window *yon_menu_window_new(); -void on_menu_window_size_reallocated(GtkWidget *self,GtkAllocation *,yon_menu_window *window); -void on_children_clean(GtkWidget*, yon_menu_window *window); -gboolean yon_on_revealer_switched (yon_menu_window *window); +yon_menu_window *yon_menu_window_new(); +void on_menu_window_size_reallocated(GtkWidget *self, GtkAllocation *, yon_menu_window *window); +void on_children_clean(GtkWidget *, yon_menu_window *window); +gboolean yon_on_revealer_switched(yon_menu_window *window); gboolean on_menu_clicked(GtkWidget *, GdkEventButton *event, yon_menu_window *window); yon_menu_window *yon_menu_window_open(GtkWidget *, main_window *widgets); -void on_submenu_open(GtkWidget *,yon_menu_item *item); +void on_submenu_open(GtkWidget *, yon_menu_item *item); void on_menu_chosen(GtkWidget *, yon_menu_item *item); void yon_kernel_setup(main_window *widgets); -void yon_kernel_row_setup(kernel_row *row, char *name, char *modules,char *package, char *tags, char *description); +void yon_kernel_row_setup(kernel_row *row, char *name, char *modules, char *package, char *tags, char *description); void yon_kernel_row_setup_tags(kernel_row *row, char *tags); -int yon_tag_add(GtkBox *target,char *tag_label, char *tag_style, char *icon_name); +int yon_tag_add(GtkBox *target, char *tag_label, char *tag_style, char *icon_name); kernel_row *yon_kernel_row_new(); void yon_kernel_resize(main_window *widgets); -void on_additional_software_toggled(GtkWidget *, char *path, main_window *widgets); void yon_kernel_addon_setup(main_window *widgets); void yon_kernel_addon_resize(main_window *widgets); void yon_startup_services_setup(main_window *widgets); @@ -1271,12 +1294,12 @@ startup_service_window *yon_startup_service_window_new(); void on_startup_edit_accept(GtkWidget *, main_window *widgets); void on_startup_add_accept(GtkWidget *, main_window *widgets); void yon_startup_services_setup(main_window *widgets); -void on_startup_services_remove(GtkWidget *self,main_window *widgets); -void on_startup_services_selection_changed(GtkWidget *,main_window *widgets); +void on_startup_services_remove(GtkWidget *self, main_window *widgets); +void on_startup_services_selection_changed(GtkWidget *, main_window *widgets); void on_pacman_software_all_toggled(GtkWidget *, char *path, main_window *widgets); void on_pacman_software_chosen_toggled(GtkWidget *, char *path, main_window *widgets); int yon_pacman_software_save(main_window *widgets); -void on_pacman_icon_press(GtkEntry *self,GtkEntryIconPosition icon_pos,GdkEvent* event,main_window *widgets); +void on_pacman_icon_press(GtkEntry *self, GtkEntryIconPosition icon_pos, GdkEvent *event, main_window *widgets); gboolean yon_pacman_fill(struct pacman_struct *pacman); void *yon_pacman_load(struct pacman_struct *pacman); int yon_kernel_addon_save(main_window *widgets); @@ -1285,7 +1308,7 @@ bootloader_user_window *yon_bootloader_user_window_new(); void on_bootloader_user_add(GtkWidget *, main_window *widgets); void on_bootloader_user_accept(GtkWidget *, bootloader_user_window *window); void yon_bootloader_interface_update(main_window *widgets); -void on_type_changed(GtkComboBox *self,network_info *info); +void on_type_changed(GtkComboBox *self, network_info *info); void yon_network_init(main_window *widgets); void yon_page_init(main_window *widgets, enum YON_PAGES page); void yon_bootloader_init(main_window *widgets); @@ -1298,37 +1321,37 @@ void yon_install_advanced_init(main_window *widgets); void yon_os_components_init(main_window *widgets); void yon_pacman_init(main_window *widgets); void yon_software_init(main_window *widgets); -void on_install_advanced_device_chosen(GtkCellRenderer*, gchar *path, main_window *widgets); -void on_install_advanced_partition_chosen(GtkCellRenderer*, gchar *path, main_window *widgets); +void on_install_advanced_device_chosen(GtkCellRenderer *, gchar *path, main_window *widgets); +void on_install_advanced_partition_chosen(GtkCellRenderer *, gchar *path, main_window *widgets); void yon_devices_setup(main_window *widgets); void on_advanced_password_clicked(GtkWidget *, advanced_partition *part); advanced_partition *yon_advanced_partition_new(); void on_advanced_part_remove(GtkWidget *self, main_window *widgets); int yon_advanced_get_part_size(main_window *widgets); void yon_advanced_partition_clear(main_window *widgets); -void yon_os_row_setup(os_row *row, char *name, char *version,char *tags, char *description); +void yon_os_row_setup(os_row *row, char *name, char *version, char *tags, char *description); os_row *yon_os_row_new(); void yon_quick_install(GtkWidget *, main_window *widgets); void on_keyboard_layout_chosen(GtkCellRenderer *self, gchar *path, main_window *widgets); -void configuration_mode_accept(GtkWidget *,configuration_window *window); -void on_path_choose(GtkWidget *,configuration_window *window); -void on_configuration_exit(GtkWidget *,configuration_window *window); +void configuration_mode_accept(GtkWidget *, configuration_window *window); +void on_path_choose(GtkWidget *, configuration_window *window); +void on_configuration_exit(GtkWidget *, configuration_window *window); int yon_config_save(main_window *widgets); void yon_config_restore(main_window *widgets); -void on_source_clicked(GtkWidget *,main_window *widgets); +void on_source_clicked(GtkWidget *, main_window *widgets); source_window *yon_source_window_new(); -void on_source_accept(GtkWidget *,source_window *window); +void on_source_accept(GtkWidget *, source_window *window); void on_source_choose(GtkWidget *self); -void on_source_remove(GtkWidget *,source_element *element); -void on_source_add(GtkWidget *,source_window *window); +void on_source_remove(GtkWidget *, source_element *element); +void on_source_add(GtkWidget *, source_window *window); void yon_source_update(source_window *window); -void yon_source_element_add(char *key,void*,source_window *window); +void yon_source_element_add(char *key, void *, source_window *window); source_element *yon_source_element_new(); void on_rdp_toggled(GtkWidget *self, main_window *); void on_vnc_toggled(GtkWidget *self, main_window *widgets); void yon_main_window_create(main_window *widgets); void set_locales_list(main_window *widgets); -void on_installer_language_changed(GtkWidget *self,GtkTreePath*,GtkTreeViewColumn*, main_window *widgets); +void on_installer_language_changed(GtkWidget *self, GtkTreePath *, GtkTreeViewColumn *, main_window *widgets); gboolean on_country_filter(GtkTreeModel *self, GtkTreeIter *iter, main_window *widgets); int yon_char_parsed_compare(const void *a, const void *b); gboolean yon_os_component_insert(struct row_data *row_input); @@ -1346,29 +1369,29 @@ void yon_advanced_section_remove_all(); void on_advanced_section_toggled(GtkWidget *self, main_window *widgets); void yon_fs_type_setup(GtkComboBoxText *target); void yon_advanced_set_max_size_from_partition(advanced_partition *part, main_window *widgets); -void on_advanced_size_changed(GtkWidget *self,main_window *widgets); +void on_advanced_size_changed(GtkWidget *self, main_window *widgets); int yon_advanced_save(main_window *widgets); void yon_advanced_part_parameter_changed(GtkWidget *self, advanced_partition *part); void yon_advanced_section_update(main_window *widgets); -void yon_advanced_section_update_section(advanced_partition *part,GtkWidget *cur_toggle,main_window *widgets); +void yon_advanced_section_update_section(advanced_partition *part, GtkWidget *cur_toggle, main_window *widgets); int yon_advanced_section_get_by_part(advanced_partition *part); void yon_advanced_section_remove_by_name(char *part); void on_advanced_virtual_device_changed(GtkWidget *, main_window *widgets); int yon_advanced_section_append(advanced_section *section); -gboolean on_format_changed(GtkWidget *self, gboolean state, advanced_partition *part); +gboolean on_format_changed(GtkWidget *self, gboolean state, advanced_partition *part); int yon_layouts_get(); -void on_link(GtkWidget *self, char* uri, gpointer ); +void on_link(GtkWidget *self, char *uri, gpointer); void on_source_changed(GtkComboBox *self); -void yon_focus_set(GtkWidget *,GtkWidget *target); -void on_main_window_close(GtkWidget*, main_window *); +void yon_focus_set(GtkWidget *, GtkWidget *target); +void on_main_window_close(GtkWidget *, main_window *); gboolean yon_maximize_start(main_window *widgets); void *yon_maximize(main_window *widgets); kernel_addon_row *yon_kernel_addon_row_new(); -void yon_kernel_addon_row_setup(kernel_addon_row *row, char *name, char *modules,char *package, char *description); +void yon_kernel_addon_row_setup(kernel_addon_row *row, char *name, char *modules, char *package, char *description); void on_kernel_addon_install_enabled(GtkWidget *, kernel_addon_row *row); void on_kernel_addon_info(GtkLabel *self); void yon_license_init(main_window *widgets); -void on_locale_toggle(GtkCellRenderer *, gchar *path,language_window *window); +void on_locale_toggle(GtkCellRenderer *, gchar *path, language_window *window); void on_locale_accept(GtkWidget *self, language_window *window); gboolean yon_locale_window_set_locales(struct locales_struct *data); gboolean yon_locale_window_unlock(GtkWidget *spinner); @@ -1389,34 +1412,34 @@ void yon_layouts_add(GtkTreeView *, GtkListStore *, main_window *widgets); void yon_layouts_remove(GtkTreeView *tree, GtkListStore *cur_list, main_window *widgets); void on_system_layouts_remove(GtkWidget *, main_window *widgets); config_str yon_layout_get_children(char *layout_id, int *size); -void yon_layout_load(char *layout,main_window *widgets); +void yon_layout_load(char *layout, main_window *widgets); void yon_layout_build(layouts_window *window); void on_layout_move_up(GtkWidget *, main_window *widgets); void on_layout_move_down(GtkWidget *, main_window *widgets); -void on_compose_switch(GtkWidget *,int status,main_window *widgets); -void on_scroll_lock_switch(GtkWidget *,int status,main_window *widgets); +void on_compose_switch(GtkWidget *, int status, main_window *widgets); +void on_scroll_lock_switch(GtkWidget *, int status, main_window *widgets); void on_layout_default_sensitive_toggled(GtkWidget *, int status, main_window *widgets); void on_layout_default_toggled(GtkWidget *, int status, main_window *widgets); -void on_layout_selection_changed(GtkTreeView *self,main_window *widgets); +void on_layout_selection_changed(GtkTreeView *self, main_window *widgets); void on_num_lock_changed(GtkComboBox *self, main_window *); void on_model_changed(GtkComboBoxText *self, main_window *widgets); -void on_options_save(GtkWidget *,main_window *widgets); +void on_options_save(GtkWidget *, main_window *widgets); void yon_packages_tab_init(main_window *widgets); void yon_on_packages_selected(GtkWidget *, main_window *widgets); void yon_on_packages_chosen(GtkWidget *, char *path, main_window *widgets); -void yon_on_packages_activated(GtkWidget *, GtkTreePath* path, GtkTreeViewColumn* , main_window *widgets); +void yon_on_packages_activated(GtkWidget *, GtkTreePath *path, GtkTreeViewColumn *, main_window *widgets); void on_additional_page_clicked(GtkWidget *, main_window *widgets); void on_kernel_components_page_clicked(GtkWidget *, main_window *widgets); void on_kernel_page_clicked(GtkWidget *, main_window *widgets); void on_additional_packages_page_clicked(GtkWidget *, main_window *widgets); -void on_configuration_hub_open(GtkFlowBox *,GtkFlowBoxChild *child, main_window *widgets); +void on_configuration_hub_open(GtkFlowBox *, GtkFlowBoxChild *child, main_window *widgets); void yon_configuration_hub_add(GtkFlowBox *target, char *name, char *icon, enum YON_PAGES page); void yon_configuration_hub_init(main_window *widgets); void yon_flow_box_clear(GtkFlowBox *target); void yon_configuration_hub_section_get_max_size(GtkFlowBox *target, int *ret_width, int *ret_height); void yon_configuration_hub_section_set_max_size(GtkFlowBox *target, int width, int height); void yon_configuration_hub_resize(main_window *widgets); -void on_configuration_hub_selected(GtkWidget* self, main_window *widgets); +void on_configuration_hub_selected(GtkWidget *self, main_window *widgets); gboolean yon_software_insert(struct row_data *row_input); int yon_configuration_hub_save(main_window *widgets); int yon_packages_tab_save(main_window *widgets); @@ -1424,8 +1447,8 @@ gboolean on_install_slider_slide_proceed(main_window *widgets); gboolean on_install_slider_slide(main_window *widgets); void on_srartup_apps_toggled(GtkWidget *, char *path, main_window *widgets); -void on_startup_apps_selection_changed(GtkWidget *,main_window *widgets); -void on_startup_apps_remove(GtkWidget *self,main_window *widgets); +void on_startup_apps_selection_changed(GtkWidget *, main_window *widgets); +void on_startup_apps_remove(GtkWidget *self, main_window *widgets); void yon_startup_apps_setup(main_window *widgets); void on_startup_app_add_accept(GtkWidget *self, main_window *widgets); void on_startup_app_edit_accept(GtkWidget *self, main_window *widgets); @@ -1433,4 +1456,5 @@ startup_service_window *yon_startup_app_window_new(); void on_startup_app_add(GtkWidget *, main_window *widgets); void on_startup_app_edit(GtkWidget *, main_window *widgets); int yon_startup_app_save(main_window *widgets); -void yon_on_about(GtkWidget *, main_window *); \ No newline at end of file +void yon_on_about(GtkWidget *, main_window *); +void on_gparted_update(GtkWidget *, main_window *widgets); \ No newline at end of file diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index a902411..f0558aa 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -435,16 +435,56 @@ False com.ublinux.libublsettingsui-gtk3.trash-symbolic + + True + False + com.ublinux.libublsettingsui-gtk3.sync-symbolic + + + True + False + com.ublinux.libublsettingsui-gtk3.sync-symbolic + True False com.ublinux.libublsettingsui-gtk3.properties-symbolic + + True + False + com.ublinux.libublsettingsui-gtk3.sync-symbolic + + + True + False + com.ublinux.libublsettingsui-gtk3.sync-symbolic + + + True + False + com.ublinux.libublsettingsui-gtk3.sync-symbolic + True False com.ublinux.libublsettingsui-gtk3.edit-symbolic + + True + False + com.ublinux.libublsettingsui-gtk3.sync-symbolic + + + True + False + com.ublinux.libublsettingsui-gtk3.sync-symbolic + + + True + False + com.ublinux.libublsettingsui-gtk3.sync-symbolic + True False @@ -7396,7 +7436,7 @@ or continue working in the system Live environment. - + True True True @@ -7413,6 +7453,23 @@ or continue working in the system Live environment. 1 + + + True + True + True + image34 + + + + False + True + end + 2 + + False @@ -7885,7 +7942,7 @@ or continue working in the system Live environment. - + True True True @@ -7902,6 +7959,23 @@ or continue working in the system Live environment. 1 + + + True + True + True + image35 + + + + False + True + end + 2 + + False @@ -8298,6 +8372,18 @@ or continue working in the system Live environment. 4 + + + False + True + 0 + + + + + True + False + 5 True @@ -8324,7 +8410,7 @@ or continue working in the system Live environment. - True + False True 6 @@ -8566,7 +8652,7 @@ or continue working in the system Live environment. - + True True True @@ -8583,6 +8669,23 @@ or continue working in the system Live environment. 1 + + + True + True + True + image37 + + + + False + True + end + 2 + + False @@ -9258,6 +9361,23 @@ separately into the selected partition. 1 + + + True + True + True + image38 + + + + False + True + end + 2 + + False @@ -10697,7 +10817,7 @@ separately into the selected partition. - + True True True @@ -10713,6 +10833,23 @@ separately into the selected partition. 1 + + + True + True + True + image39 + + + + False + True + end + 2 + + False @@ -11092,7 +11229,7 @@ separately into the selected partition. - + True True True @@ -11108,6 +11245,23 @@ separately into the selected partition. 1 + + + True + True + True + image41 + + + + False + True + end + 2 + + False @@ -11480,7 +11634,7 @@ separately into the selected partition. - + True True True @@ -11496,6 +11650,23 @@ separately into the selected partition. 1 + + + True + True + True + image40 + + + + False + True + end + 2 + + False @@ -11876,6 +12047,18 @@ separately into the selected partition. 4 + + + False + True + 0 + + + + + True + False + 5 True @@ -11885,7 +12068,7 @@ separately into the selected partition. False True - 5 + 0 @@ -11894,24 +12077,18 @@ separately into the selected partition. False 1 True - - - True - True - - - True + False True - 6 + 1 False True - 0 + 1 @@ -11942,6 +12119,18 @@ separately into the selected partition. 1 + + + False + True + 2 + + + + + True + False + 5 True @@ -11951,7 +12140,7 @@ separately into the selected partition. False True - 2 + 0 @@ -11965,7 +12154,7 @@ separately into the selected partition. False True - 3 + 1 @@ -11977,7 +12166,7 @@ separately into the selected partition. False True - 4 + 2 @@ -11988,7 +12177,7 @@ separately into the selected partition. False True - 5 + 3 @@ -12004,14 +12193,14 @@ separately into the selected partition. False True - 6 + 4 False True - 1 + 3 @@ -12238,6 +12427,23 @@ separately into the selected partition. 1 + + + True + True + True + image42 + + + + False + True + end + 2 + + False @@ -12622,6 +12828,18 @@ separately into the selected partition. 4 + + + False + True + 0 + + + + + True + False + 5 True @@ -12631,7 +12849,7 @@ separately into the selected partition. False True - 5 + 2 @@ -12640,24 +12858,18 @@ separately into the selected partition. False 1 True - - - True - True - - - True + False True - 6 + 3 False True - 0 + 1 @@ -12688,6 +12900,18 @@ separately into the selected partition. 1 + + + False + True + 2 + + + + + True + False + 5 True @@ -12697,7 +12921,7 @@ separately into the selected partition. False True - 2 + 0 @@ -12711,7 +12935,7 @@ separately into the selected partition. False True - 3 + 1 @@ -12723,7 +12947,7 @@ separately into the selected partition. False True - 4 + 2 @@ -12734,7 +12958,7 @@ separately into the selected partition. False True - 5 + 3 @@ -12750,14 +12974,14 @@ separately into the selected partition. False True - 6 + 4 False True - 1 + 3