glade.patch

   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
   6 @@ -506,7 +506,7 @@
   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>
  12                    </widget>
  13                    <packing>
  14                      <property name="expand">False</property>
  15 @@ -547,7 +547,7 @@
  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"/>
  22                    </widget>
  23                    <packing>
  24 @@ -560,7 +560,7 @@
  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>
  30                    </widget>
  31                    <packing>
  32                      <property name="expand">False</property>
  33 @@ -581,7 +581,7 @@
  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>
  39                    </widget>
  40                    <packing>
  41                      <property name="expand">False</property>
  42 @@ -592,7 +592,7 @@
  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>
  48                    </widget>
  49                    <packing>
  50                      <property name="expand">False</property>
  51 @@ -604,7 +604,7 @@
  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>
  57                    </widget>
  58                    <packing>
  59                      <property name="expand">False</property>
  60 @@ -624,7 +624,7 @@
  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"/>
  67                    </widget>
  68                    <packing>
  69 @@ -667,25 +667,25 @@
  70                      <property name="n_rows">1</property>
  71                      <property name="n_columns">2</property>
  72                      <child>
  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>
  80                        </widget>
  81                        <packing>
  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>
  86                        </packing>
  87                      </child>
  88                      <child>
  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>
  96                        </widget>
  97                        <packing>
  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>
 102                        </packing>
 103                      </child>
 104 @@ -1216,63 +1216,63 @@
 105                  <property name="column_spacing">2</property>
 106                  <property name="row_spacing">1</property>
 107                  <child>
 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>
 113 +                    <child>
 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>
 118                    </widget>
 119                    <packing>
 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>
 125 +                      </packing>
 126 +                    </child>
 127 +                  </widget>
 128 +                  <packing>
 129                      <property name="x_options">GTK_FILL</property>
 130 -                    <property name="y_options"></property>
 131 +                    <property name="y_options">GTK_FILL</property>
 132                    </packing>
 133                  </child>
 134                  <child>
 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>
 140                    </widget>
 141                    <packing>
 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>
 147                    </packing>
 148                  </child>
 149                  <child>
 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>
 155                    </widget>
 156                    <packing>
 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>
 162                    </packing>
 163                  </child>
 164                  <child>
 165 -                  <widget class="GtkHBox" id="hbox2">
 166 -                    <property name="visible">True</property>
 167 -                    <child>
 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>
 175                        </widget>
 176                        <packing>
 177 -                        <property name="expand">False</property>
 178 -                        <property name="fill">False</property>
 179 -                        <property name="pack_type">GTK_PACK_END</property>
 180 -                      </packing>
 181 -                    </child>
 182 -                  </widget>
 183 -                  <packing>
 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>
 189                    </packing>
 190                  </child>
 191                </widget>
 192 @@ -1360,50 +1360,28 @@
 193                      <property name="n_columns">2</property>
 194                      <property name="row_spacing">5</property>
 195                      <child>
 196 -                      <widget class="GtkVButtonBox" id="vbuttonbox2">
 197 -                        <property name="visible">True</property>
 198 -                        <property name="border_width">5</property>
 199 -                        <child>
 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>
 207 -                          </widget>
 208 -                        </child>
 209 -                        <child>
 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>
 218 -                          </widget>
 219 -                          <packing>
 220 -                            <property name="position">1</property>
 221 -                          </packing>
 222 -                        </child>
 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>
 226                          <child>
 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>
 237                            </widget>
 238 -                          <packing>
 239 -                            <property name="position">2</property>
 240 -                          </packing>
 241                          </child>
 242                        </widget>
 243                        <packing>
 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>
 250                        </packing>
 251                      </child>
 252                      <child>
 253 @@ -1415,27 +1393,26 @@
 254                          <property name="column_spacing">5</property>
 255                          <property name="row_spacing">4</property>
 256                          <child>
 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>
 262 +                            <child>
 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>
 267                            </widget>
 268                            <packing>
 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>
 274                            </packing>
 275                          </child>
 276 -                        <child>
 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>
 281                            </widget>
 282                            <packing>
 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>
 290                            </packing>
 291                          </child>
 292                          <child>
 293 @@ -1452,26 +1429,27 @@
 294                            </packing>
 295                          </child>
 296                          <child>
 297 -                          <widget class="GtkHBox" id="hbox4">
 298 -                            <property name="visible">True</property>
 299 -                            <child>
 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>
 307                                </widget>
 308                                <packing>
 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>
 316                                </packing>
 317                              </child>
 318 +                        <child>
 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>
 323                            </widget>
 324                            <packing>
 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>
 330                            </packing>
 331                          </child>
 332                        </widget>
 333 @@ -1481,28 +1459,50 @@
 334                        </packing>
 335                      </child>
 336                      <child>
 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>
 341 +                        <child>
 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>
 352 +                          </widget>
 353 +                        </child>
 354                          <child>
 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>
 365                            </widget>
 366 +                          <packing>
 367 +                            <property name="position">1</property>
 368 +                          </packing>
 369 +                        </child>
 370 +                        <child>
 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>
 378 +                          </widget>
 379 +                          <packing>
 380 +                            <property name="position">2</property>
 381 +                          </packing>
 382                          </child>
 383                        </widget>
 384                        <packing>
 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>
 391                        </packing>
 392                      </child>
 393                    </widget>
 394 @@ -1590,64 +1590,68 @@
 395          <property name="n_rows">2</property>
 396          <property name="n_columns">2</property>
 397          <child>
 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>
 404              <child>
 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>
 418                </widget>
 419 +              <packing>
 420 +                <property name="expand">False</property>
 421 +                <property name="fill">False</property>
 422 +              </packing>
 423              </child>
 424              <child>
 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>
 434 +                <child>
 435 +                  <widget class="GtkHBox" id="hbox7">
 436 +                    <property name="visible">True</property>
 437 +                    <child>
 438 +                      <widget class="GtkHBox" id="hbox8">
 439 +                        <property name="visible">True</property>
 440 +                        <child>
 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>
 446                </widget>
 447                <packing>
 448 -                <property name="position">1</property>
 449 +                            <property name="expand">False</property>
 450 +                            <property name="fill">False</property>
 451 +                            <property name="padding">20</property>
 452                </packing>
 453              </child>
 454              <child>
 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>
 463                </widget>
 464                <packing>
 465 -                <property name="position">2</property>
 466 +                            <property name="expand">False</property>
 467 +                            <property name="position">1</property>
 468                </packing>
 469              </child>
 470            </widget>
 471 -          <packing>
 472 -            <property name="left_attach">1</property>
 473 -            <property name="right_attach">2</property>
 474 -          </packing>
 475          </child>
 476          <child>
 477 -          <widget class="GtkVBox" id="vbox5">
 478 +                      <widget class="GtkHBox" id="hbox9">
 479              <property name="visible">True</property>
 480 -            <property name="spacing">12</property>
 481              <child>
 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>
 492                </widget>
 493                <packing>
 494                  <property name="expand">False</property>
 495 @@ -1655,97 +1659,102 @@
 496                </packing>
 497              </child>
 498              <child>
 499 -              <widget class="GtkVBox" id="vbox6">
 500 -                <property name="visible">True</property>
 501 -                <child>
 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>
 512                    </widget>
 513                    <packing>
 514 -                    <property name="expand">False</property>
 515 +                            <property name="padding">5</property>
 516 +                            <property name="position">1</property>
 517 +                          </packing>
 518 +                        </child>
 519 +                      </widget>
 520 +                      <packing>
 521                      <property name="fill">False</property>
 522 +                        <property name="padding">20</property>
 523 +                        <property name="position">1</property>
 524                    </packing>
 525                  </child>
 526                  <child>
 527 -                  <widget class="GtkHBox" id="hbox10">
 528 -                    <property name="visible">True</property>
 529 +                      <placeholder/>
 530 +                    </child>
 531                      <child>
 532 -                      <widget class="GtkHBox" id="hbox5">
 533 +                      <placeholder/>
 534 +                    </child>
 535 +                  </widget>
 536 +                </child>
 537 +                <child>
 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>
 543                          <child>
 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>
 552                            </widget>
 553                            <packing>
 554                              <property name="expand">False</property>
 555                              <property name="fill">False</property>
 556 +                        <property name="padding">20</property>
 557                            </packing>
 558                          </child>
 559                          <child>
 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>
 565                            </widget>
 566                            <packing>
 567                              <property name="expand">False</property>
 568 -                            <property name="fill">False</property>
 569                              <property name="position">1</property>
 570                            </packing>
 571                          </child>
 572 -                        <child>
 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>
 577                            </widget>
 578                            <packing>
 579 -                            <property name="expand">False</property>
 580 -                            <property name="fill">False</property>
 581 -                            <property name="position">2</property>
 582 +                    <property name="position">1</property>
 583                            </packing>
 584                          </child>
 585                        </widget>
 586                        <packing>
 587 -                        <property name="padding">20</property>
 588 +                <property name="position">1</property>
 589                        </packing>
 590                      </child>
 591                    </widget>
 592                    <packing>
 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>
 598                    </packing>
 599                  </child>
 600 +        <child>
 601 +          <widget class="GtkVBox" id="vbox5">
 602 +            <property name="visible">True</property>
 603 +            <property name="spacing">12</property>
 604 +            <child>
 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>
 612                </widget>
 613                <packing>
 614                  <property name="expand">False</property>
 615                  <property name="fill">False</property>
 616 -                <property name="position">1</property>
 617 -              </packing>
 618 -            </child>
 619 -          </widget>
 620 -          <packing>
 621 -            <property name="y_options">GTK_FILL</property>
 622            </packing>
 623          </child>
 624          <child>
 625 -          <widget class="GtkVBox" id="vbox7">
 626 +              <widget class="GtkVBox" id="vbox6">
 627              <property name="visible">True</property>
 628              <child>
 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 @@
 639                </packing>
 640              </child>
 641              <child>
 642 -              <widget class="GtkVBox" id="vbox8">
 643 -                <property name="visible">True</property>
 644 -                <property name="spacing">5</property>
 645 -                <child>
 646 -                  <widget class="GtkHBox" id="hbox7">
 647 +                  <widget class="GtkHBox" id="hbox10">
 648                      <property name="visible">True</property>
 649                      <child>
 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>
 656                          <child>
 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>
 665                            </widget>
 666                            <packing>
 667                              <property name="expand">False</property>
 668                              <property name="fill">False</property>
 669 -                            <property name="padding">20</property>
 670                            </packing>
 671                          </child>
 672                          <child>
 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>
 678                            </widget>
 679                            <packing>
 680                              <property name="expand">False</property>
 681 +                            <property name="fill">False</property>
 682                              <property name="position">1</property>
 683                            </packing>
 684                          </child>
 685 -                      </widget>
 686 -                    </child>
 687 -                    <child>
 688 -                      <widget class="GtkHBox" id="hbox9">
 689 -                        <property name="visible">True</property>
 690                          <child>
 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>
 699                            </widget>
 700                            <packing>
 701                              <property name="expand">False</property>
 702                              <property name="fill">False</property>
 703 +                            <property name="position">2</property>
 704 +                          </packing>
 705 +                        </child>
 706 +                      </widget>
 707 +                      <packing>
 708 +                        <property name="padding">20</property>
 709                            </packing>
 710                          </child>
 711 -                        <child>
 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>
 716                            </widget>
 717                            <packing>
 718 -                            <property name="padding">5</property>
 719                              <property name="position">1</property>
 720                            </packing>
 721                          </child>
 722                        </widget>
 723                        <packing>
 724 +                <property name="expand">False</property>
 725                          <property name="fill">False</property>
 726 -                        <property name="padding">20</property>
 727                          <property name="position">1</property>
 728                        </packing>
 729                      </child>
 730 -                    <child>
 731 -                      <placeholder/>
 732 -                    </child>
 733 -                    <child>
 734 -                      <placeholder/>
 735 -                    </child>
 736                    </widget>
 737 +          <packing>
 738 +            <property name="y_options">GTK_FILL</property>
 739 +          </packing>
 740                  </child>
 741                  <child>
 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>
 748                      <child>
 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"/>
 760                        </widget>
 761 -                      <packing>
 762 -                        <property name="expand">False</property>
 763 -                        <property name="fill">False</property>
 764 -                        <property name="padding">20</property>
 765 -                      </packing>
 766                      </child>
 767                      <child>
 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>
 773 -                      </widget>
 774 -                      <packing>
 775 -                        <property name="expand">False</property>
 776 -                        <property name="position">1</property>
 777 -                      </packing>
 778 -                    </child>
 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"/>
 783                    </widget>
 784                    <packing>
 785                      <property name="position">1</property>
 786                    </packing>
 787                  </child>
 788 +            <child>
 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>
 795                </widget>
 796                <packing>
 797 -                <property name="position">1</property>
 798 +                <property name="position">2</property>
 799                </packing>
 800              </child>
 801            </widget>
 802            <packing>
 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>
 808            </packing>
 809          </child>
 810        </widget>