#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"
{
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);
}
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);
}
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;
{
GtkTextIter begin, end;
- 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);
}
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) ;
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 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);
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);
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);
gtk_widget_show (w);
}
-void
+GtkWindow *
open_syntax_window (const char *file_name, const gchar *encoding)
{
GtkWidget *se = psppire_syntax_window_new (NULL);
- if ( file_name)
+ if (file_name)
load_and_show_syntax_window (se, file_name, encoding);
+
+ return GTK_WINDOW (se);
}
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->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);
{
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));
}
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_widget_show_all (box);
- GApplication *app = g_application_get_default ();
+ GtkApplication *app = GTK_APPLICATION (g_application_get_default ());
{
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,
{
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),
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),
gtk_application_set_accels_for_action (app,
"win.save_as",
accels);
-
-
+
+
}
g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (run_current_line));
- GApplication *app = g_application_get_default ();
+ GtkApplication *app = GTK_APPLICATION (g_application_get_default ());
const gchar *accels[2] = { "<Ctrl>R", NULL};
gtk_application_set_accels_for_action (app,
"win.run-current-line",
{
GSimpleAction *run_selection = g_simple_action_new ("run-selection", NULL);
-
+
g_signal_connect_swapped (run_selection, "activate",
G_CALLBACK (on_run_selection), window);
{
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));
}
"description", _("Syntax Editor"),
"encoding", encoding,
NULL);
-
+
GApplication *app = g_application_get_default ();
gtk_application_add_window (GTK_APPLICATION (app), GTK_WINDOW (sw));
GtkTextBuffer *buffer = GTK_TEXT_BUFFER (sw->buffer);
/* 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);
NULL).string;
free (text_locale);
- if ( text_utf8 == NULL )
+ if (text_utf8 == NULL)
{
error_dialog (GTK_WINDOW (window), filename, err);
g_clear_error (&err);
{
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