From b2f7d7596c253b2b254441fb6e9f932aee3c0666 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 1 Feb 2024 12:26:52 +0600 Subject: [PATCH] Removed check box from menu --- source/ubl-settings-services.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/source/ubl-settings-services.c b/source/ubl-settings-services.c index 24aaf4a..5a50fa1 100644 --- a/source/ubl-settings-services.c +++ b/source/ubl-settings-services.c @@ -473,13 +473,10 @@ void on_column_resize(GtkTreeViewColumn *self,GParamSpec *pspec,main_window *wid } GtkWidget *yon_menu_separator_create() { - GtkWidget *menu_item = gtk_menu_item_new(); - GtkWidget *box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,0); - GtkWidget *separator = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL); - gtk_box_pack_start(GTK_BOX(box),separator,1,1,0); - gtk_container_add(GTK_CONTAINER(menu_item),box); + GtkWidget *menu_item = gtk_separator_menu_item_new(); - gtk_widget_show_all(menu_item); + gtk_style_context_add_class(gtk_widget_get_style_context(menu_item),"separator"); + gtk_widget_show(menu_item); gtk_widget_set_sensitive(menu_item,0); return menu_item; } @@ -488,12 +485,12 @@ GtkWidget *yon_menu_button_create(char *icon_name, char *text) { GtkWidget *menu_item = gtk_menu_item_new(); GtkWidget *box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,0); GtkWidget *icon; - GtkWidget *check; + // GtkWidget *check; if(icon_name){ icon = gtk_image_new_from_icon_name(icon_name,GTK_ICON_SIZE_BUTTON); - check = gtk_check_button_new(); + // check = gtk_check_button_new(); gtk_box_pack_start(GTK_BOX(box),icon,0,0,5); - gtk_box_pack_end(GTK_BOX(box),check,0,0,5); + // gtk_box_pack_end(GTK_BOX(box),check,0,0,5); } GtkWidget *label = gtk_label_new(text); gtk_box_pack_start(GTK_BOX(box),label,0,0,5); @@ -550,7 +547,7 @@ gboolean on_context_menu_open(GtkWidget *self,GdkEventButton *event, main_window gtk_menu_shell_append(GTK_MENU_SHELL(menu),menu_item_status); widgets->RMBMenu=menu; widgets->menu=menu_object; - // gtk_widget_show_all(widgets->RMBMenu); + gtk_widget_show_all(widgets->RMBMenu); // gtk_widget_show_all(widgets->menu->Menu); gtk_menu_popup_at_pointer(GTK_MENU(menu),NULL); return 0; @@ -589,13 +586,6 @@ void on_activate(GtkTreeView *self, main_window *widgets){ gtk_label_set_text(GTK_LABEL(widgets->DescriptionLabel),description); menu_obj *menu=widgets->menu; if (main_config.rmb_clicked){ - gboolean CAutostart,CAutostop,CBlock,SAutostart,SLaunched; - gtk_tree_model_get(GTK_TREE_MODEL(widgets->liststore2),&iter,0,&CAutostart,1,&CAutostop,2,&CBlock,3,&SAutostart,4,&SLaunched,-1); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g_list_nth_data(gtk_container_get_children(GTK_CONTAINER(g_list_nth_data(gtk_container_get_children(GTK_CONTAINER(menu->MenuConfigAutostart)),0))),2)),CAutostart); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g_list_nth_data(gtk_container_get_children(GTK_CONTAINER(g_list_nth_data(gtk_container_get_children(GTK_CONTAINER(menu->MenuConfigAutostop)),0))),2)),CAutostop); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g_list_nth_data(gtk_container_get_children(GTK_CONTAINER(g_list_nth_data(gtk_container_get_children(GTK_CONTAINER(menu->MenuConfigBlock)),0))),2)),CBlock); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g_list_nth_data(gtk_container_get_children(GTK_CONTAINER(g_list_nth_data(gtk_container_get_children(GTK_CONTAINER(menu->MenuSystemAutostart)),0))),2)),SAutostart); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g_list_nth_data(gtk_container_get_children(GTK_CONTAINER(g_list_nth_data(gtk_container_get_children(GTK_CONTAINER(menu->MenuSystemLaunched)),0))),2)),SLaunched); gtk_menu_popup_at_pointer(GTK_MENU(menu->Menu),NULL); } }