gnome-terminal r2471 - trunk/src
- From: chpe svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-terminal r2471 - trunk/src
- Date: Wed, 19 Mar 2008 18:09:50 +0000 (GMT)
Author: chpe
Date: Wed Mar 19 18:09:50 2008
New Revision: 2471
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2471&view=rev
Log:
Move some code around.
Modified:
trunk/src/terminal-window.c
Modified: trunk/src/terminal-window.c
==============================================================================
--- trunk/src/terminal-window.c (original)
+++ trunk/src/terminal-window.c Wed Mar 19 18:09:50 2008
@@ -761,16 +761,24 @@
g_slist_free (encodings);
}
+/* Actions stuff */
+
static void
-terminal_menu_activate_callback (GtkAction *action,
- TerminalWindow *window)
+update_copy_sensitivity (TerminalWindow *window)
{
- /* FIXMEchpe why? it's already updated when the active term changes */
- terminal_window_update_encoding_menu (window);
+ TerminalWindowPrivate *priv = window->priv;
+ GtkAction *action;
+ gboolean can_copy = FALSE;
+
+ if (priv->active_term)
+ can_copy = terminal_screen_get_text_selected (priv->active_term);
+
+ action = gtk_action_group_get_action (priv->action_group, "EditCopy");
+ gtk_action_set_sensitive (action, can_copy);
}
static void
-update_zoom_items (TerminalWindow *window)
+update_zoom_sensitivity (TerminalWindow *window)
{
TerminalWindowPrivate *priv = window->priv;
TerminalScreen *screen;
@@ -802,6 +810,14 @@
}
static void
+terminal_menu_activate_callback (GtkAction *action,
+ TerminalWindow *window)
+{
+ /* FIXMEchpe why? it's already updated when the active term changes */
+ terminal_window_update_encoding_menu (window);
+}
+
+static void
edit_menu_activate_callback (GtkMenuItem *menuitem,
gpointer user_data)
{
@@ -812,6 +828,39 @@
}
static void
+update_tabs_menu_sensitivity (TerminalWindow *window)
+{
+ TerminalWindowPrivate *priv = window->priv;
+ GtkNotebook *notebook = GTK_NOTEBOOK (priv->notebook);
+ GtkActionGroup *action_group = priv->action_group;
+ GtkAction *action;
+ int num_pages, page_num;
+ gboolean not_first, not_last;
+
+ g_return_if_fail (!priv->disposed);
+
+ num_pages = gtk_notebook_get_n_pages (notebook);
+ page_num = gtk_notebook_get_current_page (notebook);
+ not_first = page_num > 0;
+ not_last = page_num + 1 < num_pages;
+
+ action = gtk_action_group_get_action (action_group, "TabsPrevious");
+ gtk_action_set_sensitive (action, not_first);
+ action = gtk_action_group_get_action (action_group, "TabsNext");
+ gtk_action_set_sensitive (action, not_last);
+ action = gtk_action_group_get_action (action_group, "TabsMoveLeft");
+ gtk_action_set_sensitive (action, not_first);
+ action = gtk_action_group_get_action (action_group, "TabsMoveRight");
+ gtk_action_set_sensitive (action, not_last);
+ action = gtk_action_group_get_action (action_group, "TabsDetach");
+ gtk_action_set_sensitive (action, num_pages > 0);
+ action = gtk_action_group_get_action (action_group, "FileCloseTab");
+ gtk_action_set_sensitive (action, num_pages > 0);
+// action = gtk_action_group_get_action (action_group, "PopupCloseTab");
+// gtk_action_set_sensitive (action, page_num > 0);
+}
+
+static void
initialize_alpha_mode (TerminalWindow *window)
{
TerminalWindowPrivate *priv = window->priv;
@@ -843,7 +892,7 @@
static void
update_tab_visibility (TerminalWindow *window,
- int change)
+ int change)
{
TerminalWindowPrivate *priv = window->priv;
gboolean show_tabs;
@@ -885,6 +934,7 @@
return GTK_NOTEBOOK (dest_priv->notebook);
}
+#if 0
static gboolean
accel_event_key_match (GdkEventKey *event, GtkAccelKey *key)
{
@@ -907,6 +957,7 @@
return TRUE;
}
+#endif
static void
terminal_window_realized_callback (GtkWidget *window,
@@ -1483,7 +1534,7 @@
/* FIXMEchpe remove */
- update_zoom_items (window);
+ update_zoom_sensitivity (window);
terminal_window_reread_profile_list (window);
@@ -1707,54 +1758,6 @@
gdk_window_set_icon_name (GTK_WIDGET (window)->window, terminal_screen_get_icon_title (screen));
}
-
-static void
-update_copy_sensitivity (TerminalWindow *window)
-{
- TerminalWindowPrivate *priv = window->priv;
- GtkAction *action;
- gboolean can_copy = FALSE;
-
- if (priv->active_term)
- can_copy = terminal_screen_get_text_selected (priv->active_term);
-
- action = gtk_action_group_get_action (priv->action_group, "EditCopy");
- gtk_action_set_sensitive (action, can_copy);
-}
-
-static void
-update_tabs_menu_sensitivity (TerminalWindow *window)
-{
- TerminalWindowPrivate *priv = window->priv;
- GtkNotebook *notebook = GTK_NOTEBOOK (priv->notebook);
- GtkActionGroup *action_group = priv->action_group;
- GtkAction *action;
- int num_pages, page_num;
- gboolean not_first, not_last;
-
- g_return_if_fail (!priv->disposed);
-
- num_pages = gtk_notebook_get_n_pages (notebook);
- page_num = gtk_notebook_get_current_page (notebook);
- not_first = page_num > 0;
- not_last = page_num + 1 < num_pages;
-
- action = gtk_action_group_get_action (action_group, "TabsPrevious");
- gtk_action_set_sensitive (action, not_first);
- action = gtk_action_group_get_action (action_group, "TabsNext");
- gtk_action_set_sensitive (action, not_last);
- action = gtk_action_group_get_action (action_group, "TabsMoveLeft");
- gtk_action_set_sensitive (action, not_first);
- action = gtk_action_group_get_action (action_group, "TabsMoveRight");
- gtk_action_set_sensitive (action, not_last);
- action = gtk_action_group_get_action (action_group, "TabsDetach");
- gtk_action_set_sensitive (action, num_pages > 0);
- action = gtk_action_group_get_action (action_group, "FileCloseTab");
- gtk_action_set_sensitive (action, num_pages > 0);
-// action = gtk_action_group_get_action (action_group, "PopupCloseTab");
-// gtk_action_set_sensitive (action, page_num > 0);
-}
-
static void
selection_changed_callback (TerminalScreen *screen,
TerminalWindow *window)
@@ -2100,7 +2103,7 @@
terminal_window_update_set_profile_menu (window); /* FIXMEchpe no need to do this, just update the current profile action's active state! */
fill_in_new_term_submenus (window);
terminal_window_update_encoding_menu (window);
- update_zoom_items (window);
+ update_zoom_sensitivity (window);
}
TerminalScreen*
@@ -2712,7 +2715,7 @@
if (find_larger_zoom_factor (current, ¤t))
{
terminal_screen_set_font_scale (priv->active_term, current);
- update_zoom_items (window);
+ update_zoom_sensitivity (window);
}
}
@@ -2732,7 +2735,7 @@
if (find_smaller_zoom_factor (current, ¤t))
{
terminal_screen_set_font_scale (priv->active_term, current);
- update_zoom_items (window);
+ update_zoom_sensitivity (window);
}
}
@@ -2746,7 +2749,7 @@
return;
terminal_screen_set_font_scale (priv->active_term, PANGO_SCALE_MEDIUM);
- update_zoom_items (window);
+ update_zoom_sensitivity (window);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]