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

Fixes; Boot load menu fix

Browse Source
pull/207/head
Ivan Dmitrievich Yartsev 4 months ago
parent 3333aa06ca
commit 77dae8e156
6 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File

1
source/ubinstall-gtk-bootloader.c
Unescape View File

@ -249,7 +249,6 @@ yon_menu_window *yon_menu_window_open(GtkWidget *, main_window *widgets){
config_str parsed = yon_char_parse(options[i],&parsed_size,";");
{
char *temp = _(parsed[1]);
free(parsed[1]);
parsed[1] = yon_char_new(temp);
}
int have_children=0;

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

@ -124,10 +124,14 @@ void yon_installation_progress_update(GFileMonitor *,GFile *,GFile *,GFileMonito
}
}
gboolean yon_probress_bar_start(main_window *widgets){
gboolean yon_progress_bar_start(main_window *widgets){
GFile *file_desc = g_file_new_for_path(progress_path);
widgets->install_info_monitor = g_file_monitor_file(file_desc,G_FILE_MONITOR_NONE,NULL,NULL);
g_signal_connect(G_OBJECT(widgets->install_info_monitor),"changed",G_CALLBACK(yon_installation_progress_update),widgets);
g_object_unref(file_desc);
FILE *file = fopen(progress_path,"w");
if (file){
fclose(file);
}
return G_SOURCE_REMOVE;
}

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

@ -494,6 +494,7 @@ void on_page_cancel_clicked(GtkWidget *, main_window *widgets){
data->title=WARNING_TITLE_LABEL;
if (yon_confirmation_dialog_call(widgets->MainWindow,data)==GTK_RESPONSE_ACCEPT ){
pthread_cancel(main_config.install_thread);
kill(main_config.install_thread,SIGKILL);
g_signal_handlers_disconnect_by_func(G_OBJECT(widgets->install_info_monitor),yon_installation_progress_update,widgets);
g_file_monitor_cancel(widgets->install_info_monitor);
widgets->install_info_monitor = NULL;

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

@ -180,11 +180,7 @@ void *on_config_save(void *data){
yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),ERROR_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
return 0;
}
FILE *file = fopen(progress_path,"w");
if (file){
fclose(file);
}
g_idle_add((GSourceFunc)yon_probress_bar_start,widgets);
g_idle_add((GSourceFunc)yon_progress_bar_start,widgets);
if (!main_config.dry_run){
char *command = yon_debug_output("%s\n",save_config_command(yon_char_parsed_to_string(parameters,size," ")));
yon_char_parsed_free(parameters,size);

3
source/ubinstall-gtk.h
Unescape View File

@ -1455,4 +1455,5 @@ void yon_userdata_password_open(GtkWidget *, main_window *widgets);
double yon_password_check_func(yon_password_window *window, const char *password_string);
void yon_source_update(source_window *window);
void yon_main_window_update_locale(main_window *widgets);
gboolean yon_probress_bar_start(main_window *widgets);
gboolean yon_progress_bar_start(main_window *widgets);
void *yon_progress_file_buzyfy(void*);

33
ubinstall-gtk.glade
Unescape View File

@ -300,6 +300,21 @@
</columns>
</object>
<object class="GtkSizeGroup" id="TagsSizeGroup"/>
<object class="GtkFlowBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkFlowBoxChild">
<property name="width-request">100</property>
<property name="height-request">80</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<child>
<placeholder/>
</child>
</object>
</child>
</object>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can-focus">False</property>
@ -11243,6 +11258,7 @@ separately into the selected partition.</property>
<object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hscrollbar-policy">never</property>
<child>
<object class="GtkViewport">
<property name="visible">True</property>
@ -11648,6 +11664,7 @@ separately into the selected partition.</property>
<object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hscrollbar-policy">never</property>
<child>
<object class="GtkViewport">
<property name="visible">True</property>
@ -12057,7 +12074,7 @@ separately into the selected partition.</property>
<property name="adjustment">PartitionSize</property>
</object>
<packing>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
@ -12105,7 +12122,7 @@ separately into the selected partition.</property>
<property name="can-focus">True</property>
</object>
<packing>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
@ -12190,7 +12207,7 @@ separately into the selected partition.</property>
<property name="can-focus">True</property>
</object>
<packing>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
@ -12265,7 +12282,7 @@ separately into the selected partition.</property>
<property name="invisible-char">*</property>
</object>
<packing>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
@ -12879,7 +12896,7 @@ separately into the selected partition.</property>
<property name="value">16</property>
</object>
<packing>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
@ -12927,7 +12944,7 @@ separately into the selected partition.</property>
<property name="can-focus">True</property>
</object>
<packing>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">4</property>
</packing>
@ -13006,7 +13023,7 @@ separately into the selected partition.</property>
<property name="can-focus">True</property>
</object>
<packing>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">4</property>
</packing>
@ -13082,7 +13099,7 @@ separately into the selected partition.</property>
<property name="invisible-char">*</property>
</object>
<packing>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">4</property>
</packing>

Write Preview
Loading…
Cancel
Save