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

OS Menu visual changes and localisation fixes

Browse Source
pull/207/head
Ivan Dmitrievich Yartsev 4 months ago
parent 9c8621c29a
commit 79603a3653
3 changed files with 49 additions and 11 deletions
Show Stats Download Patch File Download Diff File

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

@ -239,7 +239,6 @@ yon_menu_window *yon_menu_window_open(GtkWidget *, main_window *widgets){
gtk_list_box_insert(GTK_LIST_BOX(window->ItemsListBox),item->MenuItemRow,-1); gtk_list_box_insert(GTK_LIST_BOX(window->ItemsListBox),item->MenuItemRow,-1);
gtk_widget_hide(item->ArrowImage); gtk_widget_hide(item->ArrowImage);
} }
int size; int size;
config_str options = yon_config_load(get_menus_entry_command,&size); config_str options = yon_config_load(get_menus_entry_command,&size);
GHashTable *created = g_hash_table_new(g_str_hash,g_str_equal); GHashTable *created = g_hash_table_new(g_str_hash,g_str_equal);
@ -248,6 +247,11 @@ yon_menu_window *yon_menu_window_open(GtkWidget *, main_window *widgets){
yon_char_remove_last_symbol(options[i],'\n'); yon_char_remove_last_symbol(options[i],'\n');
int parsed_size; int parsed_size;
config_str parsed = yon_char_parse(options[i],&parsed_size,";"); 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; int have_children=0;
char *children_id; char *children_id;
if ((children_id=strstr(parsed[0],">"))){ if ((children_id=strstr(parsed[0],">"))){

1
ubinstall-gtk-menu-item.glade
Unescape View File

@ -4,6 +4,7 @@
<requires lib="gtk+" version="3.24"/> <requires lib="gtk+" version="3.24"/>
<!-- interface-css-provider-path ubl-settings-bootloader.css --> <!-- interface-css-provider-path ubl-settings-bootloader.css -->
<object class="GtkListBoxRow" id="MenuItemRow"> <object class="GtkListBoxRow" id="MenuItemRow">
<property name="height-request">25</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<child> <child>

53
ubinstall-gtk-menu.glade
Unescape View File

@ -3,11 +3,6 @@
<interface domain="ubl-settings-bootloader"> <interface domain="ubl-settings-bootloader">
<requires lib="gtk+" version="3.24"/> <requires lib="gtk+" version="3.24"/>
<!-- interface-css-provider-path ubinstall-gtk.css --> <!-- interface-css-provider-path ubinstall-gtk.css -->
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">com.ublinux.libublsettingsui-gtk3.pan-left-symbolic</property>
</object>
<object class="GtkWindow" id="MainWindow"> <object class="GtkWindow" id="MainWindow">
<property name="width-request">450</property> <property name="width-request">450</property>
<property name="height-request">250</property> <property name="height-request">250</property>
@ -54,7 +49,6 @@
<object class="GtkListBox" id="ItemsListBox"> <object class="GtkListBox" id="ItemsListBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="selection-mode">none</property>
<child type="placeholder"> <child type="placeholder">
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property> <property name="visible">True</property>
@ -94,11 +88,40 @@
<property name="spacing">5</property> <property name="spacing">5</property>
<child> <child>
<object class="GtkButton" id="BackButton"> <object class="GtkButton" id="BackButton">
<property name="label" translatable="yes">Back</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<property name="image">image1</property> <child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="spacing">5</property>
<child>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">com.ublinux.libublsettingsui-gtk3.pan-left-symbolic</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Back</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
<style> <style>
<class name="noborder"/> <class name="noborder"/>
<class name="menunoborder"/> <class name="menunoborder"/>
@ -110,6 +133,17 @@
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="can-focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child> <child>
<object class="GtkScrolledWindow"> <object class="GtkScrolledWindow">
<property name="visible">True</property> <property name="visible">True</property>
@ -125,7 +159,6 @@
<object class="GtkListBox" id="ChildrenListBox"> <object class="GtkListBox" id="ChildrenListBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="selection-mode">none</property>
<child type="placeholder"> <child type="placeholder">
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property> <property name="visible">True</property>
@ -141,7 +174,7 @@
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
</object> </object>

Write Preview
Loading…
Cancel
Save