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

Reviewed-on: #68
pull/79/head v2.10
Dmitry Razumov 9 months ago
commit 57a70b1245

@ -267,6 +267,8 @@ gboolean yon_tab_create_tags(kernels_tab *tab){
else if (launched&&(strcmp(tab->package,launched))&&(boot_run&&boot_run[0]&&!strcmp(tab->package,boot_run[0]))){
gtk_widget_show(tab->launch_button);
yon_tag_add(GTK_BOX(tab->install_tags_box),RUNNING_LABEL,"tag_green",NULL);
} else if (!launched){
gtk_widget_show(tab->launch_button);
} else {
gtk_widget_hide(tab->launch_button);
if(!getuid()){
@ -857,7 +859,7 @@ void on_package_install_clicked(GtkWidget *self,dictionary *dict){
char *action_text = NULL;
dialog_window *window = yon_dialog_window_new();
g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(on_package_install_accept),dict);
gtk_tree_view_column_set_title(GTK_TREE_VIEW_COLUMN(gtk_tree_view_get_column(GTK_TREE_VIEW(window->DependencesTree),1)),PACKAGE_TAB_LABEL);
if (self == tab->update_package_button){
if (!gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){
action_text = KERNEL_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->name);
@ -892,7 +894,7 @@ void on_package_install_clicked(GtkWidget *self,dictionary *dict){
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 {
gtk_label_set_text(GTK_LABEL(window->HeadLabel),self==tab->update_package_button?UPDATE_PACKAGE_TITLE_LABEL:INSTALL_PACKAGE_TITLE_LABEL);
gtk_label_set_markup(GTK_LABEL(window->TopicLabel),KERNEL_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->name));
gtk_label_set_markup(GTK_LABEL(window->TopicLabel),self==tab->update_package_button?KERNEL_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->name):KERNEL_PACKAGE_INSTALL_CONFIRMATION_LABEL(tab->name));
if (self!=tab->update_package_button){
yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),INSTALL_PACKAGE_TITLE_LABEL,icon_path,"dialog");
int size;
@ -903,7 +905,7 @@ void on_package_install_clicked(GtkWidget *self,dictionary *dict){
for (int j=1;j<size;j++){
int cur_size;
config_str parsed = yon_char_parse(additions[j],&cur_size,";");
if (!strcmp(parsed[1],tab->package_requirements[i]))
if (!strcmp(parsed[2],tab->package_requirements[i]))
gtk_list_store_set(window->liststore1,&iter,2,parsed[3],-1);
yon_char_parsed_free(parsed,cur_size);
}
@ -990,8 +992,10 @@ void on_module_remove_clicked(GtkWidget *self,dictionary *dict){
char *target_depends = yon_package_dependent_get(tab->module);
if (target_depends&&strcmp(target_depends,tab->package)&&strstr(target_depends," ")){
free(yon_char_divide_search(target_depends," ",-1));
char *final = yon_char_replace(target_depends," ","\n");
gtk_list_store_append(window->liststore1,&itar);
gtk_list_store_set(window->liststore1,&itar,0,1,1,target_depends,-1);
free(final);
}
for (int i=0;i<tab->module_requirements_size;i++){
if (!system(get_package_is_installed_command(tab->module_requirements[i]))){
@ -1049,6 +1053,7 @@ void on_package_remove_clicked(GtkWidget *self,dictionary *dict){
}
dialog_window *window = yon_dialog_window_new();
gtk_tree_view_column_set_title(GTK_TREE_VIEW_COLUMN(gtk_tree_view_get_column(GTK_TREE_VIEW(window->DependencesTree),1)),PACKAGE_TAB_LABEL);
if (dict->first->next->next){
dict=dict->first;
free(dict->first->next->next);
@ -1080,8 +1085,10 @@ void on_package_remove_clicked(GtkWidget *self,dictionary *dict){
char *target_depends = yon_package_dependent_get(tab->package);
if (target_depends&&strcmp(target_depends,tab->package)){
free(yon_char_divide_search(target_depends," ",-1));
char *final = yon_char_replace(target_depends," ","\n");
gtk_list_store_append(window->liststore1,&itar);
gtk_list_store_set(window->liststore1,&itar,0,1,1,target_depends,-1);
gtk_list_store_set(window->liststore1,&itar,0,1,1,final,-1);
free(final);
}
config_str additions = yon_resource_open_file(kernels_addon_path,&size);
for (int i=0;i<tab->module_requirements_size;i++){

@ -78,7 +78,7 @@
#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")," <b>",target,"</b>?",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")," <b>",target,"</b> ",_("for boot?\n\nChanges will be applied after system restart"),NULL)
#define UPDATE_MODULE_LABEL _("Update module")
#define UPDATE_PACKAGE_LABEL _("Update package")

@ -18,6 +18,8 @@
</columns>
</object>
<object class="GtkApplicationWindow" id="MainWindow">
<property name="width-request">550</property>
<property name="height-request">350</property>
<property name="can-focus">False</property>
<property name="modal">True</property>
<property name="default-height">1</property>

Loading…
Cancel
Save