Commits February 2023

commits@lists.geany.org

1 participants
14 discussions

[geany/geany] 5c4632: Show modified MRU docs in red
by Nick Treleaven 12 Feb '23

12 Feb '23

Branch: refs/heads/master Author: Nick Treleaven <ntrel002(a)gmail.com> Committer: Nick Treleaven <ntrel002(a)gmail.com> Date: Wed, 08 Feb 2023 16:01:55 UTC Commit: 5c4632fe4b6272832f7614c218aaa571716a4c85 https://github.com/geany/geany/commit/5c4632fe4b6272832f7614c218aaa571716a4… Log Message: ----------- Show modified MRU docs in red (Shown when pressing Ctrl-Tab). Also use GString to build markup label text. Modified Paths: -------------- src/notebook.c Modified: src/notebook.c 16 lines changed, 10 insertions(+), 6 deletions(-) =================================================================== @@ -218,9 +218,9 @@ static GtkWidget *create_switch_dialog(void) static void update_filename_label(void) { guint i; - gchar *msg = NULL; guint queue_length; GeanyDocument *doc; + GString *markup = g_string_new(NULL); if (!switch_dialog) { @@ -234,8 +234,10 @@ static void update_filename_label(void) gchar *basename; basename = g_path_get_basename(DOC_FILENAME(doc)); + SETPTR(basename, g_markup_escape_text(basename, -1)); + if (i == mru_pos) - msg = g_markup_printf_escaped ("%s", basename); + g_string_printf(markup, "%s", basename); else if (i % queue_length == mru_pos) /* && i != mru_pos */ { /* We have wrapped around and got to the starting document again */ @@ -244,13 +246,15 @@ static void update_filename_label(void) } else { - SETPTR(basename, g_markup_printf_escaped ("\n%s", basename)); - SETPTR(msg, g_strconcat(msg, basename, NULL)); + g_string_append(markup, "\n"); + if (doc->changed) + SETPTR(basename, g_strconcat("", basename, "", NULL)); + g_string_append(markup, basename); } g_free(basename); } - gtk_label_set_markup(GTK_LABEL(switch_dialog_label), msg); - g_free(msg); + gtk_label_set_markup(GTK_LABEL(switch_dialog_label), markup->str); + g_string_free(markup, TRUE); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 518e15: Merge pull request #3390 from ntrel/mru-modified
by Enrico Tröger 12 Feb '23

12 Feb '23

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 12 Feb 2023 14:33:10 UTC Commit: 518e157e4b7833b10f3cbcb3ea09fd4990d8d4e7 https://github.com/geany/geany/commit/518e157e4b7833b10f3cbcb3ea09fd4990d8d… Log Message: ----------- Merge pull request #3390 from ntrel/mru-modified Show modified MRU docs in red Modified Paths: -------------- src/notebook.c Modified: src/notebook.c 16 lines changed, 10 insertions(+), 6 deletions(-) =================================================================== @@ -218,9 +218,9 @@ static GtkWidget *create_switch_dialog(void) static void update_filename_label(void) { guint i; - gchar *msg = NULL; guint queue_length; GeanyDocument *doc; + GString *markup = g_string_new(NULL); if (!switch_dialog) { @@ -234,8 +234,10 @@ static void update_filename_label(void) gchar *basename; basename = g_path_get_basename(DOC_FILENAME(doc)); + SETPTR(basename, g_markup_escape_text(basename, -1)); + if (i == mru_pos) - msg = g_markup_printf_escaped ("%s", basename); + g_string_printf(markup, "%s", basename); else if (i % queue_length == mru_pos) /* && i != mru_pos */ { /* We have wrapped around and got to the starting document again */ @@ -244,13 +246,15 @@ static void update_filename_label(void) } else { - SETPTR(basename, g_markup_printf_escaped ("\n%s", basename)); - SETPTR(msg, g_strconcat(msg, basename, NULL)); + g_string_append(markup, "\n"); + if (doc->changed) + SETPTR(basename, g_strconcat("", basename, "", NULL)); + g_string_append(markup, basename); } g_free(basename); } - gtk_label_set_markup(GTK_LABEL(switch_dialog_label), msg); - g_free(msg); + gtk_label_set_markup(GTK_LABEL(switch_dialog_label), markup->str); + g_string_free(markup, TRUE); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] e8a55b: Fix #2599 - Save As dialog can save the wrong document
by Nick Treleaven 12 Feb '23

12 Feb '23

Branch: refs/heads/master Author: Nick Treleaven <ntrel002(a)gmail.com> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 12 Feb 2023 14:17:02 UTC Commit: e8a55b8e7f7ff36b0387a199f8b48e92466ed5d0 https://github.com/geany/geany/commit/e8a55b8e7f7ff36b0387a199f8b48e92466ed… Log Message: ----------- Fix #2599 - Save As dialog can save the wrong document Modified Paths: -------------- src/dialogs.c Modified: src/dialogs.c 14 lines changed, 7 insertions(+), 7 deletions(-) =================================================================== @@ -479,12 +479,11 @@ void dialogs_show_open_file(void) } -static gboolean handle_save_as(const gchar *utf8_filename, gboolean rename_file) +static gboolean handle_save_as(GeanyDocument *doc, + const gchar *utf8_filename, gboolean rename_file) { - GeanyDocument *doc = document_get_current(); gboolean success = FALSE; - - g_return_val_if_fail(doc != NULL, FALSE); + g_return_val_if_fail(DOC_VALID(doc), FALSE); g_return_val_if_fail(!EMPTY(utf8_filename), FALSE); if (doc->file_name != NULL) @@ -508,7 +507,8 @@ static gboolean handle_save_as(const gchar *utf8_filename, gboolean rename_file) } -static gboolean save_as_dialog_handle_response(GtkWidget *dialog, gint response) +static gboolean save_as_dialog_handle_response(GeanyDocument *doc, + GtkWidget *dialog, gint response) { gboolean rename_file = FALSE; gboolean success = FALSE; @@ -535,7 +535,7 @@ static gboolean save_as_dialog_handle_response(GtkWidget *dialog, gint response) gchar *utf8_filename; utf8_filename = utils_get_utf8_from_locale(new_filename); - success = handle_save_as(utf8_filename, rename_file); + success = handle_save_as(doc, utf8_filename, rename_file); g_free(utf8_filename); break; } @@ -640,7 +640,7 @@ static gboolean show_save_as_gtk(GeanyDocument *doc) { resp = gtk_dialog_run(GTK_DIALOG(dialog)); } - while (! save_as_dialog_handle_response(dialog, resp)); + while (! save_as_dialog_handle_response(doc, dialog, resp)); if (app->project && !EMPTY(app->project->base_path)) gtk_file_chooser_remove_shortcut_folder(GTK_FILE_CHOOSER(dialog), -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/www.geany.org] 67631d: Fix linting
by Enrico Tröger 05 Feb '23

05 Feb '23

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 05 Feb 2023 16:16:19 UTC Commit: 67631dda0483d0311152fb4882bd2dce505da50b https://github.com/geany/www.geany.org/commit/67631dda0483d0311152fb4882bd2… Log Message: ----------- Fix linting Modified Paths: -------------- latest_version/context_processors.py news/views.py pastebin/views.py static_docs/generate_i18n_statistics.py static_docs/github_client.py Modified: latest_version/context_processors.py 11 lines changed, 6 insertions(+), 5 deletions(-) =================================================================== @@ -45,8 +45,9 @@ def latest_version(request): fallback_version=geany_plugins_latest_version.version) plugins_release_versions = geany_plugins_release_versions_provider.provide() - return dict( - geany_latest_version=geany_latest_version, - geany_plugins_latest_version=geany_plugins_latest_version, - release_versions=release_versions, - plugins_release_versions=plugins_release_versions) + return { + 'geany_latest_version': geany_latest_version, + 'geany_plugins_latest_version': geany_plugins_latest_version, + 'release_versions': release_versions, + 'plugins_release_versions': plugins_release_versions, + } Modified: news/views.py 15 lines changed, 8 insertions(+), 7 deletions(-) =================================================================== @@ -60,17 +60,18 @@ def post(self, request, *args, **kwargs): # pylint: disable=unused-argument newspost = NewsPost.objects.get(slug=newspost_slug) except NewsPost.DoesNotExist: error_message = f'News post item for "{newspost_slug}" could not be found' - result = dict(error=error_message) + result = {'error': error_message} else: # adapt to dict user_name = newspost.user.get_full_name() publish_date = date(newspost.publish_date, 'F dS, Y') content = safe(richtext_filters(newspost.content)) - result = dict( - error=None, - title=newspost.title, - content=content, - user=user_name, - publish_date=publish_date) + result = { + 'error': None, + 'title': newspost.title, + 'content': content, + 'user': user_name, + 'publish_date': publish_date, + } return JsonResponse(result, safe=True) Modified: pastebin/views.py 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -68,7 +68,7 @@ def get(self, request, snippet_id): snippet = self._fetch_snippet(snippet_id) except SnippetNotFoundError as exc: # 404 response with custom message - context = dict(message=exc) + context = {'message': exc} return TemplateResponse(request, 'errors/404.html', context=context, status=404) snippet_list_ = _get_snippet_list(no_content=True) @@ -92,8 +92,8 @@ def _fetch_snippet(self, snippet_id): raise SnippetNotFoundError( _('This snippet does not exist anymore. Probably its lifetime is expired.') ) from exc - else: - return snippet + + return snippet class SnippetDetailRawView(SnippetDetailView): Modified: static_docs/generate_i18n_statistics.py 14 lines changed, 8 insertions(+), 6 deletions(-) =================================================================== @@ -138,9 +138,10 @@ def _factor_pot_filename(self): # ---------------------------------------------------------------------- def _execute_command(self, command): - environment = dict( - srcdir=self._source_path, - LANG='C') + environment = { + 'srcdir': self._source_path, + 'LANG': 'C' + } try: output = check_output( command, @@ -242,9 +243,10 @@ def _fetch_message_catalog_stats(self): # ---------------------------------------------------------------------- def _factor_overall_statistics(self): - self._overall_statistics = dict( - total_statistics=self._pot_stats, - catalog_statistics=self._message_catalogs) + self._overall_statistics = { + 'total_statistics': self._pot_stats, + 'catalog_statistics': self._message_catalogs + } # add timestamp self._overall_statistics['generated_timestamp'] = time() Modified: static_docs/github_client.py 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -46,7 +46,7 @@ def get_file_contents(self, filename, user=None, repository=None): # ---------------------------------------------------------------------- def _request(self, url, status_404_expected=False): - request_args = dict(timeout=HTTP_REQUEST_TIMEOUT, stream=False) + request_args = {'timeout': HTTP_REQUEST_TIMEOUT, 'stream': False} if self._auth_token is not None: authorization_header = self._factor_authorization_header() request_args['headers'] = authorization_header -------------- 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 February 2023