#include "data/procedure.h"
#include "language/syntax-string-source.h"
#include "libpspp/message.h"
-#include "ui/gui/about.h"
+#include "ui/gui/help-menu.h"
#include "ui/gui/comments-dialog.h"
#include "ui/gui/compute-dialog.h"
#include "ui/gui/correlation-dialog.h"
}
-static GtkWidget *
-create_data_sheet_cases_popup_menu (PsppireDataWindow *de)
-{
- GtkWidget *menu = gtk_menu_new ();
-
- GtkWidget *insert_case =
- gtk_menu_item_new_with_label (_("Insert Case"));
-
- GtkWidget *delete_case =
- gtk_menu_item_new_with_label (_("Clear"));
-
-
- gtk_action_connect_proxy (de->delete_cases,
- delete_case);
-
-
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), insert_case);
-
- g_signal_connect_swapped (insert_case, "activate",
- G_CALLBACK (gtk_action_activate),
- de->insert_case);
-
-
- gtk_menu_shell_append (GTK_MENU_SHELL (menu),
- gtk_separator_menu_item_new ());
-
-
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), delete_case);
-
-
- gtk_widget_show_all (menu);
-
- return menu;
-}
-
-
-
static void
on_recent_data_select (GtkMenuShell *menushell,
PsppireWindow *window)
{
- GtkAction *action_data_new =
- get_action_assert (de->builder, "file_new_data");
+ GtkAction *action_data_new = get_action_assert (de->builder, "file_new_data");
- g_signal_connect (action_data_new, "activate",
- G_CALLBACK (new_file), de);
+ g_signal_connect (action_data_new, "activate", G_CALLBACK (new_file), de);
}
{
- GtkAction *invoke_text_import_assistant =
- get_action_assert (de->builder, "file_import-text");
+ GtkAction *invoke_text_import_assistant = get_action_assert (de->builder, "file_import-text");
- g_signal_connect (invoke_text_import_assistant, "activate",
- G_CALLBACK (text_data_import_assistant), de);
+ g_signal_connect (invoke_text_import_assistant, "activate", G_CALLBACK (text_data_import_assistant), de);
}
{
GtkAction *action_data_save = get_action_assert (de->builder, "file_save");
- g_signal_connect_swapped (action_data_save, "activate",
- G_CALLBACK (data_save), de);
+ g_signal_connect_swapped (action_data_save, "activate", G_CALLBACK (data_save), de);
}
{
GtkAction *action_data_open = get_action_assert (de->builder, "file_open");
- g_signal_connect (action_data_open, "activate",
- G_CALLBACK (open_window), de);
+ g_signal_connect (action_data_open, "activate", G_CALLBACK (open_window), de);
}
{
- GtkAction *action_data_save_as =
- get_action_assert (de->builder, "file_save_as");
+ GtkAction *action_data_save_as = get_action_assert (de->builder, "file_save_as");
- g_signal_connect_swapped (action_data_save_as, "activate",
- G_CALLBACK (data_save_as_dialog), de);
+ g_signal_connect_swapped (action_data_save_as, "activate", G_CALLBACK (data_save_as_dialog), de);
}
{
- GtkAction *action_info_working_file =
- get_action_assert (de->builder, "file_information_working-file");
-
+ GtkAction *action_info_working_file = get_action_assert (de->builder, "file_information_working-file");
- g_signal_connect_swapped (action_info_working_file, "activate",
- G_CALLBACK (display_dict), de);
+ g_signal_connect_swapped (action_info_working_file, "activate", G_CALLBACK (display_dict), de);
}
{
- GtkAction *action_info_external_file =
- get_action_assert (de->builder, "file_information_external-file");
+ GtkAction *action_info_external_file = get_action_assert (de->builder, "file_information_external-file");
-
- g_signal_connect_swapped (action_info_external_file, "activate",
- G_CALLBACK (sysfile_info), de);
+ g_signal_connect_swapped (action_info_external_file, "activate", G_CALLBACK (sysfile_info), de);
}
{
de->insert_case = get_action_assert (de->builder, "edit_insert-case");
- g_signal_connect (de->insert_case, "activate",
- G_CALLBACK (insert_case),
- de);
+ g_signal_connect (de->insert_case, "activate", G_CALLBACK (insert_case), de);
}
{
de->insert_variable = get_action_assert (de->builder, "action_insert-variable");
- g_signal_connect (de->insert_variable, "activate",
- G_CALLBACK (on_insert_variable),
- de);
-
-
+ g_signal_connect (de->insert_variable, "activate", G_CALLBACK (on_insert_variable), de);
}
de->invoke_goto_dialog = get_action_assert (de->builder, "edit_goto-case");
- g_signal_connect (de->invoke_goto_dialog, "activate", G_CALLBACK (goto_case_dialog), de);
+ g_signal_connect_swapped (de->invoke_goto_dialog, "activate", G_CALLBACK (goto_case_dialog), de);
{
GtkAction *value_labels_action = get_action_assert (de->builder, "view_value-labels");
- g_signal_connect (value_labels_action, "toggled",
- G_CALLBACK (toggle_value_labels), de);
+ g_signal_connect (value_labels_action, "toggled", G_CALLBACK (toggle_value_labels), de);
}
{
- de->delete_cases =
- get_action_assert (de->builder, "edit_clear-cases");
-
+ de->delete_cases = get_action_assert (de->builder, "edit_clear-cases");
- g_signal_connect_swapped (de->delete_cases, "activate",
- G_CALLBACK (psppire_data_editor_delete_cases),
- de->data_editor);
+ g_signal_connect_swapped (de->delete_cases, "activate", G_CALLBACK (psppire_data_editor_delete_cases), de->data_editor);
gtk_action_set_visible (de->delete_cases, FALSE);
}
{
- de->delete_variables =
- get_action_assert (de->builder, "edit_clear-variables");
+ de->delete_variables = get_action_assert (de->builder, "edit_clear-variables");
- g_signal_connect_swapped (de->delete_variables, "activate",
- G_CALLBACK (psppire_data_editor_delete_variables),
- de->data_editor);
+ g_signal_connect_swapped (de->delete_variables, "activate", G_CALLBACK (psppire_data_editor_delete_variables), de->data_editor);
gtk_action_set_visible (de->delete_variables, FALSE);
}
{
- GtkAction *invoke_transpose_dialog =
- get_action_assert (de->builder, "data_transpose");
+ GtkAction *invoke_transpose_dialog = get_action_assert (de->builder, "data_transpose");
-
- g_signal_connect (invoke_transpose_dialog, "activate",
- G_CALLBACK (transpose_dialog), de);
+ g_signal_connect_swapped (invoke_transpose_dialog, "activate", G_CALLBACK (transpose_dialog), de);
}
{
- GtkAction *invoke_sort_cases_dialog =
- get_action_assert (de->builder, "data_sort-cases");
-
+ GtkAction *invoke_sort_cases_dialog = get_action_assert (de->builder, "data_sort-cases");
- g_signal_connect (invoke_sort_cases_dialog, "activate",
- G_CALLBACK (sort_cases_dialog), de);
+ g_signal_connect_swapped (invoke_sort_cases_dialog, "activate", G_CALLBACK (sort_cases_dialog), de);
}
{
- GtkAction *invoke_compute_dialog =
- get_action_assert (de->builder, "transform_compute");
+ GtkAction *invoke_compute_dialog = get_action_assert (de->builder, "transform_compute");
- g_signal_connect (invoke_compute_dialog, "activate",
- G_CALLBACK (compute_dialog), de);
+ g_signal_connect_swapped (invoke_compute_dialog, "activate", G_CALLBACK (compute_dialog), de);
}
{
GtkAction *invoke_find_dialog = get_action_assert (de->builder, "edit_find");
- g_signal_connect (invoke_find_dialog, "activate",
- G_CALLBACK (find_dialog), de);
+ g_signal_connect_swapped (invoke_find_dialog, "activate", G_CALLBACK (find_dialog), de);
}
{
GtkAction *invoke_split_file_dialog = get_action_assert (de->builder, "data_split-file");
- g_signal_connect (invoke_split_file_dialog, "activate",
- G_CALLBACK (split_file_dialog), de);
+ g_signal_connect_swapped (invoke_split_file_dialog, "activate", G_CALLBACK (split_file_dialog), de);
}
{
GtkAction *invoke_weight_cases_dialog = get_action_assert (de->builder, "data_weight-cases");
- g_signal_connect (invoke_weight_cases_dialog, "activate",
- G_CALLBACK (weight_cases_dialog), de);
+ g_signal_connect_swapped (invoke_weight_cases_dialog, "activate", G_CALLBACK (weight_cases_dialog), de);
}
{
GtkAction *invoke_variable_info_dialog = get_action_assert (de->builder, "utilities_variables");
- g_signal_connect (invoke_variable_info_dialog, "activate",
- G_CALLBACK (variable_info_dialog), de);
+ g_signal_connect_swapped (invoke_variable_info_dialog, "activate", G_CALLBACK (variable_info_dialog), de);
}
{
- GtkAction *invoke_oneway_anova_dialog =
- get_action_assert (de->builder, "oneway-anova");
+ GtkAction *invoke_oneway_anova_dialog = get_action_assert (de->builder, "oneway-anova");
- g_signal_connect (invoke_oneway_anova_dialog, "activate",
- G_CALLBACK (oneway_anova_dialog), de);
+ g_signal_connect_swapped (invoke_oneway_anova_dialog, "activate", G_CALLBACK (oneway_anova_dialog), de);
}
{
- GtkAction *invoke_t_test_independent_samples_dialog =
- get_action_assert (de->builder, "indep-t-test");
-
+ GtkAction *invoke_t_test_independent_samples_dialog = get_action_assert (de->builder, "indep-t-test");
- g_signal_connect (invoke_t_test_independent_samples_dialog, "activate",
- G_CALLBACK (t_test_independent_samples_dialog), de);
+ g_signal_connect_swapped (invoke_t_test_independent_samples_dialog, "activate", G_CALLBACK (t_test_independent_samples_dialog), de);
}
{
- GtkAction *invoke_t_test_paired_samples_dialog =
- get_action_assert (de->builder, "paired-t-test");
+ GtkAction *invoke_t_test_paired_samples_dialog = get_action_assert (de->builder, "paired-t-test");
- g_signal_connect (invoke_t_test_paired_samples_dialog, "activate",
- G_CALLBACK (t_test_paired_samples_dialog), de);
+ g_signal_connect_swapped (invoke_t_test_paired_samples_dialog, "activate", G_CALLBACK (t_test_paired_samples_dialog), de);
}
{
- GtkAction *invoke_t_test_one_sample_dialog =
- get_action_assert (de->builder, "one-sample-t-test");
+ GtkAction *invoke_t_test_one_sample_dialog = get_action_assert (de->builder, "one-sample-t-test");
- g_signal_connect (invoke_t_test_one_sample_dialog, "activate",
- G_CALLBACK (t_test_one_sample_dialog), de);
+ g_signal_connect_swapped (invoke_t_test_one_sample_dialog, "activate", G_CALLBACK (t_test_one_sample_dialog), de);
}
{
- GtkAction *invoke_comments_dialog =
- get_action_assert (de->builder, "utilities_comments");
+ GtkAction *invoke_comments_dialog = get_action_assert (de->builder, "utilities_comments");
-
- g_signal_connect (invoke_comments_dialog, "activate",
- G_CALLBACK (comments_dialog), de);
+ g_signal_connect_swapped (invoke_comments_dialog, "activate", G_CALLBACK (comments_dialog), de);
}
{
- GtkAction *invoke_rank_dialog =
- get_action_assert (de->builder, "transform_rank");
+ GtkAction *invoke_rank_dialog = get_action_assert (de->builder, "transform_rank");
- g_signal_connect (invoke_rank_dialog, "activate",
- G_CALLBACK (rank_dialog), de);
+ g_signal_connect_swapped (invoke_rank_dialog, "activate", G_CALLBACK (rank_dialog), de);
}
{
- GtkAction *invoke_recode_same_dialog =
- get_action_assert (de->builder, "transform_recode-same");
+ GtkAction *invoke_recode_same_dialog = get_action_assert (de->builder, "transform_recode-same");
- g_signal_connect (invoke_recode_same_dialog, "activate",
- G_CALLBACK (recode_same_dialog), de);
+ g_signal_connect_swapped (invoke_recode_same_dialog, "activate", G_CALLBACK (recode_same_dialog), de);
}
{
- GtkAction *invoke_recode_different_dialog =
- get_action_assert (de->builder, "transform_recode-different");
+ GtkAction *invoke_recode_different_dialog = get_action_assert (de->builder, "transform_recode-different");
- g_signal_connect (invoke_recode_different_dialog, "activate",
- G_CALLBACK (recode_different_dialog), de);
+ g_signal_connect_swapped (invoke_recode_different_dialog, "activate", G_CALLBACK (recode_different_dialog), de);
}
{
- GtkAction *invoke_descriptives_dialog =
- get_action_assert (de->builder, "analyze_descriptives");
+ GtkAction *invoke_descriptives_dialog = get_action_assert (de->builder, "analyze_descriptives");
- g_signal_connect (invoke_descriptives_dialog, "activate",
- G_CALLBACK (descriptives_dialog), de);
+ g_signal_connect_swapped (invoke_descriptives_dialog, "activate", G_CALLBACK (descriptives_dialog), de);
}
{
- GtkAction *invoke_frequencies_dialog =
- get_action_assert (de->builder, "analyze_frequencies");
-
+ GtkAction *invoke_frequencies_dialog = get_action_assert (de->builder, "analyze_frequencies");
- g_signal_connect (invoke_frequencies_dialog, "activate",
- G_CALLBACK (frequencies_dialog), de);
+ g_signal_connect_swapped (invoke_frequencies_dialog, "activate", G_CALLBACK (frequencies_dialog), de);
}
{
- GtkAction *invoke_crosstabs_dialog =
- get_action_assert (de->builder, "crosstabs");
+ GtkAction *invoke_crosstabs_dialog = get_action_assert (de->builder, "crosstabs");
-
- g_signal_connect (invoke_crosstabs_dialog, "activate",
- G_CALLBACK (crosstabs_dialog), de);
+ g_signal_connect_swapped (invoke_crosstabs_dialog, "activate", G_CALLBACK (crosstabs_dialog), de);
}
-
{
- GtkAction *invoke_examine_dialog =
- get_action_assert (de->builder, "analyze_explore");
+ GtkAction *invoke_examine_dialog = get_action_assert (de->builder, "analyze_explore");
-
- g_signal_connect (invoke_examine_dialog, "activate",
- G_CALLBACK (examine_dialog), de);
+ g_signal_connect_swapped (invoke_examine_dialog, "activate", G_CALLBACK (examine_dialog), de);
}
{
- GtkAction *invoke_regression_dialog =
- get_action_assert (de->builder, "linear-regression");
-
+ GtkAction *invoke_regression_dialog = get_action_assert (de->builder, "linear-regression");
- g_signal_connect (invoke_regression_dialog, "activate",
- G_CALLBACK (regression_dialog), de);
+ g_signal_connect_swapped (invoke_regression_dialog, "activate", G_CALLBACK (regression_dialog), de);
}
{
- GtkAction *invoke_reliability_dialog =
- get_action_assert (de->builder, "reliability");
+ GtkAction *invoke_reliability_dialog = get_action_assert (de->builder, "reliability");
-
- g_signal_connect (invoke_reliability_dialog, "activate",
- G_CALLBACK (reliability_dialog), de);
- }
+ g_signal_connect_swapped (invoke_reliability_dialog, "activate", G_CALLBACK (reliability_dialog), de);
+ }
{
- GtkAction *invoke_roc_dialog =
- get_action_assert (de->builder, "roc-curve");
+ GtkAction *invoke_roc_dialog = get_action_assert (de->builder, "roc-curve");
-
- g_signal_connect (invoke_roc_dialog, "activate",
- G_CALLBACK (roc_dialog), de);
+ g_signal_connect_swapped (invoke_roc_dialog, "activate", G_CALLBACK (roc_dialog), de);
}
{
- GtkAction *invoke_correlation_dialog =
- get_action_assert (de->builder, "correlation");
-
+ GtkAction *invoke_correlation_dialog = get_action_assert (de->builder, "correlation");
- g_signal_connect (invoke_correlation_dialog, "activate",
- G_CALLBACK (correlation_dialog), de);
+ g_signal_connect_swapped (invoke_correlation_dialog, "activate", G_CALLBACK (correlation_dialog), de);
}
{
- GtkAction *invoke_factor_dialog =
- get_action_assert (de->builder, "factor-analysis");
+ GtkAction *invoke_factor_dialog = get_action_assert (de->builder, "factor-analysis");
- g_signal_connect (invoke_factor_dialog, "activate",
- G_CALLBACK (factor_dialog), de);
+ g_signal_connect_swapped (invoke_factor_dialog, "activate", G_CALLBACK (factor_dialog), de);
}
}
g_signal_connect (get_action_assert (de->builder,"file_new_syntax"),
- "activate",
- G_CALLBACK (create_syntax_window),
- NULL);
-
-
- {
- GtkAction *abt = get_action_assert (de->builder, "help_about");
-
- g_signal_connect (abt,
"activate",
- G_CALLBACK (about_new),
- de);
- }
+ G_CALLBACK (create_syntax_window),
+ NULL);
- g_signal_connect (get_action_assert (de->builder,"help_reference"),
- "activate",
- G_CALLBACK (reference_manual),
- de);
-
g_signal_connect (de->data_editor,
"cases-selected",
{
GtkAction *font_action = get_action_assert (de->builder, "view_fonts");
- g_signal_connect (font_action,
- "activate",
- G_CALLBACK (fonts_activate), de);
+ g_signal_connect (font_action, "activate", G_CALLBACK (fonts_activate), de);
}
{
- GtkAction *split_window_action =
- get_action_assert (de->builder, "windows_split");
+ GtkAction *split_window_action = get_action_assert (de->builder, "windows_split");
-
- g_signal_connect (split_window_action, "toggled",
- G_CALLBACK (toggle_split_window),
- de);
+ g_signal_connect (split_window_action, "toggled", G_CALLBACK (toggle_split_window), de);
}
{
GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER));
+ merge_help_menu (uim);
+
PSPPIRE_WINDOW (de)->menu =
GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar/windows/windows_minimise_all")->parent);
}
{
- GtkMenu *data_sheet_variable_popup_menu = get_widget_assert (de->builder,
+ GtkWidget *data_sheet_cases_popup_menu = get_widget_assert (de->builder,
+ "datasheet-cases-popup");
+
+ GtkWidget *var_sheet_variable_popup_menu = get_widget_assert (de->builder,
+ "varsheet-variable-popup");
+
+ GtkWidget *data_sheet_variable_popup_menu = get_widget_assert (de->builder,
"datasheet-variable-popup");
g_signal_connect_swapped (get_action_assert (de->builder, "sort-up"), "activate",
G_CALLBACK (psppire_data_editor_sort_descending),
de->data_editor);
- GtkMenu *var_sheet_variable_popup_menu = get_widget_assert (de->builder,
- "varsheet-variable-popup");
-
- GtkMenu *data_sheet_cases_popup_menu =
- GTK_MENU (create_data_sheet_cases_popup_menu (de));
-
g_object_set (de->data_editor,
"datasheet-column-menu", data_sheet_variable_popup_menu,
"datasheet-row-menu", data_sheet_cases_popup_menu,
projects / pspp-builds.git / blobdiff