X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=8ae97f1511970845178d947c5fae2f7419cf2a66;hb=f5574c6264163859a8eb94ab1e33bcc1b61fce5f;hp=d18788150fbb97eb5f66edac01ffebe1efade87d;hpb=ad024edf80de3f4d8c720eb3e9af80d3cd8a18f3;p=pspp diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index d18788150f..8ae97f1511 100644 --- a/src/ui/gui/psppire.c +++ b/src/ui/gui/psppire.c @@ -18,14 +18,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* - * Initial main.c file generated by Glade. Edit as required. - * Glade will not overwrite this file. - */ +#include #include +#include + #include #include +#include +#include + #include #include #include @@ -34,69 +36,143 @@ #include "psppire-dict.h" #include "psppire-var-store.h" #include "psppire-data-store.h" - #include "helper.h" #include "data-sheet.h" #include "var-sheet.h" -#include "psppire-case-array.h" +#include "message-dialog.h" GladeXML *xml; PsppireDict *the_dictionary = 0; -PsppireCaseArray *the_cases = 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); + + +#define _(msgid) gettext (msgid) +#define N_(msgid) msgid + +static void +give_help(void) +{ + static struct msg m = { + MSG_GENERAL, + MSG_NOTE, + {0, -1}, + 0, + }; + + if (! m.text) + m.text=g_strdup(_("Sorry. The help system hasn't yet been implemented.")); + + popup_message(&m); +} + +PsppireVarStore *var_store = 0; +void create_icon_factory (void); int main(int argc, char *argv[]) { - if ( ! parse_command_line(&argc, &argv) ) - return 0; + + GtkWidget *data_editor ; + GtkSheet *var_sheet ; + 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_MICRO_VERSION)) ) + { + g_critical(vers); + } + + + /* gtk_init messes with the locale. + So unset the bits we want to control ourselves */ + setlocale (LC_NUMERIC, "C"); + + bindtextdomain (PACKAGE, locale_dir); + + textdomain (PACKAGE); + + if ( ! parse_command_line(&argc, &argv, &filename, &err) ) + { + g_clear_error(&err); + return 0; + } glade_init(); + + + fmt_init(); + settings_init(); + + message_dialog_init(); + the_dictionary = psppire_dict_new(); + bind_textdomain_codeset(PACKAGE, "UTF-8"); + /* Create the model for the var_sheet */ - PsppireVarStore *var_store = psppire_var_store_new(the_dictionary); + var_store = psppire_var_store_new(the_dictionary); - /* Create the model for the data sheet */ - the_cases = psppire_case_array_new(100, 20); + data_store = psppire_data_store_new(the_dictionary); - data_store = psppire_data_store_new(the_dictionary, the_cases); + create_icon_factory(); /* load the interface */ xml = glade_xml_new(PKGDATADIR "/psppire.glade", NULL, NULL); if ( !xml ) return 1; - GtkWidget *data_editor = get_widget_assert(xml, "data_editor"); + data_editor = get_widget_assert(xml, "data_editor"); gtk_window_set_icon_from_file(GTK_WINDOW(data_editor), PKGDATADIR "/psppicon.png",0); /* connect the signals in the interface */ glade_xml_signal_autoconnect(xml); - GtkSheet *var_sheet = GTK_SHEET(get_widget_assert(xml, "variable_sheet")); - GtkSheet *data_sheet = GTK_SHEET(get_widget_assert(xml, "data_sheet")); + var_sheet = GTK_SHEET(get_widget_assert(xml, "variable_sheet")); + data_sheet = GTK_SHEET(get_widget_assert(xml, "data_sheet")); gtk_sheet_set_model(var_sheet, G_SHEET_MODEL(var_store)); gtk_sheet_set_model(data_sheet, G_SHEET_MODEL(data_store)); + if (filename) + gtk_init_add((GtkFunction)load_system_file, filename); + else + gtk_init_add((GtkFunction)clear_file, 0); + + var_data_selection_init(); + + { + GList *helps = glade_xml_get_widget_prefix(xml, "help_button_"); + + 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); + } - gtk_init_add(callbacks_on_init, 0); /* start the event loop */ gtk_main(); + + message_dialog_done(); + + settings_done(); + return 0; } @@ -105,7 +181,7 @@ main(int argc, char *argv[]) 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) +parse_command_line (int *argc, char ***argv, gchar **filename, GError **err) { static struct option long_options[] = { @@ -125,17 +201,71 @@ parse_command_line (int *argc, char ***argv) switch (c) { case 'h': - g_print("Usage: psppire {|--help|--version}\n"); + g_print ("Usage: psppire {|--help|--version}\n"); return false; case 'V': - g_print(version); - g_print("\n"); - g_print(legal); + g_print (version); + g_print ("\n"); + g_print (legal); return false; default: - assert (0); + return false; } } + if ( optind < *argc) + { + *filename = (*argv)[optind]; + } + return true; } + + + +void +create_icon_factory (void) +{ + GtkIconFactory *factory = gtk_icon_factory_new(); + + GtkIconSet *icon_set; + + GdkPixbuf *pixbuf; + + pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/value-labels.png", 0); + icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); + g_object_unref (pixbuf); + gtk_icon_factory_add ( factory, "pspp-value-labels", icon_set); + + pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/weight-cases.png", 0); + icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); + g_object_unref (pixbuf); + gtk_icon_factory_add ( factory, "pspp-weight-cases", icon_set); + + pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/goto-variable.png", 0); + icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); + g_object_unref (pixbuf); + gtk_icon_factory_add ( factory, "pspp-goto-variable", icon_set); + + pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/insert-variable.png", 0); + icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); + g_object_unref (pixbuf); + gtk_icon_factory_add ( factory, "pspp-insert-variable", icon_set); + + pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/insert-case.png", 0); + icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); + g_object_unref (pixbuf); + gtk_icon_factory_add ( factory, "pspp-insert-case", icon_set); + + pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/split-file.png", 0); + icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); + g_object_unref (pixbuf); + gtk_icon_factory_add ( factory, "pspp-split-file", icon_set); + + pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/select-cases.png", 0); + icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); + g_object_unref (pixbuf); + gtk_icon_factory_add ( factory, "pspp-select-cases", icon_set); + + gtk_icon_factory_add_default (factory); +}