diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index 5b2eb97..49d8ff1 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -685,7 +685,6 @@ void on_module_install_clicked(GtkWidget *self,dictionary *dict){ kernels_tab *tab = yon_dictionary_get_data(dict->first->next,kernels_tab*); char *action_text = NULL; dialog_window *window = yon_dialog_window_new(); - 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_dictionary_add_or_create_if_exists_with_data(dict,"window",window); g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(on_module_install_accept),dict); @@ -700,9 +699,11 @@ void on_module_install_clicked(GtkWidget *self,dictionary *dict){ } } else { 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"); action_text = KERNEL_MODULE_INSTALL_CONFIRMATION_LABEL(tab->name); gtk_label_set_text(GTK_LABEL(window->HeadLabel),INSTALL_MODULE_TITLE_LABEL); } 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"); action_text = ADDITION_MODULE_INSTALL_CONFIRMATION_LABEL(tab->name); gtk_label_set_text(GTK_LABEL(window->HeadLabel),INSTALL_ADDITION_MODULE_TITLE_LABEL); } @@ -713,7 +714,7 @@ void on_module_install_clicked(GtkWidget *self,dictionary *dict){ yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window); if (gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){ 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 { int size; config_str additions = yon_resource_open_file(kernels_addon_path,&size); @@ -737,14 +738,15 @@ void on_package_install_clicked(GtkWidget *self,dictionary *dict){ kernels_tab *tab = yon_dictionary_get_data(dict->first->next,kernels_tab*); char *action_text = NULL; dialog_window *window = yon_dialog_window_new(); - 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"); g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(on_package_install_accept),dict); if (self == tab->update_module_button){ 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_PACKAGE_TITLE_LABEL:INSTALL_PACKAGE_TITLE_LABEL,icon_path,"dialog"); action_text = KERNEL_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->name); gtk_label_set_text(GTK_LABEL(window->HeadLabel),UPDATE_PACKAGE_TITLE_LABEL); } 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,"additions_dialog"); action_text = ADDITION_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->name); gtk_label_set_text(GTK_LABEL(window->HeadLabel),UPDATE_ADDITION_PACKAGE_TITLE_LABEL); } @@ -764,7 +766,7 @@ void on_package_install_clicked(GtkWidget *self,dictionary *dict){ if (gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){ 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 { int size; config_str additions = yon_resource_open_file(kernels_addon_path,&size); @@ -819,7 +821,6 @@ void on_module_remove_clicked(GtkWidget *self,dictionary *dict){ } char *action_text = NULL; dialog_window *window = yon_dialog_window_new(); - 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"); if (dict->first->next->next){ dict=dict->first; free(dict->first->next->next); @@ -831,11 +832,13 @@ void on_module_remove_clicked(GtkWidget *self,dictionary *dict){ gtk_widget_show(window->Window); if (gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){ - action_text = KERNEL_MODULE_REMOVE_CONFIRMATION_LABEL(tab->name); + 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"); + action_text = ADDITION_MODULE_REMOVE_CONFIRMATION_LABEL(tab->name); 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); } 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"); gtk_label_set_text(GTK_LABEL(window->HeadLabel),REMOVE_MODULE_TITLE_LABEL); action_text = ADDITION_MODULE_REMOVE_CONFIRMATION_LABEL(tab->name); if (installed_kernels>1){ @@ -890,7 +893,6 @@ void on_package_remove_clicked(GtkWidget *self,dictionary *dict){ } dialog_window *window = yon_dialog_window_new(); - 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"); if (dict->first->next->next){ dict=dict->first; free(dict->first->next->next); @@ -903,16 +905,18 @@ void on_package_remove_clicked(GtkWidget *self,dictionary *dict){ gtk_widget_show(window->Window); if (gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){ - action_text = KERNEL_PACKAGE_REMOVE_CONFIRMATION_LABEL(tab->name); + 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"); + action_text = ADDITION_PACKAGE_REMOVE_CONFIRMATION_LABEL(tab->name); gtk_label_set_text(GTK_LABEL(window->HeadLabel),REMOVE_ADDITION_PACKAGE_TITLE_LABEL); 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 { - if (installed_kernels>1){ - action_text = ADDITION_PACKAGE_REMOVE_CONFIRMATION_LABEL(tab->name); - } else if (installed_kernels==1){ - action_text = KERNEL_REMOVE_LAST_CONFIRMATION_LABEL(tab->name); - } + if (installed_kernels>1){ + action_text = KERNEL_PACKAGE_REMOVE_CONFIRMATION_LABEL(tab->name); + } else if (installed_kernels==1){ + action_text = KERNEL_REMOVE_LAST_CONFIRMATION_LABEL(tab->name); + } + 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_PACKAGE_TITLE_LABEL); int size; diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 607ae2d..acf1461 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -68,8 +68,8 @@ #define KERNEL_MODULE_REMOVE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to remove kernel module")," ",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 ADDITION_MODULE_INSTALL_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to install kernel addition package")," ",target,"?",NULL) -#define ADDITION_PACKAGE_INSTALL_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to install kernel addition package")," ",target,"?",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_PACKAGE_INSTALL_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to install addition package")," ",target,"?",NULL) #define ADDITION_MODULE_UPDATE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to update kernel addition module")," ",target,"?",NULL) #define ADDITION_PACKAGE_UPDATE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to update kernel addition package")," ",target,"?",NULL) #define ADDITION_MODULE_REMOVE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to remove kernel addition module")," ",target,"?",NULL) diff --git a/ubl-settings-kernel-dialog.glade b/ubl-settings-kernel-dialog.glade index 3044e7f..bf2774c 100644 --- a/ubl-settings-kernel-dialog.glade +++ b/ubl-settings-kernel-dialog.glade @@ -14,9 +14,9 @@ - 400 False True + 1 com.ublinux.ubl-settings-repomanager @@ -155,7 +155,7 @@ - True + False True 1 diff --git a/ubl-settings-kernel.pot b/ubl-settings-kernel.pot index 6480b60..e9ddf1b 100644 --- a/ubl-settings-kernel.pot +++ b/ubl-settings-kernel.pot @@ -243,8 +243,12 @@ msgstr "" msgid "Are you sure want to remove kernel package" msgstr "" -#: source/ubl-strings.h:71 source/ubl-strings.h:72 -msgid "Are you sure want to install kernel addition package" +#: source/ubl-strings.h:71 +msgid "Are you sure want to install module with addition package" +msgstr "" + +source/ubl-strings.h:72 +msgid "Are you sure want to install addition package" msgstr "" #: source/ubl-strings.h:73 diff --git a/ubl-settings-kernel_ru.po b/ubl-settings-kernel_ru.po index 098a5d6..dda5b43 100644 --- a/ubl-settings-kernel_ru.po +++ b/ubl-settings-kernel_ru.po @@ -249,10 +249,14 @@ msgstr "" msgid "Are you sure want to remove kernel package" msgstr "Вы действительно хотите удалить из системы пакет с ядром" -#: source/ubl-strings.h:71 source/ubl-strings.h:72 -msgid "Are you sure want to install kernel addition package" +#: source/ubl-strings.h:71 +msgid "Are you sure want to install module with addition package" msgstr "Вы хотите установить в систему пакет с модулем дополнения" +#: source/ubl-strings.h:72 +msgid "Are you sure want to install addition package" +msgstr "Вы хотите установить в систему пакет с дополнением" + #: source/ubl-strings.h:73 msgid "Are you sure want to update kernel addition module" msgstr "Вы хотите обновить пакет с модулем дополнения"