/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation
+ Copyright (C) 2008, 2009, 2010, 2011, 2012, 2014, 2016,
+ 2020 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
#include <gtk/gtk.h>
#include <stdlib.h>
-#include <gtksourceview/gtksourcebuffer.h>
-#include <gtksourceview/gtksourcelanguage.h>
-#include <gtksourceview/gtksourcelanguagemanager.h>
-#include <gtksourceview/gtksourceprintcompositor.h>
-
+#include <gtksourceview/gtksource.h>
#include "language/lexer/lexer.h"
#include "libpspp/encoding-guesser.h"
#include "ui/gui/executor.h"
#include "ui/gui/help-menu.h"
#include "ui/gui/helper.h"
+#include "ui/gui/builder-wrapper.h"
#include "ui/gui/psppire-data-window.h"
#include "ui/gui/psppire-encoding-selector.h"
+#include "ui/gui/psppire-lex-reader.h"
#include "ui/gui/psppire-syntax-window.h"
-#include "ui/gui/psppire-syntax-window.h"
-#include "ui/gui/psppire-window-register.h"
-#include "ui/gui/psppire.h"
#include "ui/gui/psppire.h"
+#include "ui/gui/windows-menu.h"
#include "gl/localcharset.h"
#include "gl/xalloc.h"
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
-static void psppire_syntax_window_base_finalize (PsppireSyntaxWindowClass *, gpointer);
-static void psppire_syntax_window_base_init (PsppireSyntaxWindowClass *class);
static void psppire_syntax_window_class_init (PsppireSyntaxWindowClass *class);
static void psppire_syntax_window_init (PsppireSyntaxWindow *syntax_editor);
};
}
-GType
-psppire_syntax_window_get_type (void)
-{
- static GType psppire_syntax_window_type = 0;
-
- if (!psppire_syntax_window_type)
- {
- static const GTypeInfo psppire_syntax_window_info =
- {
- sizeof (PsppireSyntaxWindowClass),
- (GBaseInitFunc) psppire_syntax_window_base_init,
- (GBaseFinalizeFunc) psppire_syntax_window_base_finalize,
- (GClassInitFunc)psppire_syntax_window_class_init,
- (GClassFinalizeFunc) NULL,
- NULL,
- sizeof (PsppireSyntaxWindow),
- 0,
- (GInstanceInitFunc) psppire_syntax_window_init,
- };
-
- static const GInterfaceInfo window_interface_info =
- {
- (GInterfaceInitFunc) psppire_syntax_window_iface_init,
- NULL,
- NULL
- };
-
- psppire_syntax_window_type =
- g_type_register_static (PSPPIRE_TYPE_WINDOW, "PsppireSyntaxWindow",
- &psppire_syntax_window_info, 0);
-
- g_type_add_interface_static (psppire_syntax_window_type,
- PSPPIRE_TYPE_WINDOW_MODEL,
- &window_interface_info);
- }
-
- return psppire_syntax_window_type;
-}
+G_DEFINE_TYPE_WITH_CODE (PsppireSyntaxWindow, psppire_syntax_window, PSPPIRE_TYPE_WINDOW,
+ G_IMPLEMENT_INTERFACE (PSPPIRE_TYPE_WINDOW_MODEL, psppire_syntax_window_iface_init))
static GObjectClass *parent_class ;
static void
psppire_syntax_window_dispose (GObject *obj)
{
- PsppireSyntaxWindow *sw = (PsppireSyntaxWindow *)obj;
+ PsppireSyntaxWindow *sw = PSPPIRE_SYNTAX_WINDOW (obj);
GtkClipboard *clip_selection;
GtkClipboard *clip_primary;
if (sw->dispose_has_run)
return;
+ g_object_unref (sw->search_text_buffer);
+
g_free (sw->encoding);
sw->encoding = NULL;
{
GParamSpec *encoding_spec;
GObjectClass *gobject_class = G_OBJECT_CLASS (class);
+ gobject_class->finalize = psppire_syntax_window_finalize;
GtkSourceLanguageManager *lm = gtk_source_language_manager_get_default ();
}
-static void
-psppire_syntax_window_base_init (PsppireSyntaxWindowClass *class)
-{
- GObjectClass *object_class = G_OBJECT_CLASS (class);
- object_class->finalize = psppire_syntax_window_finalize;
-}
-
-
-
-static void
-psppire_syntax_window_base_finalize (PsppireSyntaxWindowClass *class,
- gpointer class_data)
-{
-}
-
-
static void
editor_execute_syntax (const PsppireSyntaxWindow *sw, GtkTextIter start,
GtkTextIter stop)
{
PsppireWindow *win = PSPPIRE_WINDOW (sw);
- struct lex_reader *reader;
- gchar *text = gtk_text_buffer_get_text (GTK_TEXT_BUFFER (sw->buffer), &start, &stop, FALSE);
- reader = lex_reader_for_string (text);
- g_free (text);
+ struct lex_reader *reader = lex_reader_for_gtk_text_buffer (
+ GTK_TEXT_BUFFER (sw->buffer), start, stop, sw->syntax_mode);
- lex_reader_set_file_name (reader, psppire_window_get_filename (win));
+ const gchar *filename = psppire_window_get_filename (win);
+ /* TRANSLATORS: This is part of a filename. Please avoid whitespace. */
+ gchar *untitled = xasprintf ("%s.sps", _("Untitled"));
+ lex_reader_set_file_name (reader, filename ? filename : untitled);
+ free (untitled);
execute_syntax (psppire_default_data_window (), reader);
}
{
GtkTextIter begin, end;
GtkTextBuffer *buffer = GTK_TEXT_BUFFER (sw->buffer);
-
- if ( gtk_text_buffer_get_selection_bounds (buffer, &begin, &end) )
+
+ if (gtk_text_buffer_get_selection_bounds (buffer, &begin, &end))
gtk_text_buffer_delete (buffer, &begin, &end);
}
+/* Create and run a dialog to collect the search string.
+ In future this might be expanded to include options, for example
+ backward searching, case sensitivity etc. */
+static const char *
+get_search_text (PsppireSyntaxWindow *parent)
+{
+ const char *search_text = NULL;
+ GtkDialogFlags flags = GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL;
+ GtkWidget *dialog = gtk_dialog_new_with_buttons (_("Text Search"),
+ GTK_WINDOW (parent),
+ flags,
+ _("_OK"),
+ GTK_RESPONSE_OK,
+ _("_Cancel"),
+ GTK_RESPONSE_CANCEL,
+ NULL);
+
+ GtkWidget *content_area =
+ gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+
+ GtkWidget *box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
+ GtkWidget *label = gtk_label_new (_("Text to search for:"));
+ GtkWidget *entry = gtk_entry_new_with_buffer (parent->search_text_buffer);
+
+ /* Add the label, and show everything we have added. */
+ gtk_container_add (GTK_CONTAINER (content_area), box);
+ gtk_container_add (GTK_CONTAINER (box), label);
+ gtk_container_add (GTK_CONTAINER (box), entry);
+ gtk_widget_show_all (content_area);
+
+ int result = gtk_dialog_run (GTK_DIALOG (dialog));
+ switch (result)
+ {
+ case GTK_RESPONSE_OK:
+ search_text = gtk_entry_get_text (GTK_ENTRY (entry));
+ break;
+ default:
+ search_text = NULL;
+ };
+
+ gtk_widget_destroy (dialog);
+ return search_text;
+}
+
+
+/* What to do when the Find menuitem is called. */
+static void
+on_edit_find (PsppireSyntaxWindow *sw)
+{
+ GtkTextBuffer *buffer = GTK_TEXT_BUFFER (sw->buffer);
+ GtkTextIter begin;
+ GtkTextIter loc;
+ const char *target = get_search_text (sw);
+
+ if (target == NULL)
+ return;
+
+ /* This is a wrap-around search. So start searching one
+ character after the current char. */
+ GtkTextMark *mark = gtk_text_buffer_get_insert (buffer);
+ gtk_text_buffer_get_iter_at_mark (buffer, &begin, mark);
+ gtk_text_iter_forward_char (&begin);
+ if (gtk_text_iter_forward_search (&begin, target, 0,
+ &loc, 0, 0))
+ {
+ gtk_text_buffer_place_cursor (buffer, &loc);
+ }
+ else
+ {
+ /* If not found, then continue the search from the top
+ of the buffer. */
+ gtk_text_buffer_get_start_iter (buffer, &begin);
+ if (gtk_text_iter_forward_search (&begin, target, 0,
+ &loc, 0, 0))
+ {
+ gtk_text_buffer_place_cursor (buffer, &loc);
+ }
+ }
+}
+
/* The syntax editor's clipboard deals only with text */
enum {
{
gboolean sel = gtk_text_buffer_get_has_selection (GTK_TEXT_BUFFER (sw->buffer));
- gtk_action_set_sensitive (sw->edit_copy, sel);
- gtk_action_set_sensitive (sw->edit_cut, sel);
- gtk_action_set_sensitive (sw->edit_delete, sel);
+ g_object_set (sw->edit_copy, "enabled", sel, NULL);
+ g_object_set (sw->edit_cut, "enabled", sel, NULL);
+ g_object_set (sw->edit_delete, "enabled", sel, NULL);
}
/* The callback which runs when something request clipboard data */
PsppireSyntaxWindow *sw = data;
g_assert (info == SELECT_FMT_TEXT);
- gtk_selection_data_set (selection_data, selection_data->target,
+ gtk_selection_data_set (selection_data, gtk_selection_data_get_target (selection_data),
8,
(const guchar *) sw->cliptext, strlen (sw->cliptext));
sw->cliptext = NULL;
}
+static gchar tn1[] = "UTF8_STRING";
+static gchar tn2[] = "STRING";
+static gchar tn3[] = "TEXT";
+static gchar tn4[] = "COMPOUND_TEXT";
+static gchar tn5[] = "text/plain;charset=utf-8";
+static gchar tn6[] = "text/plain";
static const GtkTargetEntry targets[] = {
- { "UTF8_STRING", 0, SELECT_FMT_TEXT },
- { "STRING", 0, SELECT_FMT_TEXT },
- { "TEXT", 0, SELECT_FMT_TEXT },
- { "COMPOUND_TEXT", 0, SELECT_FMT_TEXT },
- { "text/plain;charset=utf-8", 0, SELECT_FMT_TEXT },
- { "text/plain", 0, SELECT_FMT_TEXT },
+ { tn1, 0, SELECT_FMT_TEXT },
+ { tn2, 0, SELECT_FMT_TEXT },
+ { tn3, 0, SELECT_FMT_TEXT },
+ { tn4, 0, SELECT_FMT_TEXT },
+ { tn5, 0, SELECT_FMT_TEXT },
+ { tn6, 0, SELECT_FMT_TEXT }
};
-
/*
Store a clip containing the currently selected text.
Returns true iff something was set.
GtkClipboard *clipboard ;
GtkTextBuffer *buffer = GTK_TEXT_BUFFER (sw->buffer);
- if ( ! gtk_text_buffer_get_selection_bounds (buffer, begin, end) )
+ if (! gtk_text_buffer_get_selection_bounds (buffer, begin, end))
return FALSE;
g_free (sw->cliptext);
on_edit_cut (PsppireSyntaxWindow *sw)
{
GtkTextIter begin, end;
-
- if ( set_clip (sw, &begin, &end))
+
+ if (set_clip (sw, &begin, &end))
gtk_text_buffer_delete (GTK_TEXT_BUFFER (sw->buffer), &begin, &end);
}
set_clip (sw, &begin, &end);
}
-
-/* A callback for when the clipboard contents have been received */
-static void
-contents_received_callback (GtkClipboard *clipboard,
- GtkSelectionData *sd,
- gpointer data)
-{
- gchar *c;
- PsppireSyntaxWindow *syntax_window = data;
-
- if ( sd->length < 0 )
- return;
-
- if ( sd->type != gdk_atom_intern ("UTF8_STRING", FALSE))
- return;
-
- c = (gchar *) sd->data;
-
- gtk_text_buffer_insert_at_cursor (GTK_TEXT_BUFFER (syntax_window->buffer),
- (gchar *) sd->data,
- sd->length);
-
-}
-
static void
on_edit_paste (PsppireSyntaxWindow *sw)
{
GtkClipboard *clipboard =
gtk_clipboard_get_for_display (display, GDK_SELECTION_CLIPBOARD);
- gtk_clipboard_request_contents (clipboard,
- gdk_atom_intern ("UTF8_STRING", TRUE),
- contents_received_callback,
- sw);
+ gtk_text_buffer_paste_clipboard (GTK_TEXT_BUFFER (sw->buffer), clipboard, NULL, TRUE);
}
for (i = 0 ; i < sizeof (targets) / sizeof (targets[0]) ; ++i)
{
GdkAtom atom = gdk_atom_intern (targets[i].target, TRUE);
- if ( gtk_clipboard_wait_is_target_available (clip, atom))
+ if (gtk_clipboard_wait_is_target_available (clip, atom))
{
compatible_target = TRUE;
break;
}
}
- gtk_action_set_sensitive (sw->edit_paste, compatible_target);
+ g_object_set (sw->edit_paste, "enabled", compatible_target, NULL);
}
/* Parse and execute all the text in the buffer */
static void
-on_run_all (GtkMenuItem *menuitem, gpointer user_data)
+on_run_all (PsppireSyntaxWindow *se)
{
GtkTextIter begin, end;
- PsppireSyntaxWindow *se = PSPPIRE_SYNTAX_WINDOW (user_data);
gtk_text_buffer_get_iter_at_offset (GTK_TEXT_BUFFER (se->buffer), &begin, 0);
gtk_text_buffer_get_iter_at_offset (GTK_TEXT_BUFFER (se->buffer), &end, -1);
/* Parse and execute the currently selected text */
static void
-on_run_selection (GtkMenuItem *menuitem, gpointer user_data)
+on_run_selection (PsppireSyntaxWindow *se)
{
GtkTextIter begin, end;
- PsppireSyntaxWindow *se = PSPPIRE_SYNTAX_WINDOW (user_data);
- if ( gtk_text_buffer_get_selection_bounds (GTK_TEXT_BUFFER (se->buffer), &begin, &end) )
+ if (gtk_text_buffer_get_selection_bounds (GTK_TEXT_BUFFER (se->buffer), &begin, &end))
editor_execute_syntax (se, begin, end);
}
/* Parse and execute the from the current line, to the end of the
buffer */
static void
-on_run_to_end (GtkMenuItem *menuitem, gpointer user_data)
+on_run_to_end (PsppireSyntaxWindow *se)
{
GtkTextIter begin, end;
GtkTextIter here;
gint line;
- PsppireSyntaxWindow *se = PSPPIRE_SYNTAX_WINDOW (user_data);
-
/* Get the current line */
gtk_text_buffer_get_iter_at_mark (GTK_TEXT_BUFFER (se->buffer),
&here,
gtk_text_buffer_get_insert (GTK_TEXT_BUFFER (se->buffer))
- );
+ );
line = gtk_text_iter_get_line (&here) ;
/* Parse and execute the current line */
static void
-on_run_current_line (GtkMenuItem *menuitem, gpointer user_data)
+on_run_current_line (PsppireSyntaxWindow *se)
{
GtkTextIter begin, end;
GtkTextIter here;
gint line;
- PsppireSyntaxWindow *se = PSPPIRE_SYNTAX_WINDOW (user_data);
-
/* Get the current line */
gtk_text_buffer_get_iter_at_mark (GTK_TEXT_BUFFER (se->buffer),
&here,
gtk_text_buffer_get_insert (GTK_TEXT_BUFFER (se->buffer))
- );
+ );
line = gtk_text_iter_get_line (&here) ;
+static void
+on_syntax (GAction *action, GVariant *param, PsppireSyntaxWindow *sw)
+{
+ g_action_change_state (action, param);
+ GVariant *new_state = g_action_get_state (action);
+
+ const gchar *what = g_variant_get_string (new_state, NULL);
+ if (0 == g_strcmp0 (what, "auto"))
+ sw->syntax_mode = SEG_MODE_AUTO;
+ else if (0 == g_strcmp0 (what, "interactive"))
+ sw->syntax_mode = SEG_MODE_INTERACTIVE;
+ else if (0 == g_strcmp0 (what, "batch"))
+ sw->syntax_mode = SEG_MODE_BATCH;
+ else
+ g_warn_if_reached ();
+}
+
+
/* Append ".sps" to FILENAME if necessary.
The returned result must be freed when no longer required.
*/
static gchar *
append_suffix (const gchar *filename)
{
- if ( ! g_str_has_suffix (filename, ".sps" ) &&
- ! g_str_has_suffix (filename, ".SPS" ) )
+ if (! g_str_has_suffix (filename, ".sps") &&
+ ! g_str_has_suffix (filename, ".SPS"))
{
return g_strdup_printf ("%s.sps", filename);
}
ss_dealloc (&text_locale);
g_free (suffixedname);
- if ( result )
+ if (result)
{
char *fn = g_filename_display_name (filename);
gchar *msg = g_strdup_printf (_("Saved file `%s'"), fn);
gtk_file_chooser_dialog_new (_("Save Syntax"),
GTK_WINDOW (se),
GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+ _("Cancel"), GTK_RESPONSE_CANCEL,
+ _("Save"), GTK_RESPONSE_ACCEPT,
NULL);
+ g_object_set (dialog, "local-only", FALSE, NULL);
+
filter = gtk_file_filter_new ();
gtk_file_filter_set_name (filter, _("Syntax Files (*.sps) "));
gtk_file_filter_add_pattern (filter, "*.sps");
response = gtk_dialog_run (GTK_DIALOG (dialog));
- if ( response == GTK_RESPONSE_ACCEPT )
+ if (response == GTK_RESPONSE_ACCEPT)
{
gchar *encoding;
char *filename;
- filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog) );
+ filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
psppire_window_set_filename (window, filename);
free (filename);
const gchar *filename = psppire_window_get_filename (se);
GError *err = NULL;
save_editor_to_file (PSPPIRE_SYNTAX_WINDOW (se), filename, &err);
- if ( err )
+ if (err)
{
msg (ME, "%s", err->message);
g_error_free (err);
}
-/* Callback for the File->Quit menuitem */
-static gboolean
-on_quit (GtkMenuItem *menuitem, gpointer user_data)
-{
- psppire_quit ();
-
- return FALSE;
-}
-
-
static void
-load_and_show_syntax_window (GtkWidget *se, const gchar *filename)
+load_and_show_syntax_window (GtkWidget *se, const gchar *filename,
+ const gchar *encoding)
{
gboolean ok;
gtk_source_buffer_begin_not_undoable_action (PSPPIRE_SYNTAX_WINDOW (se)->buffer);
- ok = psppire_window_load (PSPPIRE_WINDOW (se), filename);
+ ok = psppire_window_load (PSPPIRE_WINDOW (se), filename, encoding, NULL);
gtk_source_buffer_end_not_undoable_action (PSPPIRE_SYNTAX_WINDOW (se)->buffer);
- if (ok )
+ if (ok)
gtk_widget_show (se);
else
gtk_widget_destroy (se);
create_syntax_window (void)
{
GtkWidget *w = psppire_syntax_window_new (NULL);
+
gtk_widget_show (w);
}
-void
+GtkWindow *
open_syntax_window (const char *file_name, const gchar *encoding)
{
- GtkWidget *se = psppire_syntax_window_new (encoding);
+ GtkWidget *se = psppire_syntax_window_new (NULL);
- if ( file_name)
- load_and_show_syntax_window (se, file_name);
+ if (file_name)
+ load_and_show_syntax_window (se, file_name, encoding);
+
+ return GTK_WINDOW (se);
}
psppire_syntax_window_init (PsppireSyntaxWindow *window)
{
GtkBuilder *xml = builder_new ("syntax-editor.ui");
- GtkWidget *box = gtk_vbox_new (FALSE, 0);
+ GtkWidget *box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+
+ GObject *menu = get_object_assert (xml, "syntax-window-menu", G_TYPE_MENU);
+ GtkWidget *menubar = gtk_menu_bar_new_from_model (G_MENU_MODEL (menu));
- GtkWidget *menubar = get_widget_assert (xml, "menubar");
GtkWidget *sw = get_widget_assert (xml, "scrolledwindow8");
GtkWidget *text_view = get_widget_assert (xml, "syntax_text_view");
GtkClipboard *clip_primary = gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_PRIMARY);
window->print_settings = NULL;
- window->undo_menuitem = get_action_assert (xml, "edit_undo");
- window->redo_menuitem = get_action_assert (xml, "edit_redo");
+
+ window->undo_menuitem = g_simple_action_new ("undo", NULL);
+ window->redo_menuitem = g_simple_action_new ("redo", NULL);
+
+ g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (window->undo_menuitem));
+ g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (window->redo_menuitem));
+
if (class->lan)
window->buffer = gtk_source_buffer_new_with_language (class->lan);
NULL);
window->encoding = NULL;
+ window->syntax_mode = SEG_MODE_AUTO;
window->cliptext = NULL;
window->dispose_has_run = FALSE;
- window->edit_delete = get_action_assert (xml, "edit_delete");
- window->edit_copy = get_action_assert (xml, "edit_copy");
- window->edit_cut = get_action_assert (xml, "edit_cut");
- window->edit_paste = get_action_assert (xml, "edit_paste");
+ window->search_text_buffer = gtk_entry_buffer_new (NULL, -1);
+
+ window->edit_delete = g_simple_action_new ("delete", NULL);
+ g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (window->edit_delete));
+
+ window->edit_copy = g_simple_action_new ("copy", NULL);
+ g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (window->edit_copy));
+
+ window->edit_cut = g_simple_action_new ("cut", NULL);
+ g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (window->edit_cut));
+
+ window->edit_paste = g_simple_action_new ("paste", NULL);
+ g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (window->edit_paste));
+
+ window->edit_find = g_simple_action_new ("find", NULL);
+ g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (window->edit_find));
window->buffer = GTK_SOURCE_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view)));
window->sb = get_widget_assert (xml, "statusbar2");
window->text_context = gtk_statusbar_get_context_id (GTK_STATUSBAR (window->sb), "Text Context");
- g_signal_connect (window->buffer, "changed",
+ g_signal_connect (window->buffer, "changed",
G_CALLBACK (on_text_changed), window);
- g_signal_connect (window->buffer, "modified-changed",
+ g_signal_connect (window->buffer, "modified-changed",
G_CALLBACK (on_modified_changed), window);
- g_signal_connect_swapped (get_action_assert (xml, "file_print"), "activate",
- G_CALLBACK (psppire_syntax_window_print), window);
+ {
+ GSimpleAction *print = g_simple_action_new ("print", NULL);
+
+ g_signal_connect_swapped (print, "activate",
+ G_CALLBACK (psppire_syntax_window_print), window);
+
+ g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (print));
+ }
g_signal_connect_swapped (window->undo_menuitem,
"activate",
- G_CALLBACK (undo_last_edit),
+ G_CALLBACK (undo_last_edit),
window);
g_signal_connect_swapped (window->redo_menuitem,
undo_redo_update (window);
- window->sel_handler = g_signal_connect_swapped (clip_primary, "owner-change",
+
+ window->sel_handler = g_signal_connect_swapped (clip_primary, "owner-change",
G_CALLBACK (selection_changed), window);
- window->ps_handler = g_signal_connect (clip_selection, "owner-change",
+ window->ps_handler = g_signal_connect (clip_selection, "owner-change",
G_CALLBACK (set_paste_sensitivity), window);
- connect_help (xml);
-
gtk_container_add (GTK_CONTAINER (window), box);
- g_object_ref (menubar);
-
g_object_ref (sw);
g_object_ref (window->sb);
gtk_widget_show_all (box);
- g_signal_connect_swapped (get_action_assert (xml,"file_new_syntax"), "activate", G_CALLBACK (create_syntax_window), NULL);
+ GtkApplication *app = GTK_APPLICATION (g_application_get_default ());
- g_signal_connect (get_action_assert (xml,"file_new_data"),
- "activate",
- G_CALLBACK (create_data_window),
- window);
+ {
+ GSimpleAction *open = g_simple_action_new ("open", NULL);
- g_signal_connect_swapped (get_action_assert (xml, "file_open"),
- "activate",
- G_CALLBACK (psppire_window_open),
- window);
+ g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (open));
- g_signal_connect_swapped (get_action_assert (xml, "file_save"),
- "activate",
- G_CALLBACK (psppire_window_save),
- window);
+ g_signal_connect_swapped (open,
+ "activate",
+ G_CALLBACK (psppire_window_open),
+ window);
+ }
- g_signal_connect_swapped (get_action_assert (xml, "file_save_as"),
- "activate",
- G_CALLBACK (psppire_window_save_as),
- window);
+ {
+ GSimpleAction *save = g_simple_action_new ("save", NULL);
+
+ g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (save));
+
+ g_signal_connect_swapped (save,
+ "activate",
+ G_CALLBACK (psppire_window_save),
+ window);
+
+ const gchar *accels[2] = { "<Primary>S", NULL};
+ gtk_application_set_accels_for_action (app,
+ "win.save",
+ accels);
+
+ }
+
+ {
+ GSimpleAction *save_as = g_simple_action_new ("save_as", NULL);
+
+ g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (save_as));
+
+ g_signal_connect_swapped (save_as,
+ "activate",
+ G_CALLBACK (psppire_window_save_as),
+ window);
+
+
+ const gchar *accels[2] = { "<Shift><Primary>S", NULL};
+ gtk_application_set_accels_for_action (app,
+ "win.save_as",
+ accels);
+
+
+ }
- g_signal_connect (get_action_assert (xml,"file_quit"),
- "activate",
- G_CALLBACK (on_quit),
- window);
g_signal_connect_swapped (window->edit_delete,
"activate",
G_CALLBACK (on_edit_paste),
window);
- g_signal_connect (get_action_assert (xml,"run_all"),
+ g_signal_connect_swapped (window->edit_find,
"activate",
- G_CALLBACK (on_run_all),
+ G_CALLBACK (on_edit_find),
window);
- g_signal_connect (get_action_assert (xml,"run_selection"),
- "activate",
- G_CALLBACK (on_run_selection),
- window);
+ {
+ GSimpleAction *run_all = g_simple_action_new ("run-all", NULL);
- g_signal_connect (get_action_assert (xml,"run_current_line"),
- "activate",
- G_CALLBACK (on_run_current_line),
- window);
+ g_signal_connect_swapped (run_all, "activate",
+ G_CALLBACK (on_run_all), window);
- g_signal_connect (get_action_assert (xml,"run_to_end"),
- "activate",
- G_CALLBACK (on_run_to_end),
- window);
+ g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (run_all));
+ }
- g_signal_connect (get_action_assert (xml,"windows_minimise_all"),
- "activate",
- G_CALLBACK (psppire_window_minimise_all), NULL);
+ {
+ GSimpleAction *run_current_line = g_simple_action_new ("run-current-line", NULL);
+
+ g_signal_connect_swapped (run_current_line, "activate",
+ G_CALLBACK (on_run_current_line), window);
+ g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (run_current_line));
+ GtkApplication *app = GTK_APPLICATION (g_application_get_default ());
+ const gchar *accels[2] = { "<Primary>R", NULL};
+ gtk_application_set_accels_for_action (app,
+ "win.run-current-line",
+ accels);
+ }
+ {
+ GSimpleAction *run_selection = g_simple_action_new ("run-selection", NULL);
+ g_signal_connect_swapped (run_selection, "activate",
+ G_CALLBACK (on_run_selection), window);
+
+ g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (run_selection));
+ }
{
- GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1", GTK_TYPE_UI_MANAGER));
+ GSimpleAction *run_to_end = g_simple_action_new ("run-to-end", NULL);
+
+ g_signal_connect_swapped (run_to_end, "activate",
+ G_CALLBACK (on_run_to_end), window);
- merge_help_menu (uim);
+ g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (run_to_end));
+ }
- PSPPIRE_WINDOW (window)->menu =
- GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar/windows/windows_minimise_all")->parent);
+ {
+ GSimpleAction *act_syntax = g_simple_action_new_stateful ("syntax", G_VARIANT_TYPE_STRING,
+ g_variant_new_string ("auto"));
+ g_signal_connect (act_syntax, "activate", G_CALLBACK (on_syntax), window);
+ g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (act_syntax));
}
+ gtk_menu_shell_append (GTK_MENU_SHELL (menubar),
+ create_windows_menu (GTK_WINDOW (window)));
+
+ gtk_menu_shell_append (GTK_MENU_SHELL (menubar),
+ create_help_menu (GTK_WINDOW (window)));
+
g_object_unref (xml);
}
-GtkWidget*
+GtkWidget *
psppire_syntax_window_new (const char *encoding)
{
- return GTK_WIDGET (g_object_new (psppire_syntax_window_get_type (),
- "description", _("Syntax Editor"),
- "encoding", encoding,
- NULL));
+ GObject *sw = g_object_new (psppire_syntax_window_get_type (),
+ "description", _("Syntax Editor"),
+ "encoding", encoding,
+ NULL);
+
+ GApplication *app = g_application_get_default ();
+ gtk_application_add_window (GTK_APPLICATION (app), GTK_WINDOW (sw));
+
+ return GTK_WIDGET (sw);
}
static void
g_free (fn);
- g_object_set (dialog, "icon-name", "psppicon", NULL);
+ g_object_set (dialog, "icon-name", "org.gnu.pspp", NULL);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
"%s", err->message);
/*
Loads the buffer from the file called FILENAME
*/
-gboolean
-syntax_load (PsppireWindow *window, const gchar *filename)
+static gboolean
+syntax_load (PsppireWindow *window, const gchar *filename,
+ const gchar *encoding, gpointer not_used)
{
GError *err = NULL;
gchar *text_locale = NULL;
GtkTextIter iter;
PsppireSyntaxWindow *sw = PSPPIRE_SYNTAX_WINDOW (window);
GtkTextBuffer *buffer = GTK_TEXT_BUFFER (sw->buffer);
- gchar *encoding;
- char *mime_type;
/* FIXME: What if it's a very big file ? */
- if ( ! g_file_get_contents (filename, &text_locale, &len_locale, &err) )
+ if (! g_file_get_contents (filename, &text_locale, &len_locale, &err))
{
error_dialog (GTK_WINDOW (window), filename, err);
g_clear_error (&err);
return FALSE;
}
- /* Determine the file's encoding and update sw->encoding. (The ordering is
- important here because encoding_guess_whole_file() often returns its
- argument instead of a copy of it.) */
- encoding = g_strdup (encoding_guess_whole_file (sw->encoding, text_locale,
- len_locale));
- g_free (sw->encoding);
- sw->encoding = encoding;
+ if (!encoding || !encoding[0])
+ {
+ /* Determine the file's encoding and update sw->encoding. (The ordering
+ is important here because encoding_guess_whole_file() often returns
+ its argument instead of a copy of it.) */
+ char *guessed_encoding;
+
+ guessed_encoding = g_strdup (encoding_guess_whole_file (sw->encoding,
+ text_locale,
+ len_locale));
+ g_free (sw->encoding);
+ sw->encoding = guessed_encoding;
+ }
+ else
+ {
+ g_free (sw->encoding);
+ sw->encoding = g_strdup (encoding);
+ }
- text_utf8 = recode_substring_pool ("UTF-8", encoding,
+ text_utf8 = recode_substring_pool ("UTF-8", sw->encoding,
ss_buffer (text_locale, len_locale),
NULL).string;
free (text_locale);
- if ( text_utf8 == NULL )
+ if (text_utf8 == NULL)
{
error_dialog (GTK_WINDOW (window), filename, err);
g_clear_error (&err);
free (text_utf8);
- mime_type = xasprintf ("text/x-spss-syntax; charset=%s", sw->encoding);
- add_most_recent (filename, mime_type);
- free (mime_type);
+ add_most_recent (filename, "text/x-spss-syntax", sw->encoding);
return TRUE;
}
static void
undo_redo_update (PsppireSyntaxWindow *window)
{
- gtk_action_set_sensitive (window->undo_menuitem,
- gtk_source_buffer_can_undo (window->buffer));
+ g_object_set (window->undo_menuitem, "enabled",
+ gtk_source_buffer_can_undo (window->buffer), NULL);
- gtk_action_set_sensitive (window->redo_menuitem,
- gtk_source_buffer_can_redo (window->buffer));
+ g_object_set (window->redo_menuitem, "enabled",
+ gtk_source_buffer_can_redo (window->buffer), NULL);
}
static void
{
gint n_pages = gtk_source_print_compositor_get_n_pages (window->compositor);
gtk_print_operation_set_n_pages (operation, n_pages);
-
+
return TRUE;
}
gint page_nr,
PsppireSyntaxWindow *window)
{
- gtk_source_print_compositor_draw_page (window->compositor,
+ gtk_source_print_compositor_draw_page (window->compositor,
context,
page_nr);
}
GtkPrintOperation *print = gtk_print_operation_new ();
- if (window->print_settings != NULL)
+ if (window->print_settings != NULL)
gtk_print_operation_set_print_settings (print, window->print_settings);
projects / pspp / blobdiff