diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2010-05-11 22:42:14 +0800 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2010-05-11 22:42:14 +0800 |
| commit | 69ee9bcccbe42f413c5acf99093f553918991651 (patch) | |
| tree | 3b7dd286131087f6b7866ca3abe84b340fe7373a /shell/e-shell-window.c | |
| parent | 3cc02e83c7f854e1a088cdc7c8ac53032fedf40d (diff) | |
| parent | bde1bc6bca4c5ed63a193f7dc50252e550a0fb40 (diff) | |
| download | gsoc2013-evolution-69ee9bcccbe42f413c5acf99093f553918991651.tar gsoc2013-evolution-69ee9bcccbe42f413c5acf99093f553918991651.tar.gz gsoc2013-evolution-69ee9bcccbe42f413c5acf99093f553918991651.tar.bz2 gsoc2013-evolution-69ee9bcccbe42f413c5acf99093f553918991651.tar.lz gsoc2013-evolution-69ee9bcccbe42f413c5acf99093f553918991651.tar.xz gsoc2013-evolution-69ee9bcccbe42f413c5acf99093f553918991651.tar.zst gsoc2013-evolution-69ee9bcccbe42f413c5acf99093f553918991651.zip | |
Merge commit 'origin/express2' into express2
Diffstat (limited to 'shell/e-shell-window.c')
| -rw-r--r-- | shell/e-shell-window.c | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index 0460823b3f..7970f5b015 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -344,6 +344,23 @@ shell_window_construct_menubar (EShellWindow *shell_window) shell_window, "/main-menu"); gtk_widget_show (main_menu); + if (e_shell_get_small_screen_mode (shell_window->priv->shell)) { + GtkWidget *parent, *child; + + parent = gtk_widget_get_parent (main_menu); + g_object_ref (parent); + gtk_container_remove ((GtkContainer *)parent, main_menu); + child = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start ((GtkBox *)child, main_menu, TRUE, TRUE, 0); + gtk_widget_show (child); + gtk_container_add ((GtkContainer *)parent, child); + shell_window->priv->menubar_box = child; + + e_mutual_binding_new (main_menu, "visible", + child, "visible"); + main_menu = child; + } + g_signal_connect ( shell_window, "notify::active-view", G_CALLBACK (shell_window_menubar_update_new_menu), NULL); @@ -351,6 +368,12 @@ shell_window_construct_menubar (EShellWindow *shell_window) return main_menu; } +GtkWidget * +e_shell_window_get_menu_bar_box (EShellWindow *shell_window) +{ + return shell_window->priv->menubar_box; +} + static GtkWidget * shell_window_construct_toolbar (EShellWindow *shell_window) { @@ -411,6 +434,13 @@ shell_window_construct_toolbar (EShellWindow *shell_window) if (e_shell_get_meego_mode (shell_window->priv->shell)) gtk_widget_set_name (GTK_WIDGET (toolbar), "MeeGoToolbar"); + toolbar = e_shell_window_get_managed_widget ( + shell_window, "/close-toolbar"); + gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE); + gtk_box_pack_start (GTK_BOX (box), toolbar, FALSE, FALSE, 0); + if (e_shell_get_meego_mode (shell_window->priv->shell)) + gtk_widget_set_name (GTK_WIDGET (toolbar), "MeeGoToolbar"); + return box; } |