projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' into 'gtk3'.
[pspp]
/
src
/
ui
/
gui
/
page-intro.c
diff --git
a/src/ui/gui/page-intro.c
b/src/ui/gui/page-intro.c
index 6ef991c314d5bede4eddf3f5e1b8bb72f9de1f5f..5005a448b1cd4c6ba1ec60d63d98492d2621f6d9 100644
(file)
--- a/
src/ui/gui/page-intro.c
+++ b/
src/ui/gui/page-intro.c
@@
-22,7
+22,6
@@
#include <errno.h>
#include <fcntl.h>
#include <errno.h>
#include <fcntl.h>
-#include <gtk-contrib/psppire-sheet.h>
#include <gtk/gtk.h>
#include <limits.h>
#include <stdlib.h>
#include <gtk/gtk.h>
#include <limits.h>
#include <stdlib.h>
@@
-38,7
+37,6
@@
#include "libpspp/i18n.h"
#include "libpspp/line-reader.h"
#include "libpspp/message.h"
#include "libpspp/i18n.h"
#include "libpspp/line-reader.h"
#include "libpspp/message.h"
-#include "ui/gui/checkbox-treeview.h"
#include "ui/gui/dialog-common.h"
#include "ui/gui/executor.h"
#include "ui/gui/helper.h"
#include "ui/gui/dialog-common.h"
#include "ui/gui/executor.h"
#include "ui/gui/helper.h"
@@
-48,11
+46,9
@@
#include "ui/gui/psppire-encoding-selector.h"
#include "ui/gui/psppire-empty-list-store.h"
#include "ui/gui/psppire-var-sheet.h"
#include "ui/gui/psppire-encoding-selector.h"
#include "ui/gui/psppire-empty-list-store.h"
#include "ui/gui/psppire-var-sheet.h"
-#include "ui/gui/psppire-var-store.h"
#include "ui/gui/psppire-scanf.h"
#include "ui/syntax-gen.h"
#include "ui/gui/psppire-scanf.h"
#include "ui/syntax-gen.h"
-#include "gl/error.h"
#include "gl/intprops.h"
#include "gl/xalloc.h"
#include "gl/intprops.h"
#include "gl/xalloc.h"
@@
-109,13
+105,9
@@
intro_page_create (struct import_assistant *ia)
1, 2,
2, 3);
1, 2,
2, 3);
-#if 0
p->page = add_page_to_assistant (ia, get_widget_assert (builder, "Intro"),
GTK_ASSISTANT_PAGE_INTRO);
p->page = add_page_to_assistant (ia, get_widget_assert (builder, "Intro"),
GTK_ASSISTANT_PAGE_INTRO);
- g_print ("%s:%d Added page %p\n", __FILE__, __LINE__, p->page);
-#endif
-
p->all_cases_button = get_widget_assert (builder, "import-all-cases");
p->n_cases_button = get_widget_assert (builder, "import-n-cases");
p->all_cases_button = get_widget_assert (builder, "import-all-cases");
p->n_cases_button = get_widget_assert (builder, "import-n-cases");
@@
-138,16
+130,16
@@
intro_page_create (struct import_assistant *ia)
"commas, or other delimiters.\n\n"));
if (ia->file.total_is_exact)
ds_put_format (
"commas, or other delimiters.\n\n"));
if (ia->file.total_is_exact)
ds_put_format (
- &s, ngettext ("The selected file contains %zu line of text. ",
- "The selected file contains %zu lines of text. ",
+ &s, ngettext ("The selected file contains %
'
zu line of text. ",
+ "The selected file contains %
'
zu lines of text. ",
ia->file.line_cnt),
ia->file.line_cnt);
else if (ia->file.total_lines > 0)
{
ds_put_format (
&s, ngettext (
ia->file.line_cnt),
ia->file.line_cnt);
else if (ia->file.total_lines > 0)
{
ds_put_format (
&s, ngettext (
- "The selected file contains approximately %lu line of text. ",
- "The selected file contains approximately %lu lines of text. ",
+ "The selected file contains approximately %
'
lu line of text. ",
+ "The selected file contains approximately %
'
lu lines of text. ",
ia->file.total_lines),
ia->file.total_lines);
ds_put_format (
ia->file.total_lines),
ia->file.total_lines);
ds_put_format (