#include "psppire-dialog.h"
#include "psppire-keypad.h"
#include "psppire-data-window.h"
-#include "psppire-var-store.h"
#include "psppire-selector.h"
#include "dialog-common.h"
#include <libpspp/i18n.h>
cd->use_type = TRUE;
}
+ static void
+ on_type_toggled (GtkToggleButton *button, gpointer data)
+ {
+ struct compute_dialog *cd = data;
+
+ GtkWidget *entry =
+ get_widget_assert (cd->xml, "type-and-label-width");
+
+ if ( gtk_toggle_button_get_active (button))
+ {
+ gtk_widget_set_sensitive (entry, TRUE);
+ gtk_widget_grab_focus (entry);
+ }
+ else
+ {
+ gtk_widget_set_sensitive (entry, FALSE);
+ }
+ }
static void
on_expression_toggle (GtkToggleButton *button, gpointer data)
}
else
{
- const char *label;
struct variable *target_var;
const gchar *target_name = gtk_entry_get_text
(GTK_ENTRY (get_widget_assert (cd->xml, "compute-entry1")));
target_var = psppire_dict_lookup_var (cd->dict, target_name);
if ( target_var )
{
- label = var_get_label (target_var);
+ const char *label = var_get_label (target_var);
if ( label )
gtk_entry_set_text (GTK_ENTRY (entry), label);
gtk_entry_set_text (GTK_ENTRY (entry), "");
gtk_widget_set_sensitive (entry, TRUE);
+ gtk_widget_grab_focus (entry);
}
}
{
gint response;
- PsppireVarStore *vs = NULL;
struct compute_dialog scd;
GtkBuilder *xml = builder_new ("compute.ui");
GtkWidget *expression =
get_widget_assert (xml, "radio-button-expression-label");
+ GtkWidget *str_btn =
+ get_widget_assert (xml, "radio-button-string");
+
- g_object_get (de->data_editor, "var-store", &vs, NULL);
- g_object_get (vs, "dictionary", &scd.dict, NULL);
+ g_object_get (de->data_editor, "dictionary", &scd.dict, NULL);
scd.use_type = FALSE;
g_signal_connect (expression, "toggled",
G_CALLBACK(on_expression_toggle), &scd);
+ g_signal_connect (str_btn, "toggled",
+ G_CALLBACK(on_type_toggled), &scd);
+
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
#include <ui/gui/builder-wrapper.h>
#include "helper.h"
#include <ui/gui/psppire-dialog.h>
-#include <ui/gui/psppire-var-store.h>
#include "psppire-val-chooser.h"
}
+ static void
+ focus_value_entry (GtkWidget *w, struct recode_dialog *rd)
+ {
+ if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w)))
+ gtk_widget_grab_focus (rd->new_value_entry);
+ }
+
+
/* Callback for the new_value_entry and new_value_togglebutton widgets.
It's used to enable/disable the acr. */
static void
GtkWidget *output_variable_box = get_widget_assert (builder,"frame4");
- PsppireVarStore *vs = NULL;
- g_object_get (de->data_editor, "var-store", &vs, NULL);
-
rd.change_button = get_widget_assert (builder, "change-button");
rd.varmap = NULL;
rd.dialog = get_widget_assert (builder, "recode-dialog");
rd.new_name_entry = get_widget_assert (builder, "dest-name-entry");
rd.new_label_entry = get_widget_assert (builder, "dest-label-entry");
- g_object_get (vs, "dictionary", &rd.dict, NULL);
+ g_object_get (de->data_editor, "dictionary", &rd.dict, NULL);
rd.value_map = gtk_list_store_new (2,
old_value_get_type (),
g_signal_connect_swapped (rd.toggle[BUTTON_NEW_VALUE], "toggled",
G_CALLBACK (set_acr), &rd);
+ g_signal_connect_after (rd.toggle[BUTTON_NEW_VALUE], "toggled",
+ G_CALLBACK (focus_value_entry), &rd);
+
g_signal_connect_swapped (rd.new_value_entry, "changed",
G_CALLBACK (set_acr), &rd);
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2011 Free Software Foundation
+ Copyright (C) 2011, 2012 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
#include "psppire-var-view.h"
#include "psppire-dict.h"
-#include "psppire-var-store.h"
#include "dialog-common.h"
#include "psppire-dialog.h"
struct tt_options_dialog *opts = tt_options_dialog_create (GTK_WINDOW (de));
GtkWidget *bb = gtk_hbutton_box_new ();
- GtkWidget *opt = gtk_button_new_with_mnemonic (_("_Options"));
+ GtkWidget *opt = gtk_button_new_with_mnemonic (_("O_ptions..."));
gtk_box_pack_start (GTK_BOX (bb), opt, TRUE, TRUE, 5);
gtk_widget_show_all (bb);