projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Whitespace changes only.
[pspp-builds.git]
/
src
/
ui
/
gui
/
psppire.c
diff --git
a/src/ui/gui/psppire.c
b/src/ui/gui/psppire.c
index ed4c790b95a38797dbbe8e730ffa9cfa1c9b0fe4..bae77e87b67056ea082bfe4de666d3ff397b90d0 100644
(file)
--- a/
src/ui/gui/psppire.c
+++ b/
src/ui/gui/psppire.c
@@
-1,4
+1,4
@@
-/*
+/*
PSPPIRE --- A Graphical User Interface for PSPP
Copyright (C) 2004, 2005, 2006 Free Software Foundation
PSPPIRE --- A Graphical User Interface for PSPP
Copyright (C) 2004, 2005, 2006 Free Software Foundation
@@
-23,6
+23,7
@@
#include <libintl.h>
#include <libintl.h>
+#include "data-editor.h"
#include <libpspp/version.h>
#include <libpspp/copyleft.h>
#include <data/file-handle-def.h>
#include <libpspp/version.h>
#include <libpspp/copyleft.h>
#include <data/file-handle-def.h>
@@
-37,7
+38,6
@@
#include <gtk/gtk.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
#include <gtk/gtk.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
-#include "menu-actions.h"
#include "psppire-dict.h"
#include "psppire-var-store.h"
#include "psppire-data-store.h"
#include "psppire-dict.h"
#include "psppire-var-store.h"
#include "psppire-data-store.h"
@@
-47,15
+47,10
@@
#include "message-dialog.h"
#include "flexifile-factory.h"
#include "message-dialog.h"
#include "flexifile-factory.h"
-
GladeXML *xml
;
+
PsppireDataStore *the_data_store = 0
;
-PsppireDict *the_dictionary = 0;
-
-PsppireDataStore *data_store = 0;
-
-
-static bool parse_command_line (int *argc, char ***argv,
+static bool parse_command_line (int *argc, char ***argv,
gchar **filename, GError **err);
gchar **filename, GError **err);
@@
-63,53
+58,54
@@
static bool parse_command_line (int *argc, char ***argv,
#define N_(msgid) msgid
static void
#define N_(msgid) msgid
static void
-give_help(void)
+give_help
(void)
{
static struct msg m = {
{
static struct msg m = {
- MSG_GENERAL,
+ MSG_GENERAL,
MSG_NOTE,
{0, -1},
MSG_NOTE,
{0, -1},
- 0,
+ 0,
};
};
- if (! m.text)
- m.text=g_strdup(_("Sorry. The help system hasn't yet been implemented."));
+ if (! m.text)
+ m.text=g_strdup
(_("Sorry. The help system hasn't yet been implemented."));
- popup_message(&m);
+ popup_message
(&m);
}
}
-PsppireVarStore *var_store = 0;
+PsppireVarStore *
the_
var_store = 0;
void create_icon_factory (void);
struct source_stream *the_source_stream ;
void create_icon_factory (void);
struct source_stream *the_source_stream ;
-struct lexer *the_lexer;
struct dataset * the_dataset = NULL;
struct dataset * the_dataset = NULL;
-int
-main
(int argc, char *argv[])
+int
+main
(int argc, char *argv[])
{
struct casefile_factory *factory;
{
struct casefile_factory *factory;
+ PsppireDict *dictionary = 0;
+
GtkWidget *data_editor ;
GtkWidget *data_editor ;
- GtkSheet *var_sheet ;
+ GtkSheet *var_sheet ;
GtkSheet *data_sheet ;
gchar *filename=0;
GError *err = 0;
gchar *vers;
GtkSheet *data_sheet ;
gchar *filename=0;
GError *err = 0;
gchar *vers;
- gtk_init(&argc, &argv);
- if ( (vers = gtk_check_version
(GTK_MAJOR_VERSION,
- GTK_MINOR_VERSION,
+ gtk_init
(&argc, &argv);
+ if ( (vers = gtk_check_version
(GTK_MAJOR_VERSION,
+ GTK_MINOR_VERSION,
GTK_MICRO_VERSION)) )
{
GTK_MICRO_VERSION)) )
{
- g_critical(vers);
+ g_critical
(vers);
}
}
-
- /* gtk_init messes with the locale.
+
+ /* gtk_init messes with the locale.
So unset the bits we want to control ourselves */
setlocale (LC_NUMERIC, "C");
So unset the bits we want to control ourselves */
setlocale (LC_NUMERIC, "C");
@@
-117,91
+113,87
@@
main(int argc, char *argv[])
textdomain (PACKAGE);
textdomain (PACKAGE);
- if ( ! parse_command_line
(&argc, &argv, &filename, &err) )
+ if ( ! parse_command_line
(&argc, &argv, &filename, &err) )
{
{
- g_clear_error(&err);
+ g_clear_error
(&err);
return 0;
}
return 0;
}
- glade_init();
+ glade_init
();
- fmt_init();
- settings_init();
+ fmt_init
();
+ settings_init
();
fh_init ();
factory = flexifile_factory_create ();
the_source_stream = create_source_stream (
fn_getenv_default ("STAT_INCLUDE_PATH", include_path)
);
fh_init ();
factory = flexifile_factory_create ();
the_source_stream = create_source_stream (
fn_getenv_default ("STAT_INCLUDE_PATH", include_path)
);
- the_lexer = lex_create (the_source_stream);
-
the_dataset = create_dataset (factory);
message_dialog_init (the_source_stream);
the_dataset = create_dataset (factory);
message_dialog_init (the_source_stream);
-
the_
dictionary =
+ dictionary =
psppire_dict_new_from_dict (
dataset_dict (the_dataset)
);
psppire_dict_new_from_dict (
dataset_dict (the_dataset)
);
- bind_textdomain_codeset(PACKAGE, "UTF-8");
+ bind_textdomain_codeset
(PACKAGE, "UTF-8");
/* Create the model for the var_sheet */
/* Create the model for the var_sheet */
- var_store = psppire_var_store_new(the_dictionary);
+ the_var_store = psppire_var_store_new (dictionary);
+
-
data_store = psppire_data_store_new(the_
dictionary);
+
the_data_store = psppire_data_store_new (
dictionary);
- create_icon_factory();
+ create_icon_factory
();
+#if 0
/* load the interface */
/* load the interface */
-
xml = glade_xml_new(PKGDATADIR "/psppire
.glade", NULL, NULL);
+
data_editor_xml = glade_xml_new (PKGDATADIR "/data-editor
.glade", NULL, NULL);
- if ( !xml ) return 1;
+ if ( !
data_editor_
xml ) return 1;
- data_editor = get_widget_assert(xml, "data_editor");
- gtk_window_set_icon_from_file(GTK_WINDOW(data_editor),
- PKGDATADIR "/psppicon.png",0);
+ data_editor = get_widget_assert (data_editor_xml, "data_editor");
/* connect the signals in the interface */
/* connect the signals in the interface */
- glade_xml_signal_autoconnect(xml);
-
- var_sheet = GTK_SHEET(get_widget_assert(xml, "variable_sheet"));
- data_sheet = GTK_SHEET(get_widget_assert(xml, "data_sheet"));
+ glade_xml_signal_autoconnect (data_editor_xml);
- gtk_sheet_set_model(var_sheet, G_SHEET_MODEL(var_store));
+ var_sheet = GTK_SHEET(get_widget_assert (data_editor_xml, "variable_sheet"));
+ data_sheet = GTK_SHEET(get_widget_assert (data_editor_xml, "data_sheet"));
- gtk_sheet_set_model
(data_sheet, G_SHEET_MODEL(data
_store));
+ gtk_sheet_set_model
(var_sheet, G_SHEET_MODEL(the_var
_store));
- if (filename)
- gtk_init_add((GtkFunction)load_system_file, filename);
- else
- gtk_init_add((GtkFunction)clear_file, 0);
+ gtk_sheet_set_model (data_sheet, G_SHEET_MODEL(the_data_store));
- var_data_selection_init();
+ var_data_selection_init
();
{
{
- GList *helps = glade_xml_get_widget_prefix
(
xml, "help_button_");
+ GList *helps = glade_xml_get_widget_prefix
(data_editor_
xml, "help_button_");
GList *i;
GList *i;
- for ( i = g_list_first
(helps); i ; i = g_list_next
(i))
- g_signal_connect(GTK_WIDGET(i->data), "clicked", give_help, 0);
+ for ( i = g_list_first
(helps); i ; i = g_list_next
(i))
+ g_signal_connect
(GTK_WIDGET(i->data), "clicked", give_help, 0);
}
}
+#endif
+
+ new_data_window (NULL, NULL);
/* start the event loop */
/* start the event loop */
- gtk_main();
+ gtk_main
();
destroy_source_stream (the_source_stream);
destroy_source_stream (the_source_stream);
- message_dialog_done();
+ message_dialog_done
();
- settings_done();
+ settings_done
();
return 0;
}
/* Parses the command line specified by ARGC and ARGV as received by
return 0;
}
/* Parses the command line specified by ARGC and ARGV as received by
- main(). Returns true if normal execution should proceed,
+ main
(). Returns true if normal execution should proceed,
false if the command-line indicates that PSPP should exit. */
static bool
parse_command_line (int *argc, char ***argv, gchar **filename, GError **err)
false if the command-line indicates that PSPP should exit. */
static bool
parse_command_line (int *argc, char ***argv, gchar **filename, GError **err)
@@
-236,7
+228,7
@@
parse_command_line (int *argc, char ***argv, gchar **filename, GError **err)
}
}
}
}
- if ( optind < *argc)
+ if ( optind < *argc)
{
*filename = (*argv)[optind];
}
{
*filename = (*argv)[optind];
}
@@
-246,13
+238,13
@@
parse_command_line (int *argc, char ***argv, gchar **filename, GError **err)
-void
+void
create_icon_factory (void)
{
create_icon_factory (void)
{
- GtkIconFactory *factory = gtk_icon_factory_new();
+ GtkIconFactory *factory = gtk_icon_factory_new
();
GtkIconSet *icon_set;
GtkIconSet *icon_set;
-
+
GdkPixbuf *pixbuf;
pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/value-labels.png", 0);
GdkPixbuf *pixbuf;
pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/value-labels.png", 0);