From 9b90e087b0c216cbc802663f4c8dc06068f235bb Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Wed, 14 Apr 2010 20:56:30 +0100 Subject: add a close-window action that doesn't become insensitive on the last window. Use this in meego / full-screen mode --- shell/e-shell-window-actions.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'shell/e-shell-window-actions.c') diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c index 9b14730c7b..288c4633cc 100644 --- a/shell/e-shell-window-actions.c +++ b/shell/e-shell-window-actions.c @@ -1446,6 +1446,13 @@ static GtkActionEntry shell_entries[] = { N_("Close this window"), G_CALLBACK (action_close_cb) }, + { "close-window", + GTK_STOCK_CLOSE, + N_("_Close Window"), + "w", + N_("Close this window"), + G_CALLBACK (action_close_cb) }, + { "contents", GTK_STOCK_HELP, N_("_Contents"), -- cgit v1.2.3 From 5fca5b574ef9831ff6a789b45f7d37746739e358 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Thu, 15 Apr 2010 13:32:34 +0100 Subject: Adapt the event editor for MeeGo / small-screen. Bin the menu bar, disable the print icon, add a close button at top right. --- shell/e-shell-window-actions.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'shell/e-shell-window-actions.c') diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c index 288c4633cc..2cb53c1a02 100644 --- a/shell/e-shell-window-actions.c +++ b/shell/e-shell-window-actions.c @@ -2084,9 +2084,11 @@ e_shell_window_create_new_menu (EShellWindow *shell_window) /* Add menu separators. */ - separator = gtk_separator_menu_item_new (); - new_item_actions = g_list_prepend (new_item_actions, separator); - gtk_widget_show (GTK_WIDGET (separator)); + if (new_item_actions != NULL) { + separator = gtk_separator_menu_item_new (); + new_item_actions = g_list_prepend (new_item_actions, separator); + gtk_widget_show (GTK_WIDGET (separator)); + } if (new_source_actions != NULL) { separator = gtk_separator_menu_item_new (); -- cgit v1.2.3 From cab50ae5116499b9ec40c8a0311c10c62f54f073 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Fri, 30 Apr 2010 10:51:54 +0530 Subject: Add filter_page option for pref window so that we can show only required preferences for calendar. Bit of a hack, but proves very useful. --- shell/e-shell-window-actions.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'shell/e-shell-window-actions.c') diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c index 2cb53c1a02..06fce0fe69 100644 --- a/shell/e-shell-window-actions.c +++ b/shell/e-shell-window-actions.c @@ -926,10 +926,17 @@ action_preferences_cb (GtkAction *action, shell_backend = e_shell_view_get_shell_backend (shell_view); shell_backend_class = E_SHELL_BACKEND_GET_CLASS (shell_backend); - if (shell_backend_class->preferences_page != NULL) - e_preferences_window_show_page ( - E_PREFERENCES_WINDOW (preferences_window), - shell_backend_class->preferences_page); + if (shell_backend_class->preferences_page != NULL) { + if (e_shell_get_express_mode (shell)) { + e_preferences_window_filter_page ( + E_PREFERENCES_WINDOW (preferences_window), + shell_backend_class->preferences_page); + } else { + e_preferences_window_show_page ( + E_PREFERENCES_WINDOW (preferences_window), + shell_backend_class->preferences_page); + } + } } /** -- cgit v1.2.3 From bde1bc6bca4c5ed63a193f7dc50252e550a0fb40 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Tue, 11 May 2010 18:47:09 +0530 Subject: Handle adding 'X' close button on the menu bar. Restore adding the same for adding in calendar since it doesn't have a toolbar. --- shell/e-shell-window-actions.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'shell/e-shell-window-actions.c') diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c index 06fce0fe69..65c6acff7a 100644 --- a/shell/e-shell-window-actions.c +++ b/shell/e-shell-window-actions.c @@ -1453,6 +1453,14 @@ static GtkActionEntry shell_entries[] = { N_("Close this window"), G_CALLBACK (action_close_cb) }, + { "close-window-menu", + GTK_STOCK_CLOSE, + NULL, + "w", + N_("Close this window"), + G_CALLBACK (action_close_cb) }, + + { "close-window", GTK_STOCK_CLOSE, N_("_Close Window"), -- cgit v1.2.3 From 96538878911586a9e9ca26b81e1916c04e538980 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 25 May 2010 10:15:32 -0400 Subject: Coding style and whitespace cleanup. --- shell/e-shell-window-actions.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'shell/e-shell-window-actions.c') diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c index 65c6acff7a..16b39928ff 100644 --- a/shell/e-shell-window-actions.c +++ b/shell/e-shell-window-actions.c @@ -934,7 +934,7 @@ action_preferences_cb (GtkAction *action, } else { e_preferences_window_show_page ( E_PREFERENCES_WINDOW (preferences_window), - shell_backend_class->preferences_page); + shell_backend_class->preferences_page); } } } @@ -1460,7 +1460,6 @@ static GtkActionEntry shell_entries[] = { N_("Close this window"), G_CALLBACK (action_close_cb) }, - { "close-window", GTK_STOCK_CLOSE, N_("_Close Window"), @@ -1906,7 +1905,7 @@ e_shell_window_actions_init (EShellWindow *shell_window) EFocusTracker *focus_tracker; GtkUIManager *ui_manager; gchar *path; - + g_return_if_fail (E_IS_SHELL_WINDOW (shell_window)); ui_manager = e_shell_window_get_ui_manager (shell_window); @@ -2133,8 +2132,8 @@ e_shell_window_create_new_menu (EShellWindow *shell_window) static GtkAction * e_shell_window_create_switcher_action (GType type, EShellViewClass *class, - const char *name, const char *tooltip, - const char *view_name) + const gchar *name, const gchar *tooltip, + const gchar *view_name) { GtkAction *action; -- cgit v1.2.3