Commits

commits@lists.geany.org

1 participants
11710 discussions

[geany/geany] 2b03a7: socket: support startup_id tokens on X11 and Wayland
by Kondor Dániel 13 Dec '24

13 Dec '24

Branch: refs/heads/master Author: Kondor Dániel <kondor.dani(a)gmail.com> Committer: Daniel Kondor <kondor.dani(a)gmail.com> Date: Wed, 27 Nov 2024 19:26:19 UTC Commit: 2b03a7c08278aa13e4e3c1f9b547f7b4f5b5203f https://github.com/geany/geany/commit/2b03a7c08278aa13e4e3c1f9b547f7b4f5b52… Log Message: ----------- socket: support startup_id tokens on X11 and Wayland This allows requesting the main window to be activated when opening files via the socket interface. This relies on the following protocols: - X11: Startup notification: https://specifications.freedesktop.org/startup-notification-spec/latest/ - Wayland: xdg-activation: https://wayland.app/protocols/xdg-activation-v1 Both are natively supported by GTK, the only change required is some extra plumbing to get the activation token to the already running Geany instance. Modified Paths: -------------- src/libmain.c src/socket.c src/socket.h Modified: src/libmain.c 16 lines changed, 15 insertions(+), 1 deletions(-) =================================================================== @@ -1056,6 +1056,18 @@ gint main_lib(gint argc, gchar **argv) #ifdef ENABLE_NLS main_locale_init(utils_resource_dir(RESOURCE_DIR_LOCALE), GETTEXT_PACKAGE); #endif + + /* Magic ID used on X11 and Wayland for bringing our existing window on top; + * need to read it here, since GTK will clear this from the environment in + * gtk_init () (called from parse_command_line_options () below). Need to + * make a copy, since the value is not guaranteed to be valid after calling + * unsetenv() (which is done by GTK). */ +#ifdef HAVE_SOCKET + gchar *desktop_startup_id = g_strdup(getenv("DESKTOP_STARTUP_ID")); + if (!desktop_startup_id) + desktop_startup_id = g_strdup(getenv("XDG_ACTIVATION_TOKEN")); +#endif + /* initialize TM before parsing command-line - needed for tag file generation */ app->tm_workspace = tm_get_workspace(); parse_command_line_options(&argc, &argv); @@ -1085,7 +1097,7 @@ gint main_lib(gint argc, gchar **argv) #endif socket_info.lock_socket = -1; socket_info.lock_socket_tag = 0; - socket_info.lock_socket = socket_init(argc, argv, socket_port); + socket_info.lock_socket = socket_init(argc, argv, socket_port, desktop_startup_id); /* Quit if filenames were sent to first instance or the list of open * documents has been printed */ if ((socket_info.lock_socket == -2 /* socket exists */ && argc > 1) || @@ -1097,6 +1109,7 @@ gint main_lib(gint argc, gchar **argv) g_free(app->datadir); g_free(app->docdir); g_free(app); + g_free(desktop_startup_id); return 0; } /* Start a new instance if no command line strings were passed, @@ -1107,6 +1120,7 @@ gint main_lib(gint argc, gchar **argv) cl_options.new_instance = TRUE; } } + g_free(desktop_startup_id); #endif #ifdef G_OS_WIN32 Modified: src/socket.c 41 lines changed, 37 insertions(+), 4 deletions(-) =================================================================== @@ -92,7 +92,9 @@ #ifdef GDK_WINDOWING_X11 #include <gdk/gdkx.h> #endif - +#ifdef GDK_WINDOWING_WAYLAND +#include <gdk/gdkwayland.h> +#endif #ifdef G_OS_WIN32 #define SOCKET_IS_VALID(s) ((s) != INVALID_SOCKET) @@ -124,13 +126,20 @@ static gint socket_fd_close (gint sock); -static void send_open_command(gint sock, gint argc, gchar **argv) +static void send_open_command(gint sock, gint argc, gchar **argv, const gchar *desktop_startup_id) { gint i; g_return_if_fail(argc > 1); geany_debug("using running instance of Geany"); + if (desktop_startup_id != NULL) + { + socket_fd_write_all(sock, "desktop_startup_id\n", 19); + socket_fd_write_all(sock, desktop_startup_id, strlen(desktop_startup_id)); + socket_fd_write_all(sock, "\n.\n", 3); + } + if (cl_options.goto_line >= 0) { gchar *line = g_strdup_printf("%d\n", cl_options.goto_line); @@ -247,7 +256,7 @@ static void check_socket_permissions(void) * (taken from Sylpheed, thanks) * Returns the created socket, -1 if an error occurred or -2 if another socket exists and files * were sent to it. */ -gint socket_init(gint argc, gchar **argv, G_GNUC_UNUSED gushort socket_port) +gint socket_init(gint argc, gchar **argv, G_GNUC_UNUSED gushort socket_port, const gchar *desktop_startup_id) { gint sock; #ifdef G_OS_WIN32 @@ -334,7 +343,7 @@ gint socket_init(gint argc, gchar **argv, G_GNUC_UNUSED gushort socket_port) SetForegroundWindow(hwnd); #endif - send_open_command(sock, argc, argv); + send_open_command(sock, argc, argv, desktop_startup_id); } if (cl_options.list_documents) @@ -719,6 +728,30 @@ gboolean socket_lock_input_cb(GIOChannel *source, GIOCondition condition, gpoint cl_options.goto_column = atoi(buf); } } + else if (strncmp(buf, "desktop_startup_id", 18) == 0) + { + if (socket_fd_gets(sock, buf, sizeof(buf)) != -1 && *buf != '.') + { +#if defined(GDK_WINDOWING_WAYLAND) || defined(GDK_WINDOWING_X11) + g_strstrip(buf); /* remove \n char */ + geany_debug("Received IPC command from remote instance: desktop_startup_id (%s)", buf); + GdkDisplay *display = gdk_display_get_default(); +#ifdef GDK_WINDOWING_WAYLAND + if (GDK_IS_WAYLAND_DISPLAY(display)) + gdk_wayland_display_set_startup_notification_id(display, buf); +#endif +#ifdef GDK_WINDOWING_X11 + if (GDK_IS_X11_DISPLAY(display)) + gdk_x11_display_set_startup_notification_id(display, buf); +#endif +#endif // GDK_WINDOWING_WAYLAND || GDK_WINDOWING_X11 + while (socket_fd_gets(sock, buf, sizeof(buf)) != -1 && *buf != '.') + { + /* we expect only one line with the token, + * skip anything until the end of the message */ + } + } + } #ifdef G_OS_WIN32 else if (strncmp(buf, "window", 6) == 0) { Modified: src/socket.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -42,7 +42,7 @@ struct SocketInfo extern struct SocketInfo socket_info; -gint socket_init(gint argc, gchar **argv, gushort socket_port); +gint socket_init(gint argc, gchar **argv, gushort socket_port, const gchar *desktop_startup_id); gboolean socket_lock_input_cb(GIOChannel *source, GIOCondition condition, gpointer data); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 7a017c: Merge pull request #4071 from dkondor/xdg_activation
by Jiří Techet 13 Dec '24

13 Dec '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Fri, 13 Dec 2024 13:27:24 UTC Commit: 7a017c764038bcdfcb99db7365c3196fd8aebdbf https://github.com/geany/geany/commit/7a017c764038bcdfcb99db7365c3196fd8aeb… Log Message: ----------- Merge pull request #4071 from dkondor/xdg_activation Pass DESKTOP_STARTUP_ID via the socket to focus window Modified Paths: -------------- src/libmain.c src/socket.c src/socket.h Modified: src/libmain.c 16 lines changed, 15 insertions(+), 1 deletions(-) =================================================================== @@ -1068,6 +1068,18 @@ gint main_lib(gint argc, gchar **argv) #ifdef ENABLE_NLS main_locale_init(utils_resource_dir(RESOURCE_DIR_LOCALE), GETTEXT_PACKAGE); #endif + + /* Magic ID used on X11 and Wayland for bringing our existing window on top; + * need to read it here, since GTK will clear this from the environment in + * gtk_init () (called from parse_command_line_options () below). Need to + * make a copy, since the value is not guaranteed to be valid after calling + * unsetenv() (which is done by GTK). */ +#ifdef HAVE_SOCKET + gchar *desktop_startup_id = g_strdup(getenv("DESKTOP_STARTUP_ID")); + if (!desktop_startup_id) + desktop_startup_id = g_strdup(getenv("XDG_ACTIVATION_TOKEN")); +#endif + /* initialize TM before parsing command-line - needed for tag file generation */ app->tm_workspace = tm_get_workspace(); parse_command_line_options(&argc, &argv); @@ -1097,7 +1109,7 @@ gint main_lib(gint argc, gchar **argv) #endif socket_info.lock_socket = -1; socket_info.lock_socket_tag = 0; - socket_info.lock_socket = socket_init(argc, argv, socket_port); + socket_info.lock_socket = socket_init(argc, argv, socket_port, desktop_startup_id); /* Quit if filenames were sent to first instance or the list of open * documents has been printed */ if ((socket_info.lock_socket == -2 /* socket exists */ && argc > 1) || @@ -1109,6 +1121,7 @@ gint main_lib(gint argc, gchar **argv) g_free(app->datadir); g_free(app->docdir); g_free(app); + g_free(desktop_startup_id); return 0; } /* Start a new instance if no command line strings were passed, @@ -1119,6 +1132,7 @@ gint main_lib(gint argc, gchar **argv) cl_options.new_instance = TRUE; } } + g_free(desktop_startup_id); #endif #ifdef G_OS_WIN32 Modified: src/socket.c 41 lines changed, 37 insertions(+), 4 deletions(-) =================================================================== @@ -92,7 +92,9 @@ #ifdef GDK_WINDOWING_X11 #include <gdk/gdkx.h> #endif - +#ifdef GDK_WINDOWING_WAYLAND +#include <gdk/gdkwayland.h> +#endif #ifdef G_OS_WIN32 #define SOCKET_IS_VALID(s) ((s) != INVALID_SOCKET) @@ -124,13 +126,20 @@ static gint socket_fd_close (gint sock); -static void send_open_command(gint sock, gint argc, gchar **argv) +static void send_open_command(gint sock, gint argc, gchar **argv, const gchar *desktop_startup_id) { gint i; g_return_if_fail(argc > 1); geany_debug("using running instance of Geany"); + if (desktop_startup_id != NULL) + { + socket_fd_write_all(sock, "desktop_startup_id\n", 19); + socket_fd_write_all(sock, desktop_startup_id, strlen(desktop_startup_id)); + socket_fd_write_all(sock, "\n.\n", 3); + } + if (cl_options.goto_line >= 0) { gchar *line = g_strdup_printf("%d\n", cl_options.goto_line); @@ -247,7 +256,7 @@ static void check_socket_permissions(void) * (taken from Sylpheed, thanks) * Returns the created socket, -1 if an error occurred or -2 if another socket exists and files * were sent to it. */ -gint socket_init(gint argc, gchar **argv, G_GNUC_UNUSED gushort socket_port) +gint socket_init(gint argc, gchar **argv, G_GNUC_UNUSED gushort socket_port, const gchar *desktop_startup_id) { gint sock; #ifdef G_OS_WIN32 @@ -334,7 +343,7 @@ gint socket_init(gint argc, gchar **argv, G_GNUC_UNUSED gushort socket_port) SetForegroundWindow(hwnd); #endif - send_open_command(sock, argc, argv); + send_open_command(sock, argc, argv, desktop_startup_id); } if (cl_options.list_documents) @@ -719,6 +728,30 @@ gboolean socket_lock_input_cb(GIOChannel *source, GIOCondition condition, gpoint cl_options.goto_column = atoi(buf); } } + else if (strncmp(buf, "desktop_startup_id", 18) == 0) + { + if (socket_fd_gets(sock, buf, sizeof(buf)) != -1 && *buf != '.') + { +#if defined(GDK_WINDOWING_WAYLAND) || defined(GDK_WINDOWING_X11) + g_strstrip(buf); /* remove \n char */ + geany_debug("Received IPC command from remote instance: desktop_startup_id (%s)", buf); + GdkDisplay *display = gdk_display_get_default(); +#ifdef GDK_WINDOWING_WAYLAND + if (GDK_IS_WAYLAND_DISPLAY(display)) + gdk_wayland_display_set_startup_notification_id(display, buf); +#endif +#ifdef GDK_WINDOWING_X11 + if (GDK_IS_X11_DISPLAY(display)) + gdk_x11_display_set_startup_notification_id(display, buf); +#endif +#endif // GDK_WINDOWING_WAYLAND || GDK_WINDOWING_X11 + while (socket_fd_gets(sock, buf, sizeof(buf)) != -1 && *buf != '.') + { + /* we expect only one line with the token, + * skip anything until the end of the message */ + } + } + } #ifdef G_OS_WIN32 else if (strncmp(buf, "window", 6) == 0) { Modified: src/socket.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -42,7 +42,7 @@ struct SocketInfo extern struct SocketInfo socket_info; -gint socket_init(gint argc, gchar **argv, gushort socket_port); +gint socket_init(gint argc, gchar **argv, gushort socket_port, const gchar *desktop_startup_id); gboolean socket_lock_input_cb(GIOChannel *source, GIOCondition condition, gpointer data); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 19ff75: powershell: use the latest parser from ctags
by Jiří Techet 13 Dec '24

13 Dec '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 08 Dec 2024 17:37:21 UTC Commit: 19ff75d22f6cfcb09e7d3a4ec173a49fb045e157 https://github.com/geany/geany/commit/19ff75d22f6cfcb09e7d3a4ec173a49fb045e… Log Message: ----------- powershell: use the latest parser from ctags Fixes 4089. Modified Paths: -------------- ctags/parsers/powershell.c Modified: ctags/parsers/powershell.c 67 lines changed, 67 insertions(+), 0 deletions(-) =================================================================== @@ -9,6 +9,10 @@ * * This module contains code for generating tags for Windows PowerShell scripts * (https://en.wikipedia.org/wiki/PowerShell). +* +* References: +* - https://learn.microsoft.com/en-us/powershell/scripting/developer/windows-po… +* - https://learn.microsoft.com/en-us/powershell/scripting/lang-spec/chapter-01 */ /* @@ -102,6 +106,7 @@ typedef struct { unsigned long lineNumber; MIOPos filePosition; int parentKind; /* KIND_GHOST_INDEX if none */ + bool herestring; /* Meaningful only when type is TOKEN_STRING. */ } tokenInfo; @@ -258,6 +263,43 @@ static void parseString (vString *const string, const int delimiter) } } +static bool parseHereString (vString *const string, const int delimiter) +{ + enum phs_state { + PHS_INIT, + PHS_NEWLINE0, + PHS_QUOTE, + PHS_AT, + PHS_NEWLINE1, + PHS_END = PHS_NEWLINE1 + } s = PHS_INIT; + + while (s != PHS_END) + { + int c = getcFromInputFile (); + + if (c == EOF) + return false; + + vStringPut (string, c); + + if (s == PHS_INIT && c == '\n') + s = PHS_NEWLINE0; + else if (s == PHS_NEWLINE0 && c == delimiter) + s = PHS_QUOTE; + else if (s == PHS_QUOTE && c == '@') + s = PHS_AT; + else if (s == PHS_AT && c == '\n') + s = PHS_NEWLINE1; + else + s = PHS_INIT; + } + + Assert (vStringLength (string) >= 4); + vStringTruncate (string, vStringLength (string) - 4); + return true; +} + /* parse a identifier that may contain scopes, such as function names and * variable names. * @@ -356,8 +398,33 @@ static void readTokenFull (tokenInfo *const token, bool includingScope) parseString (token->string, c); token->lineNumber = getInputLineNumber (); token->filePosition = getInputFilePosition (); + token->herestring = false; break; + case '@': + { + int d = getcFromInputFile (); + if (d == '\'' || d == '"') + { + bool is_herestr; + token->type = TOKEN_STRING; + is_herestr = parseHereString (token->string, d); + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + if (is_herestr) + token->herestring = true; + else + token->type = TOKEN_UNDEFINED; + } + else if (d == EOF) + token->type = TOKEN_UNDEFINED; + else + { + ungetcToInputFile (d); + token->type = TOKEN_UNDEFINED; + } + break; + } case '<': { int d = getcFromInputFile (); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 1e8f51: Merge pull request #4148 from techee/powershell_fix
by Jiří Techet 13 Dec '24

13 Dec '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Fri, 13 Dec 2024 13:26:37 UTC Commit: 1e8f519b080adeceb222fa812e5fed67b8ac2b55 https://github.com/geany/geany/commit/1e8f519b080adeceb222fa812e5fed67b8ac2… Log Message: ----------- Merge pull request #4148 from techee/powershell_fix powershell: use the latest parser from ctags supporting herestrings Modified Paths: -------------- ctags/parsers/powershell.c Modified: ctags/parsers/powershell.c 67 lines changed, 67 insertions(+), 0 deletions(-) =================================================================== @@ -9,6 +9,10 @@ * * This module contains code for generating tags for Windows PowerShell scripts * (https://en.wikipedia.org/wiki/PowerShell). +* +* References: +* - https://learn.microsoft.com/en-us/powershell/scripting/developer/windows-po… +* - https://learn.microsoft.com/en-us/powershell/scripting/lang-spec/chapter-01 */ /* @@ -102,6 +106,7 @@ typedef struct { unsigned long lineNumber; MIOPos filePosition; int parentKind; /* KIND_GHOST_INDEX if none */ + bool herestring; /* Meaningful only when type is TOKEN_STRING. */ } tokenInfo; @@ -258,6 +263,43 @@ static void parseString (vString *const string, const int delimiter) } } +static bool parseHereString (vString *const string, const int delimiter) +{ + enum phs_state { + PHS_INIT, + PHS_NEWLINE0, + PHS_QUOTE, + PHS_AT, + PHS_NEWLINE1, + PHS_END = PHS_NEWLINE1 + } s = PHS_INIT; + + while (s != PHS_END) + { + int c = getcFromInputFile (); + + if (c == EOF) + return false; + + vStringPut (string, c); + + if (s == PHS_INIT && c == '\n') + s = PHS_NEWLINE0; + else if (s == PHS_NEWLINE0 && c == delimiter) + s = PHS_QUOTE; + else if (s == PHS_QUOTE && c == '@') + s = PHS_AT; + else if (s == PHS_AT && c == '\n') + s = PHS_NEWLINE1; + else + s = PHS_INIT; + } + + Assert (vStringLength (string) >= 4); + vStringTruncate (string, vStringLength (string) - 4); + return true; +} + /* parse a identifier that may contain scopes, such as function names and * variable names. * @@ -356,8 +398,33 @@ static void readTokenFull (tokenInfo *const token, bool includingScope) parseString (token->string, c); token->lineNumber = getInputLineNumber (); token->filePosition = getInputFilePosition (); + token->herestring = false; break; + case '@': + { + int d = getcFromInputFile (); + if (d == '\'' || d == '"') + { + bool is_herestr; + token->type = TOKEN_STRING; + is_herestr = parseHereString (token->string, d); + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + if (is_herestr) + token->herestring = true; + else + token->type = TOKEN_UNDEFINED; + } + else if (d == EOF) + token->type = TOKEN_UNDEFINED; + else + { + ungetcToInputFile (d); + token->type = TOKEN_UNDEFINED; + } + break; + } case '<': { int d = getcFromInputFile (); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] b6244c: Fix GTK runtime errors generated by the plugin manager
by Jiří Techet 09 Dec '24

09 Dec '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 26 Nov 2024 17:48:38 UTC Commit: b6244c6b4e66c5f51a8564e652079f90cc5a3f3b https://github.com/geany/geany/commit/b6244c6b4e66c5f51a8564e652079f90cc5a3… Log Message: ----------- Fix GTK runtime errors generated by the plugin manager The use of geany_wrap_label_new() together with the list below seems to interact in a strange way somehow and generate lots of runtime warnings/errors. This is a (cowardly) attempt by fixing this without having to understand what is going on ;-). Simply using gtk_label_new() seems to resolve the issue. Also, I think the text can be made a bit shorter in case the translation is too wide for some languages. The "at startup" is kind of misleading anyway since plugins are loaded immediately when checked in the box below and since this is a preference, it's remembered so I think it's pretty clear it happens at startup too. Fixes #2065. Modified Paths: -------------- src/plugins.c Modified: src/plugins.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1922,7 +1922,8 @@ static void pm_show_dialog(GtkMenuItem *menuitem, gpointer user_data) gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin), GTK_SHADOW_IN); gtk_container_add(GTK_CONTAINER(swin), pm_widgets.tree); - label = geany_wrap_label_new(_("Choose which plugins should be loaded at startup:")); + label = gtk_label_new(_("Choose which plugins to load:")); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); /* plugin popup menu */ pm_widgets.popup_menu = gtk_menu_new(); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 453ece: Merge pull request #4079 from techee/plugin_manager_warning
by Jiří Techet 09 Dec '24

09 Dec '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Mon, 09 Dec 2024 11:29:45 UTC Commit: 453ece0e730d58958f4c5cf08ee7b091b43cf076 https://github.com/geany/geany/commit/453ece0e730d58958f4c5cf08ee7b091b43cf… Log Message: ----------- Merge pull request #4079 from techee/plugin_manager_warning Fix GTK runtime errors generated by the plugin manager Modified Paths: -------------- src/plugins.c Modified: src/plugins.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1922,7 +1922,8 @@ static void pm_show_dialog(GtkMenuItem *menuitem, gpointer user_data) gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin), GTK_SHADOW_IN); gtk_container_add(GTK_CONTAINER(swin), pm_widgets.tree); - label = geany_wrap_label_new(_("Choose which plugins should be loaded at startup:")); + label = gtk_label_new(_("Choose which plugins to load:")); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); /* plugin popup menu */ pm_widgets.popup_menu = gtk_menu_new(); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] e6c39c: Make saveaction preference strings shorter
by Jiří Techet 09 Dec '24

09 Dec '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sat, 30 Nov 2024 15:31:03 UTC Commit: e6c39c6e92a8c70e0bfb307bd9241c6f836dd021 https://github.com/geany/geany/commit/e6c39c6e92a8c70e0bfb307bd9241c6f836dd… Log Message: ----------- Make saveaction preference strings shorter The existing strings make the dialog too wide and they are a little too verbose. I believe the substitutes contain roughly the same information value. Modified Paths: -------------- plugins/saveactions.c Modified: plugins/saveactions.c 6 lines changed, 2 insertions(+), 4 deletions(-) =================================================================== @@ -1439,7 +1439,7 @@ GtkWidget *plugin_configure(GtkDialog *dialog) gtk_box_pack_start(GTK_BOX(inner_vbox), hbox, FALSE, FALSE, 0); label = gtk_label_new_with_mnemonic( - _("Date/_Time format for backup files (for a list of available conversion specifiers see https://docs.gtk.org/glib/method.DateTime.format.html):")); + _("Date/_Time format for backup files (see https://docs.gtk.org/glib/method.DateTime.format.html):")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); gtk_box_pack_start(GTK_BOX(inner_vbox), label, FALSE, FALSE, 7); @@ -1528,9 +1528,7 @@ GtkWidget *plugin_configure(GtkDialog *dialog) gtk_box_pack_start(GTK_BOX(inner_vbox), hbox, FALSE, FALSE, 0); help_label = gtk_label_new( - _("If you set the Instant Save directory to a directory " - "which is not automatically cleared,\nyou will need to cleanup instantly saved files " - "manually. The Instant Save plugin will not delete the created files.")); + _("The plugin will not delete the files created in this directory.")); gtk_label_set_use_markup(GTK_LABEL(help_label), TRUE); gtk_misc_set_alignment(GTK_MISC(help_label), 0, 0.5); gtk_widget_set_margin_left(help_label, 12); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 397bb5: Merge pull request #4061 from techee/saveactions_str
by Jiří Techet 09 Dec '24

09 Dec '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Mon, 09 Dec 2024 11:28:29 UTC Commit: 397bb5eac38b24bbbc3b8c434766dc109af2d7f8 https://github.com/geany/geany/commit/397bb5eac38b24bbbc3b8c434766dc109af2d… Log Message: ----------- Merge pull request #4061 from techee/saveactions_str Split label in saveactions preferences to make the dialog less wide Modified Paths: -------------- plugins/saveactions.c Modified: plugins/saveactions.c 6 lines changed, 2 insertions(+), 4 deletions(-) =================================================================== @@ -1439,7 +1439,7 @@ GtkWidget *plugin_configure(GtkDialog *dialog) gtk_box_pack_start(GTK_BOX(inner_vbox), hbox, FALSE, FALSE, 0); label = gtk_label_new_with_mnemonic( - _("Date/_Time format for backup files (for a list of available conversion specifiers see https://docs.gtk.org/glib/method.DateTime.format.html):")); + _("Date/_Time format for backup files (see https://docs.gtk.org/glib/method.DateTime.format.html):")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); gtk_box_pack_start(GTK_BOX(inner_vbox), label, FALSE, FALSE, 7); @@ -1528,9 +1528,7 @@ GtkWidget *plugin_configure(GtkDialog *dialog) gtk_box_pack_start(GTK_BOX(inner_vbox), hbox, FALSE, FALSE, 0); help_label = gtk_label_new( - _("If you set the Instant Save directory to a directory " - "which is not automatically cleared,\nyou will need to cleanup instantly saved files " - "manually. The Instant Save plugin will not delete the created files.")); + _("The plugin will not delete the files created in this directory.")); gtk_label_set_use_markup(GTK_LABEL(help_label), TRUE); gtk_misc_set_alignment(GTK_MISC(help_label), 0, 0.5); gtk_widget_set_margin_left(help_label, 12); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 237240: Use light tooltips in the light theme
by Jiří Techet 07 Dec '24

07 Dec '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sat, 07 Dec 2024 18:40:46 UTC Commit: 237240dc6eee8f38d10ddd463cc77184647abd8d https://github.com/geany/geany-osx/commit/237240dc6eee8f38d10ddd463cc771846… Log Message: ----------- Use light tooltips in the light theme This makes the theme look more native both on macOS and Windows Modified Paths: -------------- Prof-Gnome/gtk-3.0/main-light.css Modified: Prof-Gnome/gtk-3.0/main-light.css 22 lines changed, 11 insertions(+), 11 deletions(-) =================================================================== @@ -5536,29 +5536,29 @@ infobar.error button:disabled */ tooltip { - color: @selected_text_color; + color: #303030; } tooltip.background { - background-color: alpha((a)osd_bg_color,0.95); + background-color: alpha(#f2f2f2,0.95); } tooltip.background label { - padding-left: 6px; - padding-right: 6px; - padding-top: 1px; - padding-bottom: 1px; + padding-left: 4px; + padding-right: 4px; + padding-top: 0px; + padding-bottom: 0px; } tooltip decoration { background-color: transparent; } tooltip * { - border-radius: 6px; - background-color: rgba(0,0,0,0); - color: @selected_text_color; + border-radius: 4px; +/* background-color: rgba(0,0,0,0);*/ + color: #303030; } /*((((((((( Color Chooser ))))))))) @@ -5776,7 +5776,7 @@ decoration tooltip.csd decoration { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.18); - border-radius: 6px; + border-radius: 4px; } messagedialog.csd decoration { @@ -6365,7 +6365,7 @@ window.background > box.vertical box.horizontal list.categories } tooltip.background.csd { - border-radius: 6px; + border-radius: 4px; } .nautilus-window.csd.background { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 2ac028: Merge pull request #4099 from techee/pref_wrap_label
by Jiří Techet 07 Dec '24

07 Dec '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Sat, 07 Dec 2024 16:38:58 UTC Commit: 2ac0280c0c7e76304678c613e0021adb01b7cee0 https://github.com/geany/geany/commit/2ac0280c0c7e76304678c613e0021adb01b7c… Log Message: ----------- Merge pull request #4099 from techee/pref_wrap_label Move long label from glade to prefs.c and use geany_wrap_label for it Modified Paths: -------------- data/geany.glade src/prefs.c Modified: data/geany.glade 15 lines changed, 0 insertions(+), 15 deletions(-) =================================================================== @@ -3174,21 +3174,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkLabel" id="label247"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Note: To apply these settings to all currently open documents, use Project->Apply Default Indentation.</property> - <property name="use-markup">True</property> - <property name="wrap">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> <child> <object class="GtkFrame" id="frame27"> <property name="visible">True</property> Modified: src/prefs.c 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -1699,6 +1699,12 @@ void prefs_show_dialog(void) gtk_widget_show(label); gtk_label_set_use_markup(GTK_LABEL(label), TRUE); gtk_misc_set_padding(GTK_MISC(label), 6, 0); + gtk_box_pack_start(GTK_BOX(ui_lookup_widget(ui_widgets.prefs_dialog, + "label_project_indent_warning")), label, FALSE, TRUE, 5); + label = geany_wrap_label_new(_("Note: To apply these settings to all currently open documents, use Project->Apply Default Indentation.")); + gtk_widget_show(label); + gtk_label_set_use_markup(GTK_LABEL(label), TRUE); + gtk_misc_set_padding(GTK_MISC(label), 6, 0); gtk_box_pack_start(GTK_BOX(ui_lookup_widget(ui_widgets.prefs_dialog, "label_project_indent_warning")), label, FALSE, TRUE, 5); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits