mirror
/
dl-fldigi
kopia lustrzana https://github.com/jamescoxon/dl-fldigi
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge with upstream

pull/2/head
Stelios Bounanos 2008-10-31 03:48:13 +00:00
rodzic 9a0fadc492 6b1c297560
commit 64cbeebe78
12 zmienionych plików z 474 dodań i 858 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
configure.ac
Wyświetl plik

@ -9,7 +9,7 @@ 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, [0])
m4_define(FLDIGI_PATCH, [4AW])
m4_define(FLDIGI_PATCH, [4AX])
AC_INIT([fldigi], FLDIGI_MAJOR.FLDIGI_MINOR[FLDIGI_PATCH], [w1hkj AT w1hkj DOT com])

35
src/dialogs/confdialog.cxx
Wyświetl plik

@ -1,4 +1,4 @@
// generated by Fast Light User Interface Designer (fluid) version 1.0109
// generated by Fast Light User Interface Designer (fluid) version 1.0108
#include "confdialog.h"
#include <config.h>
@ -320,9 +320,9 @@ Fl_Check_Button *btnWaterfallClickInsert=(Fl_Check_Button *)0;
static void cb_btnWaterfallClickInsert(Fl_Check_Button* o, void*) {
progdefaults.WaterfallClickInsert = o->value();
if (progdefaults.WaterfallClickInsert)
inpWaterfallClickText->show();
inpWaterfallClickText->activate();
else
inpWaterfallClickText->hide();
inpWaterfallClickText->deactivate();
progdefaults.changed = true;
}
@ -1148,6 +1148,13 @@ Fl_Tooltip::enable(progdefaults.tooltips);
progdefaults.changed = true;
}
Fl_Check_Button *btnNagMe=(Fl_Check_Button *)0;
static void cb_btnNagMe(Fl_Check_Button* o, void*) {
progdefaults.NagMe=o->value();
progdefaults.changed = true;
}
Fl_Group *tabRSid=(Fl_Group *)0;
Fl_Check_Button *chkTransmitRSid=(Fl_Check_Button *)0;
@ -1976,23 +1983,25 @@ static const char szBaudRates[] = "300|600|1200|2400|4800|9600|19200|38400|57600
o->hide();
{ Fl_Group* o = new Fl_Group(5, 56, 390, 158);
o->box(FL_ENGRAVED_FRAME);
{ btnWaterfallHistoryDefault = new Fl_Check_Button(15, 66, 276, 20, "Left/Right click always replays history");
{ Fl_Check_Button* o = btnWaterfallHistoryDefault = new Fl_Check_Button(15, 66, 276, 20, "Left/Right click always replays history");
btnWaterfallHistoryDefault->tooltip("Disabled - Ctrl-Lft click plays history");
btnWaterfallHistoryDefault->down_box(FL_DOWN_BOX);
btnWaterfallHistoryDefault->callback((Fl_Callback*)cb_btnWaterfallHistoryDefault);
o->value(progdefaults.WaterfallHistoryDefault);
} // Fl_Check_Button* btnWaterfallHistoryDefault
{ btnWaterfallQSY = new Fl_Check_Button(15, 96, 225, 20, "Dragging changes frequency");
{ Fl_Check_Button* o = btnWaterfallQSY = new Fl_Check_Button(15, 96, 225, 20, "Dragging changes frequency");
btnWaterfallQSY->down_box(FL_DOWN_BOX);
btnWaterfallQSY->callback((Fl_Callback*)cb_btnWaterfallQSY);
o->value(progdefaults.WaterfallQSY);
} // Fl_Check_Button* btnWaterfallQSY
{ inpWaterfallClickText = new Fl_Input(206, 120, 150, 50);
inpWaterfallClickText->callback((Fl_Callback*)cb_inpWaterfallClickText);
inpWaterfallClickText->align(FL_ALIGN_RIGHT);
} // Fl_Input* inpWaterfallClickText
{ btnWaterfallClickInsert = new Fl_Check_Button(15, 134, 172, 20, "Insert text on left click");
{ Fl_Check_Button* o = btnWaterfallClickInsert = new Fl_Check_Button(15, 134, 172, 20, "Insert text on left click");
btnWaterfallClickInsert->down_box(FL_DOWN_BOX);
btnWaterfallClickInsert->callback((Fl_Callback*)cb_btnWaterfallClickInsert);
btnWaterfallClickInsert->value(progdefaults.WaterfallClickInsert);
o->value(progdefaults.WaterfallClickInsert);
} // Fl_Check_Button* btnWaterfallClickInsert
o->end();
} // Fl_Group* o
@ -2578,6 +2587,7 @@ l with your sound hardware.");
valPCMvolume->type(5);
valPCMvolume->color((Fl_Color)26);
valPCMvolume->selection_color((Fl_Color)1);
valPCMvolume->step(0.01);
valPCMvolume->value(0.8);
valPCMvolume->textsize(14);
valPCMvolume->callback((Fl_Callback*)cb_valPCMvolume);
@ -2690,6 +2700,11 @@ l with your sound hardware.");
btnShowTooltips->callback((Fl_Callback*)cb_btnShowTooltips);
o->value(progdefaults.tooltips);
} // Fl_Check_Button* btnShowTooltips
{ Fl_Check_Button* o = btnNagMe = new Fl_Check_Button(160, 68, 70, 15, "Nag me about log entries");
btnNagMe->down_box(FL_DOWN_BOX);
btnNagMe->callback((Fl_Callback*)cb_btnNagMe);
o->value(progdefaults.NagMe);
} // Fl_Check_Button* btnNagMe
o->end();
} // Fl_Group* o
tabMainWindow->end();
@ -2854,6 +2869,7 @@ l with your sound hardware.");
cntCWdash2dot->type(1);
cntCWdash2dot->minimum(2.5);
cntCWdash2dot->maximum(4);
cntCWdash2dot->step(0.1);
cntCWdash2dot->value(3);
cntCWdash2dot->callback((Fl_Callback*)cb_cntCWdash2dot);
cntCWdash2dot->align(FL_ALIGN_LEFT);
@ -2863,6 +2879,7 @@ l with your sound hardware.");
cntCWrisetime->type(1);
cntCWrisetime->minimum(0);
cntCWrisetime->maximum(15);
cntCWrisetime->step(0.1);
cntCWrisetime->value(4);
cntCWrisetime->callback((Fl_Callback*)cb_cntCWrisetime);
cntCWrisetime->align(FL_ALIGN_LEFT);
@ -2925,6 +2942,7 @@ l with your sound hardware.");
valTHOR_BW->type(1);
valTHOR_BW->minimum(1);
valTHOR_BW->maximum(2);
valTHOR_BW->step(0.1);
valTHOR_BW->value(1.5);
valTHOR_BW->callback((Fl_Callback*)cb_valTHOR_BW);
o->value(progdefaults.THOR_BW);
@ -2952,6 +2970,7 @@ l with your sound hardware.");
} // Fl_Check_Button* valTHOR_SOFT
{ Fl_Value_Slider* o = valThorCWI = new Fl_Value_Slider(120, 174, 260, 21, "CWI threshold:");
valThorCWI->type(1);
valThorCWI->step(0.01);
valThorCWI->textsize(14);
valThorCWI->callback((Fl_Callback*)cb_valThorCWI);
valThorCWI->align(FL_ALIGN_LEFT);
@ -2973,6 +2992,7 @@ l with your sound hardware.");
valDominoEX_BW->type(1);
valDominoEX_BW->minimum(1);
valDominoEX_BW->maximum(2);
valDominoEX_BW->step(0.1);
valDominoEX_BW->value(1.5);
valDominoEX_BW->callback((Fl_Callback*)cb_valDominoEX_BW);
o->value(progdefaults.DOMINOEX_BW);
@ -3000,6 +3020,7 @@ l with your sound hardware.");
} // Fl_Counter* valDominoEX_PATHS
{ Fl_Value_Slider* o = valDomCWI = new Fl_Value_Slider(125, 179, 260, 21, "CWI threshold:");
valDomCWI->type(1);
valDomCWI->step(0.01);
valDomCWI->textsize(14);
valDomCWI->callback((Fl_Callback*)cb_valDomCWI);
valDomCWI->align(FL_ALIGN_LEFT);

17
src/dialogs/confdialog.fl
Wyświetl plik

@ -1,5 +1,5 @@
# data file for the Fltk User Interface Designer (fluid)
version 1.0109
version 1.0108
header_name {.h}
code_name {.cxx}
decl {\#include <config.h>} {}
@ -378,12 +378,14 @@ progdefaults.changed = true;}
callback {progdefaults.WaterfallHistoryDefault = o->value();
progdefaults.changed = true;}
tooltip {Disabled - Ctrl-Lft click plays history} xywh {15 66 276 20} down_box DOWN_BOX
code0 {o->value(progdefaults.WaterfallHistoryDefault);}
}
Fl_Check_Button btnWaterfallQSY {
label {Dragging changes frequency}
callback {progdefaults.WaterfallQSY = o->value();
progdefaults.changed = true;}
xywh {15 96 225 20} down_box DOWN_BOX
code0 {o->value(progdefaults.WaterfallQSY);}
}
Fl_Input inpWaterfallClickText {
callback {progdefaults.WaterfallClickText = o->value();
@ -394,12 +396,12 @@ progdefaults.changed = true;}
label {Insert text on left click}
callback {progdefaults.WaterfallClickInsert = o->value();
if (progdefaults.WaterfallClickInsert)
inpWaterfallClickText->show();
inpWaterfallClickText->activate();
else
inpWaterfallClickText->hide();
inpWaterfallClickText->deactivate();
progdefaults.changed = true;}
xywh {15 134 172 20} down_box DOWN_BOX
code0 {btnWaterfallClickInsert->value(progdefaults.WaterfallClickInsert);}
code0 {o->value(progdefaults.WaterfallClickInsert);}
}
}
Fl_Choice mnuWaterfallWheelAction {
@ -1340,6 +1342,13 @@ progdefaults.changed = true;}
xywh {20 68 70 15} down_box DOWN_BOX value 1
code0 {o->value(progdefaults.tooltips);}
}
Fl_Check_Button btnNagMe {
label {Nag me about log entries}
callback {progdefaults.NagMe=o->value();
progdefaults.changed = true;}
xywh {160 68 70 15} down_box DOWN_BOX
code0 {o->value(progdefaults.NagMe);}
}
}
}
Fl_Group tabRSid {

11
src/dialogs/fl_digi.cxx
Wyświetl plik

@ -1154,10 +1154,15 @@ void cb_log(Fl_Widget*, void*)
void qsoClear_cb(Fl_Widget *b, void *)
{
if (progdefaults.NagMe) {
if (oktoclear || fl_choice("Clear log fields?", "Cancel", "OK", NULL) == 1) {
clearQSO();
oktoclear = true;
}
} else {
clearQSO();
oktoclear = true;
}
restoreFocus();
}
@ -1274,7 +1279,7 @@ bool clean_exit(void) {
break;
}
}
if (!oktoclear) {
if (!oktoclear && progdefaults.NagMe) {
switch (fl_choice("Save log before exiting?", "Cancel", "Save", "Don't save")) {
case 0:
return false;
@ -1460,10 +1465,10 @@ Fl_Menu_Item menu_[] = {
{ make_icon_label("Defaults", preferences_system_icon), 0, 0, 0, FL_SUBMENU, _FL_MULTI_LABEL, 0, 14, 0},
{ make_icon_label("Colors && Fonts", preferences_desktop_font_icon), 0, (Fl_Callback*)cb_mnuConfigFonts, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{ make_icon_label("Operator", system_users_icon), 0, (Fl_Callback*)cb_mnuConfigOperator, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{ make_icon_label("Waterfall"), 0, (Fl_Callback*)cb_mnuConfigWaterfall, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{ make_icon_label("Waterfall", waterfall_icon), 0, (Fl_Callback*)cb_mnuConfigWaterfall, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{ make_icon_label("Video"), 0, (Fl_Callback*)cb_mnuConfigVideo, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{ make_icon_label("Rig Control", multimedia_player_icon), 0, (Fl_Callback*)cb_mnuConfigRigCtrl, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{ make_icon_label("QRZ", system_search_icon), 0, (Fl_Callback*)cb_mnuConfigQRZ, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{ make_icon_label("QRZ", net_icon), 0, (Fl_Callback*)cb_mnuConfigQRZ, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{ make_icon_label("Sound Card", audio_card_icon), 0, (Fl_Callback*)cb_mnuConfigSoundCard, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{ make_icon_label("Misc"), 0, (Fl_Callback*)cb_mnuConfigMisc, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{0,0,0,0,0,0,0,0,0},

1
src/include/confdialog.h
Wyświetl plik

@ -158,6 +158,7 @@ extern Fl_Check_Button *btnDockedScope;
extern Fl_Check_Button *btnDockedRigControl;
extern Fl_Check_Button *btnCheckButtons;
extern Fl_Check_Button *btnShowTooltips;
extern Fl_Check_Button *btnNagMe;
extern Fl_Group *tabRSid;
extern Fl_Check_Button *chkTransmitRSid;
extern Fl_Check_Button *chkRSidWideSearch;

1
src/include/configuration.h
Wyświetl plik

@ -153,6 +153,7 @@
ELEM_(int, wfheight, "WFHEIGHT", 125) \
ELEM_(bool, tooltips, "TOOLTIPS", true) \
ELEM_(bool, useCheckButtons, "USECHECKBUTTONS", false) \
ELEM_(bool, NagMe, "NAGME", false) \
/* QRZ */ \
ELEM_(int, QRZ, "QRZTYPE", 0) /* Not available */ \
ELEM_(std::string, QRZpathname, "QRZPATHNAME", "") \

0
src/include/fldigi-icon-48.xpm
Wyświetl plik

8
src/include/icons.h
Wyświetl plik

@ -1,11 +1,11 @@
#ifndef ICONS_H_
#define ICONS_H_
#ifdef __CYGWIN__
# define USE_IMAGE_LABELS 0
#else
//#ifdef __CYGWIN__
//# define USE_IMAGE_LABELS 0
//#else
# define USE_IMAGE_LABELS 1
#endif
//#endif
#include <FL/Fl_Widget.H>
#include <FL/Fl_Menu_Item.H>

1
src/include/pixmaps.h
Wyświetl plik

@ -51,5 +51,6 @@ extern const char *tx2_icon[];
extern const char *rx_icon[];
extern const char *tx_icon[];
extern const char *fldigi_icon[];
extern const char *waterfall_icon[];
#endif // PIXMAPS_H_

2
src/include/rigsupport.h
Wyświetl plik

@ -35,7 +35,6 @@ extern int qso_movFreq();
extern int cb_qso_opMODE();
extern int cb_qso_opBW();
extern void qso_setMode();
extern string modeString(rmode_t m);
extern void selectFreq();
extern void delFreq();
@ -56,6 +55,7 @@ extern bool init_rigMEM_RigDialog();
#if USE_HAMLIB
extern bool init_Hamlib_RigDialog();
extern void selMode(rmode_t m);
extern string modeString(rmode_t m);
#endif
extern Fl_Double_Window * createRigDialog();

2
src/misc/configuration.cxx
Wyświetl plik

@ -429,7 +429,7 @@ int configuration::setDefaults() {
inpWaterfallClickText->input_type(FL_MULTILINE_INPUT);
inpWaterfallClickText->value(WaterfallClickText.c_str());
if (!WaterfallClickInsert)
inpWaterfallClickText->hide();
inpWaterfallClickText->deactivate();
mnuWaterfallWheelAction->add(waterfall::wf_wheel_action);
mnuWaterfallWheelAction->value(WaterfallWheelAction);

1244
src/misc/pixmaps.cxx
Wyświetl plik

Plik diff jest za duży Load Diff