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

Reviewed-on: #79
pull/105/head^2
Dmitry Razumov 6 months ago
commit 4c6d9fd9d4

@ -380,8 +380,14 @@ void *yon_interface_update(main_window *widgets){
int kernels_size;
config_str kernels = yon_resource_open_file(kernels_path, &kernels_size);
yon_packages_init();
for (int i=1;i<kernels_size;i++){
int parsed_size;
config_str parsed = yon_char_parse(kernels[i],&parsed_size,";");
if (!yon_packages_check_exist(parsed[1])&&!yon_packages_check_exist(parsed[2])){
yon_char_parsed_free(parsed,parsed_size);
continue;
}
kernels_tab *tab = yon_tab_row_new(GTK_LIST_BOX(widgets->KernelsPackageBox),kernels[i],widgets);
g_thread_new("tags_install_tread",(GThreadFunc)yon_tab_set_installed,tab);
{
@ -395,6 +401,12 @@ void *yon_interface_update(main_window *widgets){
yon_char_parsed_free(kernels,kernels_size);
kernels = yon_resource_open_file(kernels_addon_path, &kernels_size);
for (int i=1;i<kernels_size;i++){
int parsed_size;
config_str parsed = yon_char_parse(kernels[i],&parsed_size,";");
if (!yon_packages_check_exist(parsed[1])&&!yon_packages_check_exist(parsed[2])){
yon_char_parsed_free(parsed,parsed_size);
continue;
}
additions_kernels_tab *tab = yon_additions_tab_row_new(GTK_LIST_BOX(widgets->AdditionsPackageBox),kernels[i],widgets);
GThread *thr = g_thread_new("tags_install_tread",(GThreadFunc)yon_tab_set_installed,tab);
if (i+1==kernels_size) {
@ -418,6 +430,7 @@ void *yon_interface_update(main_window *widgets){
}
gtk_widget_set_can_focus(gtk_widget_get_parent(tab->main_box),0);
}
yon_packages_finish():
}
return NULL;
}
@ -1584,12 +1597,12 @@ 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->AdditionsPackageBox))));
char *path = yon_char_unite(yon_ubl_user_get_home_directory(),"/.config/",LocaleName,"/",LocaleName,".conf",NULL);
yon_window_config_load(path);
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;
if (yon_window_config_get_parameter("settings","paned_pos",&paned_pos,YON_TYPE_INT)) {
gtk_paned_set_position(GTK_PANED(widgets->TerminalPaned),paned_pos);
}
if (yon_window_config_get_parameter("settings","paned_pos",&paned_pos,YON_TYPE_INT)) {
gtk_paned_set_position(GTK_PANED(widgets->TerminalPaned),paned_pos);
}
yon_root_button_setup((template_main_window*)widgets,main_config.launch_arguments,main_config.launch_size);
if (getuid()){

@ -6,12 +6,12 @@
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">com.ublinux.libublsettingsui-gtk.update-cloud-symbolic</property>
<property name="icon-name">com.ublinux.libublsettingsui-gtk3.update-cloud-symbolic</property>
</object>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">com.ublinux.libublsettingsui-gtk.update-cloud-symbolic</property>
<property name="icon-name">com.ublinux.libublsettingsui-gtk3.update-cloud-symbolic</property>
</object>
<object class="GtkBox" id="TableRowLabel">
<property name="can-focus">False</property>

@ -6,12 +6,12 @@
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">com.ublinux.libublsettingsui-gtk.update-cloud-symbolic</property>
<property name="icon-name">com.ublinux.libublsettingsui-gtk3.update-cloud-symbolic</property>
</object>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">com.ublinux.libublsettingsui-gtk.update-cloud-symbolic</property>
<property name="icon-name">com.ublinux.libublsettingsui-gtk3.update-cloud-symbolic</property>
</object>
<object class="GtkBox" id="TableRowLabel">
<property name="can-focus">False</property>

Loading…
Cancel
Save