From 58f613cc498bbcf9f1aa098809c525dfee0dd452 Mon Sep 17 00:00:00 2001 From: GFdevelop Date: Thu, 23 May 2019 00:25:51 +0200 Subject: [PATCH 1/4] FIX: right-click on filebrowser plugin: first right-click on filebrowser not working with some items on popup: - open in geany and open external not starting - find in files don't have the clicked path --- plugins/filebrowser.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/filebrowser.c b/plugins/filebrowser.c index 925548dcb1..ca43a24fd4 100644 --- a/plugins/filebrowser.c +++ b/plugins/filebrowser.c @@ -68,6 +68,8 @@ enum FILEVIEW_N_COLUMNS }; +static GtkWidget *popup_menu = NULL; + static gboolean fb_set_project_base_path = FALSE; static gboolean fb_follow_path = FALSE; static gboolean show_hidden_files = FALSE; @@ -686,6 +688,7 @@ static GtkWidget *create_popup_menu(void) gtk_container_add(GTK_CONTAINER(menu), item); item = gtk_check_menu_item_new_with_mnemonic(_("Show _Hidden Files")); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item),show_hidden_files); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); g_signal_connect(item, "activate", G_CALLBACK(on_hidden_files_clicked), NULL); @@ -736,13 +739,9 @@ static gboolean on_button_press(GtkWidget *widget, GdkEventButton *event, gpoint } else if (event->button == 3) { - static GtkWidget *popup_menu = NULL; - if (popup_menu == NULL) popup_menu = create_popup_menu(); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(popup_items.show_hidden_files), - show_hidden_files); gtk_menu_popup(GTK_MENU(popup_menu), NULL, NULL, NULL, NULL, event->button, event->time); /* don't return TRUE here, unless the selection won't be changed */ } From c22f9b11fcee3e414228bad078401e0b3fc31074 Mon Sep 17 00:00:00 2001 From: GFdevelop Date: Thu, 23 May 2019 03:32:41 +0200 Subject: [PATCH 2/4] Small fix --- plugins/filebrowser.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/filebrowser.c b/plugins/filebrowser.c index ca43a24fd4..2d5986bba4 100644 --- a/plugins/filebrowser.c +++ b/plugins/filebrowser.c @@ -68,8 +68,6 @@ enum FILEVIEW_N_COLUMNS }; -static GtkWidget *popup_menu = NULL; - static gboolean fb_set_project_base_path = FALSE; static gboolean fb_follow_path = FALSE; static gboolean show_hidden_files = FALSE; @@ -688,7 +686,7 @@ static GtkWidget *create_popup_menu(void) gtk_container_add(GTK_CONTAINER(menu), item); item = gtk_check_menu_item_new_with_mnemonic(_("Show _Hidden Files")); - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item),show_hidden_files); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), show_hidden_files); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); g_signal_connect(item, "activate", G_CALLBACK(on_hidden_files_clicked), NULL); @@ -739,6 +737,8 @@ static gboolean on_button_press(GtkWidget *widget, GdkEventButton *event, gpoint } else if (event->button == 3) { + static GtkWidget *popup_menu = NULL; + if (popup_menu == NULL) popup_menu = create_popup_menu(); From 9de0575fccee826655beae8fa69bed56be616f75 Mon Sep 17 00:00:00 2001 From: GFdevelop Date: Fri, 24 May 2019 22:49:24 +0200 Subject: [PATCH 3/4] FIXED: filebrowser "show hidden files" settings changes The popup item is toggled by the settings changes --- plugins/filebrowser.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/filebrowser.c b/plugins/filebrowser.c index 2d5986bba4..4fc0062e58 100644 --- a/plugins/filebrowser.c +++ b/plugins/filebrowser.c @@ -68,6 +68,8 @@ enum FILEVIEW_N_COLUMNS }; +static GtkWidget *popup_menu = NULL; + static gboolean fb_set_project_base_path = FALSE; static gboolean fb_follow_path = FALSE; static gboolean show_hidden_files = FALSE; @@ -737,8 +739,6 @@ static gboolean on_button_press(GtkWidget *widget, GdkEventButton *event, gpoint } else if (event->button == 3) { - static GtkWidget *popup_menu = NULL; - if (popup_menu == NULL) popup_menu = create_popup_menu(); @@ -1249,6 +1249,8 @@ static void on_toggle_hidden(void) gboolean enabled = !gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(pref_widgets.show_hidden_checkbox)); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(popup_items.show_hidden_files), !enabled); + gtk_widget_set_sensitive(pref_widgets.hide_objects_checkbox, enabled); enabled &= gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(pref_widgets.hide_objects_checkbox)); gtk_widget_set_sensitive(pref_widgets.hidden_files_entry, enabled); From cfc672895f362fe96476f60e1f1d48bd9200bdb0 Mon Sep 17 00:00:00 2001 From: GFdevelop Date: Fri, 24 May 2019 23:05:08 +0200 Subject: [PATCH 4/4] Fixed testing code --- plugins/filebrowser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/filebrowser.c b/plugins/filebrowser.c index 4fc0062e58..473a3b4f20 100644 --- a/plugins/filebrowser.c +++ b/plugins/filebrowser.c @@ -68,8 +68,6 @@ enum FILEVIEW_N_COLUMNS }; -static GtkWidget *popup_menu = NULL; - static gboolean fb_set_project_base_path = FALSE; static gboolean fb_follow_path = FALSE; static gboolean show_hidden_files = FALSE; @@ -739,6 +737,8 @@ static gboolean on_button_press(GtkWidget *widget, GdkEventButton *event, gpoint } else if (event->button == 3) { + static GtkWidget *popup_menu = NULL; + if (popup_menu == NULL) popup_menu = create_popup_menu();