master #321

Merged
asmeron merged 2 commits from YanTheKaller/ubinstall-gtk:master into master 1 month ago

@ -266,6 +266,12 @@ void yon_translation_init(GtkBuilder *builder){
GSList *list = gtk_builder_get_objects(builder);
GSList *iter;
for (iter = list; iter; iter = iter->next){
if (GTK_IS_WIDGET(iter->data)){
const char *tooltip = gtk_widget_get_tooltip_text(GTK_WIDGET(iter->data));
if (!yon_char_is_empty(tooltip)){
g_object_set_data(G_OBJECT(iter->data),"original_tooltip",(void*)tooltip);
}
}
GObject *cur_widget = NULL;
const char *widget_text = NULL;
if (GTK_IS_BUTTON(iter->data)){
@ -289,7 +295,7 @@ void yon_translation_init(GtkBuilder *builder){
}
widget_text = yon_char_new(gtk_menu_item_get_label(GTK_MENU_ITEM(cur_widget)));
} else continue;
g_object_set_data(G_OBJECT(cur_widget),"original_label",(void*)widget_text);
g_object_set_data(G_OBJECT(cur_widget),"original_label",(void*)widget_text);
}
}
@ -342,6 +348,12 @@ void yon_update_translation(main_window *widgets){
} else if (iter->data == widgets->LanguagesTree){
yon_set_locales_list(widgets);
}
if (GTK_IS_WIDGET(iter->data)){
const char *tooltip_text = g_object_get_data(G_OBJECT(iter->data),"original_tooltip");
if (!yon_char_is_empty(tooltip_text)){
gtk_widget_set_tooltip_text(GTK_WIDGET(iter->data),_(tooltip_text));
}
}
}
{
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->DocumentationMenuItem));

@ -90,7 +90,7 @@
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="pixel-size">32</property>
<property name="icon-name">com.ublinux.ubl-settings-keyboard</property>
<property name="icon-name">com.ublinux.ubinstall-keyboard</property>
</object>
</child>
<child>

Loading…
Cancel
Save