[Gnash-commit] gnash ChangeLog gui/Makefile.am gui/gtk.cpp gui...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    06/12/17 01:49:49

Modified files:
        .              : ChangeLog 
        gui            : Makefile.am gtk.cpp gtksup.h gui.h 

Log message:
                * gui/Makefile.am: Switch from the rectangular gnash_128_96.ico 
to
                the square "Gnashing G" icon. It looks better in the toolbar.
                * gui/gtksup.h: Add about box callback prototype.
                * gui/gui.h: Add menu_about().
                * gui/gtk.cpp: Switch from the rectangular gnash_128_96.ico to
                the square "Gnashing G" icon. Add about box, patch by Sebastiá
                Matas, #5640.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1946&r2=1.1947
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtksup.h?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.h?cvsroot=gnash&r1=1.41&r2=1.42

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1946
retrieving revision 1.1947
diff -u -b -r1.1946 -r1.1947
--- ChangeLog   15 Dec 2006 21:19:25 -0000      1.1946
+++ ChangeLog   17 Dec 2006 01:49:49 -0000      1.1947
@@ -1,3 +1,14 @@
+2006-12-16  Rob Savoye  <address@hidden>
+
+       
+       * gui/Makefile.am: Switch from the rectangular gnash_128_96.ico to
+       the square "Gnashing G" icon. It looks better in the toolbar.
+       * gui/gtksup.h: Add about box callback prototype.
+       * gui/gui.h: Add menu_about().
+       * gui/gtk.cpp: Switch from the rectangular gnash_128_96.ico to
+       the square "Gnashing G" icon. Add about box, patch by Sebastiá
+       Matas, #5640.
+
 2006-12-15  Rob Savoye  <address@hidden>
 
        * extensions/Makefile.am: Build MySQL extension.

Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- gui/Makefile.am     28 Nov 2006 12:28:53 -0000      1.51
+++ gui/Makefile.am     17 Dec 2006 01:49:49 -0000      1.52
@@ -17,7 +17,7 @@
 
 # 
 
-# $Id: Makefile.am,v 1.51 2006/11/28 12:28:53 nihilus Exp $
+# $Id: Makefile.am,v 1.52 2006/12/17 01:49:49 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -26,6 +26,7 @@
         -I$(top_srcdir)/server \
         -I$(top_srcdir)/server/parser \
         -I$(top_srcdir)/server/vm \
+       -I$(top_srcdir)/libltdl \
         -I$(top_srcdir)/libbase \
         -I$(top_srcdir)/backend \
         -I$(top_srcdir)/libgeometry \
@@ -165,7 +166,7 @@
 AM_CPPFLAGS += -DDECODER_CONFIG=\"$(DECODER_CONFIG)\"
 AM_CPPFLAGS += -DTARGET_CONFIG=\"$(target)\"
 
-dist_images_DATA = images/gnash_128_96.ico
+dist_images_DATA = images/gnash_128_96.ico images/GnashG.png
 #dist_images_DATA = images/gnash_G_v3.ico
 imagesdir = $(pkgdatadir)
 
@@ -185,6 +186,7 @@
 libgnashgui_la_LIBADD = \
        $(top_builddir)/server/libgnashserver.la \
        $(top_builddir)/backend/libgnashbackend.la \
+       $(top_builddir)/server/libgnashserver.la \
        $(AM_LDFLAGS)
 
 if USE_GUI_KDE
@@ -198,6 +200,7 @@
        $(top_builddir)/libamf/libgnashamf.la \
        $(top_builddir)/backend/libgnashbackend.la \
        $(top_builddir)/server/libgnashserver.la \
+       $(top_builddir)/server/vm/libgnashvm.la \
        $(top_builddir)/libgeometry/libgnashgeo.la \
        $(top_builddir)/libbase/libgnashbase.la \
        libgnashplayer.la
@@ -208,6 +211,7 @@
 libgnashplayer_la_LIBADD = \
        $(top_builddir)/server/libgnashserver.la \
        $(top_builddir)/backend/libgnashbackend.la \
+       $(top_builddir)/server/libgnashserver.la \
        libgnashgui.la \
        $(AM_LDFLAGS) 
 

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- gui/gtk.cpp 5 Dec 2006 23:25:42 -0000       1.53
+++ gui/gtk.cpp 17 Dec 2006 01:49:49 -0000      1.54
@@ -82,7 +82,7 @@
     // XXXbjacques: why do we need this?
     gtk_container_set_reallocate_redraws(GTK_CONTAINER (_window), TRUE);
 
-    _window_icon_pixbuf = create_pixbuf ("gnash_128_96.ico");
+    _window_icon_pixbuf = create_pixbuf ("GnashG.png");
     if (_window_icon_pixbuf) {
         gtk_window_set_icon (GTK_WINDOW (_window), _window_icon_pixbuf);
        gdk_pixbuf_unref (_window_icon_pixbuf);
@@ -323,6 +323,11 @@
         gtk_widget_show(GTK_WIDGET(menuitem_sound));
     }
 
+    GtkMenuItem *menuitem_about =
+       GTK_MENU_ITEM(gtk_menu_item_new_with_label("About Gnash"));
+    gtk_menu_append(_popup_menu, GTK_WIDGET(menuitem_about));
+    gtk_widget_show(GTK_WIDGET(menuitem_about));
+
     GtkMenuItem *menuitem_quit =
        GTK_MENU_ITEM(gtk_menu_item_new_with_label("Quit Gnash"));
     gtk_menu_append(_popup_menu, GTK_WIDGET(menuitem_quit));
@@ -345,6 +350,8 @@
                      G_CALLBACK(&menuitem_jump_backward_callback), this);
     g_signal_connect(GTK_OBJECT(menuitem_quit), "activate",
                      G_CALLBACK(&menuitem_quit_callback), this);
+    g_signal_connect(GTK_OBJECT(menuitem_about), "activate",
++                     G_CALLBACK(&menuitem_about_callback), this);
     if (get_sound_handler()) {
         g_signal_connect(GTK_OBJECT(menuitem_sound), "activate",
                          G_CALLBACK(&menuitem_sound_callback), this);
@@ -428,6 +435,44 @@
   return true;
 }
 
+/// \brief show info about gnash
+void
+GtkGui::menuitem_about_callback(GtkMenuItem* /*menuitem*/, gpointer /*data*/)
+{
+//    GNASH_REPORT_FUNCTION;
+    const gchar *documentors[] = { 
+        "Rob Savoye", 
+        "Sandro Santilli", 
+        NULL 
+    };
+    
+    const gchar *authors[] = { 
+        "Rob Savoye", 
+        "Sandro Santilli", 
+        "Bastiaan Jacques", 
+        "Thomas Groth", 
+        "Udo Giacomozzi", 
+        "Hannes Mayr", 
+        "Marjus Gothe", 
+        "Vitaly Alexeev",
+        NULL 
+    };
+    
+    GdkPixbuf *logo_pixbuf = gdk_pixbuf_new_from_file("GnashG.png", NULL);
+    GtkWidget *about = (GtkWidget*) g_object_new (GTK_TYPE_ABOUT_DIALOG,
+                   "name", "GNASH flash movie player", 
+                   "version", VERSION,
+                   "copyright", "(C) 2005-2006 The Free Software Foundation",
+                  "comments", "Gnash is a GNU Flash movie player. Until now it 
has only been possible to play flash movies with proprietary software. While 
there are a few other free flash players, none supports anything higher than 
SWF v4 at best. Gnash is based on GameSWF, and supports many SWF v7 features.",
+                   "authors", authors,
+                   "documenters", documentors,
+                   "translator-credits", "translator-credits",
+                   "logo", logo_pixbuf,
+                   NULL);
+ 
+    gtk_widget_show (about);
+}
+
 
 // This pops up the menu when the right mouse button is clicked
 gint
@@ -449,6 +494,7 @@
 }
 
 
+
 /// \brief Toggle the sound on or off
 void
 GtkGui::menuitem_sound_callback(GtkMenuItem* /*menuitem*/, gpointer /*data*/)

Index: gui/gtksup.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gtksup.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- gui/gtksup.h        2 Dec 2006 21:03:50 -0000       1.30
+++ gui/gtksup.h        17 Dec 2006 01:49:49 -0000      1.31
@@ -73,6 +73,8 @@
                                    gpointer instance);
     static void menuitem_quit_callback(GtkMenuItem *menuitem,
                                        gpointer instance);
+    static void menuitem_about_callback(GtkMenuItem *menuitem,
+                                        gpointer instance);
     static void menuitem_play_callback(GtkMenuItem *menuitem,
                                        gpointer instance);
     static void menuitem_pause_callback(GtkMenuItem *menuitem,

Index: gui/gui.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- gui/gui.h   6 Dec 2006 11:10:06 -0000       1.41
+++ gui/gui.h   17 Dec 2006 01:49:49 -0000      1.42
@@ -166,6 +166,7 @@
      */
     static void menu_restart();
     static void menu_quit();
+    static void menu_about();
     static void menu_play();
     static void menu_pause();
     static void menu_stop();