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

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   07/09/26 10:53:48

Modified files:
        .              : ChangeLog 
        gui            : gtk.cpp 

Log message:
                * gui/gtk.cpp: More moving menu items about.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4419&r2=1.4420
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.115&r2=1.116

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4419
retrieving revision 1.4420
diff -u -b -r1.4419 -r1.4420
--- ChangeLog   26 Sep 2007 10:41:02 -0000      1.4419
+++ ChangeLog   26 Sep 2007 10:53:47 -0000      1.4420
@@ -1,3 +1,7 @@
+2007-09-26 Benjamin Wolsey <address@hidden>
+
+       * gui/gtk.cpp: More moving menu items about.
+
 2007-09-26 Sandro Santilli <address@hidden>
 
        * testsuite/actionscript.all/ops.as: add test for bitwise and between

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -b -r1.115 -r1.116
--- gui/gtk.cpp 26 Sep 2007 08:11:19 -0000      1.115
+++ gui/gtk.cpp 26 Sep 2007 10:53:48 -0000      1.116
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: gtk.cpp,v 1.115 2007/09/26 08:11:19 bwy Exp $ */
+/* $Id: gtk.cpp,v 1.116 2007/09/26 10:53:48 bwy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1574,38 +1574,53 @@
     GtkWidget *menu = gtk_menu_new ();
     gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu);
     
-    GtkWidget *obre1 =
+// Open    
+    GtkWidget *open =
        gtk_image_menu_item_new_from_stock ("gtk-open", NULL);
-    gtk_widget_show (obre1);
-    gtk_container_add (GTK_CONTAINER (menu), obre1);
+    gtk_widget_show (open);
+    gtk_container_add (GTK_CONTAINER (menu), open);
+    g_signal_connect ((gpointer) open, "activate",
+                      G_CALLBACK (&menuitem_openfile_callback),
+                      this);
     
-    GtkWidget *desa1 =
+// Save    
+    GtkWidget *save =
        gtk_image_menu_item_new_from_stock ("gtk-save", NULL);
-    gtk_widget_show (desa1);
-    gtk_container_add (GTK_CONTAINER (menu), desa1);
+    gtk_widget_show (save);
+    gtk_container_add (GTK_CONTAINER (menu), save);
     // Disabled until save functionality is implemented:
-    gtk_widget_set_sensitive(desa1,FALSE); 
+    gtk_widget_set_sensitive(save,FALSE); 
 
-    GtkWidget *anomena_i_desa1 =
+// Save as
+    GtkWidget *save_as =
        gtk_image_menu_item_new_from_stock ("gtk-save-as", NULL);
-    gtk_widget_show (anomena_i_desa1);
-    gtk_container_add (GTK_CONTAINER (menu), anomena_i_desa1);
+    gtk_widget_show (save_as);
+    gtk_container_add (GTK_CONTAINER (menu), save_as);
     // Disabled until save-as functionality is implemented:
-    gtk_widget_set_sensitive(anomena_i_desa1,FALSE);
+    gtk_widget_set_sensitive(save_as,FALSE);
     
     GtkWidget *separatormenuitem1 = gtk_separator_menu_item_new ();
     gtk_widget_show (separatormenuitem1);
     gtk_container_add (GTK_CONTAINER (menu), separatormenuitem1);
-    gtk_widget_set_sensitive (separatormenuitem1, FALSE);
-
-    GtkWidget *surt1 = gtk_image_menu_item_new_from_stock ("gtk-quit", NULL);
-    gtk_widget_show (surt1);
-    gtk_container_add (GTK_CONTAINER (menu), surt1);
 
-    g_signal_connect ((gpointer) obre1, "activate",
-                      G_CALLBACK (&menuitem_openfile_callback),
+// Properties
+    GtkWidget *properties =
+       gtk_image_menu_item_new_from_stock ("gtk-properties", NULL);
+    gtk_widget_show (properties);
+    gtk_container_add (GTK_CONTAINER (menu), properties);
+    g_signal_connect ((gpointer) properties, "activate",
+                      G_CALLBACK (&menuitem_movieinfo_callback),
                       this);
-    g_signal_connect ((gpointer) surt1, "activate",
+
+    GtkWidget *separator2 = gtk_separator_menu_item_new ();
+    gtk_widget_show (separator2);
+    gtk_container_add (GTK_CONTAINER (menu), separator2);
+
+    GtkWidget *quit = gtk_image_menu_item_new_from_stock ("gtk-quit", NULL);
+    gtk_widget_show (quit);
+    gtk_container_add (GTK_CONTAINER (menu), quit);
+
+    g_signal_connect ((gpointer) quit, "activate",
                       G_CALLBACK (&menuitem_quit_callback),
                       this);
 }
@@ -1666,15 +1681,17 @@
     GtkWidget *menu = gtk_menu_new ();
     gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu);
 
-    GtkWidget *properties1 =
-       gtk_image_menu_item_new_from_stock ("gtk-properties", NULL);
-    gtk_widget_show (properties1);
-    gtk_container_add (GTK_CONTAINER (menu), properties1);
-    // Disabled until properties functionality is implemented:
-    g_signal_connect ((gpointer) properties1, "activate",
-                      G_CALLBACK (&menuitem_movieinfo_callback),
-                      this);
-
+// Refresh
+    GtkImageMenuItem *menuitem_refresh =
+       GTK_IMAGE_MENU_ITEM(
+           gtk_image_menu_item_new_with_label(_("Redraw")));
+    gtk_image_menu_item_set_image (menuitem_refresh,
+                                  gtk_image_new_from_stock("gtk-refresh",
+                                                            
GTK_ICON_SIZE_MENU));
+    gtk_menu_append(menu, GTK_WIDGET(menuitem_refresh));
+    gtk_widget_show(GTK_WIDGET(menuitem_refresh));
+    g_signal_connect ((gpointer) menuitem_refresh, "activate",
+        G_CALLBACK (&menuitem_refresh_view_callback), this);
 }
 
 // Create a Control menu that can be used from the menu bar or the popup.
@@ -1791,23 +1808,6 @@
     gtk_menu_append(menu, GTK_WIDGET(menuitem_jump_backward));
     gtk_widget_show(GTK_WIDGET(menuitem_jump_backward));
 
-
-    GtkWidget *separator2 = gtk_separator_menu_item_new ();
-    gtk_widget_show (separator2);
-    gtk_container_add (GTK_CONTAINER (menu), separator2);
-
-// Refresh
-// This should probably be under 'View', but then Properties should
-// be under 'File'
-    GtkMenuItem *menuitem_refresh = GTK_MENU_ITEM(
-       gtk_image_menu_item_new_from_stock ("gtk-refresh", NULL));
-    gtk_menu_append(menu, GTK_WIDGET(menuitem_refresh));
-    gtk_widget_show(GTK_WIDGET(menuitem_refresh));
-    g_signal_connect ((gpointer) menuitem_refresh, "activate",
-        G_CALLBACK (&menuitem_refresh_view_callback), this);
-
-
-
 }
 
 } // end of namespace gnash