[gtkmm-documentation] AboutDialog example: Add a logotype



commit feb4ff6d6a2242c011d0d5c214431532ea20a6cb
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Tue Jul 19 18:14:37 2016 +0200

    AboutDialog example: Add a logotype
    
    * docs/tutorial/C/index-in.docbook: Add aboutdialog.gresource.xml to the
    listed source code files.
    * examples/.gitignore: Ignore book/dialogs/aboutdialog/resources.c.
    * examples/Makefile.am: Make a resource file for the AboutDialog example.
    * examples/book/dialogs/aboutdialog/examplewindow.cc: Add a logotype to
    the dialog.
    * examples/book/dialogs/aboutdialog/aboutdialog.gresource.xml: New file.
    * examples/book/dialogs/aboutdialog/gtkmm_logo.gif: New file. Copied from
    gtkmm/docs/images/gtkmm_logo.gif.

 docs/tutorial/C/index-in.docbook                   |    2 +-
 examples/.gitignore                                |    1 +
 examples/Makefile.am                               |   10 ++++++++++
 .../dialogs/aboutdialog/aboutdialog.gresource.xml  |    6 ++++++
 examples/book/dialogs/aboutdialog/examplewindow.cc |   13 +++++++++----
 examples/book/dialogs/aboutdialog/gtkmm_logo.gif   |  Bin 0 -> 4416 bytes
 6 files changed, 27 insertions(+), 5 deletions(-)
---
diff --git a/docs/tutorial/C/index-in.docbook b/docs/tutorial/C/index-in.docbook
index edbd114..9e632d2 100644
--- a/docs/tutorial/C/index-in.docbook
+++ b/docs/tutorial/C/index-in.docbook
@@ -4179,7 +4179,7 @@ search-and-replace dialog is non-modal.
   </screenshot>
 </figure>
 
-<para><ulink url="&url_examples_base;dialogs/aboutdialog">Source Code</ulink></para>
+<para><ulink url="&url_examples_base;dialogs/aboutdialog">Source Code</ulink></para> <!-- Insert 
aboutdialog.gresource.xml -->
 </sect2>
 
 </sect1>
diff --git a/examples/.gitignore b/examples/.gitignore
index d917229..2c509b4 100644
--- a/examples/.gitignore
+++ b/examples/.gitignore
@@ -8,6 +8,7 @@ example
 /book/base/base
 /book/buttons/button/buttons
 /book/buttons/radiobutton/radiobuttons
+/book/dialogs/aboutdialog/resources.c
 /book/drag_and_drop/drag_and_drop
 /book/drawingarea/arcs/drawingareaarcs
 /book/drawingarea/clock/cairoclock
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 9683d81..b1e6c43 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -133,6 +133,7 @@ dist_noinst_DATA =                          \
        book/builder/derived/derived.glade      \
        book/buttons/button/info.xpm            \
        book/custom/custom_widget/custom_gtk.css        \
+       $(DIALOGS_ABOUTDIALOG_RESOURCES) \
        $(DRAWINGAREA_IMAGE_RESOURCES) \
        book/iconview/gnome-dice-1.svg          \
        book/iconview/gnome-dice-2.svg          \
@@ -292,6 +293,7 @@ book_custom_custom_widget_example_SOURCES =         \
        book/custom/custom_widget/mywidget.h
 
 book_dialogs_aboutdialog_example_SOURCES =             \
+       book/dialogs/aboutdialog/resources.c \
        book/dialogs/aboutdialog/examplewindow.cc       \
        book/dialogs/aboutdialog/examplewindow.h        \
        book/dialogs/aboutdialog/main.cc
@@ -760,9 +762,17 @@ others_treemodelcustom_example_SOURCES =           \
 #      others/window/wheelbarrow.cc
 
 MAINTAINERCLEANFILES = \
+  book/dialogs/aboutdialog/resources.c \
   book/drawingarea/image/resources.c \
   book/menus_and_toolbars/resources.c
 
+DIALOGS_ABOUTDIALOG_RESOURCES = \
+  book/dialogs/aboutdialog/aboutdialog.gresource.xml \
+  book/dialogs/aboutdialog/gtkmm_logo.gif
+
+book/dialogs/aboutdialog/resources.c: $(DIALOGS_ABOUTDIALOG_RESOURCES)
+       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(dir $<) --generate-source $<
+
 DRAWINGAREA_IMAGE_RESOURCES = \
   book/drawingarea/image/image.gresource.xml \
   book/drawingarea/image/fractal_image.png
diff --git a/examples/book/dialogs/aboutdialog/aboutdialog.gresource.xml 
b/examples/book/dialogs/aboutdialog/aboutdialog.gresource.xml
new file mode 100644
index 0000000..c6768d3
--- /dev/null
+++ b/examples/book/dialogs/aboutdialog/aboutdialog.gresource.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/about">
+    <file>gtkmm_logo.gif</file>
+  </gresource>
+</gresources>
diff --git a/examples/book/dialogs/aboutdialog/examplewindow.cc 
b/examples/book/dialogs/aboutdialog/examplewindow.cc
index 31820c0..715bb04 100644
--- a/examples/book/dialogs/aboutdialog/examplewindow.cc
+++ b/examples/book/dialogs/aboutdialog/examplewindow.cc
@@ -1,5 +1,3 @@
-//$Id: examplewindow.cc 836 2007-05-09 03:02:38Z jjongsma $ -*- c++ -*-
-
 /* gtkmm example Copyright (C) 2002 gtkmm development team
  *
  * This program is free software; you can redistribute it and/or modify
@@ -41,6 +39,7 @@ ExampleWindow::ExampleWindow()
 
   m_Dialog.set_transient_for(*this);
 
+  m_Dialog.set_logo(Gdk::Pixbuf::create_from_resource("/about/gtkmm_logo.gif", -1, 40, true));
   m_Dialog.set_program_name("Example application");
   m_Dialog.set_version("1.0.0");
   m_Dialog.set_copyright("Murray Cumming");
@@ -79,10 +78,16 @@ void ExampleWindow::on_about_dialog_response(int response_id)
     << ", delete_event=" << Gtk::RESPONSE_DELETE_EVENT
     << std::endl;
 
-  if((response_id == Gtk::RESPONSE_CLOSE) ||
-     (response_id == Gtk::RESPONSE_CANCEL) )
+  switch (response_id)
   {
+  case Gtk::RESPONSE_CLOSE:
+  case Gtk::RESPONSE_CANCEL:
+  case Gtk::RESPONSE_DELETE_EVENT:
     m_Dialog.hide();
+    break;
+  default:
+    std::cout << "Unexpected response!" << std::endl;
+    break;
   }
 }
 
diff --git a/examples/book/dialogs/aboutdialog/gtkmm_logo.gif 
b/examples/book/dialogs/aboutdialog/gtkmm_logo.gif
new file mode 100644
index 0000000..30b502c
Binary files /dev/null and b/examples/book/dialogs/aboutdialog/gtkmm_logo.gif differ


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]