DeforaOS/Terminal
DeforaOS/Terminal
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reflect the fullscreen status in the toolbar

Browse Source
This commit is contained in:
Pierre Pronchery 2016-03-28 19:39:49 +02:00
parent cd6830071f
commit b331a99f7b
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/terminal.c
View File

@ -85,6 +85,7 @@ struct _Terminal
#ifndef EMBEDDED #ifndef EMBEDDED
GtkWidget * menubar; GtkWidget * menubar;
#endif #endif
GtkToolItem * tb_fullscreen;
GtkWidget * notebook; GtkWidget * notebook;
}; };
@ -192,13 +193,6 @@ static DesktopToolbar _terminal_toolbar[] =
{ N_("New window"), G_CALLBACK(_terminal_on_new_window), "window-new", { N_("New window"), G_CALLBACK(_terminal_on_new_window), "window-new",
0, 0, NULL }, 0, 0, NULL },
{ "", NULL, NULL, 0, 0, NULL }, { "", NULL, NULL, 0, 0, NULL },
{ N_("Fullscreen"), G_CALLBACK(_terminal_on_fullscreen),
# if GTK_CHECK_VERSION(2, 8, 0)
GTK_STOCK_FULLSCREEN,
# else
"gtk-fullscreen",
# endif
0, GDK_KEY_F11, NULL },
{ NULL, NULL, NULL, 0, 0, NULL } { NULL, NULL, NULL, 0, 0, NULL }
}; };
@ -212,6 +206,7 @@ Terminal * terminal_new(TerminalPrefs * prefs)
GtkAccelGroup * group; GtkAccelGroup * group;
GtkWidget * vbox; GtkWidget * vbox;
GtkWidget * widget; GtkWidget * widget;
GtkToolItem * toolitem;
if((terminal = object_new(sizeof(*terminal))) == NULL) if((terminal = object_new(sizeof(*terminal))) == NULL)
return NULL; return NULL;
@ -257,6 +252,15 @@ Terminal * terminal_new(TerminalPrefs * prefs)
#endif #endif
/* toolbar */ /* toolbar */
widget = desktop_toolbar_create(_terminal_toolbar, terminal, group); widget = desktop_toolbar_create(_terminal_toolbar, terminal, group);
#if GTK_CHECK_VERSION(2, 8, 0)
toolitem = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_FULLSCREEN);
#else
toolitem = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_ZOOM_FIT);
#endif
terminal->tb_fullscreen = toolitem;
g_signal_connect_swapped(G_OBJECT(toolitem), "toggled", G_CALLBACK(
_terminal_on_fullscreen), terminal);
gtk_toolbar_insert(GTK_TOOLBAR(widget), toolitem, -1);
gtk_box_pack_start(GTK_BOX(vbox), widget, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), widget, FALSE, TRUE, 0);
/* view */ /* view */
terminal->notebook = gtk_notebook_new(); terminal->notebook = gtk_notebook_new();
@ -305,10 +309,14 @@ void terminal_set_fullscreen(Terminal * terminal, gboolean fullscreen)
#ifndef EMBEDDED #ifndef EMBEDDED
gtk_widget_hide(terminal->menubar); gtk_widget_hide(terminal->menubar);
#endif #endif
gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(
terminal->tb_fullscreen), TRUE);
gtk_window_fullscreen(GTK_WINDOW(terminal->window)); gtk_window_fullscreen(GTK_WINDOW(terminal->window));
} }
else else
{ {
gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(
terminal->tb_fullscreen), FALSE);
gtk_window_unfullscreen(GTK_WINDOW(terminal->window)); gtk_window_unfullscreen(GTK_WINDOW(terminal->window));
#ifndef EMBEDDED #ifndef EMBEDDED
gtk_widget_show(terminal->menubar); gtk_widget_show(terminal->menubar);