projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Better abstraction of the unsaved window status.
[pspp-builds.git]
/
src
/
ui
/
gui
/
psppire-var-sheet.c
diff --git
a/src/ui/gui/psppire-var-sheet.c
b/src/ui/gui/psppire-var-sheet.c
index 493fd05c04783ac1476ed5eb5b14e92891b1eb69..cfcce14c2a2fc52675c66d738d91c18437458fe1 100644
(file)
--- a/
src/ui/gui/psppire-var-sheet.c
+++ b/
src/ui/gui/psppire-var-sheet.c
@@
-16,9
+16,8
@@
#include <config.h>
#include "psppire-var-sheet.h"
#include <config.h>
#include "psppire-var-sheet.h"
-#include <
gtksheet/psppire-axis-hetero
.h>
+#include <
ui/gui/sheet/psppire-axis-impl
.h>
-#include <glade/glade.h>
#include "helper.h"
#include "customentry.h"
#include "helper.h"
#include "customentry.h"
@@
-58,7
+57,7
@@
psppire_var_sheet_get_type (void)
(GInstanceInitFunc) psppire_var_sheet_init,
};
(GInstanceInitFunc) psppire_var_sheet_init,
};
- vs_type = g_type_register_static (
GTK
_TYPE_SHEET, "PsppireVarSheet",
+ vs_type = g_type_register_static (
PSPPIRE
_TYPE_SHEET, "PsppireVarSheet",
&vs_info, 0);
}
&vs_info, 0);
}
@@
-122,9
+121,7
@@
create_label_list (const gchar *const *labels)
gint i = 0;
GtkTreeIter iter;
gint i = 0;
GtkTreeIter iter;
- GtkListStore *list_store;
- list_store = gtk_list_store_new (1, G_TYPE_STRING);
-
+ GtkListStore *list_store = gtk_list_store_new (1, G_TYPE_STRING);
while ( (s = labels[i++]))
{
while ( (s = labels[i++]))
{
@@
-240,12
+237,12
@@
change_measure (GtkComboBox *cb,
/* Moves the focus to a new cell.
Returns TRUE iff the move should be disallowed */
static gboolean
/* Moves the focus to a new cell.
Returns TRUE iff the move should be disallowed */
static gboolean
-traverse_cell_callback (
Gtk
Sheet *sheet,
- const
Gtk
SheetCell *existing_cell,
-
Gtk
SheetCell *new_cell)
+traverse_cell_callback (
Psppire
Sheet *sheet,
+ const
Psppire
SheetCell *existing_cell,
+
Psppire
SheetCell *new_cell)
{
PsppireVarSheet *var_sheet = PSPPIRE_VAR_SHEET (sheet);
{
PsppireVarSheet *var_sheet = PSPPIRE_VAR_SHEET (sheet);
- PsppireVarStore *var_store = PSPPIRE_VAR_STORE (
gtk
_sheet_get_model (sheet));
+ PsppireVarStore *var_store = PSPPIRE_VAR_STORE (
psppire
_sheet_get_model (sheet));
gint n_vars = psppire_var_store_get_var_cnt (var_store);
gint n_vars = psppire_var_store_get_var_cnt (var_store);
@@
-254,7
+251,7
@@
traverse_cell_callback (GtkSheet *sheet,
if ( existing_cell->row == n_vars && new_cell->row >= n_vars)
{
if ( existing_cell->row == n_vars && new_cell->row >= n_vars)
{
- GtkEntry *entry =
GTK_ENTRY (gtk_sheet_get_entry (sheet)
);
+ GtkEntry *entry =
psppire_sheet_get_entry (sheet
);
const gchar *name = gtk_entry_get_text (entry);
const gchar *name = gtk_entry_get_text (entry);
@@
-294,24
+291,24
@@
var_sheet_change_active_cell (PsppireVarSheet *vs,
gint oldrow, gint oldcolumn,
gpointer data)
{
gint oldrow, gint oldcolumn,
gpointer data)
{
-
Gtk
SheetCellAttr attributes;
+
Psppire
SheetCellAttr attributes;
PsppireVarStore *var_store;
PsppireVarSheetClass *vs_class =
PSPPIRE_VAR_SHEET_CLASS(G_OBJECT_GET_CLASS (vs));
struct variable *var ;
PsppireVarStore *var_store;
PsppireVarSheetClass *vs_class =
PSPPIRE_VAR_SHEET_CLASS(G_OBJECT_GET_CLASS (vs));
struct variable *var ;
-
GtkSheet *sheet = GTK
_SHEET (vs);
+
PsppireSheet *sheet = PSPPIRE
_SHEET (vs);
g_return_if_fail (sheet != NULL);
g_return_if_fail (sheet != NULL);
- var_store = PSPPIRE_VAR_STORE (
gtk
_sheet_get_model (sheet));
+ var_store = PSPPIRE_VAR_STORE (
psppire
_sheet_get_model (sheet));
g_assert (var_store);
g_return_if_fail (oldcolumn == PSPPIRE_VAR_STORE_COL_NAME ||
row < psppire_var_store_get_var_cnt (var_store));
g_assert (var_store);
g_return_if_fail (oldcolumn == PSPPIRE_VAR_STORE_COL_NAME ||
row < psppire_var_store_get_var_cnt (var_store));
-
gtk
_sheet_get_attributes (sheet, row, column, &attributes);
+
psppire
_sheet_get_attributes (sheet, row, column, &attributes);
var = psppire_var_store_get_var (var_store, row);
var = psppire_var_store_get_var (var_store, row);
@@
-319,12
+316,12
@@
var_sheet_change_active_cell (PsppireVarSheet *vs,
{
case PSPPIRE_VAR_STORE_COL_ALIGN:
{
{
case PSPPIRE_VAR_STORE_COL_ALIGN:
{
+ GtkEntry *entry;
static GtkListStore *list_store = NULL;
GtkComboBoxEntry *cbe;
static GtkListStore *list_store = NULL;
GtkComboBoxEntry *cbe;
- gtk_sheet_change_entry (sheet, GTK_TYPE_COMBO_BOX_ENTRY);
- cbe =
- GTK_COMBO_BOX_ENTRY (gtk_sheet_get_entry (sheet)->parent);
-
+ psppire_sheet_change_entry (sheet, GTK_TYPE_COMBO_BOX_ENTRY);
+ entry = psppire_sheet_get_entry (sheet);
+ cbe = GTK_COMBO_BOX_ENTRY (GTK_WIDGET (entry)->parent);
if ( ! list_store) list_store = create_label_list (alignments);
if ( ! list_store) list_store = create_label_list (alignments);
@@
-333,26
+330,25
@@
var_sheet_change_active_cell (PsppireVarSheet *vs,
gtk_combo_box_entry_set_text_column (cbe, 0);
gtk_combo_box_entry_set_text_column (cbe, 0);
- g_signal_connect (
G_OBJECT (cbe),
"changed",
+ g_signal_connect (
cbe,
"changed",
G_CALLBACK (change_alignment), var);
}
break;
case PSPPIRE_VAR_STORE_COL_MEASURE:
{
G_CALLBACK (change_alignment), var);
}
break;
case PSPPIRE_VAR_STORE_COL_MEASURE:
{
+ GtkEntry *entry;
GtkComboBoxEntry *cbe;
GtkComboBoxEntry *cbe;
- gtk_sheet_change_entry (sheet, GTK_TYPE_COMBO_BOX_ENTRY);
- cbe =
- GTK_COMBO_BOX_ENTRY (gtk_sheet_get_entry (sheet)->parent);
-
-
+ psppire_sheet_change_entry (sheet, GTK_TYPE_COMBO_BOX_ENTRY);
+ entry = psppire_sheet_get_entry (sheet);
+ cbe = GTK_COMBO_BOX_ENTRY (GTK_WIDGET (entry)->parent);
gtk_combo_box_set_model (GTK_COMBO_BOX (cbe),
GTK_TREE_MODEL (vs_class->measure_list));
gtk_combo_box_entry_set_text_column (cbe, 0);
gtk_combo_box_set_model (GTK_COMBO_BOX (cbe),
GTK_TREE_MODEL (vs_class->measure_list));
gtk_combo_box_entry_set_text_column (cbe, 0);
- g_signal_connect (
G_OBJECT (cbe),
"changed",
+ g_signal_connect (
cbe,
"changed",
G_CALLBACK (change_measure), var);
}
break;
G_CALLBACK (change_measure), var);
}
break;
@@
-361,10
+357,10
@@
var_sheet_change_active_cell (PsppireVarSheet *vs,
{
PsppireCustomEntry *customEntry;
{
PsppireCustomEntry *customEntry;
-
gtk
_sheet_change_entry (sheet, PSPPIRE_CUSTOM_ENTRY_TYPE);
+
psppire
_sheet_change_entry (sheet, PSPPIRE_CUSTOM_ENTRY_TYPE);
customEntry =
customEntry =
- PSPPIRE_CUSTOM_ENTRY (
gtk
_sheet_get_entry (sheet));
+ PSPPIRE_CUSTOM_ENTRY (
psppire
_sheet_get_entry (sheet));
if ( var_is_long_string (var))
g_object_set (customEntry,
if ( var_is_long_string (var))
g_object_set (customEntry,
@@
-384,10
+380,10
@@
var_sheet_change_active_cell (PsppireVarSheet *vs,
{
PsppireCustomEntry *customEntry;
{
PsppireCustomEntry *customEntry;
-
gtk
_sheet_change_entry (sheet, PSPPIRE_CUSTOM_ENTRY_TYPE);
+
psppire
_sheet_change_entry (sheet, PSPPIRE_CUSTOM_ENTRY_TYPE);
customEntry =
customEntry =
- PSPPIRE_CUSTOM_ENTRY (
gtk
_sheet_get_entry (sheet));
+ PSPPIRE_CUSTOM_ENTRY (
psppire
_sheet_get_entry (sheet));
if ( var_is_long_string (var))
g_object_set (customEntry,
if ( var_is_long_string (var))
g_object_set (customEntry,
@@
-409,10
+405,10
@@
var_sheet_change_active_cell (PsppireVarSheet *vs,
{
PsppireCustomEntry *customEntry;
{
PsppireCustomEntry *customEntry;
-
gtk
_sheet_change_entry (sheet, PSPPIRE_CUSTOM_ENTRY_TYPE);
+
psppire
_sheet_change_entry (sheet, PSPPIRE_CUSTOM_ENTRY_TYPE);
customEntry =
customEntry =
- PSPPIRE_CUSTOM_ENTRY (
gtk
_sheet_get_entry (sheet));
+ PSPPIRE_CUSTOM_ENTRY (
psppire
_sheet_get_entry (sheet));
/* Popup the Variable Type dialog box */
/* Popup the Variable Type dialog box */
@@
-433,7
+429,7
@@
var_sheet_change_active_cell (PsppireVarSheet *vs,
{
gint r_min, r_max;
{
gint r_min, r_max;
- const gchar *s =
gtk
_sheet_cell_get_text (sheet, row, column);
+ const gchar *s =
psppire
_sheet_cell_get_text (sheet, row, column);
if (s)
{
if (s)
{
@@
-465,10
+461,10
@@
var_sheet_change_active_cell (PsppireVarSheet *vs,
1.0, 1.0, 1.0 /* steps */
);
1.0, 1.0, 1.0 /* steps */
);
-
gtk
_sheet_change_entry (sheet, GTK_TYPE_SPIN_BUTTON);
+
psppire
_sheet_change_entry (sheet, GTK_TYPE_SPIN_BUTTON);
spinButton =
spinButton =
- GTK_SPIN_BUTTON (
gtk
_sheet_get_entry (sheet));
+ GTK_SPIN_BUTTON (
psppire
_sheet_get_entry (sheet));
gtk_spin_button_set_adjustment (spinButton, GTK_ADJUSTMENT (adj));
gtk_spin_button_set_digits (spinButton, 0);
gtk_spin_button_set_adjustment (spinButton, GTK_ADJUSTMENT (adj));
gtk_spin_button_set_digits (spinButton, 0);
@@
-478,7
+474,7
@@
var_sheet_change_active_cell (PsppireVarSheet *vs,
break;
default:
break;
default:
-
gtk
_sheet_change_entry (sheet, GTK_TYPE_ENTRY);
+
psppire
_sheet_change_entry (sheet, GTK_TYPE_ENTRY);
break;
}
}
break;
}
}
@@
-487,13
+483,15
@@
var_sheet_change_active_cell (PsppireVarSheet *vs,
static void
psppire_var_sheet_init (PsppireVarSheet *vs)
{
static void
psppire_var_sheet_init (PsppireVarSheet *vs)
{
- GladeXML *xml = XML_NEW ("data-editor.glade");
+ GtkBuilder *builder = builder_new ("data-editor.ui");
+
+ vs->val_labs_dialog = val_labs_dialog_create (builder);
+ vs->missing_val_dialog = missing_val_dialog_create (builder);
+ vs->var_type_dialog = var_type_dialog_create (builder);
- vs->val_labs_dialog = val_labs_dialog_create (xml);
- vs->missing_val_dialog = missing_val_dialog_create (xml);
- vs->var_type_dialog = var_type_dialog_create (xml);
+ connect_help (builder);
- g_object_unref (
xml
);
+ g_object_unref (
builder
);
vs->dispose_has_run = FALSE;
vs->may_create_vars = TRUE;
vs->dispose_has_run = FALSE;
vs->may_create_vars = TRUE;
@@
-524,14
+522,13
@@
GtkWidget*
psppire_var_sheet_new (void)
{
gint i;
psppire_var_sheet_new (void)
{
gint i;
- PsppireAxis
Hetero *ha = psppire_axis_hetero
_new ();
- PsppireAxis
Hetero *va = psppire_axis_hetero
_new ();
+ PsppireAxis
Impl *ha = psppire_axis_impl
_new ();
+ PsppireAxis
Impl *va = psppire_axis_impl
_new ();
GtkWidget *w = g_object_new (psppire_var_sheet_get_type (), NULL);
for (i = 0 ; i < 10 ; ++i)
GtkWidget *w = g_object_new (psppire_var_sheet_get_type (), NULL);
for (i = 0 ; i < 10 ; ++i)
- psppire_axis_hetero_append (ha, column_def[i].width);
-
+ psppire_axis_impl_append (ha, column_def[i].width);
g_object_set (va,
"default-size", 25,
g_object_set (va,
"default-size", 25,