From 33fc4d649539381ea0d5e2ea07a6ae5ef9e68c8d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 26 Jun 2023 10:57:11 -0400 Subject: [PATCH] buildertool: Make render an alias for screenshot Its a more neutral name and will align better with other tools. --- docs/reference/gtk/gtk4-builder-tool.rst | 15 ++++++++++----- tools/gtk-builder-tool-screenshot.c | 6 +++--- tools/gtk-builder-tool.c | 4 +++- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/docs/reference/gtk/gtk4-builder-tool.rst b/docs/reference/gtk/gtk4-builder-tool.rst index ad38532949..2eb44c30e9 100644 --- a/docs/reference/gtk/gtk4-builder-tool.rst +++ b/docs/reference/gtk/gtk4-builder-tool.rst @@ -16,6 +16,7 @@ SYNOPSIS | **gtk4-builder-tool** enumerate [OPTIONS...] | **gtk4-builder-tool** simplify [OPTIONS...] | **gtk4-builder-tool** preview [OPTIONS...] +| **gtk4-builder-tool** render [OPTIONS...] | **gtk4-builder-tool** screenshot [OPTIONS...] DESCRIPTION @@ -69,12 +70,11 @@ file to use. Load style information from the given CSS file. -Screenshot -^^^^^^^^^^ +Render +^^^^^^ -The ``screenshot`` command saves a rendering of the UI definition file -as a png image or node file. The name of the file to write can be specified as -a second FILE argument. +The ``render`` command saves a rendering of the UI definition file as a png image +or node file. The name of the file to write can be specified as a second FILE argument. This command accepts options to specify the ID of the toplevel object and a CSS file to use. @@ -96,6 +96,11 @@ file to use. Overwrite an existing file. +Screenshot +^^^^^^^^^^ + +The ``screenshot`` command is an alias for ``render``. + Simplification ^^^^^^^^^^^^^^ diff --git a/tools/gtk-builder-tool-screenshot.c b/tools/gtk-builder-tool-screenshot.c index bf4847c9e5..d6f33a39c2 100644 --- a/tools/gtk-builder-tool-screenshot.c +++ b/tools/gtk-builder-tool-screenshot.c @@ -371,11 +371,11 @@ do_screenshot (int *argc, exit (1); } - g_set_prgname ("gtk4-builder-tool screenshot"); + g_set_prgname ("gtk4-builder-tool render"); context = g_option_context_new (NULL); g_option_context_set_translation_domain (context, GETTEXT_PACKAGE); g_option_context_add_main_entries (context, entries, NULL); - g_option_context_set_summary (context, _("Take a screenshot of the file.")); + g_option_context_set_summary (context, _("Render a .ui file to an image.")); if (!g_option_context_parse (context, argc, (char ***)argv, &error)) { @@ -394,7 +394,7 @@ do_screenshot (int *argc, if (g_strv_length (filenames) > 2) { - g_printerr (_("Can only screenshot a single .ui file and a single output file\n")); + g_printerr (_("Can only render a single .ui file to a single output file\n")); exit (1); } diff --git a/tools/gtk-builder-tool.c b/tools/gtk-builder-tool.c index 347c96211b..5ac829b519 100644 --- a/tools/gtk-builder-tool.c +++ b/tools/gtk-builder-tool.c @@ -43,6 +43,7 @@ usage (void) " simplify Simplify the file\n" " enumerate List all named objects\n" " preview Preview the file\n" + " render Take a screenshot of the file\n" " screenshot Take a screenshot of the file\n" "\n")); exit (1); @@ -134,7 +135,8 @@ main (int argc, const char *argv[]) do_enumerate (&argc, &argv); else if (strcmp (argv[0], "preview") == 0) do_preview (&argc, &argv); - else if (strcmp (argv[0], "screenshot") == 0) + else if (strcmp (argv[0], "render") == 0 || + strcmp (argv[0], "screenshot") == 0) do_screenshot (&argc, &argv); else usage ();