X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Fui%2Fgui%2Fwindow-manager.c;h=91f44a59f8f592b8942817544fd74eef241e8d3c;hb=c3ac5a8af9c449072c7e872ca70a78c1755ae309;hp=2978d7ae8f5c585619c81207084249edcd4743c0;hpb=3f159627d3b80706e58a54be2431c3edbc5333dc;p=pspp
diff --git a/src/ui/gui/window-manager.c b/src/ui/gui/window-manager.c
index 2978d7ae8f..91f44a59f8 100644
--- a/src/ui/gui/window-manager.c
+++ b/src/ui/gui/window-manager.c
@@ -1,26 +1,28 @@
-/*
- PSPPIRE --- A Graphical User Interface for PSPP
- Copyright (C) 2006, 2007 Free Software Foundation
+/* PSPPIRE - a graphical user interface for PSPP.
+ Copyright (C) 2006, 2007 Free Software Foundation
- 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 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 3 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.
+ 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. */
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see . */
+#include
+
+#include "relocatable.h"
+
#include
#include "syntax-editor.h"
#include "data-editor.h"
+#include "output-viewer.h"
#include
#define _(msgid) gettext (msgid)
@@ -87,6 +89,9 @@ window_create (enum window_type type, const gchar *name)
case WINDOW_DATA:
e = (struct editor_window *) new_data_editor ();
break;
+ case WINDOW_OUTPUT:
+ e = (struct editor_window *) new_output_viewer ();
+ break;
default:
g_assert_not_reached ();
};
@@ -98,7 +103,7 @@ window_create (enum window_type type, const gchar *name)
gtk_window_set_icon_from_file (GTK_WINDOW (e->window),
- PKGDATADIR "/psppicon.png", 0);
+ relocate (PKGDATADIR "/psppicon.png"), 0);
g_signal_connect (e->window, "destroy",
G_CALLBACK (deregister_window), e);
@@ -141,6 +146,10 @@ set_window_name (struct editor_window *e,
e->name = g_strdup_printf (_("Untitled%d"), next_window_id () );
title = g_strdup_printf (_("%s --- PSPP Data Editor"), e->name);
break;
+ case WINDOW_OUTPUT:
+ e->name = g_strdup_printf (_("Output%d"), next_window_id () );
+ title = g_strdup_printf (_("%s --- PSPP Output"), e->name);
+ break;
default:
g_assert_not_reached ();
}
@@ -155,14 +164,15 @@ set_window_name (struct editor_window *e,
FILENAME is in "filename encoding" */
void
window_set_name_from_filename (struct editor_window *e,
- const gchar *filename)
+ const gchar *fn)
{
gchar *title;
+ gchar *filename = g_filename_to_utf8 (fn, -1, NULL, NULL, NULL);
gchar *basename = g_path_get_basename (filename);
set_window_name (e, filename);
- switch (e->type )
+ switch (e->type)
{
case WINDOW_SYNTAX:
title = g_strdup_printf (_("%s --- PSPP Syntax Editor"), basename);
@@ -178,6 +188,7 @@ window_set_name_from_filename (struct editor_window *e,
gtk_window_set_title (GTK_WINDOW (e->window), title);
g_free (title);
+ g_free (filename);
}
const gchar *