pull/33/head
Администратор 1 year ago
parent 59ca028cc2
commit 09c065927e

@ -839,6 +839,8 @@ gboolean on_image_slide(void *data){
config_str target = yon_char_parsed_new(&size,slide_repeat_path);
g_object_unref(widgets->slides_original);
widgets->slides_original = gdk_pixbuf_new_from_resource_at_scale(target[cur_slide],600,400,1,NULL);
if (size)
yon_char_parsed_free(target,size);
GtkWidget *parent = gtk_widget_get_parent(widgets->SlidesImage);
gtk_widget_destroy(widgets->SlidesImage);
widgets->SlidesImage = gtk_image_new();
@ -892,7 +894,7 @@ gboolean yon_installation_progress_update(void *data){
while (gtk_events_pending()) gtk_main_iteration();
int size;
while (main_config.log_progress_buzy){
while (gtk_events_pending()) gtk_main_iteration();};
while (gtk_events_pending()) gtk_main_iteration();};
main_config.log_progress_buzy=1;
config_str text = yon_file_open(progress_path,&size);
main_config.log_progress_buzy=0;
@ -1109,10 +1111,14 @@ if (window->Window){
main_config.log_progress_buzy=0;
if (size){
char *final = yon_char_parsed_to_string(parsed,size,"");
char *prev = (char*)gtk_label_get_text(GTK_LABEL(window->LogLabel));
gtk_label_set_text(GTK_LABEL(window->LogLabel),final);
yon_debug_output("%s\n",yon_char_from_long((long)gtk_adjustment_get_value(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(window->ScrollWindow)))));
yon_debug_output("%s\n",yon_char_from_long((long)gtk_adjustment_get_value(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(window->ScrollWindow)))));
if (strcmp(final,prev)||gtk_adjustment_get_value(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(window->ScrollWindow)))>gtk_adjustment_get_upper(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(window->ScrollWindow)))-100)
gtk_adjustment_set_value(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(window->ScrollWindow)),gtk_adjustment_get_upper(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(window->ScrollWindow))));
free(final);
yon_char_parsed_free(parsed,size);
gtk_adjustment_set_value(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(window->ScrollWindow)),gtk_adjustment_get_upper(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(window->ScrollWindow))));
}
return 1;
}

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.38.2 -->
<!-- Generated with glade 3.40.0 -->
<interface domain="ubinstall-gtk">
<requires lib="gtk+" version="3.24"/>
<!-- interface-css-provider-path ubinstall-gtk.css -->
@ -41,6 +41,20 @@
<property name="margin-bottom">5</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<object class="GtkCheckButton" id="ScrollToEndCheck">
<property name="label" translatable="yes">Scroll to the end</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="ScrollWindow">
<property name="visible">True</property>

@ -317,10 +317,6 @@ msgstr "Мб"
msgid "Available languages in the system:"
msgstr "Доступные языки в системе:"
#: source/ubl-strings.h:66
msgid "Available languages in the system"
msgstr "Доступные языки в системе"
#: source/ubl-strings.h:67
msgid "No device were chosen"
msgstr "Устройство не выбрано"

Loading…
Cancel
Save