gnome-commander r1620 - in trunk: . src src/intviewer

[epiotr svn gnome org]

Author: epiotr
Date: Wed Mar  5 21:46:48 2008
New Revision: 1620
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=1620&view=rev

Log:
Replaced deprecated icon names with newer ones

Modified:
   trunk/ChangeLog
   trunk/src/gnome-cmd-file-popmenu.cc
   trunk/src/gnome-cmd-list-popmenu.cc
   trunk/src/gnome-cmd-main-menu.cc
   trunk/src/gnome-cmd-search-dialog.cc
   trunk/src/intviewer/viewer-window.cc

Modified: trunk/src/gnome-cmd-file-popmenu.cc
==============================================================================
--- trunk/src/gnome-cmd-file-popmenu.cc	(original)
+++ trunk/src/gnome-cmd-file-popmenu.cc	Wed Mar  5 21:46:48 2008
@@ -449,15 +449,15 @@
 
     static GnomeUIInfo other_uiinfo[] =
     {
-        GNOMEUIINFO_ITEM_STOCK(N_("Cu_t"), NULL, on_cut, GNOME_STOCK_MENU_CUT),
-        GNOMEUIINFO_ITEM_STOCK(N_("_Copy"), NULL, on_copy, GNOME_STOCK_MENU_COPY),
-        GNOMEUIINFO_ITEM_STOCK(N_("_Delete"), NULL, on_delete, GNOME_STOCK_MENU_TRASH),
+        GNOMEUIINFO_ITEM_STOCK(N_("Cu_t"), NULL, on_cut, GTK_STOCK_CUT),
+        GNOMEUIINFO_ITEM_STOCK(N_("_Copy"), NULL, on_copy, GTK_STOCK_COPY),
+        GNOMEUIINFO_ITEM_STOCK(N_("_Delete"), NULL, on_delete, GNOME_STOCK_TRASH),
         GNOMEUIINFO_SEPARATOR,
         GNOMEUIINFO_ITEM_NONE (N_("Rename"), NULL, on_rename),
         GNOMEUIINFO_ITEM_STOCK(_("Send files"), NULL, file_sendto, GNOME_STOCK_MAIL_SND),
         GNOMEUIINFO_ITEM_FILENAME (N_("Open _terminal here"), NULL, command_open_terminal, PACKAGE_NAME G_DIR_SEPARATOR_S "terminal.svg"),
         GNOMEUIINFO_SEPARATOR,
-        GNOMEUIINFO_ITEM_STOCK(N_("_Properties..."), NULL, on_properties, GNOME_STOCK_MENU_PROP),
+        GNOMEUIINFO_ITEM_STOCK(N_("_Properties..."), NULL, on_properties, GTK_STOCK_PROPERTIES),
         GNOMEUIINFO_END
     };
 

Modified: trunk/src/gnome-cmd-list-popmenu.cc
==============================================================================
--- trunk/src/gnome-cmd-list-popmenu.cc	(original)
+++ trunk/src/gnome-cmd-list-popmenu.cc	Wed Mar  5 21:46:48 2008
@@ -119,9 +119,9 @@
     static GnomeUIInfo popmenu_uiinfo[] =
     {
         GNOMEUIINFO_SUBTREE(N_("_New..."), new_uiinfo),
-        GNOMEUIINFO_ITEM_STOCK(N_("_Paste"), NULL, on_paste, GNOME_STOCK_MENU_PASTE),
+        GNOMEUIINFO_ITEM_STOCK(N_("_Paste"), NULL, on_paste, GTK_STOCK_PASTE),
         GNOMEUIINFO_ITEM_FILENAME (N_("Open _terminal here"), NULL, command_open_terminal, PACKAGE_NAME G_DIR_SEPARATOR_S "terminal.svg"),
-        GNOMEUIINFO_ITEM_STOCK(N_("_Refresh"), NULL, on_refresh, GNOME_STOCK_MENU_REFRESH),
+        GNOMEUIINFO_ITEM_STOCK(N_("_Refresh"), NULL, on_refresh, GTK_STOCK_REFRESH),
         GNOMEUIINFO_END
     };
 

Modified: trunk/src/gnome-cmd-main-menu.cc
==============================================================================
--- trunk/src/gnome-cmd-main-menu.cc	(original)
+++ trunk/src/gnome-cmd-main-menu.cc	Wed Mar  5 21:46:48 2008
@@ -486,7 +486,7 @@
         {
             MENU_TYPE_ITEM, _("_Quit"), "Ctrl+Q", NULL,
             (gpointer) file_exit, NULL,
-            GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_QUIT,
+            GNOME_APP_PIXMAP_STOCK, GTK_STOCK_QUIT,
             NULL
         },
         MENUTYPE_END
@@ -545,25 +545,25 @@
         {
             MENU_TYPE_ITEM, _("Cu_t"), "Ctrl+X", NULL,
             (gpointer) edit_cap_cut, NULL,
-            GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_CUT,
+            GNOME_APP_PIXMAP_STOCK, GTK_STOCK_CUT,
             NULL
         },
         {
             MENU_TYPE_ITEM, _("_Copy"), "Ctrl+C", NULL,
             (gpointer) edit_cap_copy, NULL,
-            GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_COPY,
+            GNOME_APP_PIXMAP_STOCK, GTK_STOCK_COPY,
             NULL
         },
         {
             MENU_TYPE_ITEM, _("_Paste"), "Ctrl+V", NULL,
             (gpointer) edit_cap_paste, NULL,
-            GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_PASTE,
+            GNOME_APP_PIXMAP_STOCK, GTK_STOCK_PASTE,
             NULL
         },
         {
             MENU_TYPE_ITEM, _("_Delete"), "Delete", NULL,
             (gpointer) file_delete, NULL,
-            GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_TRASH,
+            GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_TRASH,
             NULL
         },
         MENUTYPE_SEPARATOR,
@@ -577,7 +577,7 @@
         {
             MENU_TYPE_ITEM, _("_Search..."), "Alt+F7", NULL,
             (gpointer) edit_search, NULL,
-            GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_SEARCH,
+            GNOME_APP_PIXMAP_STOCK, GTK_STOCK_FIND,
             NULL
         },
         {
@@ -600,19 +600,19 @@
         {
             MENU_TYPE_ITEM, _("_Back"), "Alt+Left", NULL,
             (gpointer) view_back, NULL,
-            GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_BACK,
+            GNOME_APP_PIXMAP_STOCK, GTK_STOCK_GO_BACK,
             NULL
         },
         {
             MENU_TYPE_ITEM, _("_Forward"), "Alt+Right", NULL,
             (gpointer) view_forward, NULL,
-            GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_FORWARD,
+            GNOME_APP_PIXMAP_STOCK, GTK_STOCK_GO_FORWARD,
             NULL
         },
         {
             MENU_TYPE_ITEM, _("_Refresh"), "Ctrl+R", NULL,
             (gpointer) view_refresh, NULL,
-            GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_REFRESH,
+            GNOME_APP_PIXMAP_STOCK, GTK_STOCK_REFRESH,
             NULL
         },
         MENUTYPE_SEPARATOR,
@@ -757,7 +757,7 @@
         {
             MENU_TYPE_ITEM, _("_About"), "", NULL,
             (gpointer) help_about, NULL,
-            GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_ABOUT,
+            GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_ABOUT,
             NULL
         },
         MENUTYPE_END

Modified: trunk/src/gnome-cmd-search-dialog.cc
==============================================================================
--- trunk/src/gnome-cmd-search-dialog.cc	(original)
+++ trunk/src/gnome-cmd-search-dialog.cc	Wed Mar  5 21:46:48 2008
@@ -779,16 +779,16 @@
 
 
     dialog->priv->close_button = gnome_cmd_dialog_add_button (
-        GNOME_CMD_DIALOG (dialog), GNOME_STOCK_PIXMAP_CLOSE,
+        GNOME_CMD_DIALOG (dialog), GTK_STOCK_CLOSE,
         GTK_SIGNAL_FUNC (on_close), dialog);
     dialog->priv->goto_button = gnome_cmd_dialog_add_button (
         GNOME_CMD_DIALOG (dialog), _("Goto"),
         GTK_SIGNAL_FUNC (on_goto), dialog);
     dialog->priv->stop_button = gnome_cmd_dialog_add_button (
-        GNOME_CMD_DIALOG (dialog), GNOME_STOCK_PIXMAP_STOP,
+        GNOME_CMD_DIALOG (dialog), GTK_STOCK_STOP,
         GTK_SIGNAL_FUNC (on_stop), dialog);
     dialog->priv->search_button = gnome_cmd_dialog_add_button (
-        GNOME_CMD_DIALOG (dialog), GNOME_STOCK_PIXMAP_SEARCH,
+        GNOME_CMD_DIALOG (dialog), GTK_STOCK_FIND,
         GTK_SIGNAL_FUNC (on_search), dialog);
 
     gtk_widget_set_sensitive (dialog->priv->stop_button, FALSE);

Modified: trunk/src/intviewer/viewer-window.cc
==============================================================================
--- trunk/src/intviewer/viewer-window.cc	(original)
+++ trunk/src/intviewer/viewer-window.cc	Wed Mar  5 21:46:48 2008
@@ -703,7 +703,7 @@
 
     MENU_ITEM_DATA file_menu_items[] = {
         {MI_NORMAL, _("_Close"), GDK_Escape, NO_MODIFIER, G_CALLBACK (menu_file_close),
-                GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_CLOSE,
+                GNOME_APP_PIXMAP_STOCK, GTK_STOCK_CLOSE,
                 NO_GOBJ_KEY, NO_GOBJ_VAL,
                 NO_MENU_ITEM, NO_GSLIST},
         {MI_NONE}
@@ -755,11 +755,11 @@
 #endif
     MENU_ITEM_DATA text_menu_items[] = {
         {MI_NORMAL, _("_Copy Text Selection"), GDK_C, GDK_CONTROL_MASK, G_CALLBACK (menu_edit_copy),
-                GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_COPY,
+                GNOME_APP_PIXMAP_STOCK, GTK_STOCK_COPY,
                 NO_GOBJ_KEY, NO_GOBJ_VAL,
                 NO_MENU_ITEM, NO_GSLIST},
         {MI_NORMAL, _("Find..."), GDK_F, GDK_CONTROL_MASK, G_CALLBACK (menu_edit_find),
-                GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_SEARCH,
+                GNOME_APP_PIXMAP_STOCK, GTK_STOCK_FIND,
                 NO_GOBJ_KEY, NO_GOBJ_VAL,
                 NO_MENU_ITEM, NO_GSLIST},
         {MI_NORMAL, _("Find Next"), GDK_F3, NO_MODIFIER, G_CALLBACK (menu_edit_find_next),