gnome-commander r2431 - in trunk: . src

[epiotr svn gnome org]

Author: epiotr
Date: Thu Jan 15 17:22:21 2009
New Revision: 2431
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=2431&view=rev

Log:
tabs: added menus+shortcuts for open/close tabs

Modified:
   trunk/ChangeLog
   trunk/src/gnome-cmd-file-list.cc
   trunk/src/gnome-cmd-main-menu.cc
   trunk/src/gnome-cmd-user-actions.cc

Modified: trunk/src/gnome-cmd-file-list.cc
==============================================================================
--- trunk/src/gnome-cmd-file-list.cc	(original)
+++ trunk/src/gnome-cmd-file-list.cc	Thu Jan 15 17:22:21 2009
@@ -55,12 +55,6 @@
 #define POPUP_TIMEOUT 750
 
 
-#if 0
-static char *msgs[] = {N_("Open in New _Tab"),
-                       N_("_Close Tab")};
-#endif
-
-
 enum
 {
     FILE_CLICKED,        // A file in the list was clicked

Modified: trunk/src/gnome-cmd-main-menu.cc
==============================================================================
--- trunk/src/gnome-cmd-main-menu.cc	(original)
+++ trunk/src/gnome-cmd-main-menu.cc	Thu Jan 15 17:22:21 2009
@@ -619,6 +619,19 @@
         },
         MENUTYPE_SEPARATOR,
         {
+            MENU_TYPE_ITEM, _("Open in New _Tab"), "Ctrl+T", NULL,
+            (gpointer) view_new_tab, NULL,
+            GNOME_APP_PIXMAP_STOCK, GTK_STOCK_OPEN,
+            NULL
+        },
+        {
+            MENU_TYPE_ITEM, _("_Close Tab"), "Ctrl+W", NULL,
+            (gpointer) view_close_tab, NULL,
+            GNOME_APP_PIXMAP_STOCK, GTK_STOCK_CLOSE,
+            NULL
+        },
+        MENUTYPE_SEPARATOR,
+        {
             MENU_TYPE_TOGGLEITEM, _("Show Toolbar"), "", NULL,
             (gpointer) view_toolbar, NULL,
             GNOME_APP_PIXMAP_NONE, NULL,
@@ -829,13 +842,13 @@
     gtk_menu_shell_append (GTK_MENU_SHELL (main_menu), main_menu->priv->help_menu);
 
     main_menu->priv->menu_edit_paste = edit_menu_uiinfo[2].widget;
-    main_menu->priv->menu_view_toolbar = view_menu_uiinfo[4].widget;
-    main_menu->priv->menu_view_conbuttons = view_menu_uiinfo[5].widget;
-    main_menu->priv->menu_view_concombo = view_menu_uiinfo[6].widget;
-    main_menu->priv->menu_view_cmdline = view_menu_uiinfo[7].widget;
-    main_menu->priv->menu_view_buttonbar = view_menu_uiinfo[8].widget;
-    main_menu->priv->menu_view_hidden_files = view_menu_uiinfo[10].widget;
-    main_menu->priv->menu_view_backup_files = view_menu_uiinfo[11].widget;
+    main_menu->priv->menu_view_toolbar = view_menu_uiinfo[7].widget;
+    main_menu->priv->menu_view_conbuttons = view_menu_uiinfo[8].widget;
+    main_menu->priv->menu_view_concombo = view_menu_uiinfo[9].widget;
+    main_menu->priv->menu_view_cmdline = view_menu_uiinfo[10].widget;
+    main_menu->priv->menu_view_buttonbar = view_menu_uiinfo[11].widget;
+    main_menu->priv->menu_view_hidden_files = view_menu_uiinfo[13].widget;
+    main_menu->priv->menu_view_backup_files = view_menu_uiinfo[14].widget;
     main_menu->priv->menu_view_back = view_menu_uiinfo[0].widget;
     main_menu->priv->menu_view_forward = view_menu_uiinfo[1].widget;
 

Modified: trunk/src/gnome-cmd-user-actions.cc
==============================================================================
--- trunk/src/gnome-cmd-user-actions.cc	(original)
+++ trunk/src/gnome-cmd-user-actions.cc	Thu Jan 15 17:22:21 2009
@@ -331,6 +331,15 @@
     if (!registered("view.refresh"))
         register_action(GDK_CONTROL_MASK, GDK_R, "view.refresh");
 
+    if (!registered("view.new_tab"))
+    {
+        unregister(GDK_CONTROL_MASK, GDK_T);                       // unregister CTRL+T as it was used previously for file.advrename
+        register_action(GDK_CONTROL_MASK, GDK_T, "view.new_tab");
+    }
+
+    if (!registered("view.close_tab"))
+        register_action(GDK_CONTROL_MASK, GDK_W, "view.close_tab");
+
     unregister(GDK_F9);                                 // unregister F9 if defined in [key-bindings]
     register_action(GDK_F9, "edit.search");             // and overwrite it with edit.search action