[gtk/print-editor: 1/2] printeditor: Cosmetics
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/print-editor: 1/2] printeditor: Cosmetics
- Date: Sun, 28 Jun 2020 14:14:21 +0000 (UTC)
commit f279035e910ed784166b2b1cedcfd02fe9240cd4
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Jun 28 08:33:17 2020 -0400
printeditor: Cosmetics
Bring this up to our standards for an installable demo,
by touching up the about dialog and menus.
demos/print-editor/print-editor.c | 91 +++++++++++++++++++++++++++------------
1 file changed, 64 insertions(+), 27 deletions(-)
---
diff --git a/demos/print-editor/print-editor.c b/demos/print-editor/print-editor.c
index 79e9b0d807..2c36ae9f08 100644
--- a/demos/print-editor/print-editor.c
+++ b/demos/print-editor/print-editor.c
@@ -2,6 +2,7 @@
#include <math.h>
#include <pango/pangocairo.h>
#include <gtk/gtk.h>
+#include <cups/cups.h>
static GtkWidget *main_window;
static GFile *filename = NULL;
@@ -23,7 +24,7 @@ update_title (GtkWindow *window)
else
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);
gtk_window_set_title (window, title);
@@ -592,18 +593,54 @@ activate_about (GSimpleAction *action,
GVariant *parameter,
gpointer user_data)
{
- const gchar *authors[] = {
- "Alexander Larsson",
- NULL
- };
+ char *version;
+ GString *sysinfo;
+ 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),
- "name", "Print Test Editor",
- "logo-icon-name", "text-editor-symbolic",
- "version", PACKAGE_VERSION,
+ "program-name", "GTK Print Editor",
+ "version", version,
"copyright", "© 2006-2020 Red Hat, Inc",
- "comments", "Program to demonstrate GTK printing.",
- "authors", authors,
+ "license-type", GTK_LICENSE_LGPL_2_1,
+ "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);
+
+ g_string_free (sysinfo, TRUE);
+ g_free (version);
}
static void
@@ -643,23 +680,6 @@ static const gchar ui_info[] =
"<interface>"
" <menu id='menubar'>"
" <submenu>"
- " <attribute name='label'>_Application</attribute>"
- " <section>"
- " <item>"
- " <attribute name='label'>_About</attribute>"
- " <attribute name='action'>app.about</attribute>"
- " <attribute name='accel'><Primary>a</attribute>"
- " </item>"
- " </section>"
- " <section>"
- " <item>"
- " <attribute name='label'>_Quit</attribute>"
- " <attribute name='action'>app.quit</attribute>"
- " <attribute name='accel'><Primary>q</attribute>"
- " </item>"
- " </section>"
- " </submenu>"
- " <submenu>"
" <attribute name='label'>_File</attribute>"
" <section>"
" <item>"
@@ -696,6 +716,23 @@ static const gchar ui_info[] =
" <attribute name='action'>app.print</attribute>"
" </item>"
" </section>"
+ " <section>"
+ " <item>"
+ " <attribute name='label'>_Quit</attribute>"
+ " <attribute name='action'>app.quit</attribute>"
+ " <attribute name='accel'><Primary>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'><Primary>a</attribute>"
+ " </item>"
+ " </section>"
" </submenu>"
" </menu>"
"</interface>";
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]