X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-output-window.c;h=b7ed01a1916c143cc406518bb0fd983b96bf3256;hb=29917c4f5908454803e663d2ad78bca4bc35e805;hp=de57f17f9dab9af6e73cd88e15c02aa9836b7727;hpb=50f6ea7d66d03895020891215fb4f55bbf061003;p=pspp

diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c
index de57f17f9d..b7ed01a191 100644
--- a/src/ui/gui/psppire-output-window.c
+++ b/src/ui/gui/psppire-output-window.c
@@ -28,12 +28,8 @@
 #include "libpspp/cast.h"
 #include "libpspp/message.h"
 #include "libpspp/string-map.h"
-#include "output/chart-item.h"
 #include "output/driver-provider.h"
-#include "output/message-item.h"
 #include "output/output-item.h"
-#include "output/table-item.h"
-#include "output/text-item.h"
 #include "ui/gui/help-menu.h"
 #include "ui/gui/builder-wrapper.h"
 #include "ui/gui/psppire-output-view.h"
@@ -48,36 +44,7 @@
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
 
-static void psppire_output_window_class_init    (PsppireOutputWindowClass *class);
-static void psppire_output_window_init          (PsppireOutputWindow      *window);
-
-GType
-psppire_output_window_get_type (void)
-{
-  static GType psppire_output_window_type = 0;
-
-  if (!psppire_output_window_type)
-    {
-      static const GTypeInfo psppire_output_window_info =
-      {
-	sizeof (PsppireOutputWindowClass),
-	(GBaseInitFunc) NULL,
-        (GBaseFinalizeFunc) NULL,
-	(GClassInitFunc)psppire_output_window_class_init,
-	(GClassFinalizeFunc) NULL,
-	NULL,
-        sizeof (PsppireOutputWindow),
-	0,
-	(GInstanceInitFunc) psppire_output_window_init,
-      };
-
-      psppire_output_window_type =
-	g_type_register_static (PSPPIRE_TYPE_WINDOW, "PsppireOutputWindow",
-				&psppire_output_window_info, 0);
-    }
-
-  return psppire_output_window_type;
-}
+G_DEFINE_TYPE (PsppireOutputWindow, psppire_output_window, PSPPIRE_TYPE_WINDOW)
 
 static GObjectClass *parent_class;
 
@@ -266,7 +233,7 @@ enum
 
 #define N_EXTENSIONS (n_FT - 1)
 
-struct file_types ft[n_FT] = {
+static const struct file_types ft[n_FT] = {
   {N_("Infer file type from extension"),  NULL},
   {N_("SPSS Viewer (*.spv)"),             ".spv"},
   {N_("PDF (*.pdf)"),                     ".pdf"},
@@ -298,12 +265,12 @@ on_combo_change (GtkFileChooser *chooser)
   else
     {
       gint i;
-      if ( x != 0 )
+      if (x != 0)
 	sensitive = TRUE;
 
       for (i = 1 ; i < N_EXTENSIONS ; ++i)
 	{
-	  if ( g_str_has_suffix (fn, ft[i].ext))
+	  if (g_str_has_suffix (fn, ft[i].ext))
 	    {
 	      sensitive = TRUE;
 	      break;
@@ -324,11 +291,11 @@ on_file_chooser_change (GObject *w, GParamSpec *pspec, gpointer data)
   GtkFileChooser *chooser = data;
   const gchar *name = g_param_spec_get_name (pspec);
 
-  if ( ! gtk_widget_get_realized (GTK_WIDGET (chooser)))
+  if (! gtk_widget_get_realized (GTK_WIDGET (chooser)))
     return;
 
   /* Ignore this one.  It causes recursion. */
-  if ( 0 == strcmp ("tooltip-text", name))
+  if (0 == strcmp ("tooltip-text", name))
     return;
 
   on_combo_change (chooser);
@@ -340,7 +307,7 @@ on_file_chooser_change (GObject *w, GParamSpec *pspec, gpointer data)
 static void
 iterate_widgets (GtkWidget *w, gpointer data)
 {
-  if ( GTK_IS_CONTAINER (w))
+  if (GTK_IS_CONTAINER (w))
     gtk_container_forall (GTK_CONTAINER (w), iterate_widgets, data);
   else
     g_signal_connect (w, "notify",  G_CALLBACK (on_file_chooser_change), data);
@@ -395,7 +362,7 @@ psppire_output_window_export (PsppireOutputWindow *window)
   {
     /* Create text cell renderer */
     GtkCellRenderer *cell = gtk_cell_renderer_text_new();
-    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), cell, FALSE );
+    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), cell, FALSE);
 
     gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), cell,  "text", 0);
   }
@@ -415,7 +382,7 @@ psppire_output_window_export (PsppireOutputWindow *window)
 
   response = gtk_dialog_run (GTK_DIALOG (dialog));
 
-  if ( response == GTK_RESPONSE_ACCEPT )
+  if (response == GTK_RESPONSE_ACCEPT)
     {
       gint file_type = gtk_combo_box_get_active (GTK_COMBO_BOX (combo));
       gchar *filename = gtk_file_chooser_get_filename (chooser);
@@ -431,7 +398,7 @@ psppire_output_window_export (PsppireOutputWindow *window)
 	  gint i;
 	  for (i = 1 ; i < N_EXTENSIONS ; ++i)
 	    {
-	      if ( g_str_has_suffix (filename, ft[i].ext))
+	      if (g_str_has_suffix (filename, ft[i].ext))
 		{
 		  file_type = i;
 		  break;
@@ -510,9 +477,6 @@ psppire_output_window_init (PsppireOutputWindow *window)
     GTK_LAYOUT (get_widget_assert (xml, "output")),
     GTK_TREE_VIEW (get_widget_assert (xml, "overview")));
 
-
-  connect_help (xml);
-
   g_signal_connect (window,
 		    "focus-in-event",
 		    G_CALLBACK (cancel_urgency),
@@ -535,7 +499,7 @@ psppire_output_window_init (PsppireOutputWindow *window)
     g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (print));
 
 
-    const gchar *accels[2] = { "<Ctrl>P", NULL};
+    const gchar *accels[2] = { "<Primary>P", NULL};
     gtk_application_set_accels_for_action (app,
 					   "win.print",
 					   accels);
@@ -557,7 +521,7 @@ psppire_output_window_init (PsppireOutputWindow *window)
     GSimpleAction *copy = g_simple_action_new ("copy", NULL);
     g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (copy));
 
-    const gchar *accels[2] = { "<Ctrl>C", NULL};
+    const gchar *accels[2] = { "<Primary>C", NULL};
     gtk_application_set_accels_for_action (app,
 					   "win.copy",
 					   accels);