diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index 34d7b23..ea75fbb 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -394,16 +394,6 @@ void *yon_interface_update(main_window *widgets){ g_thread_new("tags_install_tread",(GThreadFunc)yon_tab_set_installed,tab); gtk_widget_set_can_focus(gtk_widget_get_parent(tab->main_box),0); } - textdomain(template_ui_LocaleName); - switch (main_config.load_mode){ - case 0: yon_ubl_status_box_render(GLOBAL_LOAD_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); - break; - case 1: yon_ubl_status_box_render(LOCAL_LOAD_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); - break; - case 3: yon_ubl_status_box_render(LOCAL_LOAD_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); - break; - } - textdomain(LocaleName); } return NULL; } @@ -477,6 +467,7 @@ int yon_tag_add(GtkBox *target,char *tag_label, char *tag_style, char *icon_name } gboolean on_command_execute_success(GtkWidget *,gint status,main_window *widgets){ + // gtk_revealer_set_reveal_child(GTK_REVEALER(widgets->MainRevealer),0); g_mutex_lock(&main_config.progress_mutex); main_config.progress_active=0; g_mutex_unlock(&main_config.progress_mutex); @@ -505,6 +496,24 @@ gboolean on_command_execute_success(GtkWidget *,gint status,main_window *widgets 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); + + int pos = gtk_paned_get_position(GTK_PANED(widgets->TerminalPaned)); + yon_window_config_add_instant_parameter("paned_pos","settings",&pos,YON_TYPE_INT); + + GValue val = G_VALUE_INIT; + g_object_get_property(G_OBJECT(widgets->TerminalPaned),"max-position",&val); + gtk_paned_set_position(GTK_PANED(widgets->TerminalPaned),g_value_get_int(&val)); + g_value_unset(&val); + + g_object_ref(widgets->MainNotebook); + gtk_container_remove(GTK_CONTAINER(widgets->TerminalPaned),widgets->MainNotebook); + gtk_box_pack_start(GTK_BOX(gtk_widget_get_parent(widgets->TerminalPaned)),widgets->MainNotebook,1,1,0); + + gtk_box_reorder_child(GTK_BOX(gtk_widget_get_parent(widgets->MainNotebook)),widgets->MainNotebook,0); + gtk_widget_hide(widgets->TerminalPaned); + } return G_SOURCE_REMOVE; } @@ -583,6 +592,7 @@ void *yon_command_execute_async(char *command,main_window *widgets){ gtk_widget_set_sensitive(((kernels_tab*)dict->data)->remove_package_button,0); } } + on_terminal_revealer_open(NULL,widgets); return NULL; } @@ -594,7 +604,7 @@ void on_module_install_accept(GtkWidget *, dictionary *dict){ dict->first->next->next = NULL; char *module_formated = yon_package_string_set(tab->module); char *modules_to_install = NULL; - if (!tab->module_updated) modules_to_install = yon_char_unite(module_formated, " ", yon_package_string_set(tab->package), NULL); + if (!tab->module_updated) modules_to_install = module_formated; else modules_to_install = module_formated; GtkTreeIter iter; @@ -796,7 +806,7 @@ void on_module_install_clicked(GtkWidget *self,dictionary *dict){ int cur_size; config_str parsed = yon_char_parse(additions[j],&cur_size,";"); if (!strcmp(parsed[1],tab->module_requirements[i])) - gtk_list_store_set(window->liststore1,&iter,1,yon_char_unite(parsed[1],",",parsed[2],NULL),2,parsed[3],-1); + gtk_list_store_set(window->liststore1,&iter,1,parsed[1],2,parsed[3],-1); yon_char_parsed_free(parsed,cur_size); } } @@ -920,13 +930,19 @@ void on_module_remove_clicked(GtkWidget *self,dictionary *dict){ int size; config_str additions = yon_resource_open_file(kernels_addon_path,&size); GtkTreeIter itar; + char *target_depends = yon_package_dependent_get(tab->module); + if (target_depends&&strcmp(target_depends,tab->package)){ + free(yon_char_divide_search(target_depends," ",-1)); + gtk_list_store_append(window->liststore1,&itar); + gtk_list_store_set(window->liststore1,&itar,0,1,1,target_depends,-1); + } for (int i=0;imodule_requirements_size;i++){ if (!system(get_package_is_installed_command(tab->module_requirements[i]))){ for (int j=1;jmodule_requirements[i])){ - char *target = yon_char_unite(parsed[1],",",parsed[2],NULL); + char *target = parsed[1]; char *depends = yon_package_dependent_get(target); if (strcmp(depends,target)){ gtk_list_store_append(window->liststore1,&itar); @@ -1002,7 +1018,13 @@ void on_package_remove_clicked(GtkWidget *self,dictionary *dict){ gtk_label_set_text(GTK_LABEL(window->HeadLabel),REMOVE_PACKAGE_TITLE_LABEL); int size; - GtkTreeIter itar; + GtkTreeIter itar; + 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)); + gtk_list_store_append(window->liststore1,&itar); + gtk_list_store_set(window->liststore1,&itar,0,1,1,target_depends,-1); + } config_str additions = yon_resource_open_file(kernels_addon_path,&size); for (int i=0;imodule_requirements_size;i++){ if (!system(get_package_is_installed_command(tab->package_requirements[i]))){ @@ -1010,7 +1032,7 @@ void on_package_remove_clicked(GtkWidget *self,dictionary *dict){ int cur_size; config_str parsed = yon_char_parse(additions[j],&cur_size,";"); if (!strcmp(parsed[1],tab->module_requirements[i])){ - char *target = yon_char_unite(parsed[1],",",parsed[2],NULL); + char *target = parsed[2]; char *depends = yon_package_dependent_get(target); if (strcmp(depends,target)){ gtk_list_store_append(window->liststore1,&itar); @@ -1481,6 +1503,7 @@ void yon_main_window_complete(main_window *widgets){ yon_save_window_set_postsave_function(on_save_done,widgets); yon_terminal_integrated_start(widgets->InstallTerminal,pacman_update_command); + on_terminal_revealer_open(NULL,widgets); } yon_load_proceed(YON_CONFIG_LOCAL); }