master #353

Merged
asmeron merged 2 commits from YanTheKaller/ubinstall-gtk:master into master 1 month ago

@ -813,6 +813,10 @@ msgstr ""
msgid "Package information" msgid "Package information"
msgstr "" msgstr ""
#: source/ubl-strings.h:230
msgid "Module information"
msgstr ""
#: source/ubl-strings.h:231 #: source/ubl-strings.h:231
msgid "Yes, I agree to the License Agreement" msgid "Yes, I agree to the License Agreement"
msgstr "" msgstr ""

@ -837,6 +837,10 @@ msgstr "Пакеты не найдены"
msgid "Package information" msgid "Package information"
msgstr "Информация о пакете" msgstr "Информация о пакете"
#: source/ubl-strings.h:230
msgid "Module information"
msgstr "Информация о модуле"
#: source/ubl-strings.h:231 #: source/ubl-strings.h:231
msgid "Yes, I agree to the License Agreement" msgid "Yes, I agree to the License Agreement"
msgstr "Да, я согласен с лицензионным соглашением" msgstr "Да, я согласен с лицензионным соглашением"

@ -20,9 +20,9 @@ int yon_kernel_save(main_window *widgets){
yon_config_append_elements(packages_parameter,append_str,","); yon_config_append_elements(packages_parameter,append_str,",");
free(append_str); free(append_str);
active_size++; active_size++;
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->EnableRadio))){ }
enabled_module = row->package; if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->EnableRadio))){
} enabled_module = row->package;
} }
} else { } else {
char *append_str = yon_char_replace(row->modules," ",","); char *append_str = yon_char_replace(row->modules," ",",");

@ -244,7 +244,7 @@ void yon_kernel_init(main_window *widgets){
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->InstallCheck),1); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->InstallCheck),1);
gtk_widget_set_sensitive(row->InstallCheck,0); gtk_widget_set_sensitive(row->InstallCheck,0);
} }
if (!yon_char_is_empty(enabled)&&!strcmp(package,enabled)){ if (!yon_char_is_empty(enabled)&&(!strcmp(package,enabled)||yon_char_check_element(modules,enabled," "))){
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->EnableRadio),1); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->EnableRadio),1);
} }
yon_char_parsed_free(parsed,parsed_size); yon_char_parsed_free(parsed,parsed_size);
@ -291,9 +291,9 @@ info_element *yon_package_info_element_new(){
return element; return element;
} }
void on_kernel_addon_info(GtkLabel *self){ void on_kernel_addon_info(GtkLabel *self, kernel_addon_row *row){
yon_window *window = yon_window_new(); yon_window *window = yon_window_new();
yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,PACKAGE_INFO_LABEL,icon_path,"info-label"); yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,(GtkWidget*)self==row->PackageLabel?PACKAGE_INFO_LABEL:MODULE_INFO_LABEL,icon_path,"info-label");
char *package=NULL; char *package=NULL;
package = yon_char_new(gtk_label_get_text(self)); package = yon_char_new(gtk_label_get_text(self));
int size=0; int size=0;
@ -354,8 +354,8 @@ kernel_addon_row *yon_kernel_addon_row_new(){
row->package=NULL; row->package=NULL;
g_signal_connect(G_OBJECT(row->InstallCheck),"toggled",G_CALLBACK(on_kernel_addon_install_enabled),row); g_signal_connect(G_OBJECT(row->InstallCheck),"toggled",G_CALLBACK(on_kernel_addon_install_enabled),row);
g_signal_connect(G_OBJECT(row->ModuleLabel),"activate-link",G_CALLBACK(on_kernel_addon_info),NULL); g_signal_connect(G_OBJECT(row->ModuleLabel),"activate-link",G_CALLBACK(on_kernel_addon_info),row);
g_signal_connect(G_OBJECT(row->PackageLabel),"activate-link",G_CALLBACK(on_kernel_addon_info),NULL); g_signal_connect(G_OBJECT(row->PackageLabel),"activate-link",G_CALLBACK(on_kernel_addon_info),row);
g_signal_connect(G_OBJECT(row->PackageLabel),"button-press-event",G_CALLBACK(on_kernel_addon_menu_block),row); g_signal_connect(G_OBJECT(row->PackageLabel),"button-press-event",G_CALLBACK(on_kernel_addon_menu_block),row);
g_signal_connect(G_OBJECT(row->ModuleLabel),"button-press-event",G_CALLBACK(on_kernel_addon_menu_block),row); g_signal_connect(G_OBJECT(row->ModuleLabel),"button-press-event",G_CALLBACK(on_kernel_addon_menu_block),row);

@ -1470,7 +1470,7 @@ void *yon_maximize(main_window *widgets);
kernel_addon_row *yon_kernel_addon_row_new(); kernel_addon_row *yon_kernel_addon_row_new();
void yon_kernel_addon_row_setup(kernel_addon_row *row, char *name, char *modules, char *package, char *description); void yon_kernel_addon_row_setup(kernel_addon_row *row, char *name, char *modules, char *package, char *description);
void on_kernel_addon_install_enabled(GtkWidget *, kernel_addon_row *row); void on_kernel_addon_install_enabled(GtkWidget *, kernel_addon_row *row);
void on_kernel_addon_info(GtkLabel *self); void on_kernel_addon_info(GtkLabel *self, kernel_addon_row *row);
void yon_license_init(main_window *widgets); void yon_license_init(main_window *widgets);
void on_locale_toggle(GtkCellRenderer *, gchar *path, language_window *window); void on_locale_toggle(GtkCellRenderer *, gchar *path, language_window *window);
void on_locale_accept(GtkWidget *self, language_window *window); void on_locale_accept(GtkWidget *self, language_window *window);

@ -220,6 +220,7 @@ NULL)
#define ROOT_FORCE_CONFIGURATION_MODE_LABEL _("Warning! Application was launched without root. Only configuration mode is allowed.") #define ROOT_FORCE_CONFIGURATION_MODE_LABEL _("Warning! Application was launched without root. Only configuration mode is allowed.")
#define PACKAGE_NOT_FOUND_LABEL _("Package were not found") #define PACKAGE_NOT_FOUND_LABEL _("Package were not found")
#define PACKAGE_INFO_LABEL _("Package information") #define PACKAGE_INFO_LABEL _("Package information")
#define MODULE_INFO_LABEL _("Module information")
#define LICENCE_AGREE_LABEL _("Yes, I agree to the License Agreement") #define LICENCE_AGREE_LABEL _("Yes, I agree to the License Agreement")
#define LICENCE_DISAGREE_LABEL _("No, I do not agree") #define LICENCE_DISAGREE_LABEL _("No, I do not agree")
#define ADD_LANGUAGE_TITLE_LABEL _("Add locales") #define ADD_LANGUAGE_TITLE_LABEL _("Add locales")

Loading…
Cancel
Save