From 60d3b3d71ab32ddd08dca1df328cd386ee326e3a Mon Sep 17 00:00:00 2001 From: Stelios Bounanos Date: Thu, 10 Jan 2008 18:02:24 +0000 Subject: [PATCH] Upstream version 2.08c --- ChangeLog | 23 ++++++++++++++++-- README | 41 ++++++++++++++++++++------------ configure.ac | 8 +++++-- {icons => data}/fldigi-psk.png | Bin {icons => data}/fldigi-rtty.png | Bin data/fldigi.desktop | 10 ++++++++ {icons => data}/fldigi.xpm | 0 src/Makefile.am | 16 +++++++++---- src/main.cxx | 2 +- src/widgets/FTextView.cxx | 1 + 10 files changed, 76 insertions(+), 25 deletions(-) rename {icons => data}/fldigi-psk.png (100%) rename {icons => data}/fldigi-rtty.png (100%) create mode 100644 data/fldigi.desktop rename {icons => data}/fldigi.xpm (100%) diff --git a/ChangeLog b/ChangeLog index 3fd70e8c..a212d2d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,28 @@ Change Log: 2.08 1) Use PortAudio's C API; the C++ bindings are no longer required - 2) Boost is no longer required when std::(tr1::)bind is available, as is - the case with g++ >= 4.0 + 2) Boost is no longer required when std::(tr1::)bind is available, + as is the case with g++ >= 4.0 3) Autodetect TLS support + 4) Switch to the PortAudio C API (portaudiocpp no longer required). + Improved PortAudio error handling. + 5) Use std::bind (or std::tr1::bind) if available. Boost no longer + needed with g++-4.x, still required with with very old compilers + (g++ 3.x). + 6) qrunner cleanups + 7) Add m4 macros for TLS autodetection (the --enable-tls/--disable-tls + switches are still supported). + 8) New ringbuffer and other utility code + 9) New item in the sample rate menu: "Native" selects the hardware's + preferred sample rate. Breaks backward compatibility: saving this + with fldigi-2.08 will result in an "invalid sample rate" message if + the same fldigi_def.xml file is then used with 2.07 -- until "Auto" + or a specific value is selected again. + 10) Correction to the waterfall's "casual tuning" feature: don't set the + modem to SIGSEARCH when the right mouse button is released. + 11) Set locale only for LC_TIME + 12) Add .desktop, move icons to data/ + 13) Minor changes to configure.ac 2.07 1) bug fix for mode changes via SysV interface (pskmail / flarq) 2) bug fix for modem configuration post quick change from status diff --git a/README b/README index 883248a9..cb51e810 100644 --- a/README +++ b/README @@ -1,18 +1,29 @@ -Fldigi is a software modem program for Amateur Radio use. It is a sound card -based program that both is used for both transmitting and receiving data in any -of the following modes: - -CW speeds from 5 to 200 wpm -DominoEX 4 DominoEX 5 DominoEX 8 DominoEX 11 DominoEX 16 DominoEX 22 -Feld-Hell FSK-Hell FSK-Hell 105 -MFSK-8 MFSK-16 MFSK-16 pix -PSK-31 QPSK-31 PSK-63 QPSK-63 -PSK-125 QPSK-125 PSK-250 QPSK-250 -Throb-1 Throb-2 Throb-4 ThrobX-1 ThrobX-2 ThrobX-4 -OLIVIA various tones and bandwidth -RTTY various Baud Rates, Shifts, Nbr of data bits, etc. -WWV Receive only - calibrate your sound card to WWV -Freq Anal Receive only to measure the frequency of a received carrier +Fldigi is a software modem for Amateur Radio use. It is a sound card based +program that is used for both transmitting and receiving data in any of the +following modes: + +CW speeds from 5 to 200 wpm +DominoEX 4, 5, 8, 11, 16 and 22 +Hellschreiber Feld-Hell, FSK-Hell and FSK-Hell 105 +MFSK 8 and 16; images can be sent and received in MFSK-16 mode +BPSK and QPSK 31, 63, 125, and 250 +Throb and ThrobX 1, 2, and 4 +OLIVIA various tones and bandwidths +RTTY various baud rates, shifts, nbr. of data bits, etc. +WWV receive only - calibrate your sound card to WWV +Frequency Analysis receive only - measure the frequency of a carrier + +Fldigi can also control a transceiver using Hamlib or RigCAT I/O, perform online +or cdrom QRZ queries, and log QSOs with fl_logbook or xlog. +The latest version can always be found at: + http://www.w1hkj.com/Fldigi-2.x.html + +Visit this page for extensive documentation and an archive of XML files for +transceivers supported by RigCAT. + +Join the linuxham Yahoo group for support, news and updates on W1HKJ software: + + http://groups.yahoo.com/group/linuxham/join diff --git a/configure.ac b/configure.ac index aa211b88..3949def9 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ # Copyright (C) 2007 Stelios Bounanos, M0GLD (m0gld AT enotty DOT net) AC_PREREQ(2.61) -AC_INIT([fldigi], [2.08b], [w1hkj AT w1hkj DOT com]) +AC_INIT([fldigi], [2.08c], [w1hkj AT w1hkj DOT com]) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([-Wall foreign 1.9.6]) AM_MAINTAINER_MODE @@ -84,8 +84,10 @@ AC_ARG_ENABLE([debug], if test "x$ac_cv_debug" = "xyes"; then if test "x$GXX" = "xyes"; then RDYNAMIC=-rdynamic + CXXFLAGS="-O0 -ggdb3 -Wall" + else + CXXFLAGS="-O0 -g -Wall" fi - CXXFLAGS="-O0 -ggdb3 -Wall" CFLAGS="$CXXFLAGS" AC_MSG_NOTICE([debugging enabled; overriding CXXFLAGS]) fi @@ -162,6 +164,8 @@ if test "x$ac_cv_std_bind" = "xno" && test "x$ac_cv_std_tr1_bind" = "xno"; then AC_MSG_ERROR([Boost is required]) fi fi +AC_SUBST([BOOST_CPPFLAGS]) +AC_SUBST([BOOST_LDFLAGS]) ########################### # FLTK diff --git a/icons/fldigi-psk.png b/data/fldigi-psk.png similarity index 100% rename from icons/fldigi-psk.png rename to data/fldigi-psk.png diff --git a/icons/fldigi-rtty.png b/data/fldigi-rtty.png similarity index 100% rename from icons/fldigi-rtty.png rename to data/fldigi-rtty.png diff --git a/data/fldigi.desktop b/data/fldigi.desktop new file mode 100644 index 00000000..6609a477 --- /dev/null +++ b/data/fldigi.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Fldigi +GenericName=Amateur Radio Digital Modem +Comment=Amateur Radio Sound Card Communications +Exec=fldigi +Icon=fldigi +Terminal=false +Type=Application +Categories=Network;HamRadio; diff --git a/icons/fldigi.xpm b/data/fldigi.xpm similarity index 100% rename from icons/fldigi.xpm rename to data/fldigi.xpm diff --git a/src/Makefile.am b/src/Makefile.am index c1208e36..19438ab4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -55,13 +55,18 @@ CLEANFILES = $(BUILT_SOURCES) install-data-local: - if test -f $(srcdir)/../icons/fldigi.xpm; then \ + if test -f $(srcdir)/../data/fldigi.xpm; then \ $(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps; \ - $(INSTALL_DATA) $(srcdir)/../icons/fldigi.xpm $(DESTDIR)/$(datadir)/pixmaps; \ + $(INSTALL_DATA) $(srcdir)/../data/fldigi.xpm $(DESTDIR)/$(datadir)/pixmaps; \ + fi + if test -f $(srcdir)/../data/fldigi.desktop; then \ + $(mkinstalldirs) $(DESTDIR)$(datadir)/applications; \ + $(INSTALL_DATA) $(srcdir)/../data/fldigi.desktop $(DESTDIR)/$(datadir)/applications; \ fi uninstall-local: rm -f $(DESTDIR)/$(datadir)/pixmaps/fldigi.xpm + rm -f $(DESTDIR)/$(datadir)/applications/fldigi.desktop # Sources that we build. It is OK to have headers here. fldigi_SOURCES += \ @@ -258,9 +263,10 @@ EXTRA_fldigi_SOURCES += \ # Additional non-source files that we distribute EXTRA_DIST = \ $(srcdir)/../scripts/mkversions.sh \ - $(srcdir)/../icons/fldigi-psk.png \ - $(srcdir)/../icons/fldigi-rtty.png \ - $(srcdir)/../icons/fldigi.xpm \ + $(srcdir)/../data/fldigi-psk.png \ + $(srcdir)/../data/fldigi-rtty.png \ + $(srcdir)/../data/fldigi.xpm \ + $(srcdir)/../data/fldigi.desktop \ fileselector/allfiles.xbm \ fileselector/d1.xbm \ fileselector/d1_mask.xbm \ diff --git a/src/main.cxx b/src/main.cxx index 13e15f20..f0b58c64 100644 --- a/src/main.cxx +++ b/src/main.cxx @@ -125,7 +125,7 @@ int main(int argc, char ** argv) signal(SIGSEGV, handle_signal); signal(SIGILL, handle_signal); - setlocale(LC_ALL, ""); + setlocale(LC_TIME, ""); fl_filename_expand(szHomedir, 119, "$HOME/.fldigi/"); HomeDir = szHomedir; diff --git a/src/widgets/FTextView.cxx b/src/widgets/FTextView.cxx index f68d401e..586dc372 100644 --- a/src/widgets/FTextView.cxx +++ b/src/widgets/FTextView.cxx @@ -236,6 +236,7 @@ void FTextBase::show_context_menu(void) popx = xpos - x(); popy = ypos - y(); + window()->cursor(FL_CURSOR_DEFAULT); m = context_menu->popup(xpos, ypos, 0, 0, 0); if (!m) return;