/* 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 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 "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-window-register.h"
#include "ui/gui/psppire.h"
+#include "ui/gui/windows-menu.h"
#include "gl/localcharset.h"
#include "gl/xalloc.h"
{
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));
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);
}
}
}
- 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) )
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,
/* 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_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);
}
-/* 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 )
create_syntax_window (void)
{
GtkWidget *w = psppire_syntax_window_new (NULL);
+
gtk_widget_show (w);
}
void
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);
+ load_and_show_syntax_window (se, file_name, encoding);
}
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);
else
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->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->buffer = GTK_SOURCE_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view)));
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",
G_CALLBACK (selection_changed), window);
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);
+ GApplication *app = g_application_get_default ();
- g_signal_connect (get_action_assert (xml,"file_new_data"),
- "activate",
- G_CALLBACK (create_data_window),
- window);
-
- g_signal_connect_swapped (get_action_assert (xml, "file_open"),
- "activate",
- G_CALLBACK (psppire_window_open),
- window);
+ {
+ GSimpleAction *open = g_simple_action_new ("open", NULL);
+
+ g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (open));
+
+ g_signal_connect_swapped (open,
+ "activate",
+ G_CALLBACK (psppire_window_open),
+ window);
+ }
- g_signal_connect_swapped (get_action_assert (xml, "file_save"),
- "activate",
- G_CALLBACK (psppire_window_save),
- 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] = { "<Ctrl>S", NULL};
+ gtk_application_set_accels_for_action (app,
+ "win.save",
+ accels);
+
+ }
- g_signal_connect_swapped (get_action_assert (xml, "file_save_as"),
- "activate",
- G_CALLBACK (psppire_window_save_as),
- window);
+ {
+ 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><Ctrl>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"),
- "activate",
- G_CALLBACK (on_run_all),
- window);
+ {
+ GSimpleAction *run_all = g_simple_action_new ("run-all", NULL);
- g_signal_connect (get_action_assert (xml,"run_selection"),
- "activate",
- G_CALLBACK (on_run_selection),
- window);
+ g_signal_connect_swapped (run_all, "activate",
+ G_CALLBACK (on_run_all), window);
- g_signal_connect (get_action_assert (xml,"run_current_line"),
- "activate",
- G_CALLBACK (on_run_current_line),
- window);
+ g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (run_all));
+ }
- g_signal_connect (get_action_assert (xml,"run_to_end"),
- "activate",
- G_CALLBACK (on_run_to_end),
- window);
+ {
+ GSimpleAction *run_current_line = g_simple_action_new ("run-current-line", NULL);
- g_signal_connect (get_action_assert (xml,"windows_minimise_all"),
- "activate",
- G_CALLBACK (psppire_window_minimise_all), 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));
+ GApplication *app = g_application_get_default ();
+ const gchar *accels[2] = { "<Ctrl>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);
+
+ g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (run_to_end));
+ }
- merge_help_menu (uim);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menubar),
+ create_windows_menu (GTK_WINDOW (window)));
- PSPPIRE_WINDOW (window)->menu =
- GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar/windows/windows_minimise_all")->parent);
- }
+ 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
Loads the buffer from the file called FILENAME
*/
gboolean
-syntax_load (PsppireWindow *window, const gchar *filename)
+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) )
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);
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
projects / pspp / blobdiff