1 This patch mitigates a bug in glade-2, which silently deletes stock_ids, which
2 it thinks are not valid. You may have to apply this patch after editing
3 data-editor.glade with glade-3.
4 --- src/ui/gui/data-editor.glade,bad 2007-01-26 16:15:32.000000000 +0900
5 +++ src/ui/gui/data-editor.glade 2007-01-26 16:16:18.000000000 +0900
7 <property name="sensitive">False</property>
8 <property name="tooltip" translatable="yes">Variables</property>
9 <property name="use_underline">True</property>
10 - <property name="stock_id">gtk-missing-image</property>
11 + <property name="stock_id">pspp-goto-variable</property>
14 <property name="expand">False</property>
16 <property name="sensitive">False</property>
17 <property name="tooltip" translatable="yes">Insert Case</property>
18 <property name="use_underline">True</property>
19 - <property name="stock_id">gtk-missing-image</property>
20 + <property name="stock_id">pspp-insert-case</property>
21 <signal name="clicked" handler="on_insert_case_clicked"/>
25 <property name="sensitive">False</property>
26 <property name="tooltip" translatable="yes">Insert Variable</property>
27 <property name="use_underline">True</property>
28 - <property name="stock_id">gtk-missing-image</property>
29 + <property name="stock_id">pspp-insert-variable</property>
32 <property name="expand">False</property>
34 <property name="sensitive">False</property>
35 <property name="tooltip" translatable="yes">Split File</property>
36 <property name="use_underline">True</property>
37 - <property name="stock_id">gtk-missing-image</property>
38 + <property name="stock_id">pspp-split-file</property>
41 <property name="expand">False</property>
43 <property name="visible">True</property>
44 <property name="tooltip" translatable="yes">Weight Cases</property>
45 <property name="use_underline">True</property>
46 - <property name="stock_id">gtk-missing-image</property>
47 + <property name="stock_id">pspp-weight-cases</property>
50 <property name="expand">False</property>
52 <property name="sensitive">False</property>
53 <property name="tooltip" translatable="yes">Select Cases</property>
54 <property name="use_underline">True</property>
55 - <property name="stock_id">gtk-missing-image</property>
56 + <property name="stock_id">pspp-select-cases</property>
59 <property name="expand">False</property>
61 <property name="visible">True</property>
62 <property name="tooltip" translatable="yes">Value Labels</property>
63 <property name="use_underline">True</property>
64 - <property name="stock_id">gtk-missing-image</property>
65 + <property name="stock_id">pspp-value-labels</property>
66 <signal name="toggled" handler="on_togglebutton_value_labels_toggled"/>
70 <property name="n_rows">1</property>
71 <property name="n_columns">2</property>
73 - <widget class="GtkEntry" id="entry4">
74 + <widget class="GtkEntry" id="cell_ref_entry">
75 <property name="visible">True</property>
76 - <property name="can_focus">True</property>
77 + <property name="sensitive">False</property>
78 + <property name="editable">False</property>
79 + <property name="width_chars">25</property>
82 - <property name="left_attach">1</property>
83 - <property name="right_attach">2</property>
84 + <property name="x_options">GTK_FILL</property>
85 <property name="y_options"></property>
89 - <widget class="GtkEntry" id="cell_ref_entry">
90 + <widget class="GtkEntry" id="entry4">
91 <property name="visible">True</property>
92 - <property name="sensitive">False</property>
93 - <property name="editable">False</property>
94 - <property name="width_chars">25</property>
95 + <property name="can_focus">True</property>
98 - <property name="x_options">GTK_FILL</property>
99 + <property name="left_attach">1</property>
100 + <property name="right_attach">2</property>
101 <property name="y_options"></property>
104 @@ -1216,63 +1216,63 @@
105 <property name="column_spacing">2</property>
106 <property name="row_spacing">1</property>
108 - <widget class="GtkLabel" id="decimals_label">
109 + <widget class="GtkHBox" id="hbox2">
110 <property name="visible">True</property>
111 - <property name="xalign">0</property>
112 - <property name="label" translatable="yes">Decimal Places:</property>
114 + <widget class="GtkLabel" id="width_label">
115 + <property name="visible">True</property>
116 + <property name="label" translatable="yes">Width:</property>
117 <property name="justify">GTK_JUSTIFY_RIGHT</property>
120 - <property name="top_attach">1</property>
121 - <property name="bottom_attach">2</property>
122 + <property name="expand">False</property>
123 + <property name="fill">False</property>
124 + <property name="pack_type">GTK_PACK_END</property>
129 <property name="x_options">GTK_FILL</property>
130 - <property name="y_options"></property>
131 + <property name="y_options">GTK_FILL</property>
135 - <widget class="GtkEntry" id="width_entry">
136 + <widget class="GtkEntry" id="decimals_entry">
137 <property name="width_request">25</property>
138 + <property name="visible">True</property>
139 <property name="can_focus">True</property>
142 <property name="left_attach">1</property>
143 <property name="right_attach">2</property>
144 + <property name="top_attach">1</property>
145 + <property name="bottom_attach">2</property>
146 <property name="y_options"></property>
150 - <widget class="GtkEntry" id="decimals_entry">
151 + <widget class="GtkEntry" id="width_entry">
152 <property name="width_request">25</property>
153 - <property name="visible">True</property>
154 <property name="can_focus">True</property>
157 <property name="left_attach">1</property>
158 <property name="right_attach">2</property>
159 - <property name="top_attach">1</property>
160 - <property name="bottom_attach">2</property>
161 <property name="y_options"></property>
165 - <widget class="GtkHBox" id="hbox2">
166 - <property name="visible">True</property>
168 - <widget class="GtkLabel" id="width_label">
169 + <widget class="GtkLabel" id="decimals_label">
170 <property name="visible">True</property>
171 - <property name="label" translatable="yes">Width:</property>
172 + <property name="xalign">0</property>
173 + <property name="label" translatable="yes">Decimal Places:</property>
174 <property name="justify">GTK_JUSTIFY_RIGHT</property>
177 - <property name="expand">False</property>
178 - <property name="fill">False</property>
179 - <property name="pack_type">GTK_PACK_END</property>
184 + <property name="top_attach">1</property>
185 + <property name="bottom_attach">2</property>
186 <property name="x_options">GTK_FILL</property>
187 - <property name="y_options">GTK_FILL</property>
188 + <property name="y_options"></property>
192 @@ -1360,50 +1360,28 @@
193 <property name="n_columns">2</property>
194 <property name="row_spacing">5</property>
196 - <widget class="GtkVButtonBox" id="vbuttonbox2">
197 - <property name="visible">True</property>
198 - <property name="border_width">5</property>
200 - <widget class="GtkButton" id="val_labs_add">
201 - <property name="visible">True</property>
202 - <property name="sensitive">False</property>
203 - <property name="can_focus">True</property>
204 - <property name="can_default">True</property>
205 - <property name="label">gtk-add</property>
206 - <property name="use_stock">True</property>
210 - <widget class="GtkButton" id="val_labs_change">
211 + <widget class="GtkScrolledWindow" id="scrolledwindow3">
212 <property name="visible">True</property>
213 - <property name="sensitive">False</property>
214 <property name="can_focus">True</property>
215 - <property name="can_default">True</property>
216 - <property name="label">gtk-apply</property>
217 - <property name="use_stock">True</property>
220 - <property name="position">1</property>
223 + <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
224 + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
225 + <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
227 - <widget class="GtkButton" id="val_labs_remove">
228 + <widget class="GtkTreeView" id="treeview1">
229 <property name="visible">True</property>
230 - <property name="sensitive">False</property>
231 <property name="can_focus">True</property>
232 - <property name="can_default">True</property>
233 - <property name="label">gtk-remove</property>
234 - <property name="use_stock">True</property>
235 + <property name="headers_visible">False</property>
236 + <property name="enable_search">False</property>
239 - <property name="position">2</property>
244 + <property name="left_attach">1</property>
245 + <property name="right_attach">2</property>
246 <property name="top_attach">1</property>
247 <property name="bottom_attach">2</property>
248 <property name="x_options">GTK_FILL</property>
249 + <property name="y_options">GTK_FILL</property>
253 @@ -1415,27 +1393,26 @@
254 <property name="column_spacing">5</property>
255 <property name="row_spacing">4</property>
257 - <widget class="GtkLabel" id="label5">
258 + <widget class="GtkHBox" id="hbox4">
259 <property name="visible">True</property>
260 - <property name="xalign">0</property>
261 - <property name="label" translatable="yes">Value:</property>
263 + <widget class="GtkEntry" id="value_entry">
264 + <property name="width_request">85</property>
265 + <property name="visible">True</property>
266 + <property name="can_focus">True</property>
269 - <property name="x_options">GTK_FILL</property>
270 - <property name="y_options"></property>
271 + <property name="expand">False</property>
272 + <property name="fill">False</property>
273 + <property name="padding">1</property>
277 - <widget class="GtkLabel" id="label6">
278 - <property name="visible">True</property>
279 - <property name="xalign">0</property>
280 - <property name="label" translatable="yes">Value Label:</property>
283 - <property name="top_attach">1</property>
284 - <property name="bottom_attach">2</property>
285 + <property name="left_attach">1</property>
286 + <property name="right_attach">2</property>
287 <property name="x_options">GTK_FILL</property>
288 - <property name="y_options"></property>
289 + <property name="y_options">GTK_FILL</property>
293 @@ -1452,26 +1429,27 @@
297 - <widget class="GtkHBox" id="hbox4">
298 - <property name="visible">True</property>
300 - <widget class="GtkEntry" id="value_entry">
301 - <property name="width_request">85</property>
302 + <widget class="GtkLabel" id="label6">
303 <property name="visible">True</property>
304 - <property name="can_focus">True</property>
305 + <property name="xalign">0</property>
306 + <property name="label" translatable="yes">Value Label:</property>
309 - <property name="expand">False</property>
310 - <property name="fill">False</property>
311 - <property name="padding">1</property>
312 + <property name="top_attach">1</property>
313 + <property name="bottom_attach">2</property>
314 + <property name="x_options">GTK_FILL</property>
315 + <property name="y_options"></property>
319 + <widget class="GtkLabel" id="label5">
320 + <property name="visible">True</property>
321 + <property name="xalign">0</property>
322 + <property name="label" translatable="yes">Value:</property>
325 - <property name="left_attach">1</property>
326 - <property name="right_attach">2</property>
327 <property name="x_options">GTK_FILL</property>
328 - <property name="y_options">GTK_FILL</property>
329 + <property name="y_options"></property>
333 @@ -1481,28 +1459,50 @@
337 - <widget class="GtkScrolledWindow" id="scrolledwindow3">
338 + <widget class="GtkVButtonBox" id="vbuttonbox2">
339 + <property name="visible">True</property>
340 + <property name="border_width">5</property>
342 + <widget class="GtkButton" id="val_labs_add">
343 <property name="visible">True</property>
344 + <property name="sensitive">False</property>
345 <property name="can_focus">True</property>
346 - <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
347 - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
348 - <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
349 + <property name="can_default">True</property>
350 + <property name="label">gtk-add</property>
351 + <property name="use_stock">True</property>
355 - <widget class="GtkTreeView" id="treeview1">
356 + <widget class="GtkButton" id="val_labs_change">
357 <property name="visible">True</property>
358 + <property name="sensitive">False</property>
359 <property name="can_focus">True</property>
360 - <property name="headers_visible">False</property>
361 - <property name="enable_search">False</property>
362 + <property name="can_default">True</property>
363 + <property name="label">gtk-apply</property>
364 + <property name="use_stock">True</property>
367 + <property name="position">1</property>
371 + <widget class="GtkButton" id="val_labs_remove">
372 + <property name="visible">True</property>
373 + <property name="sensitive">False</property>
374 + <property name="can_focus">True</property>
375 + <property name="can_default">True</property>
376 + <property name="label">gtk-remove</property>
377 + <property name="use_stock">True</property>
380 + <property name="position">2</property>
385 - <property name="left_attach">1</property>
386 - <property name="right_attach">2</property>
387 <property name="top_attach">1</property>
388 <property name="bottom_attach">2</property>
389 <property name="x_options">GTK_FILL</property>
390 - <property name="y_options">GTK_FILL</property>
394 @@ -1590,64 +1590,68 @@
395 <property name="n_rows">2</property>
396 <property name="n_columns">2</property>
398 - <widget class="GtkVButtonBox" id="vbuttonbox5">
399 + <widget class="GtkVBox" id="vbox7">
400 <property name="visible">True</property>
401 - <property name="border_width">5</property>
402 - <property name="spacing">5</property>
403 - <property name="layout_style">GTK_BUTTONBOX_START</property>
405 - <widget class="GtkButton" id="missing_val_ok">
406 + <widget class="GtkRadioButton" id="range_missing">
407 <property name="visible">True</property>
408 <property name="can_focus">True</property>
409 - <property name="can_default">True</property>
410 - <property name="label">gtk-ok</property>
411 - <property name="use_stock">True</property>
412 - <signal name="clicked" handler="gtk_widget_hide" object="val_labs_dialog"/>
413 + <property name="label" translatable="yes">_Range plus one optional discrete missing value</property>
414 + <property name="use_underline">True</property>
415 + <property name="focus_on_click">False</property>
416 + <property name="draw_indicator">True</property>
417 + <property name="group">no_missing</property>
420 + <property name="expand">False</property>
421 + <property name="fill">False</property>
425 - <widget class="GtkButton" id="missing_val_cancel">
426 + <widget class="GtkVBox" id="vbox8">
427 <property name="visible">True</property>
428 - <property name="can_focus">True</property>
429 - <property name="can_default">True</property>
430 - <property name="label">gtk-cancel</property>
431 - <property name="use_stock">True</property>
432 - <signal name="clicked" handler="gtk_widget_hide" object="val_labs_dialog"/>
433 + <property name="spacing">5</property>
435 + <widget class="GtkHBox" id="hbox7">
436 + <property name="visible">True</property>
438 + <widget class="GtkHBox" id="hbox8">
439 + <property name="visible">True</property>
441 + <widget class="GtkLabel" id="label11">
442 + <property name="visible">True</property>
443 + <property name="label" translatable="yes">_Low:</property>
444 + <property name="use_underline">True</property>
445 + <property name="mnemonic_widget">mv-low</property>
448 - <property name="position">1</property>
449 + <property name="expand">False</property>
450 + <property name="fill">False</property>
451 + <property name="padding">20</property>
455 - <widget class="GtkButton" id="help_button_missing_values">
456 + <widget class="GtkEntry" id="mv-low">
457 + <property name="width_request">75</property>
458 <property name="visible">True</property>
459 <property name="can_focus">True</property>
460 - <property name="can_default">True</property>
461 - <property name="label">gtk-help</property>
462 - <property name="use_stock">True</property>
465 - <property name="position">2</property>
466 + <property name="expand">False</property>
467 + <property name="position">1</property>
472 - <property name="left_attach">1</property>
473 - <property name="right_attach">2</property>
477 - <widget class="GtkVBox" id="vbox5">
478 + <widget class="GtkHBox" id="hbox9">
479 <property name="visible">True</property>
480 - <property name="spacing">12</property>
482 - <widget class="GtkRadioButton" id="no_missing">
483 + <widget class="GtkLabel" id="label12">
484 <property name="visible">True</property>
485 - <property name="can_focus">True</property>
486 - <property name="label" translatable="yes">_No missing values</property>
487 + <property name="label" translatable="yes">_High:</property>
488 <property name="use_underline">True</property>
489 - <property name="active">True</property>
490 - <property name="draw_indicator">True</property>
491 + <property name="mnemonic_widget">mv-high</property>
494 <property name="expand">False</property>
495 @@ -1655,97 +1659,102 @@
499 - <widget class="GtkVBox" id="vbox6">
500 - <property name="visible">True</property>
502 - <widget class="GtkRadioButton" id="discrete_missing">
503 + <widget class="GtkEntry" id="mv-high">
504 + <property name="width_request">75</property>
505 <property name="visible">True</property>
506 <property name="can_focus">True</property>
507 - <property name="label" translatable="yes">_Discrete missing values</property>
508 - <property name="use_underline">True</property>
509 - <property name="focus_on_click">False</property>
510 - <property name="draw_indicator">True</property>
511 - <property name="group">no_missing</property>
514 - <property name="expand">False</property>
515 + <property name="padding">5</property>
516 + <property name="position">1</property>
521 <property name="fill">False</property>
522 + <property name="padding">20</property>
523 + <property name="position">1</property>
527 - <widget class="GtkHBox" id="hbox10">
528 - <property name="visible">True</property>
532 - <widget class="GtkHBox" id="hbox5">
538 + <widget class="GtkHBox" id="hbox6">
539 <property name="visible">True</property>
540 - <property name="border_width">5</property>
541 - <property name="spacing">5</property>
542 - <property name="homogeneous">True</property>
544 - <widget class="GtkEntry" id="mv0">
545 - <property name="width_request">75</property>
546 + <widget class="GtkLabel" id="label10">
547 <property name="visible">True</property>
548 - <property name="can_focus">True</property>
549 + <property name="label" translatable="yes">Di_screte value:</property>
550 + <property name="use_underline">True</property>
551 + <property name="mnemonic_widget">mv-discrete</property>
554 <property name="expand">False</property>
555 <property name="fill">False</property>
556 + <property name="padding">20</property>
560 - <widget class="GtkEntry" id="mv1">
561 + <widget class="GtkEntry" id="mv-discrete">
562 <property name="width_request">75</property>
563 <property name="visible">True</property>
564 <property name="can_focus">True</property>
567 <property name="expand">False</property>
568 - <property name="fill">False</property>
569 <property name="position">1</property>
573 - <widget class="GtkEntry" id="mv2">
574 - <property name="width_request">75</property>
575 - <property name="visible">True</property>
576 - <property name="can_focus">True</property>
579 - <property name="expand">False</property>
580 - <property name="fill">False</property>
581 - <property name="position">2</property>
582 + <property name="position">1</property>
587 - <property name="padding">20</property>
588 + <property name="position">1</property>
593 - <property name="position">1</property>
594 + <property name="right_attach">2</property>
595 + <property name="top_attach">1</property>
596 + <property name="bottom_attach">2</property>
597 + <property name="x_options">GTK_FILL</property>
601 + <widget class="GtkVBox" id="vbox5">
602 + <property name="visible">True</property>
603 + <property name="spacing">12</property>
605 + <widget class="GtkRadioButton" id="no_missing">
606 + <property name="visible">True</property>
607 + <property name="can_focus">True</property>
608 + <property name="label" translatable="yes">_No missing values</property>
609 + <property name="use_underline">True</property>
610 + <property name="active">True</property>
611 + <property name="draw_indicator">True</property>
614 <property name="expand">False</property>
615 <property name="fill">False</property>
616 - <property name="position">1</property>
621 - <property name="y_options">GTK_FILL</property>
625 - <widget class="GtkVBox" id="vbox7">
626 + <widget class="GtkVBox" id="vbox6">
627 <property name="visible">True</property>
629 - <widget class="GtkRadioButton" id="range_missing">
630 + <widget class="GtkRadioButton" id="discrete_missing">
631 <property name="visible">True</property>
632 <property name="can_focus">True</property>
633 - <property name="label" translatable="yes">_Range plus one optional discrete missing value</property>
634 + <property name="label" translatable="yes">_Discrete missing values</property>
635 <property name="use_underline">True</property>
636 <property name="focus_on_click">False</property>
637 <property name="draw_indicator">True</property>
638 @@ -1757,125 +1766,116 @@
642 - <widget class="GtkVBox" id="vbox8">
643 - <property name="visible">True</property>
644 - <property name="spacing">5</property>
646 - <widget class="GtkHBox" id="hbox7">
647 + <widget class="GtkHBox" id="hbox10">
648 <property name="visible">True</property>
650 - <widget class="GtkHBox" id="hbox8">
651 + <widget class="GtkHBox" id="hbox5">
652 <property name="visible">True</property>
653 + <property name="border_width">5</property>
654 + <property name="spacing">5</property>
655 + <property name="homogeneous">True</property>
657 - <widget class="GtkLabel" id="label11">
658 + <widget class="GtkEntry" id="mv0">
659 + <property name="width_request">75</property>
660 <property name="visible">True</property>
661 - <property name="label" translatable="yes">_Low:</property>
662 - <property name="use_underline">True</property>
663 - <property name="mnemonic_widget">mv-low</property>
664 + <property name="can_focus">True</property>
667 <property name="expand">False</property>
668 <property name="fill">False</property>
669 - <property name="padding">20</property>
673 - <widget class="GtkEntry" id="mv-low">
674 + <widget class="GtkEntry" id="mv1">
675 <property name="width_request">75</property>
676 <property name="visible">True</property>
677 <property name="can_focus">True</property>
680 <property name="expand">False</property>
681 + <property name="fill">False</property>
682 <property name="position">1</property>
688 - <widget class="GtkHBox" id="hbox9">
689 - <property name="visible">True</property>
691 - <widget class="GtkLabel" id="label12">
692 + <widget class="GtkEntry" id="mv2">
693 + <property name="width_request">75</property>
694 <property name="visible">True</property>
695 - <property name="label" translatable="yes">_High:</property>
696 - <property name="use_underline">True</property>
697 - <property name="mnemonic_widget">mv-high</property>
698 + <property name="can_focus">True</property>
701 <property name="expand">False</property>
702 <property name="fill">False</property>
703 + <property name="position">2</property>
708 + <property name="padding">20</property>
712 - <widget class="GtkEntry" id="mv-high">
713 - <property name="width_request">75</property>
714 - <property name="visible">True</property>
715 - <property name="can_focus">True</property>
718 - <property name="padding">5</property>
719 <property name="position">1</property>
724 + <property name="expand">False</property>
725 <property name="fill">False</property>
726 - <property name="padding">20</property>
727 <property name="position">1</property>
738 + <property name="y_options">GTK_FILL</property>
742 - <widget class="GtkHBox" id="hbox6">
743 + <widget class="GtkVButtonBox" id="vbuttonbox5">
744 <property name="visible">True</property>
745 + <property name="border_width">5</property>
746 + <property name="spacing">5</property>
747 + <property name="layout_style">GTK_BUTTONBOX_START</property>
749 - <widget class="GtkLabel" id="label10">
750 + <widget class="GtkButton" id="missing_val_ok">
751 <property name="visible">True</property>
752 - <property name="label" translatable="yes">Di_screte value:</property>
753 - <property name="use_underline">True</property>
754 - <property name="mnemonic_widget">mv-discrete</property>
755 + <property name="can_focus">True</property>
756 + <property name="can_default">True</property>
757 + <property name="label">gtk-ok</property>
758 + <property name="use_stock">True</property>
759 + <signal name="clicked" handler="gtk_widget_hide" object="val_labs_dialog"/>
762 - <property name="expand">False</property>
763 - <property name="fill">False</property>
764 - <property name="padding">20</property>
768 - <widget class="GtkEntry" id="mv-discrete">
769 - <property name="width_request">75</property>
770 + <widget class="GtkButton" id="missing_val_cancel">
771 <property name="visible">True</property>
772 <property name="can_focus">True</property>
775 - <property name="expand">False</property>
776 - <property name="position">1</property>
779 + <property name="can_default">True</property>
780 + <property name="label">gtk-cancel</property>
781 + <property name="use_stock">True</property>
782 + <signal name="clicked" handler="gtk_widget_hide" object="val_labs_dialog"/>
785 <property name="position">1</property>
789 + <widget class="GtkButton" id="help_button_missing_values">
790 + <property name="visible">True</property>
791 + <property name="can_focus">True</property>
792 + <property name="can_default">True</property>
793 + <property name="label">gtk-help</property>
794 + <property name="use_stock">True</property>
797 - <property name="position">1</property>
798 + <property name="position">2</property>
803 + <property name="left_attach">1</property>
804 <property name="right_attach">2</property>
805 - <property name="top_attach">1</property>
806 - <property name="bottom_attach">2</property>
807 - <property name="x_options">GTK_FILL</property>