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

Fixes

Browse Source
pull/238/head
Ivan Dmitrievich Yartsev 2 months ago
parent ccae174831
commit f1827f2acf
7 changed files with 24 additions and 37 deletions
Show Stats Download Patch File Download Diff File

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

@ -142,7 +142,7 @@ void *yon_modules_list_load(main_window *widgets){
int size;
config_str modules = yon_config_load(yon_debug_output("%s\n",get_modules_command),&size);
for(int i=1;i<size;i++){
yon_char_remove_last_symbol(modules[i],'\0');
yon_char_remove_last_symbol(modules[i],'\n');
int parsed_size;
config_str parsed = yon_char_parse(modules[i],&parsed_size,";");
struct row_data *row = malloc(sizeof(struct row_data));
@ -508,6 +508,10 @@ void *yon_pacman_load(struct pacman_struct *pacman){
return NULL;
}
void on_pacman_search_enter(GtkEntry *self, main_window *widgets){
on_pacman_icon_press(self,GTK_ENTRY_ICON_SECONDARY,NULL,widgets);
}
void on_pacman_icon_press(GtkEntry *self,GtkEntryIconPosition icon_pos,GdkEvent* ,main_window *widgets){
if(icon_pos != GTK_ENTRY_ICON_SECONDARY) return;

5
source/ubinstall-gtk-kernel.c
Unescape View File

@ -275,7 +275,7 @@ void on_kernel_addon_info(GtkLabel *self){
yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,PACKAGE_INFO_LABEL,icon_path,"info-label");
char *package=NULL;
package = yon_char_new(gtk_label_get_text(self));
int size;
int size=0;
if (strstr(package,",")){
@ -288,8 +288,9 @@ void on_kernel_addon_info(GtkLabel *self){
yon_packages_info *info_struct = yon_packages_get_info_struct(YON_PACKAGES_ALL,package);
if (!info_struct) return;
char* info_string = yon_packages_get_info_string(info_struct);
yon_debug_output("%s\n",info_string);
config_str info = yon_char_parse(info_string,&size,"\n");
if (size!=-1){
if (size>0){
info_element *element = yon_package_info_element_new();
gtk_box_pack_start(GTK_BOX(window->MainBox),element->MainBox,1,1,0);
for (int i=0;i<size;i++){

2
source/ubinstall-gtk-ui-lang.c
Unescape View File

@ -89,7 +89,7 @@ void yon_startup_language_init(){
}
void yon_main_window_update_locale(main_window *widgets){
volatile char *locale = config(installer_locale_parameter);
char *locale = yon_char_new(config(installer_locale_parameter));
if (yon_char_is_empty((char *)locale)){
char *sys_locale = config(lang_parameter);

29
source/ubinstall-gtk.c
Unescape View File

@ -172,39 +172,15 @@ void on_toggle_button_switch_on(GtkWidget *, GtkToggleButton *toggle){
// * [RU]
// * Функция инициализации всех параметров конфигурации
// */
void config_init(){
main_config.always_open_documentation=0;
void config_init(){
memset(&main_config,0,sizeof(config));
main_config.socket_id=-1;
main_config.save_socket_id=-1;
main_config.load_socket_id=-1;
main_config.lock_help=0;
main_config.lock_help=0;
main_config.lock_load_global=0;
main_config.lock_save_global=0;
main_config.lock_save_local=0;
main_config.debug_mode=0;
main_config.slider_thread=0;
main_config.install_thread=0;
main_config.progress_thread=0;
main_config.install_complete=0;
main_config.save_done=0;
main_config.save_configured=0;
main_config.configure_mode=0;
main_config.load_mode=YON_CONFIG_GLOBAL;
main_config.log_progress_buzy=0;
main_config.log_end=0;
main_config.exit_accepted=0;
main_config.config_load_path = NULL;
main_config.config_save_path = NULL;
main_config.force_scenario=0;
yon_packages_init();
main_config.dry_run=0;
main_config.force_ini=NULL;
main_config.network_types = g_hash_table_new(g_str_hash,g_str_equal);
main_config.slides = NULL;
main_config.chosen_slide = NULL;
main_config.os_name = NULL;
main_config.devices = yon_config_load(get_devices_command,&main_config.devices_size);
{
int size;
@ -758,6 +734,7 @@ void yon_main_window_create(main_window *widgets){
g_signal_connect(G_OBJECT(widgets->PacmanSoftwareAllCell),"toggled",G_CALLBACK(on_pacman_software_all_toggled),widgets);
g_signal_connect(G_OBJECT(widgets->PacmanSoftwareChosenCell),"toggled",G_CALLBACK(on_pacman_software_chosen_toggled),widgets);
g_signal_connect(G_OBJECT(widgets->PacmanSoftwareSearchEntry),"icon-press",G_CALLBACK(on_pacman_icon_press),widgets);
g_signal_connect(G_OBJECT(widgets->PacmanSoftwareSearchEntry),"activate",G_CALLBACK(on_pacman_search_enter),widgets);
g_signal_connect(G_OBJECT(widgets->BootloadUserAddButton),"clicked",G_CALLBACK(on_bootloader_user_add),widgets);
g_signal_connect(G_OBJECT(widgets->BootloadTimerSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch),widgets->BootloadTimerSpin);

4
source/ubinstall-gtk.h
Unescape View File

@ -1519,4 +1519,6 @@ void yon_size_changed(GtkSpinButton *self, main_window *widgets);
void yon_pacman_software_update_overall_size(main_window *widgets);
int yon_installation_check_packages_size(main_window *widgets);
config_str yon_os_components_get_modules(int *size);
int yon_os_components_check_packages_size(GtkWidget *, main_window *widgets);
int yon_os_components_check_packages_size(GtkWidget *, main_window *widgets);
void on_pacman_search_enter(GtkEntry *self, main_window *widgets);
void yon_log_scroll(GtkScrolledWindow* self, GtkScrollType* scroll, gboolean horizontal,log_window *window);

11
ubinstall-gtk-os-row.glade
Unescape View File

@ -22,7 +22,7 @@
<property name="receives-default">False</property>
<property name="margin-start">5</property>
<property name="margin-end">10</property>
<property name="margin-top">5</property>
<property name="margin-top">3</property>
<property name="margin-bottom">5</property>
<property name="draw-indicator">True</property>
<child>
@ -111,6 +111,7 @@
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
@ -126,7 +127,7 @@
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
@ -154,6 +155,7 @@
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="spacing">5</property>
<child>
<object class="GtkLabel">
@ -174,7 +176,6 @@
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="use-markup">True</property>
<property name="width-chars">15</property>
<property name="track-visited-links">False</property>
<property name="xalign">0</property>
</object>
@ -195,6 +196,7 @@
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="spacing">5</property>
<child>
<object class="GtkLabel" id="DescriptionLabel">
@ -206,7 +208,7 @@
<property name="yalign">0</property>
</object>
<packing>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
@ -301,6 +303,7 @@
</child>
<style>
<class name="bggrey"/>
<class name="thin"/>
</style>
</object>
</child>

4
ubinstall-gtk.glade
Unescape View File

@ -12065,7 +12065,7 @@ separately into the selected partition.</property>
<object class="GtkLabel" id="WelcomeTitleLabel24">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">OS only</property>
<property name="label" translatable="yes">System restore</property>
<property name="wrap">True</property>
<property name="xalign">0</property>
<attributes>
@ -12085,7 +12085,7 @@ separately into the selected partition.</property>
<object class="GtkLabel" id="WelcomeInfoLabel24">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Installing only OS components without user data</property>
<property name="label" translatable="yes">Restore missing or corrupted system files. Users data is not affected</property>
<property name="wrap">True</property>
<property name="xalign">0</property>
<attributes>

Write Preview
Loading…
Cancel
Save