Commits June 2024

commits@lists.geany.org

1 participants
58 discussions

[geany/geany] 39ce0c: Export some types/functions so plugins have access to Geany symbol icons
by Jiří Techet 29 Jun '24

29 Jun '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 25 Jun 2024 13:19:47 UTC Commit: 39ce0c095967964db6b49b411f6bf54d08ae53d1 https://github.com/geany/geany/commit/39ce0c095967964db6b49b411f6bf54d08ae5… Log Message: ----------- Export some types/functions so plugins have access to Geany symbol icons Modified Paths: -------------- src/symbols.c src/symbols.h src/tagmanager/tm_parser.h Modified: src/symbols.c 21 lines changed, 19 insertions(+), 2 deletions(-) =================================================================== @@ -259,6 +259,23 @@ const gchar *symbols_get_context_separator(gint ft_id) } +/** Gets the icon data corresponding to the provided TMIcon. + * @param icon TMIcon. + * + * Returns the GdkPixbuf corresponding to the provided TMIcon. + * + * @since 2.1 + */ +GEANY_API_SYMBOL +GdkPixbuf *symbols_get_icon_pixbuf(TMIcon icon) +{ + if (icon < TM_N_ICONS) + return symbols_icons[icon].pixbuf; + + return NULL; +} + + /* sort by name, then line */ static gint compare_symbol(const TMTag *tag_a, const TMTag *tag_b) { @@ -437,7 +454,7 @@ static void tag_list_add_groups(GtkTreeStore *tree_store, TMParserType lang) GdkPixbuf *icon = NULL; if (icon_id < TM_N_ICONS) - icon = symbols_icons[icon_id].pixbuf; + icon = symbols_get_icon_pixbuf(icon_id); g_assert(title != NULL); g_ptr_array_add(top_level_iter_names, (gchar *)title); @@ -1476,7 +1493,7 @@ static void show_goto_popup(GeanyDocument *doc, GPtrArray *tags, gboolean have_b tooltip = g_markup_printf_escaped("%s:%lu\n<small><tt>%s</tt></small>", fname, tmtag->line, sym); - image = gtk_image_new_from_pixbuf(symbols_icons[get_tag_class(tmtag)].pixbuf); + image = gtk_image_new_from_pixbuf(symbols_get_icon_pixbuf(get_tag_class(tmtag))); box = g_object_new(GTK_TYPE_BOX, "orientation", GTK_ORIENTATION_HORIZONTAL, "spacing", 12, NULL); label = g_object_new(GTK_TYPE_LABEL, "label", text, "use-markup", TRUE, "xalign", 0.0, NULL); gtk_size_group_add_widget(group, label); Modified: src/symbols.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -30,6 +30,7 @@ G_BEGIN_DECLS const gchar *symbols_get_context_separator(gint ft_id); +GdkPixbuf *symbols_get_icon_pixbuf(TMIcon icon); #ifdef GEANY_PRIVATE Modified: src/tagmanager/tm_parser.h 34 lines changed, 20 insertions(+), 14 deletions(-) =================================================================== @@ -53,6 +53,26 @@ typedef enum typedef gint TMParserType; +/* keep in sync with icon names in symbols.c */ +/** + * Identifiers of icons used by Geany in the symbol tree, in the autocompletion popup, + * and in the goto popup. + */ +typedef enum +{ + TM_ICON_CLASS, + TM_ICON_MACRO, + TM_ICON_MEMBER, + TM_ICON_METHOD, + TM_ICON_NAMESPACE, + TM_ICON_OTHER, + TM_ICON_STRUCT, + TM_ICON_VAR, + TM_ICON_NONE, + TM_N_ICONS = TM_ICON_NONE +} TMIcon; + + #ifdef GEANY_PRIVATE /* keep in sync with tm_parsers.h and parser_map in tm_parser.c */ @@ -125,20 +145,6 @@ enum TM_PARSER_COUNT }; -/* keep in sync with icon names in symbols.c */ -enum -{ - TM_ICON_CLASS, - TM_ICON_MACRO, - TM_ICON_MEMBER, - TM_ICON_METHOD, - TM_ICON_NAMESPACE, - TM_ICON_OTHER, - TM_ICON_STRUCT, - TM_ICON_VAR, - TM_ICON_NONE, - TM_N_ICONS = TM_ICON_NONE -}; void tm_parser_verify_type_mappings(void); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 9bf576: Merge pull request #3916 from techee/symtree_icons
by Jiří Techet 29 Jun '24

29 Jun '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Sat, 29 Jun 2024 13:45:50 UTC Commit: 9bf5769f582cbf3d82a1faca035e7f63e8908afe https://github.com/geany/geany/commit/9bf5769f582cbf3d82a1faca035e7f63e8908… Log Message: ----------- Merge pull request #3916 from techee/symtree_icons Export some types/functions so plugins have access to Geany symbol icons Modified Paths: -------------- src/symbols.c src/symbols.h src/tagmanager/tm_parser.h Modified: src/symbols.c 21 lines changed, 19 insertions(+), 2 deletions(-) =================================================================== @@ -259,6 +259,23 @@ const gchar *symbols_get_context_separator(gint ft_id) } +/** Gets the icon data corresponding to the provided TMIcon. + * @param icon TMIcon. + * + * Returns the GdkPixbuf corresponding to the provided TMIcon. + * + * @since 2.1 + */ +GEANY_API_SYMBOL +GdkPixbuf *symbols_get_icon_pixbuf(TMIcon icon) +{ + if (icon < TM_N_ICONS) + return symbols_icons[icon].pixbuf; + + return NULL; +} + + /* sort by name, then line */ static gint compare_symbol(const TMTag *tag_a, const TMTag *tag_b) { @@ -437,7 +454,7 @@ static void tag_list_add_groups(GtkTreeStore *tree_store, TMParserType lang) GdkPixbuf *icon = NULL; if (icon_id < TM_N_ICONS) - icon = symbols_icons[icon_id].pixbuf; + icon = symbols_get_icon_pixbuf(icon_id); g_assert(title != NULL); g_ptr_array_add(top_level_iter_names, (gchar *)title); @@ -1476,7 +1493,7 @@ static void show_goto_popup(GeanyDocument *doc, GPtrArray *tags, gboolean have_b tooltip = g_markup_printf_escaped("%s:%lu\n<small><tt>%s</tt></small>", fname, tmtag->line, sym); - image = gtk_image_new_from_pixbuf(symbols_icons[get_tag_class(tmtag)].pixbuf); + image = gtk_image_new_from_pixbuf(symbols_get_icon_pixbuf(get_tag_class(tmtag))); box = g_object_new(GTK_TYPE_BOX, "orientation", GTK_ORIENTATION_HORIZONTAL, "spacing", 12, NULL); label = g_object_new(GTK_TYPE_LABEL, "label", text, "use-markup", TRUE, "xalign", 0.0, NULL); gtk_size_group_add_widget(group, label); Modified: src/symbols.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -30,6 +30,7 @@ G_BEGIN_DECLS const gchar *symbols_get_context_separator(gint ft_id); +GdkPixbuf *symbols_get_icon_pixbuf(TMIcon icon); #ifdef GEANY_PRIVATE Modified: src/tagmanager/tm_parser.h 34 lines changed, 20 insertions(+), 14 deletions(-) =================================================================== @@ -53,6 +53,26 @@ typedef enum typedef gint TMParserType; +/* keep in sync with icon names in symbols.c */ +/** + * Identifiers of icons used by Geany in the symbol tree, in the autocompletion popup, + * and in the goto popup. + */ +typedef enum +{ + TM_ICON_CLASS, + TM_ICON_MACRO, + TM_ICON_MEMBER, + TM_ICON_METHOD, + TM_ICON_NAMESPACE, + TM_ICON_OTHER, + TM_ICON_STRUCT, + TM_ICON_VAR, + TM_ICON_NONE, + TM_N_ICONS = TM_ICON_NONE +} TMIcon; + + #ifdef GEANY_PRIVATE /* keep in sync with tm_parsers.h and parser_map in tm_parser.c */ @@ -125,20 +145,6 @@ enum TM_PARSER_COUNT }; -/* keep in sync with icon names in symbols.c */ -enum -{ - TM_ICON_CLASS, - TM_ICON_MACRO, - TM_ICON_MEMBER, - TM_ICON_METHOD, - TM_ICON_NAMESPACE, - TM_ICON_OTHER, - TM_ICON_STRUCT, - TM_ICON_VAR, - TM_ICON_NONE, - TM_N_ICONS = TM_ICON_NONE -}; void tm_parser_verify_type_mappings(void); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 2aaa66: Enable keyboard searching for Compiler and Messages tree views
by Nick Treleaven 23 Jun '24

23 Jun '24

Branch: refs/heads/master Author: Nick Treleaven <ntrel002(a)gmail.com> Committer: Nick Treleaven <ntrel002(a)gmail.com> Date: Mon, 08 Apr 2024 10:16:22 UTC Commit: 2aaa66b3b59780f298576fb3ea90ae0f77282502 https://github.com/geany/geany/commit/2aaa66b3b59780f298576fb3ea90ae0f77282… Log Message: ----------- Enable keyboard searching for Compiler and Messages tree views Modified Paths: -------------- src/msgwindow.c Modified: src/msgwindow.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -236,7 +236,7 @@ static void prepare_msg_tree_view(void) "foreground-gdk", MSG_COL_COLOR, "text", MSG_COL_STRING, NULL); gtk_tree_view_append_column(GTK_TREE_VIEW(msgwindow.tree_msg), column); - gtk_tree_view_set_enable_search(GTK_TREE_VIEW(msgwindow.tree_msg), FALSE); + gtk_tree_view_set_search_column(GTK_TREE_VIEW(msgwindow.tree_msg), MSG_COL_STRING); ui_widget_modify_font_from_string(msgwindow.tree_msg, interface_prefs.msgwin_font); @@ -273,7 +273,7 @@ static void prepare_compiler_tree_view(void) "foreground-gdk", COMPILER_COL_COLOR, "text", COMPILER_COL_STRING, NULL); gtk_tree_view_append_column(GTK_TREE_VIEW(msgwindow.tree_compiler), column); - gtk_tree_view_set_enable_search(GTK_TREE_VIEW(msgwindow.tree_compiler), FALSE); + gtk_tree_view_set_search_column(GTK_TREE_VIEW(msgwindow.tree_compiler), COMPILER_COL_STRING); ui_widget_modify_font_from_string(msgwindow.tree_compiler, interface_prefs.msgwin_font); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 20908b: Merge pull request #3823 from ntrel/msg-tree-search
by Enrico Tröger 23 Jun '24

23 Jun '24

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 23 Jun 2024 20:55:03 UTC Commit: 20908b843eb46fe185f32baf2fde96d0e20f70da https://github.com/geany/geany/commit/20908b843eb46fe185f32baf2fde96d0e20f7… Log Message: ----------- Merge pull request #3823 from ntrel/msg-tree-search [RFC] Enable keyboard searching for Compiler and Messages tree views Modified Paths: -------------- src/msgwindow.c Modified: src/msgwindow.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -236,7 +236,7 @@ static void prepare_msg_tree_view(void) "foreground-gdk", MSG_COL_COLOR, "text", MSG_COL_STRING, NULL); gtk_tree_view_append_column(GTK_TREE_VIEW(msgwindow.tree_msg), column); - gtk_tree_view_set_enable_search(GTK_TREE_VIEW(msgwindow.tree_msg), FALSE); + gtk_tree_view_set_search_column(GTK_TREE_VIEW(msgwindow.tree_msg), MSG_COL_STRING); ui_widget_modify_font_from_string(msgwindow.tree_msg, interface_prefs.msgwin_font); @@ -273,7 +273,7 @@ static void prepare_compiler_tree_view(void) "foreground-gdk", COMPILER_COL_COLOR, "text", COMPILER_COL_STRING, NULL); gtk_tree_view_append_column(GTK_TREE_VIEW(msgwindow.tree_compiler), column); - gtk_tree_view_set_enable_search(GTK_TREE_VIEW(msgwindow.tree_compiler), FALSE); + gtk_tree_view_set_search_column(GTK_TREE_VIEW(msgwindow.tree_compiler), COMPILER_COL_STRING); ui_widget_modify_font_from_string(msgwindow.tree_compiler, interface_prefs.msgwin_font); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 8f00b0: Drop win32_message_dialog()s
by Jiří Techet 22 Jun '24

22 Jun '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 12 Jun 2024 12:10:03 UTC Commit: 8f00b04cefd88630e1860e100ffab3e8dd81f2a2 https://github.com/geany/geany/commit/8f00b04cefd88630e1860e100ffab3e8dd81f… Log Message: ----------- Drop win32_message_dialog()s There doesn't seem to be much need for these and they look a little different from the rest of Geany (or a lot different when Windows uses the dark theme and Geany the light one). Before removing the native win32 file open dialogs, win32_message_dialog() was called from the native file dialog implementations so its presence was necessary but I think normal GTK dialogs will serve their purpose well. Modified Paths: -------------- src/dialogs.c src/win32.c src/win32.h Modified: src/dialogs.c 35 lines changed, 1 insertions(+), 34 deletions(-) =================================================================== @@ -38,7 +38,6 @@ #include "support.h" #include "utils.h" #include "ui_utils.h" -#include "win32.h" #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> @@ -712,7 +711,6 @@ gboolean dialogs_show_save_as(void) } -#ifndef G_OS_WIN32 static void show_msgbox_dialog(GtkWidget *dialog, GtkMessageType type, GtkWindow *parent) { const gchar *title; @@ -738,13 +736,10 @@ static void show_msgbox_dialog(GtkWidget *dialog, GtkMessageType type, GtkWindow gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); } -#endif /** * Shows a message box of the type @a type with @a text. - * On Unix-like systems a GTK message dialog box is shown, on Win32 systems a native Windows - * message dialog box is shown. * * @param type A @c GtkMessageType, e.g. @c GTK_MESSAGE_INFO, @c GTK_MESSAGE_WARNING, * @c GTK_MESSAGE_QUESTION, @c GTK_MESSAGE_ERROR. @@ -754,9 +749,7 @@ static void show_msgbox_dialog(GtkWidget *dialog, GtkMessageType type, GtkWindow GEANY_API_SYMBOL void dialogs_show_msgbox(GtkMessageType type, const gchar *text, ...) { -#ifndef G_OS_WIN32 GtkWidget *dialog; -#endif gchar *string; va_list args; GtkWindow *parent = (main_status.main_window_realized) ? GTK_WINDOW(main_widgets.window) : NULL; @@ -765,32 +758,22 @@ void dialogs_show_msgbox(GtkMessageType type, const gchar *text, ...) string = g_strdup_vprintf(text, args); va_end(args); -#ifdef G_OS_WIN32 - win32_message_dialog(GTK_WIDGET(parent), type, string); -#else dialog = gtk_message_dialog_new(parent, GTK_DIALOG_DESTROY_WITH_PARENT, type, GTK_BUTTONS_OK, "%s", string); show_msgbox_dialog(dialog, type, parent); -#endif g_free(string); } void dialogs_show_msgbox_with_secondary(GtkMessageType type, const gchar *text, const gchar *secondary) { GtkWindow *parent = (main_status.main_window_realized) ? GTK_WINDOW(main_widgets.window) : NULL; -#ifdef G_OS_WIN32 - /* put the two strings together because Windows message boxes don't support secondary texts */ - gchar *string = g_strconcat(text, "\n", secondary, NULL); - win32_message_dialog(GTK_WIDGET(parent), type, string); - g_free(string); -#else GtkWidget *dialog; + dialog = gtk_message_dialog_new(parent, GTK_DIALOG_DESTROY_WITH_PARENT, type, GTK_BUTTONS_OK, "%s", text); gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "%s", secondary); show_msgbox_dialog(dialog, type, parent); -#endif } @@ -1317,20 +1300,6 @@ static gint show_prompt(GtkWidget *parent, response_3 = GTK_RESPONSE_YES; } -#ifdef G_OS_WIN32 - /* our native dialog code doesn't support custom buttons */ - if (utils_str_equal(btn_3, GTK_STOCK_YES) && - utils_str_equal(btn_2, GTK_STOCK_NO) && btn_1 == NULL) - { - gchar *string = (extra_text == NULL) ? g_strdup(question_text) : - g_strconcat(question_text, "\n\n", extra_text, NULL); - - ret = win32_message_dialog(parent, GTK_MESSAGE_QUESTION, string); - ret = ret ? response_3 : response_2; - g_free(string); - return ret; - } -#endif if (parent == NULL && main_status.main_window_realized) parent = main_widgets.window; @@ -1363,8 +1332,6 @@ static gint show_prompt(GtkWidget *parent, /** * Shows a question message box with @a text and Yes/No buttons. - * On Unix-like systems a GTK message dialog box is shown, on Win32 systems a native Windows - * message dialog box is shown. * * @param text Printf()-style format string. * @param ... Arguments for the @a text format string. Modified: src/win32.c 61 lines changed, 0 insertions(+), 61 deletions(-) =================================================================== @@ -60,67 +60,6 @@ #include <gdk/gdkwin32.h> -/* Creates a native Windows message box of the given type and returns always TRUE - * or FALSE representing th pressed Yes or No button. - * If type is not GTK_MESSAGE_QUESTION, it returns always TRUE. */ -gboolean win32_message_dialog(GtkWidget *parent, GtkMessageType type, const gchar *msg) -{ - gboolean ret = TRUE; - gint rc; - guint t; - const gchar *title; - HWND parent_hwnd = NULL; - static wchar_t w_msg[512]; - static wchar_t w_title[512]; - - switch (type) - { - case GTK_MESSAGE_ERROR: - { - t = MB_OK | MB_ICONERROR; - title = _("Error"); - break; - } - case GTK_MESSAGE_QUESTION: - { - t = MB_YESNO | MB_ICONQUESTION; - title = _("Question"); - break; - } - case GTK_MESSAGE_WARNING: - { - t = MB_OK | MB_ICONWARNING; - title = _("Warning"); - break; - } - default: - { - t = MB_OK | MB_ICONINFORMATION; - title = _("Information"); - break; - } - } - - /* convert the Unicode chars to wide chars */ - /** TODO test if LANG == C then possibly skip conversion => g_win32_getlocale() */ - MultiByteToWideChar(CP_UTF8, 0, msg, -1, w_msg, G_N_ELEMENTS(w_msg)); - MultiByteToWideChar(CP_UTF8, 0, title, -1, w_title, G_N_ELEMENTS(w_title)); - - if (parent != NULL) - parent_hwnd = GDK_WINDOW_HWND(gtk_widget_get_window(parent)); - else if (main_widgets.window != NULL) - parent_hwnd = GDK_WINDOW_HWND(gtk_widget_get_window(main_widgets.window)); - - /* display the message box */ - rc = MessageBoxW(parent_hwnd, w_msg, w_title, t); - - if (type == GTK_MESSAGE_QUESTION && rc != IDYES) - ret = FALSE; - - return ret; -} - - /* Little wrapper for _waccess(), returns errno or 0 if there was no error */ gint win32_check_write_permission(const gchar *dir) { Modified: src/win32.h 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -30,8 +30,6 @@ G_BEGIN_DECLS -gboolean win32_message_dialog(GtkWidget *parent, GtkMessageType type, const gchar *msg); - void win32_open_browser(const gchar *uri); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 422a75: Merge pull request #3903 from techee/win_msg
by Jiří Techet 22 Jun '24

22 Jun '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Sat, 22 Jun 2024 08:07:35 UTC Commit: 422a7588357f1e1e4a9ac7f4edaa842ae2a99409 https://github.com/geany/geany/commit/422a7588357f1e1e4a9ac7f4edaa842ae2a99… Log Message: ----------- Merge pull request #3903 from techee/win_msg Drop win32_message_dialog()s Modified Paths: -------------- src/dialogs.c src/win32.c src/win32.h Modified: src/dialogs.c 35 lines changed, 1 insertions(+), 34 deletions(-) =================================================================== @@ -38,7 +38,6 @@ #include "support.h" #include "utils.h" #include "ui_utils.h" -#include "win32.h" #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> @@ -712,7 +711,6 @@ gboolean dialogs_show_save_as(void) } -#ifndef G_OS_WIN32 static void show_msgbox_dialog(GtkWidget *dialog, GtkMessageType type, GtkWindow *parent) { const gchar *title; @@ -738,13 +736,10 @@ static void show_msgbox_dialog(GtkWidget *dialog, GtkMessageType type, GtkWindow gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); } -#endif /** * Shows a message box of the type @a type with @a text. - * On Unix-like systems a GTK message dialog box is shown, on Win32 systems a native Windows - * message dialog box is shown. * * @param type A @c GtkMessageType, e.g. @c GTK_MESSAGE_INFO, @c GTK_MESSAGE_WARNING, * @c GTK_MESSAGE_QUESTION, @c GTK_MESSAGE_ERROR. @@ -754,9 +749,7 @@ static void show_msgbox_dialog(GtkWidget *dialog, GtkMessageType type, GtkWindow GEANY_API_SYMBOL void dialogs_show_msgbox(GtkMessageType type, const gchar *text, ...) { -#ifndef G_OS_WIN32 GtkWidget *dialog; -#endif gchar *string; va_list args; GtkWindow *parent = (main_status.main_window_realized) ? GTK_WINDOW(main_widgets.window) : NULL; @@ -765,32 +758,22 @@ void dialogs_show_msgbox(GtkMessageType type, const gchar *text, ...) string = g_strdup_vprintf(text, args); va_end(args); -#ifdef G_OS_WIN32 - win32_message_dialog(GTK_WIDGET(parent), type, string); -#else dialog = gtk_message_dialog_new(parent, GTK_DIALOG_DESTROY_WITH_PARENT, type, GTK_BUTTONS_OK, "%s", string); show_msgbox_dialog(dialog, type, parent); -#endif g_free(string); } void dialogs_show_msgbox_with_secondary(GtkMessageType type, const gchar *text, const gchar *secondary) { GtkWindow *parent = (main_status.main_window_realized) ? GTK_WINDOW(main_widgets.window) : NULL; -#ifdef G_OS_WIN32 - /* put the two strings together because Windows message boxes don't support secondary texts */ - gchar *string = g_strconcat(text, "\n", secondary, NULL); - win32_message_dialog(GTK_WIDGET(parent), type, string); - g_free(string); -#else GtkWidget *dialog; + dialog = gtk_message_dialog_new(parent, GTK_DIALOG_DESTROY_WITH_PARENT, type, GTK_BUTTONS_OK, "%s", text); gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "%s", secondary); show_msgbox_dialog(dialog, type, parent); -#endif } @@ -1317,20 +1300,6 @@ static gint show_prompt(GtkWidget *parent, response_3 = GTK_RESPONSE_YES; } -#ifdef G_OS_WIN32 - /* our native dialog code doesn't support custom buttons */ - if (utils_str_equal(btn_3, GTK_STOCK_YES) && - utils_str_equal(btn_2, GTK_STOCK_NO) && btn_1 == NULL) - { - gchar *string = (extra_text == NULL) ? g_strdup(question_text) : - g_strconcat(question_text, "\n\n", extra_text, NULL); - - ret = win32_message_dialog(parent, GTK_MESSAGE_QUESTION, string); - ret = ret ? response_3 : response_2; - g_free(string); - return ret; - } -#endif if (parent == NULL && main_status.main_window_realized) parent = main_widgets.window; @@ -1363,8 +1332,6 @@ static gint show_prompt(GtkWidget *parent, /** * Shows a question message box with @a text and Yes/No buttons. - * On Unix-like systems a GTK message dialog box is shown, on Win32 systems a native Windows - * message dialog box is shown. * * @param text Printf()-style format string. * @param ... Arguments for the @a text format string. Modified: src/win32.c 61 lines changed, 0 insertions(+), 61 deletions(-) =================================================================== @@ -60,67 +60,6 @@ #include <gdk/gdkwin32.h> -/* Creates a native Windows message box of the given type and returns always TRUE - * or FALSE representing th pressed Yes or No button. - * If type is not GTK_MESSAGE_QUESTION, it returns always TRUE. */ -gboolean win32_message_dialog(GtkWidget *parent, GtkMessageType type, const gchar *msg) -{ - gboolean ret = TRUE; - gint rc; - guint t; - const gchar *title; - HWND parent_hwnd = NULL; - static wchar_t w_msg[512]; - static wchar_t w_title[512]; - - switch (type) - { - case GTK_MESSAGE_ERROR: - { - t = MB_OK | MB_ICONERROR; - title = _("Error"); - break; - } - case GTK_MESSAGE_QUESTION: - { - t = MB_YESNO | MB_ICONQUESTION; - title = _("Question"); - break; - } - case GTK_MESSAGE_WARNING: - { - t = MB_OK | MB_ICONWARNING; - title = _("Warning"); - break; - } - default: - { - t = MB_OK | MB_ICONINFORMATION; - title = _("Information"); - break; - } - } - - /* convert the Unicode chars to wide chars */ - /** TODO test if LANG == C then possibly skip conversion => g_win32_getlocale() */ - MultiByteToWideChar(CP_UTF8, 0, msg, -1, w_msg, G_N_ELEMENTS(w_msg)); - MultiByteToWideChar(CP_UTF8, 0, title, -1, w_title, G_N_ELEMENTS(w_title)); - - if (parent != NULL) - parent_hwnd = GDK_WINDOW_HWND(gtk_widget_get_window(parent)); - else if (main_widgets.window != NULL) - parent_hwnd = GDK_WINDOW_HWND(gtk_widget_get_window(main_widgets.window)); - - /* display the message box */ - rc = MessageBoxW(parent_hwnd, w_msg, w_title, t); - - if (type == GTK_MESSAGE_QUESTION && rc != IDYES) - ret = FALSE; - - return ret; -} - - /* Little wrapper for _waccess(), returns errno or 0 if there was no error */ gint win32_check_write_permission(const gchar *dir) { Modified: src/win32.h 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -30,8 +30,6 @@ G_BEGIN_DECLS -gboolean win32_message_dialog(GtkWidget *parent, GtkMessageType type, const gchar *msg); - void win32_open_browser(const gchar *uri); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] eead58: Update enchant share directory name
by Jiří Techet 21 Jun '24

21 Jun '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Fri, 21 Jun 2024 21:49:06 UTC Commit: eead58390dcaa8c507f2ab6e42b3e7efcedef208 https://github.com/geany/geany-osx/commit/eead58390dcaa8c507f2ab6e42b3e7efc… Log Message: ----------- Update enchant share directory name Modified Paths: -------------- geany.bundle Modified: geany.bundle 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -155,7 +155,7 @@ </data>  <data> - ${prefix}/share/enchant + ${prefix}/share/enchant-2 </data> <!-- Copy in the themes data. You may want to trim this to save space -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 7e01e3: Merge pull request #3913 from techee/include_fix
by Jiří Techet 20 Jun '24

20 Jun '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Thu, 20 Jun 2024 09:23:17 UTC Commit: 7e01e3dd8af374ea80ba0932f99bcdcb41955a88 https://github.com/geany/geany/commit/7e01e3dd8af374ea80ba0932f99bcdcb41955… Log Message: ----------- Merge pull request #3913 from techee/include_fix Don't include geanyfunctions.h from geanyplugin.h Modified Paths: -------------- plugins/geanyplugin.h Modified: plugins/geanyplugin.h 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -40,7 +40,6 @@ #include "encodings.h" #include "filetypes.h" #include "geany.h" -#include "geanyfunctions.h" #include "highlighting.h" #include "keybindings.h" #include "main.h" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 6d420c: Merge pull request #3912 from techee/utils_private
by Jiří Techet 20 Jun '24

20 Jun '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Thu, 20 Jun 2024 09:13:52 UTC Commit: 6d420cf5207bca801250479edfb4856d2f34f76d https://github.com/geany/geany/commit/6d420cf5207bca801250479edfb4856d2f34f… Log Message: ----------- Merge pull request #3912 from techee/utils_private Move utils_utf8_strdown() under GEANY_PRIVATE in utils.h Modified Paths: -------------- src/utils.h Modified: src/utils.h 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -193,8 +193,6 @@ gboolean utils_spawn_async(const gchar *dir, gchar **argv, gchar **env, GSpawnFl GSpawnChildSetupFunc child_setup, gpointer user_data, GPid *child_pid, GError **error); -gchar *utils_utf8_strdown(const gchar *str); - gint utils_str_casecmp(const gchar *s1, const gchar *s2); gchar *utils_get_date_time(const gchar *format, time_t *time_to_use); @@ -338,6 +336,8 @@ void utils_start_new_geany_instance(const gchar *doc_path); gchar *utils_get_os_info_string(void); +gchar *utils_utf8_strdown(const gchar *str); + #endif /* GEANY_PRIVATE */ G_END_DECLS -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 0a25af: Don't include geanyfunctions.h from geanyplugin.h
by Jiří Techet 20 Jun '24

20 Jun '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 19 Jun 2024 22:32:54 UTC Commit: 0a25af7d16bebf84729694ea6c4dd224b6deabd8 https://github.com/geany/geany/commit/0a25af7d16bebf84729694ea6c4dd224b6dea… Log Message: ----------- Don't include geanyfunctions.h from geanyplugin.h Clangd complains with main file cannot be included recursively when building a preamble and I suspect geanyfunctions.h is the old (and now empty) version of geanyplugin.h so there's no need to include it anyway. Modified Paths: -------------- plugins/geanyplugin.h Modified: plugins/geanyplugin.h 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -40,7 +40,6 @@ #include "encodings.h" #include "filetypes.h" #include "geany.h" -#include "geanyfunctions.h" #include "highlighting.h" #include "keybindings.h" #include "main.h" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2024