master #31

Merged
asmeron merged 2 commits from YanTheKaller/ubl-settings-keyboard:master into master 1 month ago

@ -3,7 +3,7 @@
void on_font_accept(GtkWidget *, layouts_window *window){ void on_font_accept(GtkWidget *, layouts_window *window){
GtkWidget *output_widget = g_object_get_data(G_OBJECT(window->Window),"output"); GtkWidget *output_widget = g_object_get_data(G_OBJECT(window->Window),"output");
if (gtk_switch_get_active(GTK_SWITCH(window->OptionsFilterCombo))){ if (gtk_switch_get_active(GTK_SWITCH(window->OptionsFilterCombo))){
gtk_entry_set_text(GTK_ENTRY(output_widget),""); gtk_entry_set_text(GTK_ENTRY(output_widget),yon_char_get_localised_from_lib(DEFAULT_LABEL));
yon_config_remove_by_key(console_keymap_parameter); yon_config_remove_by_key(console_keymap_parameter);
on_subwindow_close(window->Window); on_subwindow_close(window->Window);
return; return;

@ -4,7 +4,7 @@ void on_keymaps_accept(GtkWidget *, layouts_window *window){
main_window *widgets = g_object_get_data(G_OBJECT(window->Window),"widgets"); main_window *widgets = g_object_get_data(G_OBJECT(window->Window),"widgets");
GtkWidget *output_widget = g_object_get_data(G_OBJECT(window->Window),"output"); GtkWidget *output_widget = g_object_get_data(G_OBJECT(window->Window),"output");
if (gtk_switch_get_active(GTK_SWITCH(window->OptionsFilterCombo))){ if (gtk_switch_get_active(GTK_SWITCH(window->OptionsFilterCombo))){
gtk_entry_set_text(GTK_ENTRY(output_widget),""); gtk_entry_set_text(GTK_ENTRY(output_widget),yon_char_get_localised_from_lib(DEFAULT_LABEL));
yon_config_remove_by_key(console_keymap_parameter); yon_config_remove_by_key(console_keymap_parameter);
on_subwindow_close(window->Window); on_subwindow_close(window->Window);
return; return;

@ -79,11 +79,9 @@ void yon_layouts_add(GtkTreeView *, GtkListStore *, main_window *widgets){
char *id, *id_var; char *id, *id_var;
gtk_tree_model_get(GTK_TREE_MODEL(window->list),&iter,0,&id,-1); gtk_tree_model_get(GTK_TREE_MODEL(window->list),&iter,0,&id,-1);
for (int i=0;i<size;i++){ for (int i=0;i<size;i++){
char *key, *variant = NULL; char *key = NULL;
variant = yon_char_new(parsed[i]);
key = yon_char_divide_search(variant,"_",-1);
key = yon_char_new(parsed[i]); key = yon_char_new(parsed[i]);
if (!strcmp(id,key)&&((!variant))){ if (!strcmp(id,key)){
gtk_tree_store_set(GTK_TREE_STORE(window->list),&iter,3,1,-1); gtk_tree_store_set(GTK_TREE_STORE(window->list),&iter,3,1,-1);
found=1; found=1;
break; break;

Loading…
Cancel
Save