1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739
|
## Description: resizes and repositions widgets after GTK2 changes.
## Origin/Author: Norvald H. Ryeng
## Bug: https://bugs.launchpad.net/ubuntu/+source/predict/+bug/555706
--- a/clients/gsat-1.1.0/src/interface.c
+++ b/clients/gsat-1.1.0/src/interface.c
@@ -18,6 +18,15 @@
#include "interface.h"
#include "support.h"
+void set_font (GtkWidget *widget, gpointer data)
+{
+ PangoFontDescription *font = (PangoFontDescription *) data;
+ if (GTK_IS_WIDGET (widget))
+ gtk_widget_modify_font (widget, font);
+ if (GTK_IS_CONTAINER (widget))
+ gtk_container_forall(GTK_CONTAINER (widget), &set_font, data);
+}
+
GtkWidget*
create_mainwindow (void)
{
@@ -94,6 +103,7 @@
GtkWidget *lb_velocity;
GtkWidget *lb_ma;
GtkWidget *lb_squint;
+ PangoFontDescription *font_desc;
mainwindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_widget_set_name (mainwindow, "mainwindow");
@@ -331,8 +341,8 @@
gtk_object_set_data_full (GTK_OBJECT (mainwindow), "drawingframe", drawingframe,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (drawingframe);
- gtk_fixed_put (GTK_FIXED (fixed), drawingframe, 0, 24);
- gtk_widget_set_uposition (drawingframe, 0, 24);
+ gtk_fixed_put (GTK_FIXED (fixed), drawingframe, 0, 30);
+ gtk_widget_set_uposition (drawingframe, 0, 30);
gtk_widget_set_usize (drawingframe, 704, 354);
gtk_container_set_border_width (GTK_CONTAINER (drawingframe), 2);
gtk_frame_set_shadow_type (GTK_FRAME (drawingframe), GTK_SHADOW_ETCHED_OUT);
@@ -349,14 +359,15 @@
/* toolbar = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_TEXT); */
toolbar = gtk_toolbar_new ();
+ gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_TEXT);
gtk_widget_set_name (toolbar, "toolbar");
gtk_widget_ref (toolbar);
gtk_object_set_data_full (GTK_OBJECT (mainwindow), "toolbar", toolbar,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (toolbar);
- gtk_fixed_put (GTK_FIXED (fixed), toolbar, 0, 0);
- gtk_widget_set_uposition (toolbar, 0, 0);
- gtk_widget_set_usize (toolbar, 696, 24);
+ gtk_fixed_put (GTK_FIXED (fixed), toolbar, -12, -12);
+ gtk_widget_set_uposition (toolbar, -12, -12);
+ gtk_widget_set_usize (toolbar, 720, 48);
gtk_container_set_border_width (GTK_CONTAINER (toolbar), 5);
/* gtk_toolbar_set_space_size (GTK_TOOLBAR (toolbar), 10); */
/* gtk_toolbar_set_space_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_SPACE_LINE); */
@@ -568,8 +579,8 @@
gtk_object_set_data_full (GTK_OBJECT (mainwindow), "lb_downlink", lb_downlink,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (lb_downlink);
- gtk_fixed_put (GTK_FIXED (fixed), lb_downlink, 8, 500);
- gtk_widget_set_uposition (lb_downlink, 8, 500);
+ gtk_fixed_put (GTK_FIXED (fixed), lb_downlink, 4, 500);
+ gtk_widget_set_uposition (lb_downlink, 4, 500);
gtk_widget_set_usize (lb_downlink, 0, 0);
lb_beacon = gtk_label_new (_("Beacon Frequency"));
@@ -578,8 +589,8 @@
gtk_object_set_data_full (GTK_OBJECT (mainwindow), "lb_beacon", lb_beacon,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (lb_beacon);
- gtk_fixed_put (GTK_FIXED (fixed), lb_beacon, 8, 524);
- gtk_widget_set_uposition (lb_beacon, 8, 524);
+ gtk_fixed_put (GTK_FIXED (fixed), lb_beacon, 4, 524);
+ gtk_widget_set_uposition (lb_beacon, 4, 524);
gtk_widget_set_usize (lb_beacon, 0, 0);
lb_satellite = gtk_label_new (_("Satellite"));
@@ -588,8 +599,8 @@
gtk_object_set_data_full (GTK_OBJECT (mainwindow), "lb_satellite", lb_satellite,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (lb_satellite);
- gtk_fixed_put (GTK_FIXED (fixed), lb_satellite, 8, 388);
- gtk_widget_set_uposition (lb_satellite, 8, 388);
+ gtk_fixed_put (GTK_FIXED (fixed), lb_satellite, 4, 388);
+ gtk_widget_set_uposition (lb_satellite, 4, 388);
gtk_widget_set_usize (lb_satellite, 0, 0);
lb_uplink = gtk_label_new (_("Uplink Frequency"));
@@ -598,8 +609,8 @@
gtk_object_set_data_full (GTK_OBJECT (mainwindow), "lb_uplink", lb_uplink,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (lb_uplink);
- gtk_fixed_put (GTK_FIXED (fixed), lb_uplink, 8, 476);
- gtk_widget_set_uposition (lb_uplink, 8, 476);
+ gtk_fixed_put (GTK_FIXED (fixed), lb_uplink, 4, 476);
+ gtk_widget_set_uposition (lb_uplink, 4, 476);
gtk_widget_set_usize (lb_uplink, 0, 0);
lb_latitude = gtk_label_new (_("Latitude"));
@@ -608,8 +619,8 @@
gtk_object_set_data_full (GTK_OBJECT (mainwindow), "lb_latitude", lb_latitude,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (lb_latitude);
- gtk_fixed_put (GTK_FIXED (fixed), lb_latitude, 8, 416);
- gtk_widget_set_uposition (lb_latitude, 8, 416);
+ gtk_fixed_put (GTK_FIXED (fixed), lb_latitude, 4, 416);
+ gtk_widget_set_uposition (lb_latitude, 4, 416);
gtk_widget_set_usize (lb_latitude, 0, 0);
lb_longitude = gtk_label_new (_("Longitude"));
@@ -618,8 +629,8 @@
gtk_object_set_data_full (GTK_OBJECT (mainwindow), "lb_longitude", lb_longitude,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (lb_longitude);
- gtk_fixed_put (GTK_FIXED (fixed), lb_longitude, 8, 444);
- gtk_widget_set_uposition (lb_longitude, 8, 444);
+ gtk_fixed_put (GTK_FIXED (fixed), lb_longitude, 4, 444);
+ gtk_widget_set_uposition (lb_longitude, 4, 444);
gtk_widget_set_usize (lb_longitude, 0, 0);
lb_orbit = gtk_label_new (_("Orbit"));
@@ -955,6 +966,13 @@
gtk_widget_grab_focus (combo_tx_satname);
gtk_widget_grab_default (combo_tx_satname);
+
+ font_desc = gtk_widget_get_style (mainwindow)->font_desc;
+ pango_font_description_set_absolute_size (font_desc, 10 * PANGO_SCALE);
+ set_font (mainwindow, font_desc);
+ pango_font_description_set_absolute_size (font_desc, 9 * PANGO_SCALE);
+ set_font (toolbar, font_desc);
+
return mainwindow;
}
@@ -1071,8 +1089,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "tx_downpluginconfig", tx_downpluginconfig,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (tx_downpluginconfig);
- gtk_fixed_put (GTK_FIXED (fixed3), tx_downpluginconfig, 104, 40);
- gtk_widget_set_uposition (tx_downpluginconfig, 104, 40);
+ gtk_fixed_put (GTK_FIXED (fixed3), tx_downpluginconfig, 420, 70);
+ gtk_widget_set_uposition (tx_downpluginconfig, 420, 70);
gtk_widget_set_usize (tx_downpluginconfig, 160, 24);
tx_uppluginconfig = gtk_entry_new ();
@@ -1081,8 +1099,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "tx_uppluginconfig", tx_uppluginconfig,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (tx_uppluginconfig);
- gtk_fixed_put (GTK_FIXED (fixed3), tx_uppluginconfig, 104, 112);
- gtk_widget_set_uposition (tx_uppluginconfig, 104, 112);
+ gtk_fixed_put (GTK_FIXED (fixed3), tx_uppluginconfig, 420, 142);
+ gtk_widget_set_uposition (tx_uppluginconfig, 420, 142);
gtk_widget_set_usize (tx_uppluginconfig, 160, 24);
tx_beaconpluginconfig = gtk_entry_new ();
@@ -1091,8 +1109,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "tx_beaconpluginconfig", tx_beaconpluginconfig,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (tx_beaconpluginconfig);
- gtk_fixed_put (GTK_FIXED (fixed3), tx_beaconpluginconfig, 104, 184);
- gtk_widget_set_uposition (tx_beaconpluginconfig, 104, 184);
+ gtk_fixed_put (GTK_FIXED (fixed3), tx_beaconpluginconfig, 420, 214);
+ gtk_widget_set_uposition (tx_beaconpluginconfig, 420, 214);
gtk_widget_set_usize (tx_beaconpluginconfig, 160, 24);
lb_prefs_upconfig = gtk_label_new (_("Plugin Config"));
@@ -1101,8 +1119,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_upconfig", lb_prefs_upconfig,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (lb_prefs_upconfig);
- gtk_fixed_put (GTK_FIXED (fixed3), lb_prefs_upconfig, 0, 112);
- gtk_widget_set_uposition (lb_prefs_upconfig, 0, 112);
+ gtk_fixed_put (GTK_FIXED (fixed3), lb_prefs_upconfig, 310, 142);
+ gtk_widget_set_uposition (lb_prefs_upconfig, 310, 142);
gtk_widget_set_usize (lb_prefs_upconfig, 96, 24);
lb_prefs_beacon = gtk_label_new (_("Beacon plugin"));
@@ -1111,8 +1129,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_beacon", lb_prefs_beacon,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (lb_prefs_beacon);
- gtk_fixed_put (GTK_FIXED (fixed3), lb_prefs_beacon, 0, 152);
- gtk_widget_set_uposition (lb_prefs_beacon, 0, 152);
+ gtk_fixed_put (GTK_FIXED (fixed3), lb_prefs_beacon, 310, 182);
+ gtk_widget_set_uposition (lb_prefs_beacon, 310, 182);
gtk_widget_set_usize (lb_prefs_beacon, 96, 24);
lb_prefs_beaconconfig = gtk_label_new (_("Plugin Config"));
@@ -1121,8 +1139,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_beaconconfig", lb_prefs_beaconconfig,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (lb_prefs_beaconconfig);
- gtk_fixed_put (GTK_FIXED (fixed3), lb_prefs_beaconconfig, 0, 184);
- gtk_widget_set_uposition (lb_prefs_beaconconfig, 0, 184);
+ gtk_fixed_put (GTK_FIXED (fixed3), lb_prefs_beaconconfig, 310, 214);
+ gtk_widget_set_uposition (lb_prefs_beaconconfig, 310, 214);
gtk_widget_set_usize (lb_prefs_beaconconfig, 96, 24);
combo_downplugin = gtk_combo_new ();
@@ -1131,8 +1149,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "combo_downplugin", combo_downplugin,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (combo_downplugin);
- gtk_fixed_put (GTK_FIXED (fixed3), combo_downplugin, 104, 8);
- gtk_widget_set_uposition (combo_downplugin, 104, 8);
+ gtk_fixed_put (GTK_FIXED (fixed3), combo_downplugin, 420, 38);
+ gtk_widget_set_uposition (combo_downplugin, 420, 38);
gtk_widget_set_usize (combo_downplugin, 160, 24);
entry_downplugin = GTK_COMBO (combo_downplugin)->entry;
@@ -1149,8 +1167,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "combo_beaconplugin", combo_beaconplugin,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (combo_beaconplugin);
- gtk_fixed_put (GTK_FIXED (fixed3), combo_beaconplugin, 104, 152);
- gtk_widget_set_uposition (combo_beaconplugin, 104, 152);
+ gtk_fixed_put (GTK_FIXED (fixed3), combo_beaconplugin, 420, 182);
+ gtk_widget_set_uposition (combo_beaconplugin, 420, 182);
gtk_widget_set_usize (combo_beaconplugin, 160, 24);
entry_beaconplugin = GTK_COMBO (combo_beaconplugin)->entry;
@@ -1167,9 +1185,9 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_downlink", lb_prefs_downlink,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (lb_prefs_downlink);
- gtk_fixed_put (GTK_FIXED (fixed3), lb_prefs_downlink, 0, 8);
- gtk_widget_set_uposition (lb_prefs_downlink, 0, 8);
- gtk_widget_set_usize (lb_prefs_downlink, 96, 24);
+ gtk_fixed_put (GTK_FIXED (fixed3), lb_prefs_downlink, 310, 38);
+ gtk_widget_set_uposition (lb_prefs_downlink, 310, 38);
+ gtk_widget_set_usize (lb_prefs_downlink, 106, 24);
lb_prefs_downconfig = gtk_label_new (_("Plugin Config"));
gtk_widget_set_name (lb_prefs_downconfig, "lb_prefs_downconfig");
@@ -1177,8 +1195,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_downconfig", lb_prefs_downconfig,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (lb_prefs_downconfig);
- gtk_fixed_put (GTK_FIXED (fixed3), lb_prefs_downconfig, 0, 40);
- gtk_widget_set_uposition (lb_prefs_downconfig, 0, 40);
+ gtk_fixed_put (GTK_FIXED (fixed3), lb_prefs_downconfig, 310, 70);
+ gtk_widget_set_uposition (lb_prefs_downconfig, 310, 70);
gtk_widget_set_usize (lb_prefs_downconfig, 96, 24);
lb_prefs_uplink = gtk_label_new (_("Uplink plugin"));
@@ -1187,8 +1205,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_uplink", lb_prefs_uplink,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (lb_prefs_uplink);
- gtk_fixed_put (GTK_FIXED (fixed3), lb_prefs_uplink, 0, 80);
- gtk_widget_set_uposition (lb_prefs_uplink, 0, 80);
+ gtk_fixed_put (GTK_FIXED (fixed3), lb_prefs_uplink, 310, 110);
+ gtk_widget_set_uposition (lb_prefs_uplink, 310, 110);
gtk_widget_set_usize (lb_prefs_uplink, 96, 24);
combo_upplugin = gtk_combo_new ();
@@ -1197,8 +1215,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "combo_upplugin", combo_upplugin,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (combo_upplugin);
- gtk_fixed_put (GTK_FIXED (fixed3), combo_upplugin, 104, 80);
- gtk_widget_set_uposition (combo_upplugin, 104, 80);
+ gtk_fixed_put (GTK_FIXED (fixed3), combo_upplugin, 420, 110);
+ gtk_widget_set_uposition (combo_upplugin, 420, 110);
gtk_widget_set_usize (combo_upplugin, 160, 24);
entry_upplugin = GTK_COMBO (combo_upplugin)->entry;
@@ -1234,8 +1252,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "tx_rotorpluginconfig", tx_rotorpluginconfig,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (tx_rotorpluginconfig);
- gtk_fixed_put (GTK_FIXED (fixed8), tx_rotorpluginconfig, 96, 40);
- gtk_widget_set_uposition (tx_rotorpluginconfig, 96, 40);
+ gtk_fixed_put (GTK_FIXED (fixed8), tx_rotorpluginconfig, 420, 310);
+ gtk_widget_set_uposition (tx_rotorpluginconfig, 420, 310);
gtk_widget_set_usize (tx_rotorpluginconfig, 160, 24);
lb_prefs_rotor = gtk_label_new (_("Rotor plugin"));
@@ -1244,8 +1262,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_rotor", lb_prefs_rotor,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (lb_prefs_rotor);
- gtk_fixed_put (GTK_FIXED (fixed8), lb_prefs_rotor, 0, 8);
- gtk_widget_set_uposition (lb_prefs_rotor, 0, 8);
+ gtk_fixed_put (GTK_FIXED (fixed8), lb_prefs_rotor, 310, 278);
+ gtk_widget_set_uposition (lb_prefs_rotor, 310, 278);
gtk_widget_set_usize (lb_prefs_rotor, 96, 24);
lb_prefs_rotorpluginconfig = gtk_label_new (_("Plugin Config"));
@@ -1254,8 +1272,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_rotorpluginconfig", lb_prefs_rotorpluginconfig,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (lb_prefs_rotorpluginconfig);
- gtk_fixed_put (GTK_FIXED (fixed8), lb_prefs_rotorpluginconfig, 0, 40);
- gtk_widget_set_uposition (lb_prefs_rotorpluginconfig, 0, 40);
+ gtk_fixed_put (GTK_FIXED (fixed8), lb_prefs_rotorpluginconfig, 310, 310);
+ gtk_widget_set_uposition (lb_prefs_rotorpluginconfig, 310, 310);
gtk_widget_set_usize (lb_prefs_rotorpluginconfig, 96, 24);
combo_rotorplugin = gtk_combo_new ();
@@ -1264,8 +1282,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "combo_rotorplugin", combo_rotorplugin,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (combo_rotorplugin);
- gtk_fixed_put (GTK_FIXED (fixed8), combo_rotorplugin, 96, 8);
- gtk_widget_set_uposition (combo_rotorplugin, 96, 8);
+ gtk_fixed_put (GTK_FIXED (fixed8), combo_rotorplugin, 420, 278);
+ gtk_widget_set_uposition (combo_rotorplugin, 420, 278);
gtk_widget_set_usize (combo_rotorplugin, 160, 24);
entry_rotorplugin = GTK_COMBO (combo_rotorplugin)->entry;
@@ -1301,8 +1319,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "tx_aoscommand", tx_aoscommand,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (tx_aoscommand);
- gtk_fixed_put (GTK_FIXED (fixed2), tx_aoscommand, 104, 216);
- gtk_widget_set_uposition (tx_aoscommand, 104, 216);
+ gtk_fixed_put (GTK_FIXED (fixed2), tx_aoscommand, 126, 278);
+ gtk_widget_set_uposition (tx_aoscommand, 126, 278);
gtk_widget_set_usize (tx_aoscommand, 160, 24);
tx_loscommand = gtk_entry_new ();
@@ -1311,8 +1329,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "tx_loscommand", tx_loscommand,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (tx_loscommand);
- gtk_fixed_put (GTK_FIXED (fixed2), tx_loscommand, 104, 264);
- gtk_widget_set_uposition (tx_loscommand, 104, 264);
+ gtk_fixed_put (GTK_FIXED (fixed2), tx_loscommand, 126, 310);
+ gtk_widget_set_uposition (tx_loscommand, 126, 310);
gtk_widget_set_usize (tx_loscommand, 160, 24);
lb_prefs_time = gtk_label_new (_("Time format"));
@@ -1321,9 +1339,9 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_time", lb_prefs_time,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (lb_prefs_time);
- gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_time, 8, 48);
- gtk_widget_set_uposition (lb_prefs_time, 8, 48);
- gtk_widget_set_usize (lb_prefs_time, 88, 24);
+ gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_time, 16, 70);
+ gtk_widget_set_uposition (lb_prefs_time, 16, 70);
+ gtk_widget_set_usize (lb_prefs_time, 84, 24);
rd_prefs_local = gtk_radio_button_new_with_label (timeprefs_group, _("Local time"));
timeprefs_group = gtk_radio_button_group (GTK_RADIO_BUTTON (rd_prefs_local));
@@ -1332,9 +1350,9 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "rd_prefs_local", rd_prefs_local,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (rd_prefs_local);
- gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_local, 104, 48);
- gtk_widget_set_uposition (rd_prefs_local, 104, 48);
- gtk_widget_set_usize (rd_prefs_local, 64, 24);
+ gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_local, 146, 70);
+ gtk_widget_set_uposition (rd_prefs_local, 146, 70);
+ gtk_widget_set_usize (rd_prefs_local, 94, 24);
rd_prefs_utc = gtk_radio_button_new_with_label (timeprefs_group, _("UTC time"));
timeprefs_group = gtk_radio_button_group (GTK_RADIO_BUTTON (rd_prefs_utc));
@@ -1343,9 +1361,9 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "rd_prefs_utc", rd_prefs_utc,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (rd_prefs_utc);
- gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_utc, 176, 48);
- gtk_widget_set_uposition (rd_prefs_utc, 176, 48);
- gtk_widget_set_usize (rd_prefs_utc, 64, 24);
+ gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_utc, 146, 90);
+ gtk_widget_set_uposition (rd_prefs_utc, 146, 90);
+ gtk_widget_set_usize (rd_prefs_utc, 94, 24);
lb_prefs_grid = gtk_label_new (_("Map grid"));
gtk_widget_set_name (lb_prefs_grid, "lb_prefs_grid");
@@ -1353,9 +1371,9 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_grid", lb_prefs_grid,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (lb_prefs_grid);
- gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_grid, 8, 16);
- gtk_widget_set_uposition (lb_prefs_grid, 8, 16);
- gtk_widget_set_usize (lb_prefs_grid, 88, 24);
+ gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_grid, 16, 38);
+ gtk_widget_set_uposition (lb_prefs_grid, 16, 38);
+ gtk_widget_set_usize (lb_prefs_grid, 58, 24);
rd_prefs_gridon = gtk_radio_button_new_with_label (gridprefs_group, _("On"));
gridprefs_group = gtk_radio_button_group (GTK_RADIO_BUTTON (rd_prefs_gridon));
@@ -1364,8 +1382,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "rd_prefs_gridon", rd_prefs_gridon,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (rd_prefs_gridon);
- gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_gridon, 104, 16);
- gtk_widget_set_uposition (rd_prefs_gridon, 104, 16);
+ gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_gridon, 146, 38);
+ gtk_widget_set_uposition (rd_prefs_gridon, 146, 38);
gtk_widget_set_usize (rd_prefs_gridon, 48, 24);
rd_prefs_gridoff = gtk_radio_button_new_with_label (gridprefs_group, _("Off"));
@@ -1375,8 +1393,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "rd_prefs_gridoff", rd_prefs_gridoff,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (rd_prefs_gridoff);
- gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_gridoff, 152, 16);
- gtk_widget_set_uposition (rd_prefs_gridoff, 152, 16);
+ gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_gridoff, 194, 38);
+ gtk_widget_set_uposition (rd_prefs_gridoff, 194, 38);
gtk_widget_set_usize (rd_prefs_gridoff, 48, 24);
lb_prefs_fpsat = gtk_label_new (_("Satellite footprint"));
@@ -1385,9 +1403,9 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_fpsat", lb_prefs_fpsat,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (lb_prefs_fpsat);
- gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_fpsat, 8, 80);
- gtk_widget_set_uposition (lb_prefs_fpsat, 8, 80);
- gtk_widget_set_usize (lb_prefs_fpsat, 88, 24);
+ gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_fpsat, 16, 122);
+ gtk_widget_set_uposition (lb_prefs_fpsat, 16, 122);
+ gtk_widget_set_usize (lb_prefs_fpsat, 114, 24);
rd_prefs_fpsaton = gtk_radio_button_new_with_label (fpsatprefs_group, _("On"));
fpsatprefs_group = gtk_radio_button_group (GTK_RADIO_BUTTON (rd_prefs_fpsaton));
@@ -1396,8 +1414,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "rd_prefs_fpsaton", rd_prefs_fpsaton,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (rd_prefs_fpsaton);
- gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_fpsaton, 104, 80);
- gtk_widget_set_uposition (rd_prefs_fpsaton, 104, 80);
+ gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_fpsaton, 146, 122);
+ gtk_widget_set_uposition (rd_prefs_fpsaton, 146, 122);
gtk_widget_set_usize (rd_prefs_fpsaton, 48, 24);
rd_prefs_fpsatoff = gtk_radio_button_new_with_label (fpsatprefs_group, _("Off"));
@@ -1407,8 +1425,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "rd_prefs_fpsatoff", rd_prefs_fpsatoff,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (rd_prefs_fpsatoff);
- gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_fpsatoff, 152, 80);
- gtk_widget_set_uposition (rd_prefs_fpsatoff, 152, 80);
+ gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_fpsatoff, 194, 122);
+ gtk_widget_set_uposition (rd_prefs_fpsatoff, 194, 122);
gtk_widget_set_usize (rd_prefs_fpsatoff, 48, 24);
lb_prefs_fpqth = gtk_label_new (_("Station footprint"));
@@ -1417,9 +1435,9 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_fpqth", lb_prefs_fpqth,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (lb_prefs_fpqth);
- gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_fpqth, 8, 112);
- gtk_widget_set_uposition (lb_prefs_fpqth, 8, 112);
- gtk_widget_set_usize (lb_prefs_fpqth, 88, 24);
+ gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_fpqth, 16, 154);
+ gtk_widget_set_uposition (lb_prefs_fpqth, 16, 154);
+ gtk_widget_set_usize (lb_prefs_fpqth, 108, 24);
rd_prefs_fpqthon = gtk_radio_button_new_with_label (fpqthprefs_group, _("On"));
fpqthprefs_group = gtk_radio_button_group (GTK_RADIO_BUTTON (rd_prefs_fpqthon));
@@ -1428,8 +1446,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "rd_prefs_fpqthon", rd_prefs_fpqthon,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (rd_prefs_fpqthon);
- gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_fpqthon, 104, 112);
- gtk_widget_set_uposition (rd_prefs_fpqthon, 104, 112);
+ gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_fpqthon, 146, 154);
+ gtk_widget_set_uposition (rd_prefs_fpqthon, 146, 154);
gtk_widget_set_usize (rd_prefs_fpqthon, 48, 24);
rd_prefs_fpqthoff = gtk_radio_button_new_with_label (fpqthprefs_group, _("Off"));
@@ -1439,8 +1457,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "rd_prefs_fpqthoff", rd_prefs_fpqthoff,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (rd_prefs_fpqthoff);
- gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_fpqthoff, 152, 112);
- gtk_widget_set_uposition (rd_prefs_fpqthoff, 152, 112);
+ gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_fpqthoff, 194, 154);
+ gtk_widget_set_uposition (rd_prefs_fpqthoff, 194, 154);
gtk_widget_set_usize (rd_prefs_fpqthoff, 48, 24);
lb_prefs_track = gtk_label_new (_("Ground Track"));
@@ -1449,8 +1467,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_track", lb_prefs_track,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (lb_prefs_track);
- gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_track, 8, 144);
- gtk_widget_set_uposition (lb_prefs_track, 8, 144);
+ gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_track, 16, 186);
+ gtk_widget_set_uposition (lb_prefs_track, 16, 186);
gtk_widget_set_usize (lb_prefs_track, 88, 24);
rd_prefs_trackon = gtk_radio_button_new_with_label (trackprefs_group, _("On"));
@@ -1460,8 +1478,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "rd_prefs_trackon", rd_prefs_trackon,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (rd_prefs_trackon);
- gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_trackon, 104, 144);
- gtk_widget_set_uposition (rd_prefs_trackon, 104, 144);
+ gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_trackon, 146, 186);
+ gtk_widget_set_uposition (rd_prefs_trackon, 146, 186);
gtk_widget_set_usize (rd_prefs_trackon, 48, 24);
rd_prefs_trackoff = gtk_radio_button_new_with_label (trackprefs_group, _("Off"));
@@ -1471,8 +1489,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "rd_prefs_trackoff", rd_prefs_trackoff,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (rd_prefs_trackoff);
- gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_trackoff, 152, 144);
- gtk_widget_set_uposition (rd_prefs_trackoff, 152, 144);
+ gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_trackoff, 194, 186);
+ gtk_widget_set_uposition (rd_prefs_trackoff, 194, 186);
gtk_widget_set_usize (rd_prefs_trackoff, 48, 24);
lb_prefs_autofreq = gtk_label_new (_("Auto Frequency"));
@@ -1481,9 +1499,9 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_autofreq", lb_prefs_autofreq,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (lb_prefs_autofreq);
- gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_autofreq, 8, 176);
- gtk_widget_set_uposition (lb_prefs_autofreq, 8, 176);
- gtk_widget_set_usize (lb_prefs_autofreq, 88, 24);
+ gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_autofreq, 16, 218);
+ gtk_widget_set_uposition (lb_prefs_autofreq, 16, 218);
+ gtk_widget_set_usize (lb_prefs_autofreq, 108, 24);
rd_prefs_autofreqon = gtk_radio_button_new_with_label (autofreqprefs_group, _("On"));
autofreqprefs_group = gtk_radio_button_group (GTK_RADIO_BUTTON (rd_prefs_autofreqon));
@@ -1492,8 +1510,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "rd_prefs_autofreqon", rd_prefs_autofreqon,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (rd_prefs_autofreqon);
- gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_autofreqon, 104, 176);
- gtk_widget_set_uposition (rd_prefs_autofreqon, 104, 176);
+ gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_autofreqon, 146, 218);
+ gtk_widget_set_uposition (rd_prefs_autofreqon, 146, 218);
gtk_widget_set_usize (rd_prefs_autofreqon, 48, 24);
rd_prefs_autofreqoff = gtk_radio_button_new_with_label (autofreqprefs_group, _("Off"));
@@ -1503,8 +1521,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "rd_prefs_autofreqoff", rd_prefs_autofreqoff,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (rd_prefs_autofreqoff);
- gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_autofreqoff, 152, 176);
- gtk_widget_set_uposition (rd_prefs_autofreqoff, 152, 176);
+ gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_autofreqoff, 194, 218);
+ gtk_widget_set_uposition (rd_prefs_autofreqoff, 194, 218);
gtk_widget_set_usize (rd_prefs_autofreqoff, 48, 24);
lb_prefs_aoscommand = gtk_label_new (_("AOS command"));
@@ -1513,8 +1531,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_aoscommand", lb_prefs_aoscommand,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (lb_prefs_aoscommand);
- gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_aoscommand, 8, 216);
- gtk_widget_set_uposition (lb_prefs_aoscommand, 8, 216);
+ gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_aoscommand, 16, 278);
+ gtk_widget_set_uposition (lb_prefs_aoscommand, 16, 278);
gtk_widget_set_usize (lb_prefs_aoscommand, 96, 24);
lb_prefs_loscommand = gtk_label_new (_("LOS command"));
@@ -1523,8 +1541,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_loscommand", lb_prefs_loscommand,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (lb_prefs_loscommand);
- gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_loscommand, 8, 264);
- gtk_widget_set_uposition (lb_prefs_loscommand, 8, 264);
+ gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_loscommand, 16, 310);
+ gtk_widget_set_uposition (lb_prefs_loscommand, 16, 310);
gtk_widget_set_usize (lb_prefs_loscommand, 96, 24);
dialog_action_area1 = GTK_DIALOG (dialog_preferences)->action_area;
@@ -1817,8 +1835,7 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_azel_graph), "tx_azel_sat", tx_azel_sat,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (tx_azel_sat);
- gtk_fixed_put (GTK_FIXED (fixed7), tx_azel_sat, 96, 8);
- gtk_widget_set_uposition (tx_azel_sat, 96, 8);
+ gtk_fixed_put (GTK_FIXED (fixed7), tx_azel_sat, 112, 8);
gtk_widget_set_usize (tx_azel_sat, 80, 16);
gtk_entry_set_editable (GTK_ENTRY (tx_azel_sat), FALSE);
@@ -1829,7 +1846,6 @@
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (tx_azel_azimuth);
gtk_fixed_put (GTK_FIXED (fixed7), tx_azel_azimuth, 64, 32);
- gtk_widget_set_uposition (tx_azel_azimuth, 64, 32);
gtk_widget_set_usize (tx_azel_azimuth, 48, 16);
GTK_WIDGET_UNSET_FLAGS (tx_azel_azimuth, GTK_CAN_FOCUS);
gtk_entry_set_editable (GTK_ENTRY (tx_azel_azimuth), FALSE);
@@ -1840,8 +1856,7 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_azel_graph), "tx_azel_elevation", tx_azel_elevation,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (tx_azel_elevation);
- gtk_fixed_put (GTK_FIXED (fixed7), tx_azel_elevation, 184, 32);
- gtk_widget_set_uposition (tx_azel_elevation, 184, 32);
+ gtk_fixed_put (GTK_FIXED (fixed7), tx_azel_elevation, 200, 32);
gtk_widget_set_usize (tx_azel_elevation, 48, 16);
GTK_WIDGET_UNSET_FLAGS (tx_azel_elevation, GTK_CAN_FOCUS);
gtk_entry_set_editable (GTK_ENTRY (tx_azel_elevation), FALSE);
@@ -1852,9 +1867,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_azel_graph), "lb_azel_sat", lb_azel_sat,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (lb_azel_sat);
- gtk_fixed_put (GTK_FIXED (fixed7), lb_azel_sat, 48, 8);
- gtk_widget_set_uposition (lb_azel_sat, 48, 8);
- gtk_widget_set_usize (lb_azel_sat, 48, 16);
+ gtk_fixed_put (GTK_FIXED (fixed7), lb_azel_sat, 38, 8);
+ gtk_widget_set_usize (lb_azel_sat, 58, 16);
lb_azel_elevation = gtk_label_new (_("Elevation"));
gtk_widget_set_name (lb_azel_elevation, "lb_azel_elevation");
@@ -1863,8 +1877,7 @@
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (lb_azel_elevation);
gtk_fixed_put (GTK_FIXED (fixed7), lb_azel_elevation, 128, 32);
- gtk_widget_set_uposition (lb_azel_elevation, 128, 32);
- gtk_widget_set_usize (lb_azel_elevation, 48, 16);
+ gtk_widget_set_usize (lb_azel_elevation, 64, 16);
lb_azel_azimuth = gtk_label_new (_("Azimuth"));
gtk_widget_set_name (lb_azel_azimuth, "lb_azel_azimuth");
@@ -1872,9 +1885,8 @@
gtk_object_set_data_full (GTK_OBJECT (dialog_azel_graph), "lb_azel_azimuth", lb_azel_azimuth,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (lb_azel_azimuth);
- gtk_fixed_put (GTK_FIXED (fixed7), lb_azel_azimuth, 16, 32);
- gtk_widget_set_uposition (lb_azel_azimuth, 16, 32);
- gtk_widget_set_usize (lb_azel_azimuth, 40, 16);
+ gtk_fixed_put (GTK_FIXED (fixed7), lb_azel_azimuth, 0, 32);
+ gtk_widget_set_usize (lb_azel_azimuth, 58, 16);
gtk_signal_connect (GTK_OBJECT (dialog_azel_graph), "delete_event",
GTK_SIGNAL_FUNC (on_dialog_azel_graph_delete_event),
@@ -2020,7 +2032,6 @@
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (tx_dbsat);
gtk_fixed_put (GTK_FIXED (fixed10), tx_dbsat, 8, 24);
- gtk_widget_set_uposition (tx_dbsat, 8, 24);
gtk_widget_set_usize (tx_dbsat, 80, 20);
tx_dbuplink = gtk_entry_new ();
@@ -2030,7 +2041,6 @@
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (tx_dbuplink);
gtk_fixed_put (GTK_FIXED (fixed10), tx_dbuplink, 144, 24);
- gtk_widget_set_uposition (tx_dbuplink, 144, 24);
gtk_widget_set_usize (tx_dbuplink, 76, 20);
tx_dbdownlink = gtk_entry_new ();
@@ -2040,7 +2050,6 @@
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (tx_dbdownlink);
gtk_fixed_put (GTK_FIXED (fixed10), tx_dbdownlink, 228, 24);
- gtk_widget_set_uposition (tx_dbdownlink, 228, 24);
gtk_widget_set_usize (tx_dbdownlink, 76, 20);
tx_dbbeacon = gtk_entry_new ();
@@ -2050,7 +2059,6 @@
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (tx_dbbeacon);
gtk_fixed_put (GTK_FIXED (fixed10), tx_dbbeacon, 312, 24);
- gtk_widget_set_uposition (tx_dbbeacon, 312, 24);
gtk_widget_set_usize (tx_dbbeacon, 76, 20);
bt_dbadd = gtk_button_new_with_label (_("Add"));
@@ -2060,7 +2068,6 @@
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (bt_dbadd);
gtk_fixed_put (GTK_FIXED (fixed10), bt_dbadd, 16, 56);
- gtk_widget_set_uposition (bt_dbadd, 16, 56);
gtk_widget_set_usize (bt_dbadd, 64, 24);
bt_dbupdate = gtk_button_new_with_label (_("Update"));
@@ -2070,7 +2077,6 @@
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (bt_dbupdate);
gtk_fixed_put (GTK_FIXED (fixed10), bt_dbupdate, 167, 56);
- gtk_widget_set_uposition (bt_dbupdate, 167, 56);
gtk_widget_set_usize (bt_dbupdate, 64, 24);
bt_dbdelete = gtk_button_new_with_label (_("Delete"));
@@ -2080,7 +2086,6 @@
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (bt_dbdelete);
gtk_fixed_put (GTK_FIXED (fixed10), bt_dbdelete, 317, 56);
- gtk_widget_set_uposition (bt_dbdelete, 317, 56);
gtk_widget_set_usize (bt_dbdelete, 64, 24);
lb_dbsat = gtk_label_new (_("Satellite"));
@@ -2090,7 +2095,6 @@
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (lb_dbsat);
gtk_fixed_put (GTK_FIXED (fixed10), lb_dbsat, 8, 6);
- gtk_widget_set_uposition (lb_dbsat, 8, 6);
gtk_widget_set_usize (lb_dbsat, 80, 16);
lb_dbmode = gtk_label_new (_("Mode"));
@@ -2100,7 +2104,6 @@
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (lb_dbmode);
gtk_fixed_put (GTK_FIXED (fixed10), lb_dbmode, 96, 6);
- gtk_widget_set_uposition (lb_dbmode, 96, 6);
gtk_widget_set_usize (lb_dbmode, 40, 16);
tx_dbmode = gtk_entry_new ();
@@ -2110,7 +2113,6 @@
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (tx_dbmode);
gtk_fixed_put (GTK_FIXED (fixed10), tx_dbmode, 96, 24);
- gtk_widget_set_uposition (tx_dbmode, 96, 24);
gtk_widget_set_usize (tx_dbmode, 40, 20);
lb_dbuplink = gtk_label_new (_("Uplink"));
@@ -2120,7 +2122,6 @@
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (lb_dbuplink);
gtk_fixed_put (GTK_FIXED (fixed10), lb_dbuplink, 144, 6);
- gtk_widget_set_uposition (lb_dbuplink, 144, 6);
gtk_widget_set_usize (lb_dbuplink, 76, 16);
lb_dbdownlink = gtk_label_new (_("Downlink"));
@@ -2130,7 +2131,6 @@
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (lb_dbdownlink);
gtk_fixed_put (GTK_FIXED (fixed10), lb_dbdownlink, 228, 6);
- gtk_widget_set_uposition (lb_dbdownlink, 228, 6);
gtk_widget_set_usize (lb_dbdownlink, 76, 16);
lb_dbbeacon = gtk_label_new (_("Beacon"));
@@ -2140,7 +2140,6 @@
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (lb_dbbeacon);
gtk_fixed_put (GTK_FIXED (fixed10), lb_dbbeacon, 312, 6);
- gtk_widget_set_uposition (lb_dbbeacon, 312, 6);
gtk_widget_set_usize (lb_dbbeacon, 76, 16);
gtk_signal_connect (GTK_OBJECT (dialog_dbedit), "delete_event",
|