projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove redundant "break"
[pspp]
/
src
/
ui
/
gui
/
psppire-import-assistant.c
diff --git
a/src/ui/gui/psppire-import-assistant.c
b/src/ui/gui/psppire-import-assistant.c
index 3d7ba0468a6312a748e0c9fcacec9ee9a16a58ba..bb29d04993cd288425dfb0215a3b83f6705e850d 100644
(file)
--- a/
src/ui/gui/psppire-import-assistant.c
+++ b/
src/ui/gui/psppire-import-assistant.c
@@
-459,15
+459,6
@@
on_prepare (GtkAssistant *assistant, GtkWidget *page, PsppireImportAssistant *ia
on_entering (ia, new_page);
}
on_entering (ia, new_page);
}
-#if GTK3_TRANSITION
- if (gtk_assistant_get_page_type (assistant, page)
- == GTK_ASSISTANT_PAGE_CONFIRM)
- gtk_widget_grab_focus (assistant->apply);
- else
- gtk_widget_grab_focus (assistant->forward);
-#endif
-
-
ia->current_page = pn;
}
ia->current_page = pn;
}
@@
-672,7
+663,7
@@
add_line_number_column (const PsppireImportAssistant *ia,
static void
static void
-set_model_on_treeview (
const
PsppireImportAssistant *ia, GtkWidget *tree_view, size_t first_line)
+set_model_on_treeview (PsppireImportAssistant *ia, GtkWidget *tree_view, size_t first_line)
{
GtkTreeModel *model = GTK_TREE_MODEL (psppire_empty_list_store_new (ia->line_cnt - first_line));
{
GtkTreeModel *model = GTK_TREE_MODEL (psppire_empty_list_store_new (ia->line_cnt - first_line));
@@
-962,6
+953,8
@@
psppire_import_assistant_init (PsppireImportAssistant *ia)
chooser_page_create (ia);
gtk_assistant_set_forward_page_func (GTK_ASSISTANT (ia), next_page_func, NULL, NULL);
chooser_page_create (ia);
gtk_assistant_set_forward_page_func (GTK_ASSISTANT (ia), next_page_func, NULL, NULL);
+
+ gtk_window_fullscreen (GTK_WINDOW (ia));
}
}
@@
-2054,7
+2047,7
@@
prepare_formats_page (PsppireImportAssistant *ia)
case SPREADSHEET_GNUMERIC:
{
reader = spreadsheet_make_reader (ia->spreadsheet, &sro);
case SPREADSHEET_GNUMERIC:
{
reader = spreadsheet_make_reader (ia->spreadsheet, &sro);
- ia->dict =
ia->spreadsheet->dict
;
+ ia->dict =
dict_clone (ia->spreadsheet->dict)
;
}
break;
default:
}
break;
default: