master #114

Merged
asmeron merged 3 commits from YanTheKaller/ubl-settings-bootloader:master into master 2 months ago

@ -113,7 +113,7 @@ void on_ringtone_remove_clicked(GtkWidget *,main_window *widgets){
if (yon_confirmation_dialog_call(widgets->Window,data)==GTK_RESPONSE_ACCEPT){
char *config_code = config(GRUB_PLAY_parameter);
yon_window_config_erase_instant_parameter(name,"melodies");
if (!yon_char_is_empty(config_code)&&strcmp(code,config_code)){
if (!yon_char_is_empty(config_code)&&!strcmp(code,config_code)){
yon_config_remove_by_key(GRUB_PLAY_parameter);
}

@ -533,14 +533,21 @@ void on_melody_toggled(GtkCellRenderer *, char *path, main_window *widgets){
GtkTreePath *cur_path = gtk_tree_path_new_from_string(path);
for_iter(model,&iter){
int status;
gtk_tree_model_get(model,&iter,0,&status,-1);
GtkTreePath *compare_path = gtk_tree_model_get_path(model,&iter);
if (gtk_tree_path_compare(cur_path,compare_path)){
gtk_list_store_set(widgets->BootRingtoneList,&iter,0,0,-1);
} else {
gtk_list_store_set(widgets->BootRingtoneList,&iter,0,1,-1);
char *code;
gtk_tree_model_get(model,&iter,2,&code,-1);
yon_config_register(GRUB_PLAY_parameter,GRUB_PLAY_command,(char*)code);
gtk_list_store_set(widgets->BootRingtoneList,&iter,0,!status,-1);
if (status){
yon_config_remove_by_key(GRUB_PLAY_parameter);
} else {
char *code;
gtk_tree_model_get(model,&iter,2,&code,-1);
yon_config_register(GRUB_PLAY_parameter,GRUB_PLAY_command,(char*)code);
}
}
gtk_tree_path_free(compare_path);
}

@ -502,9 +502,7 @@
<child>
<object class="GtkTreeViewColumn">
<child>
<object class="GtkCellRendererToggle" id="MelodyChosenCellRenderer">
<property name="radio">True</property>
</object>
<object class="GtkCellRendererToggle" id="MelodyChosenCellRenderer"/>
<attributes>
<attribute name="active">0</attribute>
</attributes>

Loading…
Cancel
Save