projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src/ui/gui/psppire-dialog-action-regression.c (generate_syntax): Reduce scope of...
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action-histogram.c
diff --git
a/src/ui/gui/psppire-dialog-action-histogram.c
b/src/ui/gui/psppire-dialog-action-histogram.c
index 49d2a5f45b02cd9a0ba20db5376336d1400ead61..f99000ac2898767180c2663e15971329effe02c2 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-histogram.c
+++ b/
src/ui/gui/psppire-dialog-action-histogram.c
@@
-14,7
+14,6
@@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
#include <config.h>
#include "psppire-dialog-action-histogram.h"
#include <config.h>
#include "psppire-dialog-action-histogram.h"
@@
-43,7
+42,7
@@
dialog_state_valid (gpointer data)
const gchar *var_name = gtk_entry_get_text (GTK_ENTRY (rd->variable));
const struct variable *var = psppire_dict_lookup_var (PSPPIRE_DIALOG_ACTION (rd)->dict, var_name);
const gchar *var_name = gtk_entry_get_text (GTK_ENTRY (rd->variable));
const struct variable *var = psppire_dict_lookup_var (PSPPIRE_DIALOG_ACTION (rd)->dict, var_name);
- if (
var == NULL)
+ if (var == NULL)
return FALSE;
return FALSE;
@@
-59,23
+58,20
@@
refresh (PsppireDialogAction *rd_)
gtk_entry_set_text (GTK_ENTRY (rd->variable), "");
}
gtk_entry_set_text (GTK_ENTRY (rd->variable), "");
}
-static
void
-psppire_dialog_action_histogram_activate (
GtkAction *a
)
+static
GtkBuilder *
+psppire_dialog_action_histogram_activate (
PsppireDialogAction *a, GVariant *param
)
{
PsppireDialogActionHistogram *act = PSPPIRE_DIALOG_ACTION_HISTOGRAM (a);
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
{
PsppireDialogActionHistogram *act = PSPPIRE_DIALOG_ACTION_HISTOGRAM (a);
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
- GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
- GtkBuilder *xml = g_hash_table_lookup (thing, a);
- if (!xml)
- {
- xml = builder_new ("histogram.ui");
- g_hash_table_insert (thing, a, xml);
- }
+ GtkBuilder *xml = builder_new ("histogram.ui");
pda->dialog = get_widget_assert (xml, "histogram-dialog");
pda->source = get_widget_assert (xml, "dict-view");
pda->dialog = get_widget_assert (xml, "histogram-dialog");
pda->source = get_widget_assert (xml, "dict-view");
+ g_object_set (pda->source,
+ "predicate", var_is_numeric, NULL);
+
act->variable = get_widget_assert (xml, "entry1");
act->curve = get_widget_assert (xml, "curve");
act->variable = get_widget_assert (xml, "entry1");
act->curve = get_widget_assert (xml, "curve");
@@
-84,14
+80,13
@@
psppire_dialog_action_histogram_activate (GtkAction *a)
psppire_dialog_action_set_valid_predicate (pda,
dialog_state_valid);
psppire_dialog_action_set_valid_predicate (pda,
dialog_state_valid);
- if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_histogram_parent_class)->activate)
- PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_histogram_parent_class)->activate (pda);
+ return xml;
}
static char *
}
static char *
-generate_syntax (PsppireDialogAction *a)
+generate_syntax (
const
PsppireDialogAction *a)
{
PsppireDialogActionHistogram *rd = PSPPIRE_DIALOG_ACTION_HISTOGRAM (a);
gchar *text;
{
PsppireDialogActionHistogram *rd = PSPPIRE_DIALOG_ACTION_HISTOGRAM (a);
gchar *text;
@@
-118,9
+113,7
@@
generate_syntax (PsppireDialogAction *a)
static void
psppire_dialog_action_histogram_class_init (PsppireDialogActionHistogramClass *class)
{
static void
psppire_dialog_action_histogram_class_init (PsppireDialogActionHistogramClass *class)
{
- GtkActionClass *action_class = GTK_ACTION_CLASS (class);
-
- action_class->activate = psppire_dialog_action_histogram_activate;
+ PSPPIRE_DIALOG_ACTION_CLASS (class)->initial_activate = psppire_dialog_action_histogram_activate;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
@@
-130,4
+123,3
@@
static void
psppire_dialog_action_histogram_init (PsppireDialogActionHistogram *act)
{
}
psppire_dialog_action_histogram_init (PsppireDialogActionHistogram *act)
{
}
-