gnome-terminal r3405 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Mon Mar 30 17:16:45 2009
New Revision: 3405
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=3405&view=rev

Log:
Add Leave Fullscreen item. Bug #566335, patch by Simon van der Linden.

Modified:
   trunk/src/terminal-window.c
   trunk/src/terminal.xml

Modified: trunk/src/terminal-window.c
==============================================================================
--- trunk/src/terminal-window.c	(original)
+++ trunk/src/terminal-window.c	Mon Mar 30 17:16:45 2009
@@ -1133,6 +1133,13 @@
 }
 
 static void
+popup_leave_fullscreen_callback (GtkAction *action,
+                                 TerminalWindow *window)
+{
+    gtk_window_unfullscreen (GTK_WINDOW (window));
+}
+
+static void
 remove_popup_info (TerminalWindow *window)
 {
   TerminalWindowPrivate *priv = window->priv;
@@ -1432,6 +1439,9 @@
 
       action = gtk_action_group_get_action (priv->action_group, "ViewFullscreen");
       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), is_fullscreen);
+  
+      action = gtk_action_group_get_action (priv->action_group, "PopupLeaveFullscreen");
+      gtk_action_set_visible (action, is_fullscreen);
     }
   
   if (window_state_event)
@@ -1713,6 +1723,9 @@
       { "PopupCloseTab", NULL, N_("C_lose Tab"), NULL,
         NULL,
         G_CALLBACK (file_close_tab_callback) },
+      { "PopupLeaveFullscreen", NULL, N_("L_eave Full Screen"), NULL,
+        NULL,
+        G_CALLBACK (popup_leave_fullscreen_callback) },
       { "PopupInputMethods", NULL, N_("_Input Methods") }
     };
   
@@ -1823,6 +1836,10 @@
   action = gtk_action_group_get_action (priv->action_group, "EditPasteURIPaths");
   gtk_action_set_visible (action, FALSE);
 
+  /* Idem for this action, since the window is not fullscreen. */
+  action = gtk_action_group_get_action (priv->action_group, "PopupLeaveFullscreen");
+  gtk_action_set_visible (action, FALSE);
+
   /* Load the UI */
   error = NULL;
   priv->ui_id = gtk_ui_manager_add_ui_from_file (manager,

Modified: trunk/src/terminal.xml
==============================================================================
--- trunk/src/terminal.xml	(original)
+++ trunk/src/terminal.xml	Mon Mar 30 17:16:45 2009
@@ -84,6 +84,7 @@
         <menuitem action="EditCurrentProfile" />
     </menu>
     <menuitem action="ViewMenubar" />
+    <menuitem action="PopupLeaveFullscreen" />
     <separator />
     <menuitem action="PopupInputMethods" />
   </popup>