Permalink
Browse files

Merge remote-tracking branch 'upstream/maint/3.21'

Conflicts:
	src/Makefile.am
	src/dialogs/confdialog.cxx
	src/dialogs/confdialog.fl
	src/include/confdialog.h
  • Loading branch information...
2 parents d83c605 + bb836f1 commit 411780119c6450075dc0031698403e37d094ef3f @fsphil fsphil committed Feb 14, 2012
Showing with 7,498 additions and 5,600 deletions.
  1. +57 −2 ChangeLog
  2. +2 −2 configure.ac
  3. +1 −1 m4/fltk.m4
  4. +1 −0 m4/win32.m4
  5. +6 −2 src/Makefile.am
  6. +3 −2 src/dialogs/Viewer.cxx
  7. +76 −76 src/dialogs/colorsfonts.cxx
  8. +975 −690 src/dialogs/confdialog.cxx
  9. +450 −244 src/dialogs/confdialog.fl
  10. +66 −26 src/dialogs/fl_digi.cxx
  11. +2 −0 src/dialogs/font_browser.cxx
  12. +58 −58 src/dialogs/notifydialog.cxx
  13. +9 −7 src/dialogs/notifydialog.fl
  14. +2 −2 src/fileselector/FL/Fl_Native_File_Chooser.H
  15. +137 −0 src/fileselector/FL/MAC_chooser.h
  16. +14 −2 src/fileselector/Fl_Native_File_Chooser.cxx
  17. +46 −74 src/fileselector/{Fl_Native_File_Chooser_MAC.cxx → MAC_chooser.cxx}
  18. +25 −6 src/fileselector/fileselect.cxx
  19. +189 −0 src/fileselector/fileselect_1_1.cxx
  20. +190 −0 src/fileselector/fileselect_1_3.cxx
  21. +73 −73 src/flarq-src/arqdialogs.cxx
  22. +17 −0 src/flarq-src/arqhelp.cxx
  23. +18 −8 src/flarq-src/flarq.cxx
  24. +1 −1 src/flarq-src/include/arqdialogs.h
  25. +183 −383 src/include/Fl_Text_Buffer_mod_1_3.H
  26. +446 −304 src/include/Fl_Text_Display_mod_1_3.H
  27. +9 −9 src/include/Fl_Text_Editor_mod_1_3.H
  28. +1 −1 src/include/colorsfonts.h
  29. +18 −1 src/include/compat.h
  30. +18 −2 src/include/confdialog.h
  31. +48 −1 src/include/configuration.h
  32. +14 −26 src/include/fileselect.h
  33. +1 −1 src/include/lgbook.h
  34. +1 −1 src/include/notifydialog.h
  35. +1 −1 src/include/rigio.h
  36. +2 −0 src/include/rigxml.h
  37. +31 −0 src/include/weather.h
  38. +237 −237 src/logbook/lgbook.cxx
  39. +76 −72 src/logbook/lgbook.fl
  40. +55 −19 src/logbook/logsupport.cxx
  41. +1 −0 src/logger/rx_extract.cxx
  42. +10 −5 src/main.cxx
  43. +18 −0 src/misc/configuration.cxx
  44. +41 −14 src/misc/debug.cxx
  45. +23 −11 src/misc/lookupcall.cxx
  46. +2 −0 src/misc/macroedit.cxx
  47. +117 −22 src/misc/macros.cxx
  48. +198 −0 src/misc/weather.cxx
  49. +6 −0 src/rigcontrol/ptt.cxx
  50. +42 −19 src/rigcontrol/rigio.cxx
  51. +11 −0 src/rigcontrol/rigxml.cxx
  52. +22 −16 src/soundcard/sound.cxx
  53. +4 −0 src/waterfall/waterfall.cxx
  54. +6 −1 src/wefax/wefax-pic.cxx
  55. +1 −0 src/wefax/wefax.cxx
  56. +146 −14 src/widgets/FTextRXTX.cxx
  57. +42 −21 src/widgets/FTextView.cxx
  58. +826 −1,273 src/widgets/Fl_Text_Buffer_mod_1_3.cxx
  59. +2,331 −1,839 src/widgets/Fl_Text_Display_mod_1_3.cxx
  60. +61 −29 src/widgets/Fl_Text_Editor_mod_1_3.cxx
  61. +31 −2 src/widgets/Panel.cxx
View
@@ -1,8 +1,63 @@
-=Version 3.21.33=
+=Version 3.21.38=
+
+2012-02-01 David Freese <w1hkj@w1hkj.com>
+
+ 9327490: Control sizing
+ df3bf09: eQSL
+ 13b7107: OS X file chooser
+ 5122c7b: Control key parsing
+ 3c0bcd8: Control-shortcuts
+ b940e9c: WX international
+
+
+=Version 3.21.37=
+
+ c4336b7: Macro filename
+ ba5b5d5: Callsign query
+ 2af9ebc: WX Celsius
+ 62d9f42: Weather tag
+ 3fc748e: Inline tags
+ 3ae8ee9: OS-X native file chooser
+
+
+=Version 3.21.36=
+
+ 5cc14a1: rigcat serial test
+ 4c0526a: Macro load display
+ 5cbed0c: File-dir selection
+ 59e8dc9: Rx text wrap
+ 2dfd6fd: UTF-8 rx suppress
+ c36983e: Get WX
+ 22e1f8b: Update to fltk.m4
+ 890013c: rigCAT closure
+ 56104f4: GCC-4.7 fixes
+ e7ab7e2: Missing files
+ 3b02bb3: RX last line
+ 6e81738: Debug text
+ 0f87d87: View browser find control
+ b6a8332: Rx text wrap
+ f1abc9e: Find chars fwd/back
+ 6102e0c: Corner controls
+ 2281325: Fltk-1.3.0
+ 847fdd3: Rig cat close
+ 672f4ee: OpBrowser font
+ 5f8b712: Tune abort
-2011-12-09 David Freese <w1hkj@w1hkj.com>
+
+=Version 3.21.35=
+
+
+
+=Version 3.21.34=
+
+ a70c0fe: VAC PTT delay
+ 62532af: Mono audio
+ a7f741b: VSP boolean
+
+
+=Version 3.21.33=
a68d917: Right Channel audio
00d4308: WEFAX update
View
@@ -9,10 +9,10 @@ dnl major and minor must be integers; patch may
dnl contain other characters or be empty
m4_define(FLDIGI_MAJOR, [3])
m4_define(FLDIGI_MINOR, [21])
-m4_define(FLDIGI_PATCH, [.33])
+m4_define(FLDIGI_PATCH, [.38])
m4_define(FLARQ_MAJOR, [4])
m4_define(FLARQ_MINOR, [3])
-m4_define(FLARQ_PATCH, [.1])
+m4_define(FLARQ_PATCH, [.3])
AC_INIT([dl-fldigi], FLDIGI_MAJOR.FLDIGI_MINOR[]FLDIGI_PATCH, [fldigi-devel@lists.berlios.de])
View
@@ -33,7 +33,7 @@ AC_DEFUN([AC_FLDIGI_FLTK], [
*** To build $PACKAGE you need a FLTK version that provides API 1.1, 1.2 or 1.3.
])
fi
- if test $FLDIGI_FLTK_API_MINOR -gt 1; then
+ if test $FLDIGI_FLTK_API_MINOR -gt 3; then
AC_MSG_WARN([$PACKAGE_TARNAME may not work with FLTK $FLTK_API_VERSION])
fi
FLTK_CFLAGS=`$FLTK_CONFIG --cxxflags`
View
@@ -18,6 +18,7 @@ if test "x$target_win32" = "xyes"; then
AC_MSG_WARN([The windres utility could not be found])
fi
AC_DEFINE([__WOE32__], 1, [Define to 1 if we are building on cygwin or mingw])
+ AC_DEFINE([__MINGW32__], 1, [Define to 1 if we are building on cygwin or mingw])
AC_DEFINE([_WINDOWS], 1, [Define to 1 if we are building on cygwin or mingw])
fi
View
@@ -424,6 +424,7 @@ dl_fldigi_SOURCES += \
include/habitat/Extractor.h \
include/habitat/UKHASExtractor.h \
include/habitat/EZ.h \
+ include/weather.h \
irrxml/CXMLReaderImpl.h \
irrxml/fast_atof.h \
irrxml/heapsort.h \
@@ -474,6 +475,7 @@ dl_fldigi_SOURCES += \
misc/threads.cxx \
misc/timeops.cxx \
misc/util.cxx \
+ misc/weather.cxx \
mt63/dsp.cxx \
mt63/mt63.cxx \
mt63/mt63base.cxx \
@@ -572,12 +574,14 @@ EXTRA_dl_fldigi_SOURCES += \
blank/blank.cxx \
blank/blank.h \
fileselector/FL/Fl_Native_File_Chooser_FLTK.H \
- fileselector/FL/Fl_Native_File_Chooser_MAC.H \
+ fileselector/FL/MAC_chooser.h \
fileselector/FL/Fl_Native_File_Chooser_WIN32.H \
fileselector/Fl_Native_File_Chooser_FLTK.cxx \
- fileselector/Fl_Native_File_Chooser_MAC.cxx \
+ fileselector/MAC_chooser.cxx \
fileselector/Fl_Native_File_Chooser_WIN32.cxx \
fileselector/flnfc_common.cxx \
+ fileselector/fileselect_1_1.cxx \
+ fileselector/fileselect_1_3.cxx \
feld/Feld7x7-14.cxx \
feld/Feld7x7n-14.cxx \
feld/FeldDx-14.cxx \
@@ -244,7 +244,8 @@ Fl_Double_Window* createViewer(void)
// search field
const char* label = _("Find: ");
fl_font(FL_HELVETICA, FL_NORMAL_SIZE);
- viewer_inp_seek = new Fl_Input2(static_cast<int>(BWSR_BORDER + fl_width(label)), BWSR_BORDER, 200, gseek->h(), label);
+ viewer_inp_seek = new Fl_Input2(static_cast<int>(BWSR_BORDER + fl_width(label) + fl_width("X")), BWSR_BORDER, 200, gseek->h(), label);
+ viewer_inp_seek->labelfont(FL_HELVETICA);
viewer_inp_seek->callback((Fl_Callback*)cb_Seek);
viewer_inp_seek->when(FL_WHEN_CHANGED);
viewer_inp_seek->textfont(FL_COURIER);
@@ -262,7 +263,7 @@ Fl_Double_Window* createViewer(void)
Fl_Group *g = new Fl_Group(BWSR_BORDER, brwsViewer->y() + brwsViewer->h() + pad, viewerwidth, 20);
// close button
- btnCloseViewer = new Fl_Button(g->w() + BWSR_BORDER - 65, g->y(), 65, g->h(),
+ btnCloseViewer = new Fl_Button(g->w() + BWSR_BORDER - 75, g->y(), 75, g->h(),
make_icon_label(_("Close"), close_icon));
btnCloseViewer->align(FL_ALIGN_LEFT | FL_ALIGN_INSIDE);
set_icon_label(btnCloseViewer);
@@ -1,4 +1,4 @@
-// generated by Fast Light User Interface Designer (fluid) version 1.0110
+// generated by Fast Light User Interface Designer (fluid) version 1.0300
#include "gettext.h"
#include "colorsfonts.h"
@@ -11,15 +11,15 @@
void selectColorsFonts() {
if (!dlgColorFont)
- make_colorsfonts();
-dlgColorFont->show();
+ make_colorsfonts();
+ dlgColorFont->show();
}
static void choose_color(Fl_Color & c) {
unsigned char r, g, b;
-Fl::get_color(c, r, g, b);
-if (fl_color_chooser("Font color", r, g, b))
- c = fl_rgb_color(r, g, b);
+ Fl::get_color(c, r, g, b);
+ if (fl_color_chooser("Font color", r, g, b))
+ c = fl_rgb_color(r, g, b);
}
static void adjust_label(Fl_Widget* w) {
@@ -28,85 +28,85 @@ static void adjust_label(Fl_Widget* w) {
static void cbRxFontBrowser(Fl_Widget*, void*) {
Fl_Font font = font_browser->fontNumber();
- int size = font_browser->fontSize();
- Fl_Color color = font_browser->fontColor();
-
- RxText->textfont(font);
- RxText->textsize(size);
- RxText->textcolor(color);
- RxText->redraw();
-
- progdefaults.RxFontnbr = font;
- progdefaults.RxFontsize = size;
- progdefaults.RxFontcolor = color;
-
- ReceiveText->setFont(font);
- ReceiveText->setFontSize(size);
- ReceiveText->setFontColor(progdefaults.RxFontcolor, FTextBase::RECV);
-
- font_browser->hide();
-
- progdefaults.changed = true;
+ int size = font_browser->fontSize();
+ Fl_Color color = font_browser->fontColor();
+
+ RxText->textfont(font);
+ RxText->textsize(size);
+ RxText->textcolor(color);
+ RxText->redraw();
+
+ progdefaults.RxFontnbr = font;
+ progdefaults.RxFontsize = size;
+ progdefaults.RxFontcolor = color;
+
+ ReceiveText->setFont(font);
+ ReceiveText->setFontSize(size);
+ ReceiveText->setFontColor(progdefaults.RxFontcolor, FTextBase::RECV);
+
+ font_browser->hide();
+
+ progdefaults.changed = true;
}
static void cbTxFontBrowser(Fl_Widget*, void*) {
Fl_Font font = font_browser->fontNumber();
- int size = font_browser->fontSize();
- Fl_Color color = font_browser->fontColor();
-
- TxText->textfont(font);
- TxText->textsize(size);
- TxText->textcolor(color);
- TxText->redraw();
-
- progdefaults.TxFontnbr = font;
- progdefaults.TxFontsize = size;
- progdefaults.TxFontcolor = color;
-
- TransmitText->setFont(font);
- TransmitText->setFontSize(size);
- TransmitText->setFontColor(progdefaults.TxFontcolor, FTextBase::RECV);
-
- font_browser->hide();
-
- progdefaults.changed = true;
+ int size = font_browser->fontSize();
+ Fl_Color color = font_browser->fontColor();
+
+ TxText->textfont(font);
+ TxText->textsize(size);
+ TxText->textcolor(color);
+ TxText->redraw();
+
+ progdefaults.TxFontnbr = font;
+ progdefaults.TxFontsize = size;
+ progdefaults.TxFontcolor = color;
+
+ TransmitText->setFont(font);
+ TransmitText->setFontSize(size);
+ TransmitText->setFontColor(progdefaults.TxFontcolor, FTextBase::RECV);
+
+ font_browser->hide();
+
+ progdefaults.changed = true;
}
void cbWaterfallFontBrowser(Fl_Widget*, void*) {
Fl_Font fnt = font_browser->fontNumber();
- int size = font_browser->fontSize();
-
- progdefaults.WaterfallFontnbr = fnt;
- progdefaults.WaterfallFontsize = size;
- progdefaults.changed = true;
-
- font_browser->hide();
+ int size = font_browser->fontSize();
+
+ progdefaults.WaterfallFontnbr = fnt;
+ progdefaults.WaterfallFontsize = size;
+ progdefaults.changed = true;
+
+ font_browser->hide();
}
void cbViewerFontBrowser(Fl_Widget*, void*) {
progdefaults.ViewerFontnbr = font_browser->fontNumber();
- progdefaults.ViewerFontsize = font_browser->fontSize();
- initViewer();
- progdefaults.changed = true;
-
- font_browser->hide();
+ progdefaults.ViewerFontsize = font_browser->fontSize();
+ initViewer();
+ progdefaults.changed = true;
+
+ font_browser->hide();
}
void cbFreqControlFontBrowser(Fl_Widget*, void*) {
Fl_Font fnt = font_browser->fontNumber();
- progdefaults.FreqControlFontnbr = fnt;
- progdefaults.changed = true;
-
- FDdisplay->labelfont(progdefaults.FreqControlFontnbr);
- FDdisplay->redraw();
- qsoFreqDisp1->font(progdefaults.FreqControlFontnbr);
- qsoFreqDisp2->font(progdefaults.FreqControlFontnbr);
- qsoFreqDisp3->font(progdefaults.FreqControlFontnbr);
- qsoFreqDisp1->redraw();
- qsoFreqDisp2->redraw();
- qsoFreqDisp3->redraw();
-
- font_browser->hide();
+ progdefaults.FreqControlFontnbr = fnt;
+ progdefaults.changed = true;
+
+ FDdisplay->labelfont(progdefaults.FreqControlFontnbr);
+ FDdisplay->redraw();
+ qsoFreqDisp1->font(progdefaults.FreqControlFontnbr);
+ qsoFreqDisp2->font(progdefaults.FreqControlFontnbr);
+ qsoFreqDisp3->font(progdefaults.FreqControlFontnbr);
+ qsoFreqDisp1->redraw();
+ qsoFreqDisp2->redraw();
+ qsoFreqDisp3->redraw();
+
+ font_browser->hide();
}
Fl_Double_Window *dlgColorFont=(Fl_Double_Window *)0;
@@ -909,31 +909,31 @@ Fl_Double_Window* make_colorsfonts() {
{ btnXMIT = new Fl_Button(5, 134, 40, 21, _("XMIT"));
btnXMIT->tooltip(_("Sent chars in Rx/Tx pane"));
btnXMIT->callback((Fl_Callback*)cb_btnXMIT);
- btnXMIT->align(FL_ALIGN_BOTTOM);
+ btnXMIT->align(Fl_Align(FL_ALIGN_BOTTOM));
btnXMIT->color(progdefaults.XMITcolor);
} // Fl_Button* btnXMIT
{ btnCTRL = new Fl_Button(48, 134, 40, 21, _("CTRL"));
btnCTRL->tooltip(_("Control chars in Rx/Tx pane"));
btnCTRL->callback((Fl_Callback*)cb_btnCTRL);
- btnCTRL->align(FL_ALIGN_BOTTOM);
+ btnCTRL->align(Fl_Align(FL_ALIGN_BOTTOM));
btnCTRL->color(progdefaults.CTRLcolor);
} // Fl_Button* btnCTRL
{ btnSKIP = new Fl_Button(92, 134, 40, 21, _("SKIP"));
btnSKIP->tooltip(_("Skipped chars in Tx pane\n(Tx on/off in CW)"));
btnSKIP->callback((Fl_Callback*)cb_btnSKIP);
- btnSKIP->align(FL_ALIGN_BOTTOM);
+ btnSKIP->align(Fl_Align(FL_ALIGN_BOTTOM));
btnSKIP->color(progdefaults.SKIPcolor);
} // Fl_Button* btnSKIP
{ btnALTR = new Fl_Button(135, 134, 40, 21, _("ALTR"));
btnALTR->tooltip(_("Alternate character color in Rx panelr"));
btnALTR->callback((Fl_Callback*)cb_btnALTR);
- btnALTR->align(FL_ALIGN_BOTTOM);
+ btnALTR->align(Fl_Align(FL_ALIGN_BOTTOM));
btnALTR->color(progdefaults.ALTRcolor);
} // Fl_Button* btnALTR
{ btnSEL = new Fl_Button(179, 134, 39, 21, _("SEL"));
btnSEL->tooltip(_("Selection background color in Rx Tx panels"));
btnSEL->callback((Fl_Callback*)cb_btnSEL);
- btnSEL->align(FL_ALIGN_BOTTOM);
+ btnSEL->align(Fl_Align(FL_ALIGN_BOTTOM));
btnSEL->color(progdefaults.RxTxSelectcolor);
} // Fl_Button* btnSEL
{ btnNoTextColor = new Fl_Button(226, 134, 70, 21, _("System"));
@@ -1030,7 +1030,7 @@ Fl_Double_Window* make_colorsfonts() {
o->color(progdefaults.Sql2Color);
} // Fl_Box* sql2color
{ Fl_Box* o = new Fl_Box(140, 159, 220, 20, _("Lighted button enabled colors"));
- o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE);
+ o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE));
} // Fl_Box* o
o->end();
} // Fl_Group* o
@@ -1041,7 +1041,7 @@ Fl_Double_Window* make_colorsfonts() {
} // Fl_Button* btnLowSignal
{ Fl_Box* o = lowcolor = new Fl_Box(81, 73, 21, 21);
lowcolor->box(FL_DIAMOND_DOWN_BOX);
- lowcolor->color((Fl_Color)FL_FOREGROUND_COLOR);
+ lowcolor->color(FL_FOREGROUND_COLOR);
o->color(progdefaults.LowSignal);
} // Fl_Box* lowcolor
{ btnHighSignal = new Fl_Button(102, 111, 70, 21, _("High"));
Oops, something went wrong.

0 comments on commit 4117801

Please sign in to comment.