[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp/src/ui/gui automake.mk menu-actions.c pspp...
|
From: |
John Darrington |
|
Subject: |
[Pspp-cvs] pspp/src/ui/gui automake.mk menu-actions.c pspp... |
|
Date: |
Thu, 07 Dec 2006 11:10:23 +0000 |
CVSROOT: /sources/pspp
Module name: pspp
Changes by: John Darrington <jmd> 06/12/07 11:10:23
Modified files:
src/ui/gui : automake.mk menu-actions.c psppire.glade
Added files:
src/ui/gui : syntax-editor.c
Log message:
Added a syntax editor to the GUI.
It doesn't do anything yet --- it's just an editor.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/automake.mk?cvsroot=pspp&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/menu-actions.c?cvsroot=pspp&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire.glade?cvsroot=pspp&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/syntax-editor.c?cvsroot=pspp&rev=1.1
Patches:
Index: automake.mk
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/automake.mk,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- automake.mk 17 Jul 2006 10:45:43 -0000 1.14
+++ automake.mk 7 Dec 2006 11:10:23 -0000 1.15
@@ -61,6 +61,7 @@
src/ui/gui/psppire-var-store.h \
src/ui/gui/sort-cases-dialog.c \
src/ui/gui/sort-cases-dialog.h \
+ src/ui/gui/syntax-editor.c \
src/ui/gui/val-labs-dialog.c \
src/ui/gui/val-labs-dialog.h \
src/ui/gui/var-sheet.c \
Index: menu-actions.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/menu-actions.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- menu-actions.c 30 Jul 2006 12:27:59 -0000 1.16
+++ menu-actions.c 7 Dec 2006 11:10:23 -0000 1.17
@@ -206,9 +206,8 @@
return TRUE;
}
-
void
-on_open1_activate (GtkMenuItem *menuitem,
+open_data (GtkMenuItem *menuitem,
gpointer user_data)
{
bool finished = FALSE;
@@ -261,6 +260,21 @@
}
+void
+on_data3_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ open_data(menuitem, user_data);
+}
+
+void
+on_data5_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ open_data(menuitem, user_data);
+}
+
+
/* Re initialise HANDLE, by interrogating the user for a new file name */
static gboolean
recreate_save_handle(struct file_handle **handle)
Index: psppire.glade
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire.glade,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- psppire.glade 17 Jul 2006 10:45:43 -0000 1.7
+++ psppire.glade 7 Dec 2006 11:10:23 -0000 1.8
@@ -5,7 +5,7 @@
<widget class="GtkWindow" id="data_editor">
<property name="visible">True</property>
- <property name="title">Psppire</property>
+ <property name="title">Psppire Data Editor</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
@@ -47,7 +47,28 @@
<property name="visible">True</property>
<property name="label">gtk-new</property>
<property name="use_stock">True</property>
- <signal name="activate" handler="on_new1_activate"
last_modification_time="Tue, 23 Mar 2004 10:22:51 GMT"/>
+
+ <child>
+ <widget class="GtkMenu" id="new1_menu">
+
+ <child>
+ <widget class="GtkMenuItem" id="syntax1">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">_Syntax</property>
+ <property name="use_underline">True</property>
+ <signal name="activate"
handler="on_syntax1_activate" last_modification_time="Tue, 05 Dec 2006 01:39:48
GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="data2">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">_Data</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
</child>
@@ -56,7 +77,29 @@
<property name="visible">True</property>
<property name="label">gtk-open</property>
<property name="use_stock">True</property>
- <signal name="activate" handler="on_open1_activate"
last_modification_time="Tue, 23 Mar 2004 10:22:51 GMT"/>
+
+ <child>
+ <widget class="GtkMenu" id="open1_menu">
+
+ <child>
+ <widget class="GtkMenuItem" id="syntax2">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">_Syntax</property>
+ <property name="use_underline">True</property>
+ <signal name="activate"
handler="on_syntax2_activate" last_modification_time="Tue, 05 Dec 2006 01:39:48
GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="data3">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">_Data</property>
+ <property name="use_underline">True</property>
+ <signal name="activate"
handler="on_data3_activate" last_modification_time="Tue, 05 Dec 2006 01:39:48
GMT"/>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
</child>
@@ -166,7 +209,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image10">
+ <widget class="GtkImage" id="image15">
<property name="visible">True</property>
<property name="stock">gtk-find</property>
<property name="icon_size">1</property>
@@ -287,7 +330,7 @@
<property name="sensitive">False</property>
<property name="label" translatable="yes">Insert
Variable</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_insert_variable" />
+ <signal name="activate" handler="on_insert_variable"/>
</widget>
</child>
@@ -308,7 +351,7 @@
<signal name="activate" handler="on_go_to_case_activate"
last_modification_time="Mon, 19 Jun 2006 10:29:37 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image11">
+ <widget class="GtkImage" id="image16">
<property name="visible">True</property>
<property name="stock">gtk-jump-to</property>
<property name="icon_size">1</property>
@@ -461,7 +504,6 @@
<property name="visible_horizontal">True</property>
<property name="visible_vertical">True</property>
<property name="is_important">False</property>
- <signal name="clicked" handler="on_open1_activate"
last_modification_time="Thu, 10 Nov 2005 12:22:50 GMT"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -576,7 +618,6 @@
<widget class="GtkToolButton" id="variables">
<property name="visible">True</property>
<property name="tooltip"
translatable="yes">Variables</property>
- <property name="stock_id">pspp-goto-variable</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">True</property>
<property name="visible_horizontal">True</property>
@@ -634,7 +675,6 @@
<widget class="GtkToolButton" id="insert_case">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Insert
Case</property>
- <property name="stock_id">pspp-insert-case</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">True</property>
<property name="visible_horizontal">True</property>
@@ -652,7 +692,6 @@
<widget class="GtkToolButton" id="insert_variable">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Insert
Variable</property>
- <property name="stock_id">pspp-insert-variable</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">True</property>
<property name="visible_horizontal">True</property>
@@ -682,7 +721,6 @@
<widget class="GtkToolButton" id="toolbutton8">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Split
File</property>
- <property name="stock_id">pspp-split-file</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">True</property>
<property name="visible_horizontal">True</property>
@@ -699,7 +737,6 @@
<widget class="GtkToolButton" id="toolbutton9">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Weight
Cases</property>
- <property name="stock_id">pspp-weight-cases</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">True</property>
<property name="visible_horizontal">True</property>
@@ -716,7 +753,6 @@
<widget class="GtkToolButton" id="toolbutton10">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Select
Cases</property>
- <property name="stock_id">pspp-select-cases</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">True</property>
<property name="visible_horizontal">True</property>
@@ -746,7 +782,6 @@
<widget class="GtkToggleToolButton"
id="togglebutton-value-labels">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Value
Labels</property>
- <property name="stock_id">pspp-value-labels</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">True</property>
<property name="visible_horizontal">True</property>
@@ -2915,4 +2950,306 @@
</child>
</widget>
+<widget class="GtkWindow" id="syntax_editor">
+ <property name="width_request">640</property>
+ <property name="height_request">480</property>
+ <property name="can_focus">True</property>
+ <property name="title" translatable="yes">Psppire Syntax Editor</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
+
+ <child>
+ <widget class="GtkVBox" id="vbox14">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkMenuBar" id="menubar2">
+ <property name="visible">True</property>
+ <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
+ <property
name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
+
+ <child>
+ <widget class="GtkMenuItem" id="menu_syntax_file">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_File</property>
+ <property name="use_underline">True</property>
+
+ <child>
+ <widget class="GtkMenu" id="menu_syntax_file_menu">
+
+ <child>
+ <widget class="GtkImageMenuItem" id="new2">
+ <property name="visible">True</property>
+ <property name="label">gtk-new</property>
+ <property name="use_stock">True</property>
+
+ <child>
+ <widget class="GtkMenu" id="new2_menu">
+
+ <child>
+ <widget class="GtkMenuItem" id="file_new_syntax">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">_Syntax</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="data4">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">_Data</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="open2">
+ <property name="visible">True</property>
+ <property name="label">gtk-open</property>
+ <property name="use_stock">True</property>
+
+ <child>
+ <widget class="GtkMenu" id="open2_menu">
+
+ <child>
+ <widget class="GtkMenuItem" id="file_open_syntax">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">_Syntax</property>
+ <property name="use_underline">True</property>
+ <signal name="activate"
handler="on_syntax4_activate" last_modification_time="Tue, 05 Dec 2006 01:43:21
GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="data5">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">_Data</property>
+ <property name="use_underline">True</property>
+ <signal name="activate"
handler="on_data5_activate" last_modification_time="Tue, 05 Dec 2006 01:43:21
GMT"/>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="file_save">
+ <property name="visible">True</property>
+ <property name="label">gtk-save</property>
+ <property name="use_stock">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="file_save_as">
+ <property name="visible">True</property>
+ <property name="label">gtk-save-as</property>
+ <property name="use_stock">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkSeparatorMenuItem"
id="separatormenuitem2">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="file_quit">
+ <property name="visible">True</property>
+ <property name="label">gtk-quit</property>
+ <property name="use_stock">True</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="menuitem7">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Edit</property>
+ <property name="use_underline">True</property>
+
+ <child>
+ <widget class="GtkMenu" id="menuitem7_menu">
+
+ <child>
+ <widget class="GtkImageMenuItem" id="cut2">
+ <property name="visible">True</property>
+ <property name="label">gtk-cut</property>
+ <property name="use_stock">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="copy2">
+ <property name="visible">True</property>
+ <property name="label">gtk-copy</property>
+ <property name="use_stock">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="paste2">
+ <property name="visible">True</property>
+ <property name="label">gtk-paste</property>
+ <property name="use_stock">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="delete1">
+ <property name="visible">True</property>
+ <property name="label">gtk-delete</property>
+ <property name="use_stock">True</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="run1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Run</property>
+ <property name="use_underline">True</property>
+
+ <child>
+ <widget class="GtkMenu" id="run1_menu">
+
+ <child>
+ <widget class="GtkMenuItem" id="all1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">All</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="selection1">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">Selection</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="current_line1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Current
Line</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="to_end1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">To
End</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="menuitem9">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Help</property>
+ <property name="use_underline">True</property>
+
+ <child>
+ <widget class="GtkMenu" id="menuitem9_menu">
+
+ <child>
+ <widget class="GtkMenuItem" id="about2">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">_About</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow8">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
+ <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+ <child>
+ <widget class="GtkTextView" id="syntax_text_view">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="overwrite">False</property>
+ <property name="accepts_tab">True</property>
+ <property name="justification">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap_mode">GTK_WRAP_NONE</property>
+ <property name="cursor_visible">True</property>
+ <property name="pixels_above_lines">0</property>
+ <property name="pixels_below_lines">0</property>
+ <property name="pixels_inside_wrap">0</property>
+ <property name="left_margin">0</property>
+ <property name="right_margin">0</property>
+ <property name="indent">0</property>
+ <property name="text" translatable="yes"></property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkStatusbar" id="statusbar2">
+ <property name="visible">True</property>
+ <property name="has_resize_grip">True</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+</widget>
+
</glade-interface>
Index: syntax-editor.c
===================================================================
RCS file: syntax-editor.c
diff -N syntax-editor.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ syntax-editor.c 7 Dec 2006 11:10:23 -0000 1.1
@@ -0,0 +1,426 @@
+/*
+ PSPPIRE --- A Graphical User Interface for PSPP
+ Copyright (C) 2006 Free Software Foundation
+ Written by John Darrington
+
+ 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA. */
+
+#include <config.h>
+#include <stdlib.h>
+#include <gettext.h>
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
+#include <glade/glade.h>
+#include <gtk/gtk.h>
+#include <libpspp/message.h>
+
+#include "helper.h"
+
+extern GladeXML *xml;
+
+struct syntax_editor
+{
+ GtkWidget *window; /* The top level window of the editor */
+ GtkTextBuffer *buffer; /* The buffer which contains the text */
+ gchar *name; /* The name of this syntax buffer/editor */
+};
+
+static gboolean save_editor_to_file (struct syntax_editor *se,
+ const gchar *filename,
+ GError **err);
+
+/* If the buffer's modified flag is set, then save it, and close the window.
+ Otherwise just close the window.
+*/
+static void
+save_if_modified (struct syntax_editor *se)
+{
+ if ( TRUE == gtk_text_buffer_get_modified (se->buffer))
+ {
+ gint response;
+ GtkWidget *dialog =
+ gtk_message_dialog_new (GTK_WINDOW(se->window),
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_NONE,
+ _("Save contents of syntax editor to %s?"),
+ se->name ? se->name : _("Untitled")
+ );
+
+ gtk_dialog_add_button (GTK_DIALOG(dialog),
+ GTK_STOCK_YES,
+ GTK_RESPONSE_ACCEPT);
+ gtk_dialog_add_button (GTK_DIALOG(dialog),
+ GTK_STOCK_NO,
+ GTK_RESPONSE_REJECT);
+ gtk_dialog_add_button (GTK_DIALOG(dialog),
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_CANCEL);
+
+
+ response = gtk_dialog_run (GTK_DIALOG(dialog));
+
+ gtk_widget_destroy (dialog);
+
+ if ( response == GTK_RESPONSE_ACCEPT )
+ {
+ GError *err = NULL;
+
+ if ( ! save_editor_to_file (se, se->name ? se->name : _("Untitled"),
+ err) )
+ {
+ msg (ME, err->message);
+ g_error_free (err);
+ }
+ }
+
+ if ( response == GTK_RESPONSE_CANCEL )
+ return ;
+ }
+
+ gtk_widget_destroy (se->window);
+}
+
+/* Callback for the File->SaveAs menuitem */
+static void
+on_syntax_save_as (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ GtkFileFilter *filter;
+ gint response;
+ struct syntax_editor *se = user_data;
+
+ GtkWidget *dialog =
+ gtk_file_chooser_dialog_new (_("Save Syntax"),
+ GTK_WINDOW(se->window),
+ GTK_FILE_CHOOSER_ACTION_SAVE,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+ NULL);
+
+ filter = gtk_file_filter_new ();
+ gtk_file_filter_set_name (filter, _("Syntax Files (*.sps) "));
+ gtk_file_filter_add_pattern (filter, "*.sps");
+ gtk_file_filter_add_pattern (filter, "*.SPS");
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER(dialog), filter);
+
+ filter = gtk_file_filter_new ();
+ gtk_file_filter_set_name (filter, _("All Files"));
+ gtk_file_filter_add_pattern (filter, "*");
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
+
+ gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER(dialog),
+ TRUE);
+ response = gtk_dialog_run (GTK_DIALOG (dialog));
+
+ if ( response == GTK_RESPONSE_ACCEPT )
+ {
+ GError *err = NULL;
+ char *filename =
+ gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog) );
+
+ if ( save_editor_to_file (se, filename, &err) )
+ {
+ g_free (se->name);
+ se->name = g_strdup (filename);
+ }
+ else
+ {
+ msg ( ME, err->message );
+ g_error_free (err);
+ }
+
+ free (filename);
+ }
+
+ gtk_widget_destroy ( dialog );
+}
+
+/* Callback for the File->Save menuitem */
+void
+on_syntax_save (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ struct syntax_editor *se = user_data;
+
+ if ( se->name == NULL )
+ on_syntax_save_as (menuitem, user_data);
+ else
+ {
+ GError *err;
+ save_editor_to_file (se, se->name, &err);
+ msg (ME, err->message);
+ g_error_free (err);
+ }
+}
+
+
+/* Callback for the "delete" action (clicking the x on the top right
+ hand corner of the window) */
+static gboolean
+on_delete (GtkWidget *w, GdkEvent *event, gpointer user_data)
+{
+ struct syntax_editor *se = user_data;
+ save_if_modified (se);
+ return TRUE;
+}
+
+
+/* Callback for the File->Quit menuitem */
+static gboolean
+on_quit (GtkMenuItem *menuitem, gpointer user_data)
+{
+ struct syntax_editor *se = user_data;
+ save_if_modified (se);
+ return FALSE;
+}
+
+void
+new_syntax_window (GtkMenuItem *menuitem,
+ gpointer user_data);
+
+
+
+static void open_syntax_window (GtkMenuItem *menuitem,
+ gpointer user_data);
+
+
+/* Create a new syntax editor with NAME.
+ If NAME is NULL, a name will be automatically assigned
+*/
+static struct syntax_editor *
+new_syntax_editor (const gchar *name)
+{
+ GladeXML *new_xml ;
+ GtkWidget *text_view;
+ struct syntax_editor *se ;
+
+ new_xml = glade_xml_new (xml->filename, "syntax_editor", NULL);
+
+ se = g_malloc (sizeof (*se));
+
+ se->window = get_widget_assert (new_xml, "syntax_editor");
+ text_view = get_widget_assert (new_xml, "syntax_text_view");
+ se->buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW(text_view));
+ if ( name )
+ se->name = g_strdup (name);
+ else
+ se->name = NULL;
+
+ g_signal_connect (get_widget_assert (new_xml,"file_new_syntax"),
+ "activate",
+ G_CALLBACK(new_syntax_window),
+ se->window);
+
+ g_signal_connect (get_widget_assert (new_xml,"file_open_syntax"),
+ "activate",
+ G_CALLBACK(open_syntax_window),
+ se->window);
+
+ g_signal_connect (get_widget_assert (new_xml,"file_quit"),
+ "activate",
+ G_CALLBACK(on_quit),
+ se);
+
+ g_signal_connect (get_widget_assert (new_xml,"file_save"),
+ "activate",
+ G_CALLBACK(on_syntax_save),
+ se);
+
+ g_signal_connect (get_widget_assert (new_xml,"file_save_as"),
+ "activate",
+ G_CALLBACK(on_syntax_save_as),
+ se);
+
+ g_object_unref (new_xml);
+
+ g_signal_connect (se->window, "delete-event",
+ G_CALLBACK(on_delete), se);
+
+ return se;
+}
+
+/* Callback for the File->New->Syntax menuitem */
+void
+new_syntax_window (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ struct syntax_editor *se = new_syntax_editor (NULL);
+ gtk_widget_show (se->window);
+}
+
+
+static void
+set_window_title_from_filename (struct syntax_editor *se,
+ const gchar *filename)
+{
+ gchar *title;
+ gchar *basename ;
+ g_free (se->name);
+ se->name = strdup (filename);
+ basename = g_path_get_basename (filename);
+ title =
+ g_strdup_printf (_("%s --- PSPP Syntax Editor"), basename);
+ g_free (basename);
+ gtk_window_set_title (GTK_WINDOW(se->window), title);
+ g_free (title);
+}
+
+
+/* Save BUFFER to the file called FILENAME.
+ If successful, clears the buffer's modified flag */
+static gboolean
+save_editor_to_file (struct syntax_editor *se,
+ const gchar *filename,
+ GError **err)
+{
+ GtkTextBuffer *buffer = se->buffer;
+ gboolean result ;
+ GtkTextIter start, stop;
+ gchar *text;
+
+ gchar *glibfilename;
+ g_assert (filename);
+
+ glibfilename = g_filename_from_utf8 (filename, -1, 0, 0, err);
+
+ if ( ! glibfilename )
+ return FALSE;
+
+ gtk_text_buffer_get_iter_at_line (buffer, &start, 0);
+ gtk_text_buffer_get_iter_at_offset (buffer, &stop, -1);
+
+ text = gtk_text_buffer_get_text (buffer, &start, &stop, FALSE);
+
+ result = g_file_set_contents (glibfilename, text, -1, err);
+
+ if ( result )
+ {
+ set_window_title_from_filename (se, filename);
+ gtk_text_buffer_set_modified (buffer, FALSE);
+ }
+
+ return result;
+}
+
+
+/* Loads the buffer from the file called FILENAME
+*/
+static gboolean
+load_editor_from_file (struct syntax_editor *se,
+ const gchar *filename,
+ GError **err)
+{
+ GtkTextBuffer *buffer = se->buffer;
+ gchar *text;
+ GtkTextIter iter;
+
+ gchar *glibfilename = g_filename_from_utf8 (filename, -1, 0, 0, err);
+
+ if ( ! glibfilename )
+ return FALSE;
+
+ /* FIXME: What if it's a very big file ? */
+ if ( ! g_file_get_contents (glibfilename, &text, NULL, err) )
+ {
+ g_free (glibfilename);
+ return FALSE;
+ }
+ g_free (glibfilename);
+
+ gtk_text_buffer_get_iter_at_line (buffer, &iter, 0);
+
+ gtk_text_buffer_insert (buffer, &iter, text, -1);
+
+ set_window_title_from_filename (se, filename);
+ gtk_text_buffer_set_modified (buffer, FALSE);
+
+ return TRUE;
+}
+
+
+/* Callback for the File->Open->Syntax menuitem */
+static void
+open_syntax_window (GtkMenuItem *menuitem, gpointer parent)
+{
+ GtkFileFilter *filter;
+ gint response;
+
+ GtkWidget *dialog =
+ gtk_file_chooser_dialog_new (_("Open Syntax"),
+ GTK_WINDOW(parent),
+ GTK_FILE_CHOOSER_ACTION_OPEN,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+ NULL);
+
+ filter = gtk_file_filter_new ();
+ gtk_file_filter_set_name (filter, _("Syntax Files (*.sps) "));
+ gtk_file_filter_add_pattern (filter, "*.sps");
+ gtk_file_filter_add_pattern (filter, "*.SPS");
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER(dialog), filter);
+
+ filter = gtk_file_filter_new ();
+ gtk_file_filter_set_name (filter, _("All Files"));
+ gtk_file_filter_add_pattern (filter, "*");
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
+
+ response = gtk_dialog_run (GTK_DIALOG (dialog));
+
+ if (response == GTK_RESPONSE_ACCEPT)
+ {
+ const char *file_name = gtk_file_chooser_get_filename
+ (GTK_FILE_CHOOSER (dialog));
+
+ struct syntax_editor *se = new_syntax_editor (file_name);
+
+ load_editor_from_file (se, file_name, NULL);
+
+ gtk_widget_show (se->window);
+ }
+
+ gtk_widget_destroy (dialog);
+}
+
+
+#if 1
+/* FIXME: get rid of these functions */
+void
+on_syntax4_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ g_print ("%s\n", __FUNCTION__);
+}
+
+
+
+void
+on_syntax2_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ g_print ("%s\n", __FUNCTION__);
+}
+
+void
+on_syntax1_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ g_print ("%s\n", __FUNCTION__);
+ new_syntax_window (menuitem, user_data);
+}
+#endif
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp/src/ui/gui automake.mk menu-actions.c pspp...,
John Darrington <=