|
|
|
|
@ -813,6 +813,7 @@ log_window *yon_log_window_new(){
|
|
|
|
|
log_window *window = malloc(sizeof(log_window));
|
|
|
|
|
GtkBuilder *builder = gtk_builder_new_from_resource(glade_path_log_view);
|
|
|
|
|
window->Window = yon_gtk_builder_get_widget(builder,"MainWindow");
|
|
|
|
|
window->ScrollWindow = yon_gtk_builder_get_widget(builder,"ScrollWindow");
|
|
|
|
|
window->HeadLabel = yon_gtk_builder_get_widget(builder,"headerTopic");
|
|
|
|
|
window->LogLabel = yon_gtk_builder_get_widget(builder,"LogLabel");
|
|
|
|
|
window->StatusBox = yon_gtk_builder_get_widget(builder,"StatusBox");
|
|
|
|
|
@ -835,6 +836,7 @@ if (window->Window){
|
|
|
|
|
gtk_label_set_text(GTK_LABEL(window->LogLabel),final);
|
|
|
|
|
free(final);
|
|
|
|
|
yon_char_parsed_free(parsed,size);
|
|
|
|
|
gtk_adjustment_set_value(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(window->ScrollWindow)),gtk_adjustment_get_upper(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(window->ScrollWindow))));
|
|
|
|
|
}
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
@ -984,12 +986,14 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){
|
|
|
|
|
} else {
|
|
|
|
|
yon_config_remove_by_key(xkblayout_parameter);
|
|
|
|
|
}
|
|
|
|
|
char *model = gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->KeyboardModelCombo))?(char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(widgets->KeyboardModelCombo)):"";
|
|
|
|
|
if (!gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->KeyboardModelCombo))){
|
|
|
|
|
char *model = gtk_combo_box_get_active_id(GTK_COMBO_BOX(widgets->KeyboardModelCombo));
|
|
|
|
|
// char *layout_switch;
|
|
|
|
|
if (!yon_char_is_empty(model))
|
|
|
|
|
yon_config_register(xkbmodel_parameter,xkbmodel_parameter_command,model);
|
|
|
|
|
else
|
|
|
|
|
} else{
|
|
|
|
|
yon_config_remove_by_key(xkbmodel_parameter);
|
|
|
|
|
}
|
|
|
|
|
if (!yon_char_is_empty(layouts_list))
|
|
|
|
|
yon_config_register(locale_parameter,locale_parameter_command,layouts_list);
|
|
|
|
|
else
|
|
|
|
|
@ -1139,11 +1143,12 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){
|
|
|
|
|
return;
|
|
|
|
|
} else {
|
|
|
|
|
char *password = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->PasswordEntry));
|
|
|
|
|
|
|
|
|
|
yon_config_register(user_password_parameter,user_password_parameter_command,password);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
yon_config_register(user_password_parameter,user_password_parameter_command,PASSWORD_DEFAULT);
|
|
|
|
|
yon_config_remove_by_key(user_password_parameter);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->AdminPasswordCombo))==1){
|
|
|
|
|
@ -1202,12 +1207,13 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){
|
|
|
|
|
yon_config_remove_by_key(xkbmodel_parameter);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->LayoutBindingCombo))){
|
|
|
|
|
char *options = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(widgets->LayoutBindingCombo));
|
|
|
|
|
if (!yon_char_is_empty(options)){
|
|
|
|
|
yon_config_register(xkboptions_parameter,xkboptions_parameter_command,options);
|
|
|
|
|
} else {
|
|
|
|
|
yon_config_remove_by_key(xkboptions_parameter);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!main_config.configure_mode){
|
|
|
|
|
if (!main_config.install_complete){
|
|
|
|
|
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION);
|
|
|
|
|
|