X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=67ace893386b2854b9157115e7f71646636dda67;hb=e16d30a43af6ada7b8846f48a55eb3cb8f4e5f22;hp=4d77cb3d1bfe13cbfdab1b6ea17b505522cdbdb1;hpb=75aeeafa67aa460512683311566a83917d399c70;p=pspp diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index 4d77cb3d1b..67ace89338 100644 --- a/src/ui/gui/psppire.c +++ b/src/ui/gui/psppire.c @@ -18,16 +18,13 @@ 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 @@ -36,19 +33,15 @@ #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; @@ -56,55 +49,83 @@ PsppireDataStore *data_store = 0; static bool parse_command_line (int *argc, char ***argv, gchar **filename, GError **err); + +#define _(msgid) gettext (msgid) +#define N_(msgid) msgid + static void -i18n_init (void) +give_help(void) { -#if ENABLE_NLS -#if HAVE_LC_MESSAGES - setlocale (LC_MESSAGES, ""); -#endif - setlocale (LC_MONETARY, ""); - bindtextdomain (PACKAGE, locale_dir); - textdomain (PACKAGE); -#endif /* ENABLE_NLS */ + 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[]) { - PsppireVarStore *var_store ; + 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 1; + return 0; } - glade_init(); - i18n_init(); + + + settings_init(); message_dialog_init(); the_dictionary = psppire_dict_new(); + bind_textdomain_codeset(PACKAGE, "UTF-8"); + /* Create the model for the var_sheet */ var_store = psppire_var_store_new(the_dictionary); - /* Create the model for the data sheet */ - the_cases = psppire_case_array_new(100000, 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); @@ -125,16 +146,29 @@ main(int argc, char *argv[]) gtk_sheet_set_model(data_sheet, G_SHEET_MODEL(data_store)); - gtk_init_add(callbacks_on_init, 0); - 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); + } + /* start the event loop */ gtk_main(); message_dialog_done(); + settings_done(); + return 0; } @@ -163,12 +197,12 @@ parse_command_line (int *argc, char ***argv, gchar **filename, GError **err) switch (c) { case 'h': - g_printerr("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: return false; @@ -182,3 +216,52 @@ parse_command_line (int *argc, char ***argv, gchar **filename, GError **err) 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); +}