← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/gimp/jaunty-security

« back to all changes in this revision

Viewing changes to plug-ins/MapObject/mapobject_ui.c

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Holbach
  • Date: 2007-05-02 16:33:03 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20070502163303-bvzhjzbpw8qglc4y
Tags: 2.3.16-1ubuntu1
* Resynchronized with Debian, remaining Ubuntu changes:
  - debian/rules: i18n magic.
* debian/control.in:
  - Maintainer: Ubuntu Core Developers <ubuntu-devel@lists.ubuntu.com>
* debian/patches/02_help-message.patch,
  debian/patches/03_gimp.desktop.in.in.patch,
  debian/patches/10_dont_show_wizard.patch: updated.
* debian/patches/04_composite-signedness.patch,
  debian/patches/05_add-letter-spacing.patch: dropped, used upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plug-ins/MapObject/mapobject_ui.c
299
299
  linetab[0].x1 = -1;
300
300
}
301
301
 
302
 
/*********************************************/
303
 
/* Main window "-" (zoom in) button callback */
304
 
/*********************************************/
305
 
 
306
 
static void
307
 
zoomout_callback (GtkWidget *widget,
308
 
                  gpointer   data)
309
 
{
310
 
  if (mapvals.preview_zoom_factor < 2)
311
 
    {
312
 
      mapvals.preview_zoom_factor++;
313
 
      if (linetab[0].x1 != -1)
314
 
        clear_wireframe ();
315
 
      draw_preview_image (TRUE);
316
 
    }
317
 
}
318
 
 
319
 
/**********************************************/
320
 
/* Main window "+" (zoom out) button callback */
321
 
/**********************************************/
322
 
 
323
 
static void
324
 
zoomin_callback (GtkWidget *widget,
325
 
                 gpointer   data)
326
 
{
327
 
  if (mapvals.preview_zoom_factor > 0)
328
 
    {
329
 
      mapvals.preview_zoom_factor--;
330
 
      if (linetab[0].x1 != -1)
331
 
        clear_wireframe ();
332
 
      draw_preview_image (TRUE);
333
 
    }
 
302
static void
 
303
zoomed_callback (GimpZoomModel *model)
 
304
{
 
305
  mapvals.zoom = gimp_zoom_model_get_factor (model);
 
306
 
 
307
  if (linetab[0].x1 != -1)
 
308
    clear_wireframe ();
 
309
 
 
310
  draw_preview_image (TRUE);
334
311
}
335
312
 
336
313
/**********************************************/
493
470
 
494
471
  /* General options */
495
472
 
496
 
  frame = gimp_frame_new (_("General options"));
 
473
  frame = gimp_frame_new (_("General Options"));
497
474
  gtk_box_pack_start (GTK_BOX (page), frame, FALSE, FALSE, 0);
498
475
  gtk_widget_show (frame);
499
476
 
604
581
                              1, TRUE, 0, 0,
605
582
                              _("Antialiasing quality. Higher is better, "
606
583
                               "but slower"), NULL);
607
 
  g_signal_connect (adj, "value_changed",
 
584
  g_signal_connect (adj, "value-changed",
608
585
                    G_CALLBACK (gimp_double_adjustment_update),
609
586
                    &mapvals.maxdepth);
610
587
 
614
591
                             _("_Threshold:"), 0.0, 0.5,
615
592
                             spinbutton, 1, TRUE);
616
593
 
617
 
  g_signal_connect (adj, "value_changed",
 
594
  g_signal_connect (adj, "value-changed",
618
595
                    G_CALLBACK (gimp_double_adjustment_update),
619
596
                    &mapvals.pixeltreshold);
620
597
 
684
661
                             _("Lightsource color:"), 0.0, 0.5,
685
662
                             colorbutton, 1, FALSE);
686
663
 
687
 
  g_signal_connect (colorbutton, "color_changed",
 
664
  g_signal_connect (colorbutton, "color-changed",
688
665
                    G_CALLBACK (gimp_color_button_get_color),
689
666
                    &mapvals.lightsource.color);
690
667
 
710
687
                             _("X:"), 0.0, 0.5,
711
688
                             spinbutton, 1, TRUE);
712
689
 
713
 
  g_signal_connect (xadj, "value_changed",
 
690
  g_signal_connect (xadj, "value-changed",
714
691
                    G_CALLBACK (gimp_double_adjustment_update),
715
692
                    &mapvals.lightsource.position.x);
716
693
 
724
701
                             _("Y:"), 0.0, 0.5,
725
702
                             spinbutton, 1, TRUE);
726
703
 
727
 
  g_signal_connect (yadj, "value_changed",
 
704
  g_signal_connect (yadj, "value-changed",
728
705
                    G_CALLBACK (gimp_double_adjustment_update),
729
706
                    &mapvals.lightsource.position.y);
730
707
 
738
715
                             _("Z:"), 0.0, 0.5,
739
716
                             spinbutton, 1, TRUE);
740
717
 
741
 
  g_signal_connect (zadj, "value_changed",
 
718
  g_signal_connect (zadj, "value-changed",
742
719
                    G_CALLBACK (gimp_double_adjustment_update),
743
720
                    &mapvals.lightsource.position.z);
744
721
 
764
741
                             _("X:"), 0.0, 0.5,
765
742
                             spinbutton, 1, TRUE);
766
743
 
767
 
  g_signal_connect (adj, "value_changed",
 
744
  g_signal_connect (adj, "value-changed",
768
745
                    G_CALLBACK (gimp_double_adjustment_update),
769
746
                    &mapvals.lightsource.direction.x);
770
747
 
777
754
                             _("Y:"), 0.0, 0.5,
778
755
                             spinbutton, 1, TRUE);
779
756
 
780
 
  g_signal_connect (adj, "value_changed",
 
757
  g_signal_connect (adj, "value-changed",
781
758
                    G_CALLBACK (gimp_double_adjustment_update),
782
759
                    &mapvals.lightsource.direction.y);
783
760
 
790
767
                             _("Z:"), 0.0, 0.5,
791
768
                             spinbutton, 1, TRUE);
792
769
 
793
 
  g_signal_connect (adj, "value_changed",
 
770
  g_signal_connect (adj, "value-changed",
794
771
                    G_CALLBACK (gimp_double_adjustment_update),
795
772
                    &mapvals.lightsource.direction.z);
796
773
 
851
828
                    GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
852
829
  gtk_widget_show (spinbutton);
853
830
 
854
 
  g_signal_connect (adj, "value_changed",
 
831
  g_signal_connect (adj, "value-changed",
855
832
                    G_CALLBACK (gimp_double_adjustment_update),
856
833
                    &mapvals.material.ambient_int);
857
834
 
880
857
                    GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
881
858
  gtk_widget_show (spinbutton);
882
859
 
883
 
  g_signal_connect (adj, "value_changed",
 
860
  g_signal_connect (adj, "value-changed",
884
861
                    G_CALLBACK (gimp_double_adjustment_update),
885
862
                    &mapvals.material.diffuse_int);
886
863
 
923
900
                    GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
924
901
  gtk_widget_show (spinbutton);
925
902
 
926
 
  g_signal_connect (adj, "value_changed",
 
903
  g_signal_connect (adj, "value-changed",
927
904
                    G_CALLBACK (gimp_double_adjustment_update),
928
905
                    &mapvals.material.diffuse_ref);
929
906
 
952
929
                    GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
953
930
  gtk_widget_show (spinbutton);
954
931
 
955
 
  g_signal_connect (adj, "value_changed",
 
932
  g_signal_connect (adj, "value-changed",
956
933
                    G_CALLBACK (gimp_double_adjustment_update),
957
934
                    &mapvals.material.specular_ref);
958
935
 
981
958
                    GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
982
959
  gtk_widget_show (spinbutton);
983
960
 
984
 
  g_signal_connect (adj, "value_changed",
 
961
  g_signal_connect (adj, "value-changed",
985
962
                    G_CALLBACK (gimp_double_adjustment_update),
986
963
                    &mapvals.material.highlight);
987
964
 
1037
1014
  gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj),
1038
1015
                             GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.01, 5);
1039
1016
 
1040
 
  g_signal_connect (adj, "value_changed",
 
1017
  g_signal_connect (adj, "value-changed",
1041
1018
                    G_CALLBACK (double_adjustment_update),
1042
1019
                    &mapvals.position.x);
1043
1020
 
1050
1027
  gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj),
1051
1028
                             GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.01, 5);
1052
1029
 
1053
 
  g_signal_connect (adj, "value_changed",
 
1030
  g_signal_connect (adj, "value-changed",
1054
1031
                    G_CALLBACK (double_adjustment_update),
1055
1032
                    &mapvals.position.y);
1056
1033
 
1063
1040
  gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj),
1064
1041
                             GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.01, 5);
1065
1042
 
1066
 
  g_signal_connect (adj, "value_changed",
 
1043
  g_signal_connect (adj, "value-changed",
1067
1044
                    G_CALLBACK (double_adjustment_update),
1068
1045
                    &mapvals.position.z);
1069
1046
 
1084
1061
                              _("Rotation angle about X axis"), NULL);
1085
1062
  gtk_size_group_add_widget (group, GIMP_SCALE_ENTRY_SPINBUTTON (adj));
1086
1063
 
1087
 
  g_signal_connect (adj, "value_changed",
 
1064
  g_signal_connect (adj, "value-changed",
1088
1065
                    G_CALLBACK (double_adjustment_update),
1089
1066
                    &mapvals.alpha);
1090
1067
 
1095
1072
                              _("Rotation angle about Y axis"), NULL);
1096
1073
  gtk_size_group_add_widget (group, GIMP_SCALE_ENTRY_SPINBUTTON (adj));
1097
1074
 
1098
 
  g_signal_connect (adj, "value_changed",
 
1075
  g_signal_connect (adj, "value-changed",
1099
1076
                    G_CALLBACK (double_adjustment_update),
1100
1077
                    &mapvals.beta);
1101
1078
 
1106
1083
                              _("Rotation angle about Z axis"), NULL);
1107
1084
  gtk_size_group_add_widget (group, GIMP_SCALE_ENTRY_SPINBUTTON (adj));
1108
1085
 
1109
 
  g_signal_connect (adj, "value_changed",
 
1086
  g_signal_connect (adj, "value-changed",
1110
1087
                    G_CALLBACK (double_adjustment_update),
1111
1088
                    &mapvals.gamma);
1112
1089
 
1182
1159
  gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj),
1183
1160
                             GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.1, 2);
1184
1161
 
1185
 
  g_signal_connect (adj, "value_changed",
 
1162
  g_signal_connect (adj, "value-changed",
1186
1163
                    G_CALLBACK (double_adjustment_update),
1187
1164
                    &mapvals.scale.x);
1188
1165
 
1194
1171
  gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj),
1195
1172
                             GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.1, 2);
1196
1173
 
1197
 
  g_signal_connect (adj, "value_changed",
 
1174
  g_signal_connect (adj, "value-changed",
1198
1175
                    G_CALLBACK (double_adjustment_update),
1199
1176
                    &mapvals.scale.y);
1200
1177
 
1206
1183
  gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj),
1207
1184
                             GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.1, 2);
1208
1185
 
1209
 
  g_signal_connect (adj, "value_changed",
 
1186
  g_signal_connect (adj, "value-changed",
1210
1187
                    G_CALLBACK (double_adjustment_update),
1211
1188
                    &mapvals.scale.z);
1212
1189
 
1279
1256
  gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj),
1280
1257
                             GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.1, 2);
1281
1258
 
1282
 
  g_signal_connect (adj, "value_changed",
 
1259
  g_signal_connect (adj, "value-changed",
1283
1260
                    G_CALLBACK (double_adjustment_update),
1284
1261
                    &mapvals.cylinder_radius);
1285
1262
 
1293
1270
  gtk_spin_button_configure (GIMP_SCALE_ENTRY_SPINBUTTON (adj),
1294
1271
                             GIMP_SCALE_ENTRY_SPINBUTTON_ADJ (adj), 0.1, 2);
1295
1272
 
1296
 
  g_signal_connect (adj, "value_changed",
 
1273
  g_signal_connect (adj, "value-changed",
1297
1274
                    G_CALLBACK (double_adjustment_update),
1298
1275
                    &mapvals.cylinder_length);
1299
1276
 
1356
1333
gboolean
1357
1334
main_dialog (GimpDrawable *drawable)
1358
1335
{
1359
 
  GtkWidget *main_hbox;
1360
 
  GtkWidget *vbox;
1361
 
  GtkWidget *hbox;
1362
 
  GtkWidget *frame;
1363
 
  GtkWidget *button;
1364
 
  GtkWidget *image;
1365
 
  GtkWidget *toggle;
1366
 
  gboolean   run = FALSE;
 
1336
  GtkWidget     *main_hbox;
 
1337
  GtkWidget     *vbox;
 
1338
  GtkWidget     *hbox;
 
1339
  GtkWidget     *frame;
 
1340
  GtkWidget     *button;
 
1341
  GtkWidget     *toggle;
 
1342
  GimpZoomModel *model;
 
1343
  gboolean       run = FALSE;
1367
1344
 
1368
1345
  gimp_ui_init ("MapObject", FALSE);
1369
1346
 
1376
1353
 
1377
1354
                            NULL);
1378
1355
 
 
1356
  gtk_dialog_set_alternative_button_order (GTK_DIALOG (appwin),
 
1357
                                           GTK_RESPONSE_OK,
 
1358
                                           GTK_RESPONSE_CANCEL,
 
1359
                                           -1);
 
1360
 
 
1361
  gimp_window_set_transient (GTK_WINDOW (appwin));
 
1362
 
1379
1363
  main_hbox = gtk_hbox_new (FALSE, 12);
1380
1364
  gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12);
1381
1365
  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (appwin)->vbox), main_hbox,
1424
1408
 
1425
1409
  gimp_help_set_help_data (button, _("Recompute preview image"), NULL);
1426
1410
 
1427
 
  button = gtk_button_new ();
1428
 
  gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
1429
 
  gtk_widget_show (button);
1430
 
 
1431
 
  image = gtk_image_new_from_stock (GTK_STOCK_ZOOM_OUT, GTK_ICON_SIZE_MENU);
1432
 
  gtk_container_add (GTK_CONTAINER (button), image);
1433
 
  gtk_widget_show (image);
1434
 
 
1435
 
  g_signal_connect (button, "clicked",
1436
 
                    G_CALLBACK (zoomout_callback),
1437
 
                    NULL);
1438
 
 
1439
 
  gimp_help_set_help_data (button, _("Zoom out (make image smaller)"), NULL);
1440
 
 
1441
 
  button = gtk_button_new ();
1442
 
  gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
1443
 
  gtk_widget_show (button);
1444
 
 
1445
 
  image = gtk_image_new_from_stock (GTK_STOCK_ZOOM_IN, GTK_ICON_SIZE_MENU);
1446
 
  gtk_container_add (GTK_CONTAINER (button), image);
1447
 
  gtk_widget_show (image);
1448
 
 
1449
 
  g_signal_connect (button, "clicked",
1450
 
                    G_CALLBACK (zoomin_callback),
1451
 
                    NULL);
1452
 
 
1453
 
  gimp_help_set_help_data (button, _("Zoom in (make image bigger)"), NULL);
 
1411
  model = gimp_zoom_model_new ();
 
1412
  gimp_zoom_model_set_range (model, 0.25, 1.0);
 
1413
  gimp_zoom_model_zoom (model, GIMP_ZOOM_TO, mapvals.zoom);
 
1414
 
 
1415
  button = gimp_zoom_button_new (model, GIMP_ZOOM_IN, GTK_ICON_SIZE_MENU);
 
1416
  gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
 
1417
  gtk_widget_show (button);
 
1418
 
 
1419
  button = gimp_zoom_button_new (model, GIMP_ZOOM_OUT, GTK_ICON_SIZE_MENU);
 
1420
  gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
 
1421
  gtk_widget_show (button);
 
1422
 
 
1423
  g_signal_connect (model, "zoomed",
 
1424
                    G_CALLBACK (zoomed_callback),
 
1425
                    NULL);
1454
1426
 
1455
1427
  toggle = gtk_check_button_new_with_mnemonic (_("Show preview _wireframe"));
1456
1428
  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), mapvals.showgrid);
1461
1433
                    G_CALLBACK (togglegrid_update),
1462
1434
                    &mapvals.showgrid);
1463
1435
 
1464
 
  gimp_help_set_help_data (toggle, _("Show/hide preview wireframe"), NULL);
1465
 
 
1466
1436
  create_main_notebook (main_hbox);
1467
1437
 
1468
1438
  /* Endmarkers for line table */