[PATCH] Menubar toggle option

[Joel Reed <joelreed@xxxxxxxxxxx>]

This very simple patch adds an option to toggle the menubar on spicy.
Helps maximize vertical resolution capacity without going fullscreen.
Please consider for inclusion.

jr

-- 
Joel W. Reed
Managing Partner
OpenArc, LLC
o: 724.234.1215
c: 412.212.8418

diff --git a/gtk/spicy.c b/gtk/spicy.c
index cbc702e..2eeed16 100644
--- a/gtk/spicy.c
+++ b/gtk/spicy.c
@@ -499,6 +499,15 @@ static void menu_cb_statusbar(GtkToggleAction *action, gpointer data)
     g_key_file_set_boolean(keyfile, "ui", "statusbar", state);
 }
 
+static void menu_cb_menubar(GtkToggleAction *action, gpointer data)
+{
+    struct spice_window *win = data;
+    gboolean state = gtk_toggle_action_get_active(action);
+
+    gtk_widget_set_visible(win->menubar, state);
+    g_key_file_set_boolean(keyfile, "ui", "menubar", state);
+}
+
 static void menu_cb_about(GtkAction *action, void *data)
 {
     char *comments = _("gtk test client app for the\n"
@@ -551,6 +560,9 @@ static gboolean window_state_cb(GtkWidget *widget, GdkEventWindowState *event,
             toggle = gtk_action_group_get_action(win->ag, "Statusbar");
             state = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(toggle));
             gtk_widget_set_visible(win->statusbar, state);
+            toggle = gtk_action_group_get_action(win->ag, "Menubar");
+            state = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(toggle));
+            gtk_widget_set_visible(win->menubar, state);
         }
     }
     return TRUE;
@@ -656,6 +668,11 @@ static void restore_configuration(struct spice_window *win)
     if (error == NULL)
         gtk_widget_set_visible(win->statusbar, state);
     g_clear_error(&error);
+
+    state = g_key_file_get_boolean(keyfile, "ui", "menubar", &error);
+    if (error == NULL)
+        gtk_widget_set_visible(win->menubar, state);
+    g_clear_error(&error);
 }
 
 /* ------------------------------------------------------------------ */
@@ -801,6 +818,11 @@ static const GtkToggleActionEntry tentries[] = {
         .callback    = G_CALLBACK(menu_cb_bool_prop),
     },{
 #endif
+        .name        = "Menubar",
+        .label       = N_("Menubar"),
+        .callback    = G_CALLBACK(menu_cb_menubar),
+        .accelerator = "<shift>F7",
+    },{
         .name        = "Statusbar",
         .label       = N_("Statusbar"),
         .callback    = G_CALLBACK(menu_cb_statusbar),
@@ -826,6 +848,7 @@ static char ui_xml[] =
 "    </menu>\n"
 "    <menu action='ViewMenu'>\n"
 "      <menuitem action='Fullscreen'/>\n"
+"      <menuitem action='Menubar'/>\n"
 "      <menuitem action='Toolbar'/>\n"
 "      <menuitem action='Statusbar'/>\n"
 "    </menu>\n"
@@ -1252,6 +1275,10 @@ static spice_window *create_spice_window(spice_connection *conn, int id, SpiceCh
     state = gtk_widget_get_visible(win->statusbar);
     gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(toggle), state);
 
+    toggle = gtk_action_group_get_action(win->ag, "Menubar");
+    state = gtk_widget_get_visible(win->menubar);
+    gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(toggle), state);
+
 #ifdef USE_SMARTCARD
     gboolean smartcard;

Attachment: signature.asc
Description: OpenPGP digital signature

_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/spice-devel