I think the frequency tag in the RX text is most useful if it lets you
get back to interesting points however you change the frequency, and not
just on left click.
Here's a patch which makes the scan up and scan down macros insert the
frequency. It obeys the existing preference for off/on.
I'm using the two-row macros and have set macros for search as "<?" and
"?>".
If others are using macro search I'd be interested to hear if they think
this is a good idea. If we go this way at some point we may want to
change the preference description on the waterfall page, but I haven't
done it here to avoid L10N problems.
Leigh/WA5ZNU
$ for file in `find . -name \*.orig`
do
diff -c2 $file `echo $file | sed -e 's/.orig//'`
done
*** ./misc/macros.cxx.orig 2011-02-11 05:36:00.000000000 -0800
--- ./misc/macros.cxx 2011-02-13 16:30:49.000000000 -0800
***************
*** 911,914 ****
--- 911,916 ----
s.replace( i, 8, "");
active_modem->searchUp();
+ if (progdefaults.WaterfallClickInsert)
+ wf->insert_text(true);
}
***************
*** 917,920 ****
--- 919,924 ----
s.replace( i, 8, "");
active_modem->searchDown();
+ if (progdefaults.WaterfallClickInsert)
+ wf->insert_text(true);
}
*** ./waterfall/waterfall.cxx.orig 2011-02-11 03:58:36.000000000 -0800
--- ./waterfall/waterfall.cxx 2011-02-13 11:20:48.000000000 -0800
***************
*** 1690,1694 ****
}
! static void insert_text(bool check = false)
{
if (check) {
--- 1690,1694 ----
}
! void waterfall::insert_text(bool check = false)
{
if (check) {
***************
*** 1857,1861 ****
else
if (progdefaults.WaterfallClickInsert)
! insert_text(true);
}
else if (Fl::event_state() & (FL_META | FL_ALT))
--- 1857,1861 ----
else
if (progdefaults.WaterfallClickInsert)
! wf->insert_text(true);
}
else if (Fl::event_state() & (FL_META | FL_ALT))
*** ./include/waterfall.h.orig 2011-02-11 03:58:36.000000000 -0800
--- ./include/waterfall.h 2011-02-13 11:21:04.000000000 -0800
***************
*** 350,353 ****
--- 350,355 ----
int handle(int event);
+ void insert_text(bool check);
+
enum { WF_NOP, WF_AFC_BW, WF_SIGNAL_SEARCH, WF_SQUELCH,
WF_CARRIER, WF_MODEM, WF_SCROLL };
_______________________________________________
fldigi-alpha mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/fldigi-alpha
