printeditor: Cosmetics

Bring this up to our standards for an installable demo,
by touching up the about dialog and menus.
This commit is contained in:
Matthias Clasen 2020-06-28 08:33:17 -04:00
parent ace4eac25a
commit 608cbc28af

View File

@ -23,7 +23,7 @@ update_title (GtkWindow *window)
else else
basename = g_file_get_basename (filename); basename = g_file_get_basename (filename);
title = g_strdup_printf ("Simple Editor with printing - %s", basename); title = g_strdup_printf ("GTK Print Editor — %s", basename);
g_free (basename); g_free (basename);
gtk_window_set_title (window, title); gtk_window_set_title (window, title);
@ -592,18 +592,54 @@ activate_about (GSimpleAction *action,
GVariant *parameter, GVariant *parameter,
gpointer user_data) gpointer user_data)
{ {
const gchar *authors[] = { char *version;
"Alexander Larsson", GString *sysinfo;
NULL char *setting;
}; char **backends;
int i;
sysinfo = g_string_new ("System libraries\n");
g_string_append_printf (sysinfo, "\tGLib\t%d.%d.%d\n",
glib_major_version,
glib_minor_version,
glib_micro_version);
g_string_append_printf (sysinfo, "\tPango\t%s\n",
pango_version_string ());
g_string_append_printf (sysinfo, "\tGTK\t%d.%d.%d\n",
gtk_get_major_version (),
gtk_get_minor_version (),
gtk_get_micro_version ());
g_string_append (sysinfo, "\nPrint backends\n");
g_object_get (gtk_settings_get_default (), "gtk-print-backends", &setting, NULL);
backends = g_strsplit (setting, ",", -1);
for (i = 0; backends[i]; i++)
g_string_append_printf (sysinfo, "\t%s\n", backends[i]);
g_strfreev (backends);
g_free (setting);
version = g_strdup_printf ("%s\nRunning against GTK %d.%d.%d",
PACKAGE_VERSION,
gtk_get_major_version (),
gtk_get_minor_version (),
gtk_get_micro_version ());
gtk_show_about_dialog (GTK_WINDOW (main_window), gtk_show_about_dialog (GTK_WINDOW (main_window),
"name", "Print Test Editor", "program-name", "GTK Print Editor",
"logo-icon-name", "text-editor-symbolic", "version", version,
"version", PACKAGE_VERSION,
"copyright", "© 2006-2020 Red Hat, Inc", "copyright", "© 2006-2020 Red Hat, Inc",
"comments", "Program to demonstrate GTK printing.", "license-type", GTK_LICENSE_LGPL_2_1,
"authors", authors, "website", "http://www.gtk.org",
"comments", "Program to demonstrate GTK printing",
"authors", (const char *[]){ "Alexander Larsson", NULL },
"logo-icon-name", "text-editor-symbolic",
"title", "About GTK Print Editor",
"system-information", sysinfo->str,
NULL); NULL);
g_string_free (sysinfo, TRUE);
g_free (version);
} }
static void static void
@ -643,23 +679,6 @@ static const gchar ui_info[] =
"<interface>" "<interface>"
" <menu id='menubar'>" " <menu id='menubar'>"
" <submenu>" " <submenu>"
" <attribute name='label'>_Application</attribute>"
" <section>"
" <item>"
" <attribute name='label'>_About</attribute>"
" <attribute name='action'>app.about</attribute>"
" <attribute name='accel'>&lt;Primary&gt;a</attribute>"
" </item>"
" </section>"
" <section>"
" <item>"
" <attribute name='label'>_Quit</attribute>"
" <attribute name='action'>app.quit</attribute>"
" <attribute name='accel'>&lt;Primary&gt;q</attribute>"
" </item>"
" </section>"
" </submenu>"
" <submenu>"
" <attribute name='label'>_File</attribute>" " <attribute name='label'>_File</attribute>"
" <section>" " <section>"
" <item>" " <item>"
@ -696,6 +715,23 @@ static const gchar ui_info[] =
" <attribute name='action'>app.print</attribute>" " <attribute name='action'>app.print</attribute>"
" </item>" " </item>"
" </section>" " </section>"
" <section>"
" <item>"
" <attribute name='label'>_Quit</attribute>"
" <attribute name='action'>app.quit</attribute>"
" <attribute name='accel'>&lt;Primary&gt;q</attribute>"
" </item>"
" </section>"
" </submenu>"
" <submenu>"
" <attribute name='label'>_Help</attribute>"
" <section>"
" <item>"
" <attribute name='label'>_About Print Editor</attribute>"
" <attribute name='action'>app.about</attribute>"
" <attribute name='accel'>&lt;Primary&gt;a</attribute>"
" </item>"
" </section>"
" </submenu>" " </submenu>"
" </menu>" " </menu>"
"</interface>"; "</interface>";