X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fmain.c;h=fd64f4fd68597f0efbebd8e8f3d9260fde6c7aad;hb=55f13168aef45c48b2eb920ad8a1784a86f780e8;hp=6bd6d1b9048085e47d7b09c6a1ba6966ba6f5522;hpb=69a0cb6bf086d71388a328194da41fb4c4d5b571;p=pspp diff --git a/src/ui/gui/main.c b/src/ui/gui/main.c index 6bd6d1b904..fd64f4fd68 100644 --- a/src/ui/gui/main.c +++ b/src/ui/gui/main.c @@ -1,5 +1,6 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2004, 2005, 2006, 2010, 2011, 2012, 2013 Free Software Foundation + Copyright (C) 2004, 2005, 2006, 2010, 2011, 2012, 2013, 2014, 2015, + 2016, 2020, 2021 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,6 +17,8 @@ #include +#include "pre-initialisation.h" + #include "ui/gui/psppire.h" #include @@ -27,10 +30,16 @@ #include "libpspp/assertion.h" #include "libpspp/cast.h" #include "libpspp/copyleft.h" +#include "libpspp/message.h" #include "libpspp/str.h" #include "libpspp/string-array.h" #include "libpspp/version.h" #include "ui/source-init-opts.h" +#include "ui/gui/psppire-syntax-window.h" +#include "ui/gui/psppire-data-window.h" +#include "ui/gui/psppire-output-window.h" +#include "ui/gui/psppire-conf.h" +#include "ui/gui/helper.h" #include "gl/configmake.h" #include "gl/progname.h" @@ -42,300 +51,508 @@ #define _(msgid) gettext (msgid) #define N_(msgid) msgid - -/* Arguments to be interpreted before the X server gets initialised */ -enum - { - OPT_HELP, - OPT_VERSION, - OPT_NO_SPLASH, - OPT_MEASURE_STARTUP, - N_STARTUP_OPTIONS - }; -static const struct argv_option startup_options[N_STARTUP_OPTIONS] = - { - {"help", 'h', no_argument, OPT_HELP}, - {"version", 'V', no_argument, OPT_VERSION}, - {"no-splash", 'q', no_argument, OPT_NO_SPLASH}, - {"measure-startup", 0, no_argument, OPT_MEASURE_STARTUP}, - }; +static gboolean +show_version_and_exit (void) +{ + version_etc (stdout, "psppire", PACKAGE_NAME, PACKAGE_VERSION, + "Ben Pfaff", "John Darrington", "Jason Stover", NULL_SENTINEL); -/* --measure-startup: Prints the elapsed time to start up and load any file - specified on the command line. */ -static gboolean measure_startup; -static GTimer *startup; + exit (0); -static void -usage (void) + return TRUE; +} + + + +static gboolean +init_prepare (GSource * source, gint * timeout_) { - char *inc_path = string_array_join (include_path_default (), " "); - GOptionGroup *gtk_options; - GOptionContext *ctx; - gchar *gtk_help_base, *gtk_help; - - /* Get help text for GTK+ options. */ - ctx = g_option_context_new ("psppire"); - gtk_options = gtk_get_option_group (FALSE); - gtk_help_base = g_option_context_get_help (ctx, FALSE, gtk_options); - g_option_context_free (ctx); - - /* The GTK+ help text starts with usage instructions that we don't want, - followed by a blank line. Trim off everything up to and including the - first blank line. */ - gtk_help = strstr (gtk_help_base, "\n\n"); - gtk_help = gtk_help != NULL ? gtk_help + 2 : gtk_help_base; - - printf (_("\ -PSPPIRE, a GUI for PSPP, a program for statistical analysis of sample data.\n\ -Usage: %s [OPTION]... FILE\n\ -\n\ -Arguments to long options also apply to equivalent short options.\n\ -\n\ -GUI options:\n\ - -q, --no-splash don't show splash screen during startup\n\ -\n\ -%s\ -Language options:\n\ - -I, --include=DIR append DIR to search path\n\ - -I-, --no-include clear search path\n\ - -a, --algorithm={compatible|enhanced}\n\ - set to `compatible' if you want output\n\ - calculated from broken algorithms\n\ - -x, --syntax={compatible|enhanced}\n\ - set to `compatible' to disable PSPP extensions\n\ - -i, --interactive interpret syntax in interactive mode\n\ - -s, --safer don't allow some unsafe operations\n\ -Default search path: %s\n\ -\n\ -Informative output:\n\ - -h, --help display this help and exit\n\ - -V, --version output version information and exit\n\ -\n\ -A non-option argument is interpreted as a data file in .sav or .zsav or .por\n\ -format or a syntax file to load.\n"), - program_name, gtk_help, inc_path); - - free (inc_path); - g_free (gtk_help_base); - - emit_bug_reporting_address (); - exit (EXIT_SUCCESS); + return TRUE; } -static void -startup_option_callback (int id, void *show_splash_) +static gboolean +init_check (GSource * source) { - gboolean *show_splash = show_splash_; + return TRUE; +} + +static gboolean +init_dispatch (GSource * ss, GSourceFunc callback, gpointer user_data) +{ + struct init_source *is = (struct init_source *) ss; - switch (id) + bool finished = initialize (is); + is->state++; + + if (finished) { - case OPT_HELP: - usage (); - break; + g_main_loop_quit (is->loop); + return FALSE; + } - case OPT_VERSION: - version_etc (stdout, "psppire", PACKAGE_NAME, PACKAGE_VERSION, - "Ben Pfaff", "John Darrington", "Jason Stover", - NULL_SENTINEL); - exit (EXIT_SUCCESS); + return TRUE; +} - case OPT_NO_SPLASH: - *show_splash = FALSE; - break; +static GSourceFuncs init_funcs = + {init_prepare, init_check, init_dispatch, NULL, NULL, NULL }; + +static GtkWidget *wsplash = 0; +static gint64 start_time = 0; - case OPT_MEASURE_STARTUP: - measure_startup = TRUE; - break; - default: - NOT_REACHED (); - } -} - static GtkWidget * create_splash_window (void) { - GtkWidget *splash ; - GtkWidget *image; + GtkWidget *sp = gtk_window_new (GTK_WINDOW_TOPLEVEL); + + const gchar *filename = PKGDATADIR "/splash.png"; + const char *relocated_filename = relocate (filename); + GtkWidget *l = gtk_image_new_from_file (relocated_filename); + if (filename != relocated_filename) + free (CONST_CAST (char *, relocated_filename)); + + gtk_container_add (GTK_CONTAINER (sp), l); + gtk_window_set_type_hint (GTK_WINDOW (sp), + GDK_WINDOW_TYPE_HINT_SPLASHSCREEN); + gtk_window_set_position (GTK_WINDOW (sp), GTK_WIN_POS_CENTER); + gtk_window_set_skip_pager_hint (GTK_WINDOW (sp), TRUE); + gtk_window_set_skip_taskbar_hint (GTK_WINDOW (sp), TRUE); + gtk_window_set_focus_on_map (GTK_WINDOW (sp), FALSE); + gtk_window_set_accept_focus (GTK_WINDOW (sp), FALSE); + + GdkGeometry hints; + hints.max_height = 100; + hints.max_width = 200; + gtk_window_set_geometry_hints (GTK_WINDOW (sp), + NULL, &hints, GDK_HINT_MAX_SIZE); + + + gtk_window_set_gravity (GTK_WINDOW (sp), GDK_GRAVITY_CENTER); + + gtk_window_set_modal (GTK_WINDOW (sp), TRUE); + gtk_window_set_decorated (GTK_WINDOW (sp), FALSE); + gtk_window_set_keep_above (GTK_WINDOW (sp), TRUE); + gtk_widget_show_all (sp); + return sp; +} + + +static gint +on_local_options (GApplication * application, + GVariantDict * options, gpointer user_data) +{ + { + GVariant *b = + g_variant_dict_lookup_value (options, "no-unique", + G_VARIANT_TYPE_BOOLEAN); + if (b) + { + GApplicationFlags flags = g_application_get_flags (application); + flags |= G_APPLICATION_NON_UNIQUE; + g_application_set_flags (application, flags); + g_variant_unref (b); + } + } + { + GVariant *b = + g_variant_dict_lookup_value (options, "no-splash", + G_VARIANT_TYPE_BOOLEAN); + if (b) + g_variant_unref (b); + else + start_time = g_get_monotonic_time (); + } + + + return -1; +} + +/* Use the imperitive mood for all entries in this table. + Each entry should end with a period. */ +static const char *tips[] = + { + N_("Right click on variable lists to change between viewing the variables' names and their labels."), + N_("Click \"Paste\" instead of \"OK\" when running procedures. This allows you to edit your commands before running them and you have better control over your work."), + N_("Directly import your spreadsheets using the \"File | Import Data\" menu."), + N_("For an easy way to convert string variables into numerically encoded variables, use \"Automatic Recode\" which preserves the variable names as labels."), + N_("When browsing large data sets, use \"Windows | Split\" to see both ends of the data in the same view."), + N_("Export your reports to ODT format for easy editing with the Libreoffice.org suite."), + N_("Use \"Edit | Options\" to have your Output window automatically appear when statistics are generated."), + N_("To easily reorder your variables, drag and drop them in the Variable View or the Data View.") + }; + +#define N_TIPS (sizeof tips / sizeof tips[0]) + +static void +user_tip (GApplication *app) +{ + PsppireConf *conf = psppire_conf_new (); + + gboolean show_tip = TRUE; + psppire_conf_get_boolean (conf, "startup", "show-user-tips", &show_tip); + + if (!show_tip) + return; + + GtkWindow *parent = gtk_application_get_active_window (GTK_APPLICATION (app)); - gtk_window_set_auto_startup_notification (FALSE); + GtkWidget *d = + gtk_dialog_new_with_buttons (_("Psppire User Hint"), parent, + GTK_DIALOG_MODAL, + GTK_MESSAGE_INFO, + 0, 0, + NULL); - splash = gtk_window_new (GTK_WINDOW_POPUP); + GtkWidget *pictogram = gtk_image_new_from_icon_name ("user-info", GTK_ICON_SIZE_DIALOG); - gtk_window_set_position (GTK_WINDOW (splash), - GTK_WIN_POS_CENTER_ALWAYS); + GtkWidget *next = gtk_button_new_with_mnemonic (_("_Next Tip")); + gtk_dialog_add_action_widget (GTK_DIALOG (d), next, 1); - gtk_window_set_type_hint (GTK_WINDOW (splash), - GDK_WINDOW_TYPE_HINT_SPLASHSCREEN); + GtkWidget *close = gtk_button_new_with_mnemonic (_("_Close")); + gtk_dialog_add_action_widget (GTK_DIALOG (d), close, GTK_RESPONSE_CLOSE); - image = gtk_image_new_from_file (relocate (PKGDATADIR "/splash.png")); + gtk_window_set_transient_for (GTK_WINDOW (d), parent); - gtk_container_add (GTK_CONTAINER (splash), image); + g_object_set (d, + "decorated", FALSE, + "skip-taskbar-hint", TRUE, + "skip-pager-hint", TRUE, + "application", app, + NULL); - gtk_widget_show (image); + GtkWidget *ca = gtk_dialog_get_content_area (GTK_DIALOG (d)); - return splash; + g_object_set (ca, "margin", 5, NULL); + + GtkWidget *check = gtk_check_button_new_with_mnemonic ("_Show tips at startup"); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), show_tip); + + srand (time(0)); + gint x = rand () % N_TIPS; + GtkWidget *label = gtk_label_new (gettext (tips[x])); + + /* Make the font of the label a little larger than the other widgets. */ + { + GtkStyleContext *sc = gtk_widget_get_style_context (label); + GtkCssProvider *p = gtk_css_provider_new (); + const gchar *css = "* {font-size: 130%;}"; + if (gtk_css_provider_load_from_data (p, css, strlen (css), NULL)) + { + gtk_style_context_add_provider (sc, GTK_STYLE_PROVIDER (p), + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + } + g_object_unref (p); + } + + /* It's more readable if the text is not all in one long line. */ + g_object_set (label, "wrap", TRUE, NULL); + gint width = PANGO_PIXELS (50.0 * width_of_m (label) * PANGO_SCALE); + gtk_window_set_default_size (GTK_WINDOW (d), width, -1); + + + if (pictogram) + gtk_box_pack_start (GTK_BOX (ca), pictogram, FALSE, FALSE, 5); + gtk_box_pack_start (GTK_BOX (ca), label, FALSE, FALSE, 5); + gtk_box_pack_end (GTK_BOX (ca), check, FALSE, FALSE, 5); + + gtk_widget_show_all (d); + + g_object_set (close, + "has-focus", TRUE, + "is-focus", TRUE, + NULL); + + while (1 == gtk_dialog_run (GTK_DIALOG (d))) + { + if (++x >= N_TIPS) x = 0; + g_object_set (label, "label", gettext (tips[x]), NULL); + } + + show_tip = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check)); + psppire_conf_set_boolean (conf, + "startup", "show-user-tips", + show_tip); + + g_object_unref (conf); + + gtk_widget_destroy (d); } -static gboolean -hide_splash_window (gpointer data) + +static void +on_startup (GApplication * app, gpointer ud) { - GtkWidget *splash = data; - gtk_widget_destroy (splash); - gtk_window_set_auto_startup_notification (TRUE); - return FALSE; + GMainContext *context = g_main_context_new (); + + if (start_time != 0) + { + wsplash = create_splash_window (); + gtk_application_add_window (GTK_APPLICATION (app), + GTK_WINDOW (wsplash)); + + g_signal_connect_swapped (wsplash, "destroy", G_CALLBACK (user_tip), app); + } + else + { + g_signal_connect (app, "activate", G_CALLBACK (user_tip), NULL); + } + + GMainLoop *loop = g_main_loop_new (context, FALSE); + + GSource *ss = g_source_new (&init_funcs, sizeof (struct init_source)); + + ((struct init_source *) ss)->loop = loop; + ((struct init_source *) ss)->state = 0; + + g_source_set_priority (ss, G_PRIORITY_DEFAULT); + + g_source_attach (ss, context); + g_main_loop_run (loop); } -static gboolean -print_startup_time (gpointer data) + +static void +post_initialise (GApplication * app) { - g_timer_stop (startup); - printf ("%.3f seconds elapsed\n", g_timer_elapsed (startup, NULL)); - g_timer_destroy (startup); - startup = NULL; + register_selection_functions (); + psppire_output_window_setup (); - return FALSE; + GSimpleAction *quit = g_simple_action_new ("quit", NULL); + g_signal_connect_swapped (quit, "activate", G_CALLBACK (psppire_quit), app); + g_action_map_add_action (G_ACTION_MAP (app), G_ACTION (quit)); } + +#define SPLASH_DURATION 1000 + static gboolean -quit_one_loop (gpointer data) +destroy_splash (gpointer ud) { - gtk_main_quit (); - return FALSE; + GtkWidget *sp = GTK_WIDGET (ud); + gtk_widget_destroy (sp); + wsplash = NULL; + return G_SOURCE_REMOVE; } -struct initialisation_parameters + +static void +wait_for_splash (GApplication *app, GtkWindow *x) { - const char *data_file; - GtkWidget *splash_window; -}; + if (wsplash) + { + gtk_window_set_transient_for (GTK_WINDOW (wsplash), x); + gtk_application_add_window (GTK_APPLICATION (app), GTK_WINDOW (wsplash)); + gtk_window_set_keep_above (GTK_WINDOW (wsplash), TRUE); + gtk_window_present (GTK_WINDOW (wsplash)); + + /* Remove the splash screen after SPLASH_DURATION milliseconds */ + gint64 elapsed_time = (g_get_monotonic_time () - start_time) / 1000; + if (SPLASH_DURATION - elapsed_time <= 0) + destroy_splash (wsplash); + else + g_timeout_add (SPLASH_DURATION - elapsed_time, destroy_splash, wsplash); + } +} +static GtkWidget *fatal_error_dialog = NULL; +static GtkWidget *fatal_error_label; +static const char *diagnostic_info; -static gboolean -run_inner_loop (gpointer data) +static void +fatal_error_handler (int sig) { - struct initialisation_parameters *ip = data; - initialize (ip->data_file); + /* Reset SIG to its default handling so that if it happens again we won't + recurse. */ + signal (sig, SIG_DFL); - g_timeout_add (500, hide_splash_window, ip->splash_window); - - if (measure_startup) + static char message [1024]; + strcpy (message, "proximate cause: "); + switch (sig) { - GSource *source = g_idle_source_new (); - g_source_set_priority (source, G_PRIORITY_LOW); - g_source_set_callback (source, print_startup_time, NULL, NULL); - g_source_attach (source, NULL); - g_source_unref (source); + case SIGABRT: + strcat (message, "Assertion Failure/Abort"); + break; + case SIGFPE: + strcat (message, "Floating Point Exception"); + break; + case SIGSEGV: + strcat (message, "Segmentation Violation"); + break; + default: + strcat (message, "Unknown"); + break; } + strcat (message, "\n"); + strcat (message, diagnostic_info); - gtk_main (); + g_object_set (fatal_error_label, + "label", message, + NULL); - de_initialize (); + gtk_dialog_run (GTK_DIALOG (fatal_error_dialog)); - return FALSE; + /* Re-raise the signal so that we terminate with the correct status. */ + raise (sig); } +static void +on_activate (GApplication * app, gpointer ud) +{ + struct sigaction fatal_error_action; + sigset_t sigset; + g_return_if_fail (0 == sigemptyset (&sigset)); + fatal_error_dialog = + gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, + _("Psppire: Fatal Error")); + + diagnostic_info = prepare_diagnostic_information (); + + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (fatal_error_dialog), + _("You have discovered a bug in PSPP. " + "Please report this to %s including all of the following information, " + "and a description of what you were doing when this happened."), + PACKAGE_BUGREPORT); + + g_return_if_fail (fatal_error_dialog != NULL); + + GtkWidget *content_area = gtk_dialog_get_content_area (GTK_DIALOG (fatal_error_dialog)); + fatal_error_label = gtk_label_new (""); + g_object_set (fatal_error_label, + "selectable", TRUE, + "wrap", TRUE, + NULL); + gtk_container_add (GTK_CONTAINER (content_area), fatal_error_label); + + gtk_widget_show_all (content_area); + + fatal_error_action.sa_handler = fatal_error_handler; + fatal_error_action.sa_mask = sigset; + fatal_error_action.sa_flags = 0; + + post_initialise (app); + + GtkWindow *x = create_data_window (); + gtk_application_add_window (GTK_APPLICATION (app), x); + + wait_for_splash (app, x); + sigaction (SIGABRT, &fatal_error_action, NULL); + sigaction (SIGSEGV, &fatal_error_action, NULL); + sigaction (SIGFPE, &fatal_error_action, NULL); +} -static GMemVTable vtable = - { - xmalloc, - xrealloc, - free, - xcalloc, - malloc, - realloc - }; - -#ifdef __APPLE__ -static const bool apple = true; -#else -static const bool apple = false; -#endif - -/* Searches ARGV for the -psn_xxxx option that the desktop application - launcher passes in, and removes it if it finds it. Returns the new value - of ARGC. */ -static inline int -remove_psn (int argc, char **argv) +static GtkWindow * +find_empty_data_window (GApplication *app) { - if (apple) + GList *wl = gtk_application_get_windows (GTK_APPLICATION (app)); + while (wl) { - int i; - - for (i = 0; i < argc; i++) - { - if (!strncmp (argv[i], "-psn", 4)) - { - remove_element (argv, argc + 1, sizeof *argv, i); - return argc - 1; - } - } + if (wl->data && PSPPIRE_IS_DATA_WINDOW (GTK_WINDOW (wl->data)) && + psppire_data_window_is_empty (PSPPIRE_DATA_WINDOW (wl->data))) + return GTK_WINDOW (wl->data); + wl = wl->next; } - return argc; + return NULL; } -int -main (int argc, char *argv[]) +static GtkWindow * +find_psppire_window (GApplication *app) { - struct initialisation_parameters init_p; - gboolean show_splash = TRUE; - struct argv_parser *parser; - const gchar *vers; - - set_program_name (argv[0]); + GList *wl = gtk_application_get_windows (GTK_APPLICATION (app)); + while (wl) + { + if (wl->data && PSPPIRE_IS_WINDOW (GTK_WINDOW (wl->data))) + return GTK_WINDOW (wl->data); + wl = wl->next; + } + return NULL; +} - g_mem_set_vtable (&vtable); - g_thread_init (NULL); +static void +on_open (GApplication *app, GFile **files, gint n_files, gchar * hint, + gpointer ud) +{ + /* If the application is already open and we open another file + via xdg-open on GNU/Linux or via the file manager, then open is + called. Check if we already have a psppire window. */ + if (find_psppire_window (app) == NULL) + post_initialise (app); + + /* When a new data file is opened, then try to find an empty + data window which will then be replaced as in the open file + dialog */ + GtkWindow *victim = find_empty_data_window (app); + + gchar *file = g_file_get_parse_name (files[0]); + GtkWindow *x = psppire_preload_file (file, victim); + g_free (file); + + wait_for_splash (app, x); +} - gtk_disable_setlocale (); - startup = g_timer_new (); - g_timer_start (startup); +/* These are arguments which must be processed BEFORE the X server has been initialised */ +static void +process_pre_start_arguments (int *argc, char ***argv) +{ + GOptionEntry oe[] = { + {"version", 'V', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, + show_version_and_exit, N_("Show version information and exit"), 0}, + {NULL, 0, 0, 0, NULL, "", 0} + }; - if ( ! gtk_parse_args (&argc, &argv) ) - { - perror ("Error parsing arguments"); - exit (1); - } + GOptionContext *oc = g_option_context_new (""); + g_option_context_set_help_enabled (oc, FALSE); + g_option_context_set_ignore_unknown_options (oc, FALSE); + g_option_context_add_main_entries (oc, oe, NULL); + g_option_context_parse (oc, argc, argv, NULL); + g_option_context_free (oc); +} - if ( (vers = gtk_check_version (GTK_MAJOR_VERSION, - GTK_MINOR_VERSION, - GTK_MICRO_VERSION)) ) - { - g_warning ("%s", vers); - } +int +main (int argc, char *argv[]) +{ + /* Some operating systems need to munge the arguments. */ + pre_initialisation (&argc, argv); - argc = remove_psn (argc, argv); + set_program_name (argv[0]); - /* Parse our own options. - This must come BEFORE gdk_init otherwise options such as - --help --version which ought to work without an X server, won't. - */ - parser = argv_parser_create (); - argv_parser_add_options (parser, startup_options, N_STARTUP_OPTIONS, - startup_option_callback, &show_splash); - source_init_register_argv_parser (parser); - if (!argv_parser_run (parser, argc, argv)) - exit (EXIT_FAILURE); - argv_parser_destroy (parser); + GtkApplication *app = + gtk_application_new ("gnu.pspp", G_APPLICATION_HANDLES_OPEN); - /* Initialise GDK. Theoretically this call can remove options from argc,argv if - it thinks they are gdk options. - However there shouldn't be any here because of the gtk_parse_args call above. */ - gdk_init (&argc, &argv); + process_pre_start_arguments (&argc, &argv); - init_p.splash_window = create_splash_window (); - init_p.data_file = optind < argc ? argv[optind] : NULL; + GOptionEntry oe[] = { + {"no-splash", 'q', G_OPTION_FLAG_NONE, G_OPTION_ARG_NONE, NULL, + N_("Do not display the splash screen"), 0}, + {"no-unique", 'n', G_OPTION_FLAG_NONE, G_OPTION_ARG_NONE, NULL, + N_("Do not attempt single instance negotiation"), 0}, + {NULL} + }; - if ( show_splash ) - gtk_widget_show (init_p.splash_window); + g_application_add_main_option_entries (G_APPLICATION (app), oe); - g_idle_add (quit_one_loop, 0); + g_signal_connect (app, "startup", G_CALLBACK (on_startup), NULL); + g_signal_connect (app, "activate", G_CALLBACK (on_activate), NULL); + g_signal_connect (app, "handle-local-options", + G_CALLBACK (on_local_options), NULL); + g_signal_connect (app, "open", G_CALLBACK (on_open), NULL); - gtk_quit_add (0, run_inner_loop, &init_p); - gtk_main (); + { + GSimpleAction *act_new_syntax = g_simple_action_new ("new-syntax", NULL); + g_signal_connect_swapped (act_new_syntax, "activate", + G_CALLBACK (create_syntax_window), NULL); + g_action_map_add_action (G_ACTION_MAP (app), G_ACTION (act_new_syntax)); + } - return 0; + { + GSimpleAction *act_new_data = g_simple_action_new ("new-data", NULL); + g_signal_connect_swapped (act_new_data, "activate", + G_CALLBACK (create_data_window), NULL); + g_action_map_add_action (G_ACTION_MAP (app), G_ACTION (act_new_data)); + } + + g_object_set (G_OBJECT (app), "register-session", TRUE, NULL); + return g_application_run (G_APPLICATION (app), argc, argv); }