From 1c7724870a657dad6ff1042651909ae63229261f Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 27 Aug 2024 09:48:55 +0600 Subject: [PATCH] Test fix for image size --- source/ubinstall-gtk.c | 10 +++++++--- ubinstall-gtk.glade | 19 ++++++++++++++++++- ubinstall-gtk_ru.po | 2 +- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index 665df60..c4b10e3 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -855,11 +855,11 @@ int cur_slide=0; int yon_image_resize_from_container(GtkImage *target, GdkPixbuf *pixbuf_unscaled); int yon_image_resize_from_container(GtkImage *target, GdkPixbuf *pixbuf_unscaled) { - int width = gtk_widget_get_allocated_width(gtk_widget_get_parent(gtk_widget_get_parent(GTK_WIDGET(target)))); - int height = gtk_widget_get_allocated_height(gtk_widget_get_parent(gtk_widget_get_parent(GTK_WIDGET(target)))); + int width = gtk_widget_get_allocated_width((gtk_widget_get_parent(GTK_WIDGET(target)))); + int height = gtk_widget_get_allocated_height((gtk_widget_get_parent(GTK_WIDGET(target)))); int newImgWidthDef = (width <= 217) ? width : width - 30; - int newImgHeightDef = (height <= 120) ? height : height - 217; + int newImgHeightDef = (height <= 120) ? height : height - 80; int originalWidth = gdk_pixbuf_get_width(pixbuf_unscaled); int originalHeight = gdk_pixbuf_get_height(pixbuf_unscaled); @@ -2364,6 +2364,10 @@ main_window *yon_main_window_complete(){ g_signal_connect(G_OBJECT(widgets->AddButton),"clicked",G_CALLBACK(on_keyboard_clicked),widgets); g_signal_connect(G_OBJECT(widgets->RemoveButton),"clicked",G_CALLBACK(on_keyboard_removed),widgets); + gtk_style_context_add_class(gtk_widget_get_style_context(gtk_widget_get_parent(widgets->RegionImage)),"errorBox"); + gtk_style_context_add_class(gtk_widget_get_style_context(gtk_widget_get_parent(widgets->SlidesImage)),"errorBox"); + gtk_style_context_add_class(gtk_widget_get_style_context(gtk_widget_get_parent(widgets->KeyboardImage)),"errorBox"); + g_signal_connect(G_OBJECT(widgets->UsersToggle),"toggled",G_CALLBACK(on_toggle_block),NULL); g_signal_connect(G_OBJECT(widgets->LicenceToggle),"toggled",G_CALLBACK(on_toggle_block),NULL); g_signal_connect(G_OBJECT(widgets->WelcomeToggle),"toggled",G_CALLBACK(on_toggle_block),NULL); diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index b8debf6..b1edab3 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -1493,9 +1493,15 @@ and help you install UBLinux on your computer vertical 5 - + True False + Installation + + + + + False @@ -1503,6 +1509,17 @@ and help you install UBLinux on your computer 0 + + + True + False + + + False + True + 1 + + 6 diff --git a/ubinstall-gtk_ru.po b/ubinstall-gtk_ru.po index b35644b..a65ee07 100644 --- a/ubinstall-gtk_ru.po +++ b/ubinstall-gtk_ru.po @@ -123,7 +123,7 @@ msgstr "Разделы" #: source/ubl-strings.h:17 msgid "Installation" -msgstr "Установить" +msgstr "Установка" #: source/ubl-strings.h:18 source/ubl-strings.h:33 msgid "Location"