Ubuntu
predict package

Merge lp:~ciemon/ubuntu/lucid/predict/4-fixes into lp:ubuntu/lucid/predict

  1. Lucid (10.04)
  2. 4-fixes
  3. Merge into lucid
Proposed by Ciemon Dunville
Status: Merged
Merged at revision: not available
Proposed branch: lp:~ciemon/ubuntu/lucid/predict/4-fixes
Merge into: lp:ubuntu/lucid/predict
Diff against target: 806 lines (+781/-0)
4 files modified
debian/changelog (+11/-0)
debian/patches/141_buffer_overflow.diff (+28/-0)
debian/patches/180_reworked_gui.diff (+739/-0)
debian/patches/series (+3/-0)
To merge this branch: bzr merge lp:~ciemon/ubuntu/lucid/predict/4-fixes
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+23223@code.launchpad.net

Description of the change

This branch has 5 patches included:

552568 - adds support for hamlib's rotctld rotator control daemon.
553106 - adds control for gsat and all radios and rotators supported by hamlib.
553140 - fixes buffer overflow in predict-g1yyh
555706 - resizes and repositions the widgets after gtk2 update broke them.

Packages for testing are available in my PPA
https://launchpad.net/~ciemon/+archive/ciemon/+sourcepub/1075094/+listing-archive-extra

To post a comment you must log in.
lp:~ciemon/ubuntu/lucid/predict/4-fixes updated
12. By Ciemon Dunville

Removed patches 150_rotctld.diff 160_rotctld-g1yyh.diff and 170_gsat_hamlib_plugins.diff due to feature freeze

Preview Diff

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

Subscribers

People subscribed via source and target branches