Whitespace fixes

[~andy/gtk] / examples / bloatpad.c

diff --git a/examples/bloatpad.c b/examples/bloatpad.c
index d0614d10d20df262248ce6ed66eb206be962d76b..8cd41c1e56e8875c50398454f921db3680c059df 100644 (file)
--- a/examples/bloatpad.c
+++ b/examples/bloatpad.c
@@ -1,6 +1,31 @@
 #include <stdlib.h>
 #include <gtk/gtk.h>
 
+static void
+activate_toggle (GSimpleAction *action,
+                 GVariant      *parameter,
+                 gpointer       user_data)
+{
+  GVariant *state;
+
+  state = g_action_get_state (G_ACTION (action));
+  g_action_change_state (G_ACTION (action), g_variant_new_boolean (!g_variant_get_boolean (state)));
+  g_variant_unref (state);
+}
+
+static void
+change_fullscreen_state (GSimpleAction *action,
+                         GVariant      *state,
+                         gpointer       user_data)
+{
+  if (g_variant_get_boolean (state))
+    gtk_window_fullscreen (user_data);
+  else
+    gtk_window_unfullscreen (user_data);
+
+  g_simple_action_set_state (action, state);
+}
+
 static GtkClipboard *
 get_clipboard (GtkWidget *widget)
 {
@@ -9,34 +34,35 @@ get_clipboard (GtkWidget *widget)
 
 static void
 window_copy (GSimpleAction *action,
-            GVariant      *parameter,
-            gpointer       user_data)
+             GVariant      *parameter,
+             gpointer       user_data)
 {
   GtkWindow *window = GTK_WINDOW (user_data);
   GtkTextView *text = g_object_get_data ((GObject*)window, "bloatpad-text");
 
   gtk_text_buffer_copy_clipboard (gtk_text_view_get_buffer (text),
-                                 get_clipboard ((GtkWidget*) text));
+                                  get_clipboard ((GtkWidget*) text));
 }
 
 static void
 window_paste (GSimpleAction *action,
-             GVariant      *parameter,
-             gpointer       user_data)
+              GVariant      *parameter,
+              gpointer       user_data)
 {
   GtkWindow *window = GTK_WINDOW (user_data);
   GtkTextView *text = g_object_get_data ((GObject*)window, "bloatpad-text");
   
   gtk_text_buffer_paste_clipboard (gtk_text_view_get_buffer (text),
-                                  get_clipboard ((GtkWidget*) text),
-                                  NULL,
-                                  TRUE);
+                                   get_clipboard ((GtkWidget*) text),
+                                   NULL,
+                                   TRUE);
 
 }
 
 static GActionEntry win_entries[] = {
   { "copy", window_copy, NULL, NULL, NULL },
   { "paste", window_paste, NULL, NULL, NULL },
+  { "fullscreen", activate_toggle, NULL, "false", change_fullscreen_state }
 };
 
 static void
@@ -116,9 +142,7 @@ show_about (GSimpleAction *action,
             GVariant      *parameter,
             gpointer       user_data)
 {
-  GtkWindow *window = user_data;
-
-  gtk_show_about_dialog (window,
+  gtk_show_about_dialog (NULL,
                          "program-name", "Bloatpad",
                          "title", "About Bloatpad",
                          "comments", "Not much to say, really.",
@@ -153,73 +177,55 @@ static GActionEntry app_entries[] = {
   { "quit", quit_app, NULL, NULL, NULL },
 };
 
-static GActionGroup *
-create_app_actions (void)
-{
-  GSimpleActionGroup *actions = g_simple_action_group_new ();
-  g_simple_action_group_add_entries (actions,
-                                     app_entries, G_N_ELEMENTS (app_entries),
-                                     NULL);
-
-  return G_ACTION_GROUP (actions);
-}
-
-static GMenuModel *
-create_app_menu (void)
-{
-  GMenu *menu = g_menu_new ();
-  g_menu_append (menu, "_About Bloatpad", "app.about");
-  g_menu_append (menu, "_Quit", "app.quit");
-
-  return G_MENU_MODEL (menu);
-}
-
-static GMenuModel *
-create_window_menu (void)
-{
-  GMenu *menu;
-  GMenu *edit_menu;
-
-  edit_menu = g_menu_new ();
-  g_menu_append (edit_menu, "_Copy", "win.copy");
-  g_menu_append (edit_menu, "_Paste", "win.paste");
-
-  g_menu_append (edit_menu, "_Fullscreen", "win.fullscreen");
-
-  menu = g_menu_new ();
-  g_menu_append_submenu (menu, "_Edit", (GMenuModel*)edit_menu);
-  g_object_unref (edit_menu);
-
-  return G_MENU_MODEL (menu);
+static void
+bloat_pad_startup (GApplication *application)
+{
+  GtkBuilder *builder;
+
+  G_APPLICATION_CLASS (bloat_pad_parent_class)
+    ->startup (application);
+
+  g_action_map_add_action_entries (G_ACTION_MAP (application), app_entries, G_N_ELEMENTS (app_entries), application);
+
+  builder = gtk_builder_new ();
+  gtk_builder_add_from_string (builder,
+                               "<interface>"
+                               "  <menu id='app-menu'>"
+                               "    <item label='_About Bloatpad' action='app.about'/>"
+                               "    <item label='_Quit' action='app.quit'/>"
+                               "  </menu>"
+                               "  <menu id='menubar'>"
+                               "    <submenu label='_Edit'>"
+                               "      <item label='_Copy' action='win.copy'/>"
+                               "      <item label='_Paste' action='win.paste'/>"
+                               "    </submenu>"
+                               "    <submenu label='_View'>"
+                               "      <item label='_Fullscreen' action='win.fullscreen'/>"
+                               "    </submenu>"
+                               "  </menu>"
+                               "</interface>", -1, NULL);
+  g_application_set_app_menu (application, G_MENU_MODEL (gtk_builder_get_object (builder, "app-menu")));
+  g_application_set_menubar (application, G_MENU_MODEL (gtk_builder_get_object (builder, "menubar")));
+  g_object_unref (builder);
 }
 
 static void
 bloat_pad_init (BloatPad *app)
 {
-  GActionGroup *actions;
-  GMenuModel *app_menu;
-  GMenuModel *window_menu;
-
-  actions = create_app_actions ();
-  g_application_set_action_group (G_APPLICATION (app), actions);
-  g_object_unref (actions);
-
-  app_menu = create_app_menu ();
-  g_application_set_app_menu (G_APPLICATION (app), app_menu);
-  g_object_unref (app_menu);
-
-  window_menu = create_window_menu ();
-  g_application_set_menubar (G_APPLICATION (app), window_menu);
-  g_object_unref (window_menu);
 }
 
 static void
 bloat_pad_class_init (BloatPadClass *class)
 {
-  G_OBJECT_CLASS (class)->finalize = bloat_pad_finalize;
+  GApplicationClass *application_class = G_APPLICATION_CLASS (class);
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
+
+  application_class->startup = bloat_pad_startup;
+  application_class->activate = bloat_pad_activate;
+  application_class->open = bloat_pad_open;
+
+  object_class->finalize = bloat_pad_finalize;
 
-  G_APPLICATION_CLASS (class)->activate = bloat_pad_activate;
-  G_APPLICATION_CLASS (class)->open = bloat_pad_open;
 }
 
 BloatPad *