Applications
/
ubl-settings-kernel
10
0
Fork 1
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'master' (#58) from YanTheKaller/ubl-settings-kernel:master into master

Browse Source 
Reviewed-on: #58
pull/79/head v2.8
Dmitry Razumov 10 months ago
parent 756137c2b8 ac57513adb
commit 3757dd46d2
5 changed files with 113 additions and 71 deletions
Show Stats Download Patch File Download Diff File

153
source/ubl-settings-kernel.c
Unescape View File

@ -28,7 +28,9 @@ void on_save_done(main_window *, config_str output, int size){
} }
void yon_load_proceed(YON_CONFIG_TYPE type){ void yon_load_proceed(YON_CONFIG_TYPE type){
yon_config_clean(); if (type!=YON_CONFIG_CUSTOM){
yon_config_clean();
}
if (!yon_char_is_empty(config_get_default_command)) if (!yon_char_is_empty(config_get_default_command))
yon_config_load_config(YON_CONFIG_DEFAULT,config_get_default_command,NULL); yon_config_load_config(YON_CONFIG_DEFAULT,config_get_default_command,NULL);
if (type==YON_CONFIG_GLOBAL){ if (type==YON_CONFIG_GLOBAL){
@ -57,40 +59,37 @@ void yon_load_proceed(YON_CONFIG_TYPE type){
} else { } else {
gtk_widget_destroy(dialog); gtk_widget_destroy(dialog);
} }
yon_config_clean();
char *command = yon_config_get_custom_command(path); char *command = yon_config_get_custom_command(path);
yon_config_load_config(type,command,NULL); yon_config_load_config(type,command,NULL);
} }
} }
void on_config_save(GtkWidget *, main_window *widgets){ void on_config_save(GtkWidget *, main_window *){
main_config.save_config=2; main_config.save_config=2;
template_saving_window *window = yon_save_proceed(NULL,YON_CONFIG_BOTH,yon_config_get_custom_command("global"),NULL); template_saving_window *window = yon_save_proceed(NULL,YON_CONFIG_BOTH,yon_config_get_custom_command("global"),NULL);
if (window){}; if (window){};
on_update_clicked(NULL,widgets);
} }
void on_config_global_save(GtkWidget *, main_window *widgets){ void on_config_global_save(GtkWidget *, main_window *){
main_config.save_config=0; main_config.save_config=0;
template_saving_window *window = yon_save_proceed("global",YON_CONFIG_GLOBAL,yon_config_get_custom_command("global"),NULL); template_saving_window *window = yon_save_proceed("global",YON_CONFIG_GLOBAL,yon_config_get_custom_command("global"),NULL);
if (window){}; if (window){};
on_update_clicked(NULL,widgets);
} }
void on_config_local_save(GtkWidget *, main_window *widgets){ void on_config_local_save(GtkWidget *, main_window *){
main_config.save_config=1; main_config.save_config=1;
template_saving_window *window = yon_save_proceed("system",YON_CONFIG_LOCAL,yon_config_get_custom_command("system"),NULL); template_saving_window *window = yon_save_proceed("system",YON_CONFIG_LOCAL,yon_config_get_custom_command("system"),NULL);
if (window){}; if (window){};
on_update_clicked(NULL,widgets);
} }
void on_config_custom_save(GtkWidget *, main_window *widgets){ void on_config_custom_save(GtkWidget *, main_window *){
main_config.save_config=1; main_config.save_config=1;
template_saving_window *window = yon_save_proceed(NULL,YON_CONFIG_CUSTOM,yon_config_get_custom_command("system"),NULL); template_saving_window *window = yon_save_proceed(NULL,YON_CONFIG_CUSTOM,yon_config_get_custom_command("system"),NULL);
if (window){}; if (window){};
on_update_clicked(NULL,widgets);
} }
@ -262,8 +261,12 @@ gboolean yon_tab_create_tags(kernels_tab *tab){
yon_char_remove_last_symbol(boot_run[0],'\n'); yon_char_remove_last_symbol(boot_run[0],'\n');
} }
if ((!(launched&&!strcmp(tab->package,launched))&&(strcmp(tab->package,boot_run[0])))){ if ((!(launched&&!strcmp(tab->package,launched))&&(boot_run&&!yon_char_is_empty(boot_run[0])&&strcmp(tab->package,boot_run[0])))){
gtk_widget_show(tab->launch_button);
}
else if (launched&&(strcmp(tab->package,launched))&&(boot_run&&boot_run[0]&&!strcmp(tab->package,boot_run[0]))){
gtk_widget_show(tab->launch_button); gtk_widget_show(tab->launch_button);
yon_tag_add(GTK_BOX(tab->install_tags_box),RUNNING_LABEL,"tag_green",NULL);
} else { } else {
gtk_widget_hide(tab->launch_button); gtk_widget_hide(tab->launch_button);
if(!getuid()){ if(!getuid()){
@ -504,20 +507,24 @@ gboolean on_command_execute_success(GtkWidget *,gint status,main_window *widgets
gtk_widget_set_sensitive(widgets->UpdateButton,1); gtk_widget_set_sensitive(widgets->UpdateButton,1);
dictionary *dict = NULL; dictionary *dict = NULL;
for_dictionaries(dict,main_config.kernel_tabs){ for_dictionaries(dict,main_config.kernel_tabs){
gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_module_button,1); if (!getuid()){
gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_package_button,1); gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_module_button,1);
gtk_widget_set_sensitive(((kernels_tab*)dict->data)->install_module_button,1); gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_package_button,1);
gtk_widget_set_sensitive(((kernels_tab*)dict->data)->install_package_button,1); gtk_widget_set_sensitive(((kernels_tab*)dict->data)->install_module_button,1);
gtk_widget_set_sensitive(((kernels_tab*)dict->data)->remove_module_button,1); gtk_widget_set_sensitive(((kernels_tab*)dict->data)->install_package_button,1);
gtk_widget_set_sensitive(((kernels_tab*)dict->data)->remove_package_button,1); gtk_widget_set_sensitive(((kernels_tab*)dict->data)->remove_module_button,1);
gtk_widget_set_sensitive(((kernels_tab*)dict->data)->remove_package_button,1);
}
} }
for_dictionaries(dict,main_config.addition_tabs){ for_dictionaries(dict,main_config.addition_tabs){
gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_module_button,1); if (!getuid()){
gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_package_button,1); gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_module_button,1);
gtk_widget_set_sensitive(((kernels_tab*)dict->data)->install_module_button,1); gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_package_button,1);
gtk_widget_set_sensitive(((kernels_tab*)dict->data)->install_package_button,1); gtk_widget_set_sensitive(((kernels_tab*)dict->data)->install_module_button,1);
gtk_widget_set_sensitive(((kernels_tab*)dict->data)->remove_module_button,1); gtk_widget_set_sensitive(((kernels_tab*)dict->data)->install_package_button,1);
gtk_widget_set_sensitive(((kernels_tab*)dict->data)->remove_package_button,1); gtk_widget_set_sensitive(((kernels_tab*)dict->data)->remove_module_button,1);
gtk_widget_set_sensitive(((kernels_tab*)dict->data)->remove_package_button,1);
}
} }
{ {
gtk_button_set_label(GTK_BUTTON(widgets->MoreButton),MORE_LABEL); gtk_button_set_label(GTK_BUTTON(widgets->MoreButton),MORE_LABEL);
@ -678,8 +685,6 @@ void on_package_install_accept(GtkWidget *, dictionary *dict){
char *command = install_command(modules_to_install); char *command = install_command(modules_to_install);
yon_command_execute_async(command,widgets); yon_command_execute_async(command,widgets);
tab->package_installed=1; tab->package_installed=1;
free(dict->first->next->next);
dict->first->next->next=NULL;
on_subwindow_close(window->Window); on_subwindow_close(window->Window);
} }
@ -793,30 +798,38 @@ void on_module_install_clicked(GtkWidget *self,dictionary *dict){
g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(on_module_install_accept),dict); g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(on_module_install_accept),dict);
if (self == tab->update_module_button){ if (self == tab->update_module_button){
gtk_box_set_spacing(GTK_BOX(gtk_widget_get_parent(window->TopicLabel)),25);
gtk_widget_set_margin_start(gtk_widget_get_parent(window->TopicLabel),10);
yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),UPDATE_MODULE_TITLE_LABEL,icon_path,"update_dialog");
if (!gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){ if (!gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){
action_text = KERNEL_MODULE_UPDATE_CONFIRMATION_LABEL(tab->name); action_text = KERNEL_MODULE_UPDATE_CONFIRMATION_LABEL(tab->name);
gtk_label_set_text(GTK_LABEL(window->HeadLabel),UPDATE_MODULE_TITLE_LABEL); gtk_label_set_markup(GTK_LABEL(window->HeadLabel),UPDATE_MODULE_TITLE_LABEL);
} else { } else {
action_text = ADDITION_MODULE_UPDATE_CONFIRMATION_LABEL(tab->name); action_text = ADDITION_MODULE_UPDATE_CONFIRMATION_LABEL(tab->name);
gtk_label_set_text(GTK_LABEL(window->HeadLabel),UPDATE_ADDITION_MODULE_TITLE_LABEL); gtk_label_set_markup(GTK_LABEL(window->HeadLabel),UPDATE_ADDITION_MODULE_TITLE_LABEL);
} }
} else { } else {
if (!gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){ if (!gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){
yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),self==tab->update_package_button?UPDATE_MODULE_TITLE_LABEL:INSTALL_MODULE_TITLE_LABEL,icon_path,"dialog"); yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),INSTALL_MODULE_TITLE_LABEL,icon_path,"dialog");
action_text = KERNEL_MODULE_INSTALL_CONFIRMATION_LABEL(tab->name); action_text = KERNEL_MODULE_INSTALL_CONFIRMATION_LABEL(tab->name);
gtk_label_set_text(GTK_LABEL(window->HeadLabel),INSTALL_MODULE_TITLE_LABEL); gtk_label_set_markup(GTK_LABEL(window->HeadLabel),INSTALL_MODULE_TITLE_LABEL);
} else { } else {
yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),self==tab->update_package_button?UPDATE_MODULE_TITLE_LABEL:INSTALL_MODULE_TITLE_LABEL,icon_path,"additions_dialog"); yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),INSTALL_MODULE_TITLE_LABEL,icon_path,"additions_dialog");
action_text = ADDITION_MODULE_INSTALL_CONFIRMATION_LABEL(tab->name); action_text = ADDITION_MODULE_INSTALL_CONFIRMATION_LABEL(tab->name);
gtk_label_set_text(GTK_LABEL(window->HeadLabel),INSTALL_ADDITION_MODULE_TITLE_LABEL); gtk_label_set_markup(GTK_LABEL(window->HeadLabel),INSTALL_ADDITION_MODULE_TITLE_LABEL);
} }
} }
gtk_label_set_text(GTK_LABEL(window->TopicLabel),action_text); gtk_label_set_text(GTK_LABEL(window->TopicLabel),action_text);
gtk_widget_show(window->Window); gtk_widget_show(window->Window);
if (dict->first->next->next) {
yon_dictionary_free(dict->first->next->next);
dict->first->next->next=NULL;
}
yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window); yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window);
if (gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){ if (gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))||self==tab->update_module_button){
gtk_widget_hide(window->DependencesFrame); gtk_widget_hide(window->DependencesFrame);
gtk_box_set_child_packing(GTK_BOX(gtk_widget_get_parent(window->DependencesFrame)),gtk_widget_get_parent(gtk_widget_get_parent(window->TopicLabel)),1,1,0,GTK_PACK_START); gtk_box_set_child_packing(GTK_BOX(gtk_widget_get_parent(window->DependencesFrame)),gtk_widget_get_parent(gtk_widget_get_parent(window->TopicLabel)),1,1,0,GTK_PACK_START);
} else { } else {
@ -845,49 +858,65 @@ void on_package_install_clicked(GtkWidget *self,dictionary *dict){
dialog_window *window = yon_dialog_window_new(); dialog_window *window = yon_dialog_window_new();
g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(on_package_install_accept),dict); g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(on_package_install_accept),dict);
if (self == tab->update_module_button){ if (self == tab->update_package_button){
if (!gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){ if (!gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){
action_text = KERNEL_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->name); action_text = KERNEL_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->name);
gtk_label_set_text(GTK_LABEL(window->HeadLabel),UPDATE_PACKAGE_TITLE_LABEL); gtk_label_set_markup(GTK_LABEL(window->HeadLabel),UPDATE_PACKAGE_TITLE_LABEL);
} else { } else {
action_text = ADDITION_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->name); action_text = ADDITION_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->name);
gtk_label_set_text(GTK_LABEL(window->HeadLabel),UPDATE_ADDITION_PACKAGE_TITLE_LABEL); gtk_label_set_markup(GTK_LABEL(window->HeadLabel),UPDATE_ADDITION_PACKAGE_TITLE_LABEL);
} }
}else{ }else{
if (!gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){ if (!gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){
action_text = KERNEL_PACKAGE_INSTALL_CONFIRMATION_LABEL(tab->name); action_text = KERNEL_PACKAGE_INSTALL_CONFIRMATION_LABEL(tab->name);
gtk_label_set_text(GTK_LABEL(window->HeadLabel),INSTALL_PACKAGE_TITLE_LABEL); gtk_label_set_markup(GTK_LABEL(window->HeadLabel),INSTALL_PACKAGE_TITLE_LABEL);
} else { } else {
action_text = ADDITION_PACKAGE_INSTALL_CONFIRMATION_LABEL(tab->name); action_text = ADDITION_PACKAGE_INSTALL_CONFIRMATION_LABEL(tab->name);
gtk_label_set_text(GTK_LABEL(window->HeadLabel),INSTALL_ADDITION_PACKAGE_TITLE_LABEL); gtk_label_set_markup(GTK_LABEL(window->HeadLabel),INSTALL_ADDITION_PACKAGE_TITLE_LABEL);
} }
} }
gtk_label_set_markup(GTK_LABEL(window->TopicLabel),action_text); gtk_label_set_markup(GTK_LABEL(window->TopicLabel),action_text);
gtk_widget_show(window->Window); gtk_widget_show(window->Window);
if (dict->first->next->next) {
yon_dictionary_free(dict->first->next->next);
dict->first->next->next=NULL;
}
yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window); yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window);
if (gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){ if (gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){
gtk_label_set_text(GTK_LABEL(window->HeadLabel),self==tab->update_package_button?UPDATE_ADDITION_PACKAGE_TITLE_LABEL:INSTALL_ADDITION_PACKAGE_TITLE_LABEL);
gtk_label_set_markup(GTK_LABEL(window->TopicLabel),ADDITION_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->name));
yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),self==tab->update_package_button?UPDATE_PACKAGE_TITLE_LABEL:INSTALL_PACKAGE_TITLE_LABEL,icon_path,"additions_dialog"); yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),self==tab->update_package_button?UPDATE_PACKAGE_TITLE_LABEL:INSTALL_PACKAGE_TITLE_LABEL,icon_path,"additions_dialog");
gtk_widget_hide(window->DependencesFrame); gtk_widget_hide(window->DependencesFrame);
gtk_box_set_child_packing(GTK_BOX(gtk_widget_get_parent(window->DependencesFrame)),gtk_widget_get_parent(gtk_widget_get_parent(window->TopicLabel)),1,1,0,GTK_PACK_START); gtk_box_set_child_packing(GTK_BOX(gtk_widget_get_parent(window->DependencesFrame)),gtk_widget_get_parent(gtk_widget_get_parent(window->TopicLabel)),1,1,0,GTK_PACK_START);
} else { } else {
yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),self==tab->update_package_button?UPDATE_PACKAGE_TITLE_LABEL:INSTALL_PACKAGE_TITLE_LABEL,icon_path,"dialog"); gtk_label_set_text(GTK_LABEL(window->HeadLabel),self==tab->update_package_button?UPDATE_PACKAGE_TITLE_LABEL:INSTALL_PACKAGE_TITLE_LABEL);
int size; gtk_label_set_markup(GTK_LABEL(window->TopicLabel),KERNEL_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->name));
config_str additions = yon_resource_open_file(kernels_addon_path,&size); if (self!=tab->update_package_button){
GtkTreeIter iter; yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),INSTALL_PACKAGE_TITLE_LABEL,icon_path,"dialog");
for (int i=0;i<tab->package_requirements_size;i++){ int size;
gtk_list_store_append(window->liststore1,&iter); config_str additions = yon_resource_open_file(kernels_addon_path,&size);
for (int j=1;j<size;j++){ GtkTreeIter iter;
int cur_size; for (int i=0;i<tab->package_requirements_size;i++){
config_str parsed = yon_char_parse(additions[j],&cur_size,";"); gtk_list_store_append(window->liststore1,&iter);
if (!strcmp(parsed[1],tab->package_requirements[i])) for (int j=1;j<size;j++){
gtk_list_store_set(window->liststore1,&iter,2,parsed[3],-1); int cur_size;
yon_char_parsed_free(parsed,cur_size); config_str parsed = yon_char_parse(additions[j],&cur_size,";");
if (!strcmp(parsed[1],tab->package_requirements[i]))
gtk_list_store_set(window->liststore1,&iter,2,parsed[3],-1);
yon_char_parsed_free(parsed,cur_size);
}
gtk_list_store_set(window->liststore1,&iter,0,1,1,tab->package_requirements[i],4,1,-1);
} }
gtk_list_store_set(window->liststore1,&iter,0,1,1,tab->package_requirements[i],4,1,-1); yon_char_parsed_free(additions,size);
} else {
gtk_widget_set_margin_start(gtk_widget_get_parent(window->TopicLabel),10);
gtk_box_set_spacing(GTK_BOX(gtk_widget_get_parent(window->TopicLabel)),25);
gtk_box_set_child_packing(GTK_BOX(gtk_widget_get_parent(window->DependencesFrame)),gtk_widget_get_parent(gtk_widget_get_parent(window->TopicLabel)),1,1,0,GTK_PACK_START);
yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),UPDATE_PACKAGE_TITLE_LABEL,icon_path,"update_dialog");
gtk_widget_hide(window->DependencesFrame);
} }
yon_char_parsed_free(additions,size);
} }
} }
@ -906,6 +935,9 @@ void on_module_remove_clicked(GtkWidget *self,dictionary *dict){
kernels_tab *tab = yon_dictionary_get_data(dict->first->next,kernels_tab*); kernels_tab *tab = yon_dictionary_get_data(dict->first->next,kernels_tab*);
int size; int size;
config_str cnf = yon_config_load(SAVE_MODE_GET_COMMAND,&size); config_str cnf = yon_config_load(SAVE_MODE_GET_COMMAND,&size);
if (!cnf){
cnf = yon_char_parsed_new(&size,"changes",NULL);
}
yon_char_remove_last_symbol(cnf[0],'\n'); yon_char_remove_last_symbol(cnf[0],'\n');
SAVE_MODE_TYPE type = yon_ubl_save_mode_get_type(cnf[0]); SAVE_MODE_TYPE type = yon_ubl_save_mode_get_type(cnf[0]);
int installed_kernels=0; int installed_kernels=0;
@ -942,7 +974,7 @@ void on_module_remove_clicked(GtkWidget *self,dictionary *dict){
action_text = ADDITION_MODULE_REMOVE_CONFIRMATION_LABEL(tab->name); action_text = ADDITION_MODULE_REMOVE_CONFIRMATION_LABEL(tab->name);
gtk_widget_hide(window->DependencesFrame); gtk_widget_hide(window->DependencesFrame);
gtk_box_set_child_packing(GTK_BOX(gtk_widget_get_parent(window->DependencesFrame)),gtk_widget_get_parent(gtk_widget_get_parent(window->TopicLabel)),1,1,0,GTK_PACK_START); gtk_box_set_child_packing(GTK_BOX(gtk_widget_get_parent(window->DependencesFrame)),gtk_widget_get_parent(gtk_widget_get_parent(window->TopicLabel)),1,1,0,GTK_PACK_START);
gtk_label_set_text(GTK_LABEL(window->HeadLabel),REMOVE_ADDITION_MODULE_TITLE_LABEL); gtk_label_set_markup(GTK_LABEL(window->HeadLabel),REMOVE_ADDITION_MODULE_TITLE_LABEL);
} else { } else {
yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),self==tab->update_package_button?UPDATE_MODULE_TITLE_LABEL:INSTALL_MODULE_TITLE_LABEL,icon_path,"dialog"); yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),self==tab->update_package_button?UPDATE_MODULE_TITLE_LABEL:INSTALL_MODULE_TITLE_LABEL,icon_path,"dialog");
gtk_label_set_text(GTK_LABEL(window->HeadLabel),REMOVE_MODULE_TITLE_LABEL); gtk_label_set_text(GTK_LABEL(window->HeadLabel),REMOVE_MODULE_TITLE_LABEL);
@ -986,7 +1018,7 @@ void on_module_remove_clicked(GtkWidget *self,dictionary *dict){
} }
yon_char_parsed_free(additions,size); yon_char_parsed_free(additions,size);
} }
gtk_label_set_text(GTK_LABEL(window->TopicLabel),action_text); gtk_label_set_markup(GTK_LABEL(window->TopicLabel),action_text);
} }
@ -1076,7 +1108,7 @@ void on_package_remove_clicked(GtkWidget *self,dictionary *dict){
} }
yon_char_parsed_free(additions,size); yon_char_parsed_free(additions,size);
} }
gtk_label_set_text(GTK_LABEL(window->TopicLabel),action_text); gtk_label_set_markup(GTK_LABEL(window->TopicLabel),action_text);
} }
@ -1088,7 +1120,7 @@ void on_launch_cliked(GtkWidget *self,dictionary *dict){
data->function = NULL; data->function = NULL;
data->data = NULL; data->data = NULL;
if (yon_confirmation_dialog_call(self,data) == GTK_RESPONSE_ACCEPT){ if (yon_confirmation_dialog_call(self,data) == GTK_RESPONSE_ACCEPT){
yon_config_set(KERNEL_BOOT_parameter,tab->package); yon_config_register(KERNEL_BOOT_parameter,KERNEL_BOOT_command,tab->package);
on_update_clicked(NULL,widgets); on_update_clicked(NULL,widgets);
} }
@ -1252,6 +1284,14 @@ additions_kernels_tab *yon_additions_tab_row_new(GtkListBox *target, char *targe
g_signal_connect(G_OBJECT(tab->module_label),"activate-link",G_CALLBACK(on_info_clicked),tab); g_signal_connect(G_OBJECT(tab->module_label),"activate-link",G_CALLBACK(on_info_clicked),tab);
g_signal_connect(G_OBJECT(tab->package_label),"activate-link",G_CALLBACK(on_info_clicked),tab); g_signal_connect(G_OBJECT(tab->package_label),"activate-link",G_CALLBACK(on_info_clicked),tab);
if(getuid()){
gtk_widget_set_sensitive(tab->launch_button,0);
gtk_widget_set_sensitive(tab->remove_module_button,0);
gtk_widget_set_sensitive(tab->install_module_button,0);
gtk_widget_set_sensitive(tab->remove_package_button,0);
gtk_widget_set_sensitive(tab->install_package_button,0);
}
gtk_list_box_insert(target,tab->main_box,-1); gtk_list_box_insert(target,tab->main_box,-1);
tab->name = yon_char_new(parsed[0]); tab->name = yon_char_new(parsed[0]);
@ -1532,6 +1572,8 @@ void yon_main_window_complete(main_window *widgets){
// yon_gtk_scrolled_window_set_horizontal_at_desired_size(widgets->Window,GTK_SCROLLED_WINDOW(gtk_widget_get_parent(gtk_widget_get_parent(widgets->KernelsPackageBox)))); // yon_gtk_scrolled_window_set_horizontal_at_desired_size(widgets->Window,GTK_SCROLLED_WINDOW(gtk_widget_get_parent(gtk_widget_get_parent(widgets->KernelsPackageBox))));
// yon_gtk_scrolled_window_set_horizontal_at_desired_size(widgets->Window,GTK_SCROLLED_WINDOW(gtk_widget_get_parent(gtk_widget_get_parent(widgets->AdditionsPackageBox)))); // yon_gtk_scrolled_window_set_horizontal_at_desired_size(widgets->Window,GTK_SCROLLED_WINDOW(gtk_widget_get_parent(gtk_widget_get_parent(widgets->AdditionsPackageBox))));
char *path = yon_char_unite(yon_ubl_user_get_home_directory(),"/.config/",LocaleName,"/",LocaleName,".conf",NULL);
yon_window_config_load(path);
int paned_pos=0; int paned_pos=0;
if (yon_window_config_get_parameter("settings","paned_pos",&paned_pos,YON_TYPE_INT)) { if (yon_window_config_get_parameter("settings","paned_pos",&paned_pos,YON_TYPE_INT)) {
gtk_paned_set_position(GTK_PANED(widgets->TerminalPaned),paned_pos); gtk_paned_set_position(GTK_PANED(widgets->TerminalPaned),paned_pos);
@ -1565,7 +1607,6 @@ int main(int argc, char *argv[]){
local=setlocale(LC_ALL, ""); local=setlocale(LC_ALL, "");
textdomain (LocaleName); textdomain (LocaleName);
config_init(); config_init();
yon_ubl_connect_config((_template_config*)&main_config); yon_ubl_connect_config((_template_config*)&main_config);
yon_ubl_window_init(TITLE_LABEL,TITLE_INFO_LABEL,LocaleName,CssPath,LocaleName,version_application,WIKI_LINK); yon_ubl_window_init(TITLE_LABEL,TITLE_INFO_LABEL,LocaleName,CssPath,LocaleName,version_application,WIKI_LINK);
config_str unfound = NULL; config_str unfound = NULL;
@ -1574,8 +1615,6 @@ int main(int argc, char *argv[]){
gtk_init(&argc,&argv); gtk_init(&argc,&argv);
template_main_window *widgets = yon_ubl_window_setup(); template_main_window *widgets = yon_ubl_window_setup();
yon_main_window_complete((main_window*)widgets); yon_main_window_complete((main_window*)widgets);
char *path = yon_char_unite(yon_ubl_user_get_home_directory(),"/.config/",LocaleName,"/",LocaleName,".conf",NULL);
yon_window_config_load(path);
main_config.launch_arguments=yon_char_parsed_copy(argv,argc); main_config.launch_arguments=yon_char_parsed_copy(argv,argc);
main_config.launch_size=argc; main_config.launch_size=argc;
if (getuid()!=0){ if (getuid()!=0){

1
source/ubl-settings-kernel.h
Unescape View File

@ -69,6 +69,7 @@
#define config_get_local_only_parameters "" #define config_get_local_only_parameters ""
#define KERNEL_BOOT_parameter "KERNEL_BOOT" #define KERNEL_BOOT_parameter "KERNEL_BOOT"
#define KERNEL_BOOT_command "ubconfig --source global get boot KERNEL_BOOT"
typedef char* string; typedef char* string;
string version_application; string version_application;

24
source/ubl-strings.h
Unescape View File

@ -65,19 +65,19 @@
#define OPERATION_IN_PROGRESS_LABEL _("Terminal operation in process") #define OPERATION_IN_PROGRESS_LABEL _("Terminal operation in process")
#define PACKAGE_REMOVED_BUT_NOT_DISABLED_LABEL _("The package with the module has been removed, but the module is not disabled from the system, as it is used by other system programs. After rebooting, the module will be disabled and removed.") #define PACKAGE_REMOVED_BUT_NOT_DISABLED_LABEL _("The package with the module has been removed, but the module is not disabled from the system, as it is used by other system programs. After rebooting, the module will be disabled and removed.")
#define KERNEL_MODULE_INSTALL_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to install kernel module")," ",target,"?",NULL) #define KERNEL_MODULE_INSTALL_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to install kernel module")," <b>",target,"</b>?",NULL)
#define KERNEL_PACKAGE_INSTALL_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to install kernel package")," ",target,"?\n<i>",KERNEL_PACKAGE_INSTALL_ATTENTION_LABEL,"</i>",NULL) #define KERNEL_PACKAGE_INSTALL_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to install kernel package")," <b>",target,"</b>?\n<i>",KERNEL_PACKAGE_INSTALL_ATTENTION_LABEL,"</i>",NULL)
#define KERNEL_MODULE_UPDATE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to update kernel module")," ",target,"?",NULL) #define KERNEL_MODULE_UPDATE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to update kernel module")," <b>",target,"</b>?",NULL)
#define KERNEL_PACKAGE_UPDATE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to update kernel package")," ",target,"?",NULL) #define KERNEL_PACKAGE_UPDATE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to update kernel package")," <b>",target,"</b>?",NULL)
#define KERNEL_MODULE_REMOVE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to remove kernel module")," ",target,"?",NULL) #define KERNEL_MODULE_REMOVE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to remove kernel module")," <b>",target,"</b>?",NULL)
#define KERNEL_REMOVE_LAST_CONFIRMATION_LABEL(target) yon_char_unite(_("The kernel is the only one in the system. If you remove it, it will become impossible to boot. Do you really want to remove")," ",target,"?",NULL) #define KERNEL_REMOVE_LAST_CONFIRMATION_LABEL(target) yon_char_unite(_("The kernel is the only one in the system. If you remove it, it will become impossible to boot. Do you really want to remove")," ",target,"?",NULL)
#define KERNEL_PACKAGE_REMOVE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to remove kernel package")," ",target,"?",NULL) #define KERNEL_PACKAGE_REMOVE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to remove kernel package")," <b>",target,"</b>?",NULL)
#define ADDITION_MODULE_INSTALL_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to install module with addition package")," ",target,"?",NULL) #define ADDITION_MODULE_INSTALL_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to install module with addition package")," <b>",target,"</b>?",NULL)
#define ADDITION_PACKAGE_INSTALL_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to install addition package")," ",target,"?",NULL) #define ADDITION_PACKAGE_INSTALL_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to install addition package")," <b>",target,"</b>?",NULL)
#define ADDITION_MODULE_UPDATE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to update kernel addition module")," ",target,"?",NULL) #define ADDITION_MODULE_UPDATE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to update kernel addition module")," <b>",target,"</b>?",NULL)
#define ADDITION_PACKAGE_UPDATE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to update kernel addition package")," ",target,"?",NULL) #define ADDITION_PACKAGE_UPDATE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to update kernel addition package")," <b>",target,"</b>?",NULL)
#define ADDITION_MODULE_REMOVE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to remove kernel addition module")," ",target,"?",NULL) #define ADDITION_MODULE_REMOVE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to remove kernel addition module")," <b>",target,"</b>?",NULL)
#define ADDITION_PACKAGE_REMOVE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to remove kernel addition package")," ",target,"?",NULL) #define ADDITION_PACKAGE_REMOVE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to remove kernel addition package")," <b>",target,"</b>?",NULL)
#define LAUNCH_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to launch")," ",target," ",_("for boot?\n\nChanges will be applied after system restart"),NULL) #define LAUNCH_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to launch")," ",target," ",_("for boot?\n\nChanges will be applied after system restart"),NULL)
#define UPDATE_MODULE_LABEL _("Update module") #define UPDATE_MODULE_LABEL _("Update module")

2
ubl-settings-kernel-additions-table-row.glade
Unescape View File

@ -95,6 +95,7 @@
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Module</property> <property name="label" translatable="yes">Module</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="track-visited-links">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
</object> </object>
<packing> <packing>
@ -135,6 +136,7 @@
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Package</property> <property name="label" translatable="yes">Package</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="track-visited-links">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
</object> </object>
<packing> <packing>

4
ubl-settings-kernel_ru.po
Unescape View File

@ -227,11 +227,11 @@ msgstr "Вы хотите установить в систему пакет с
#: source/ubl-strings.h:66 #: source/ubl-strings.h:66
msgid "Are you sure want to update kernel module" msgid "Are you sure want to update kernel module"
msgstr "Вы хотите обновить пакет с модулем ядра" msgstr "Вы действительно хотите обновить пакет с модулем ядра"
#: source/ubl-strings.h:67 #: source/ubl-strings.h:67
msgid "Are you sure want to update kernel package" msgid "Are you sure want to update kernel package"
msgstr "Вы действительно хотите обновить пакет с ядром " msgstr "Вы действительно хотите обновить пакет с ядром"
#: source/ubl-strings.h:68 #: source/ubl-strings.h:68
msgid "Are you sure want to remove kernel module" msgid "Are you sure want to remove kernel module"

Write Preview
Loading…
Cancel
Save