kopia lustrzana https://github.com/jamescoxon/dl-fldigi
fixes, had to change ->value to ->index in flight.cxx, same in confdialog
James Coxon
rodzic
15311ca7d6
commit
4f71336009
|
|
@ -1,4 +1,4 @@
|
|||
// generated by Fast Light User Interface Designer (fluid) version 1.0300
|
||||
// generated by Fast Light User Interface Designer (fluid) version 1.0302
|
||||
|
||||
#ifndef confdialog_h
|
||||
#define confdialog_h
|
||||
|
|
@ -39,8 +39,7 @@ extern Fl_Tabs *tabsUI;
|
|||
extern Fl_Group *tabBrowser;
|
||||
extern Fl_Spinner2 *cntChannels;
|
||||
extern Fl_Spinner2 *cntTimeout;
|
||||
#include <FL/Fl_Choice.H>
|
||||
extern Fl_Choice *mnuViewerLabel;
|
||||
extern Fl_ListBox *listboxViewerLabel;
|
||||
#include <FL/Fl_Button.H>
|
||||
extern Fl_Button *btnViewerFont;
|
||||
extern Fl_Check_Button *btnFixedIntervals;
|
||||
|
|
@ -78,9 +77,9 @@ extern Fl_Button *btnDupColor;
|
|||
extern Fl_Group *tabUserInterface;
|
||||
extern Fl_Check_Button *btnShowTooltips;
|
||||
extern Fl_Check_Button *chkMenuIcons;
|
||||
extern Fl_Choice *mnuScheme;
|
||||
extern Fl_ListBox *listboxScheme;
|
||||
extern Fl_Button *bVisibleModes;
|
||||
extern Fl_Choice *mnuLang;
|
||||
extern Fl_ListBox *listbox_language;
|
||||
extern Fl_Check_Button *btn_rx_lowercase;
|
||||
extern Fl_Check_Button *btn_tx_lowercase;
|
||||
extern Fl_Check_Button *btn_save_config_on_exit;
|
||||
|
|
@ -139,9 +138,8 @@ extern Fl_Button *btn_wf_enable_all;
|
|||
extern Fl_Button *btn_wf_disable_all;
|
||||
extern Fl_Group *tabColorsFonts;
|
||||
extern Fl_Tabs *tabsColors;
|
||||
#include <FL/Fl_Menu_Button.H>
|
||||
#include "fl_digi.h"
|
||||
extern Fl_Menu_Button *CHARSETstatus;
|
||||
extern Fl_ListBox *listbox_charset_status;
|
||||
extern Fl_Input *RxText;
|
||||
extern Fl_Button *btnRxColor;
|
||||
extern Fl_Button *btnTxColor;
|
||||
|
|
@ -228,7 +226,7 @@ extern Fl_Check_Button *btnViewXmtSignal;
|
|||
extern Fl_Value_Slider2 *valTxMonitorLevel;
|
||||
extern Fl_Counter2 *cntLowFreqCutoff;
|
||||
extern Fl_Check_Button *btnWFaveraging;
|
||||
extern Fl_Choice *mnuFFTPrefilter;
|
||||
extern Fl_ListBox *listboxFFTPrefilter;
|
||||
extern Fl_Counter2 *cntrWfwidth;
|
||||
extern Fl_Counter2 *wf_latency;
|
||||
extern Fl_Counter2 *cntrWfheight;
|
||||
|
|
@ -236,7 +234,7 @@ extern Fl_Check_Button *btnWaterfallHistoryDefault;
|
|||
extern Fl_Check_Button *btnWaterfallQSY;
|
||||
extern Fl_Check_Button *btnWaterfallClickInsert;
|
||||
extern Fl_Input2 *inpWaterfallClickText;
|
||||
extern Fl_Choice *mnuWaterfallWheelAction;
|
||||
extern Fl_ListBox *listboxWaterfallWheelAction;
|
||||
extern Fl_Group *tabModems;
|
||||
extern Fl_Tabs *tabsModems;
|
||||
extern Fl_Group *tabCW;
|
||||
|
|
@ -263,16 +261,16 @@ extern Fl_Check_Button *btnCWusefarnsworth;
|
|||
extern Fl_Counter2 *cntCWweight;
|
||||
extern Fl_Counter2 *cntCWdash2dot;
|
||||
extern Fl_Counter2 *cntCWrisetime;
|
||||
extern Fl_Choice *mnuQSKshape;
|
||||
extern Fl_ListBox *i_listboxQSKshape;
|
||||
extern Fl_Check_Button *btnCWnarrow;
|
||||
extern Fl_Check_Button *btnQSK;
|
||||
extern Fl_Counter2 *cntPreTiming;
|
||||
extern Fl_Counter2 *cntPostTiming;
|
||||
extern Fl_Check_Button *btnQSKadjust;
|
||||
extern char szTestChar[];
|
||||
extern Fl_Choice *mnuTestChar;
|
||||
extern Fl_ListBox *i_listbox_test_char;
|
||||
extern Fl_Check_Button *btnCW_use_paren;
|
||||
extern Fl_Choice *mnu_prosign[9];
|
||||
extern Fl_ListBox *listbox_prosign[9];
|
||||
extern Fl_Group *tabDomEX;
|
||||
extern Fl_Input2 *txtSecondary;
|
||||
extern Fl_Check_Button *valDominoEX_FILTER;
|
||||
|
|
@ -283,11 +281,11 @@ extern Fl_Value_Slider2 *valDomCWI;
|
|||
extern Fl_Counter2 *valDominoEX_PATHS;
|
||||
extern Fl_Group *tabFeld;
|
||||
#include "fontdef.h"
|
||||
extern Fl_Choice *selHellFont;
|
||||
extern Fl_ListBox *listboxHellFont;
|
||||
extern Fl_Check_Button *btnBlackboard;
|
||||
extern Fl_Spinner2 *valHellXmtWidth;
|
||||
extern Fl_Check_Button *btnHellRcvWidth;
|
||||
extern Fl_Choice *mnuHellPulse;
|
||||
extern Fl_ListBox *listboxHellPulse;
|
||||
extern Fl_Value_Slider2 *sldrHellBW;
|
||||
extern Fl_Check_Button *btnFeldHellIdle;
|
||||
extern Fl_Check_Button *btnHellXmtWidth;
|
||||
|
|
@ -299,15 +297,15 @@ extern Fl_Check_Button *btnMT63_upper_lower;
|
|||
extern Fl_Spinner2 *MT63_tone_duration;
|
||||
extern Fl_Check_Button *btnMT63_at500;
|
||||
extern Fl_Group *tabOlivia;
|
||||
extern Fl_Choice *mnuOlivia_Bandwidth;
|
||||
extern Fl_Choice *mnuOlivia_Tones;
|
||||
extern Fl_ListBox *i_listbox_olivia_bandwidth;
|
||||
extern Fl_ListBox *i_listbox_olivia_tones;
|
||||
extern Fl_Counter2 *cntOlivia_smargin;
|
||||
extern Fl_Counter2 *cntOlivia_sinteg;
|
||||
extern Fl_Check_Button *btn_olivia_reset_fec;
|
||||
extern Fl_Check_Button *btnOlivia_8bit;
|
||||
extern Fl_Group *tabContestia;
|
||||
extern Fl_Choice *mnuContestia_Bandwidth;
|
||||
extern Fl_Choice *mnuContestia_Tones;
|
||||
extern Fl_ListBox *i_listbox_contestia_bandwidth;
|
||||
extern Fl_ListBox *i_listbox_contestia_tones;
|
||||
extern Fl_Counter2 *cntContestia_smargin;
|
||||
extern Fl_Counter2 *cntContestia_sinteg;
|
||||
extern Fl_Check_Button *btn_contestia_reset_fec;
|
||||
|
|
@ -316,11 +314,11 @@ extern Fl_Group *tabPSK;
|
|||
extern Fl_Tabs *tabsPSK;
|
||||
extern Fl_Counter2 *cntSearchRange;
|
||||
extern Fl_Counter2 *cntACQsn;
|
||||
extern Fl_Choice *mnuPSKStatusTimeout;
|
||||
extern Fl_ListBox *listbox_psk_status_timeout;
|
||||
extern Fl_Check_Button *btnEnablePSKbrowsing;
|
||||
extern Fl_Group *tabRTTY;
|
||||
extern Fl_Tabs *tabsRTTY;
|
||||
extern Fl_Choice *mnuRTTYAFCSpeed;
|
||||
extern Fl_ListBox *i_listbox_rtty_afc_speed;
|
||||
extern Fl_Check_Button *chkUOSrx;
|
||||
#include <FL/Fl_Value_Input.H>
|
||||
extern Fl_Value_Input *rtty_rx_shape;
|
||||
|
|
@ -329,12 +327,12 @@ extern Fl_Check_Button *btnPreferXhairScope;
|
|||
extern Fl_Check_Button *chk_true_scope;
|
||||
extern Fl_Check_Button *chk_useMARKfreq;
|
||||
extern Fl_Button *btnRTTY_mark_color;
|
||||
extern Fl_Choice *selShift;
|
||||
extern Fl_ListBox *selShift;
|
||||
extern Fl_Counter2 *selCustomShift;
|
||||
extern Fl_Choice *selBaud;
|
||||
extern Fl_Choice *selBits;
|
||||
extern Fl_Choice *selParity;
|
||||
extern Fl_Choice *selStopBits;
|
||||
extern Fl_ListBox *selBaud;
|
||||
extern Fl_ListBox *selBits;
|
||||
extern Fl_ListBox *selParity;
|
||||
extern Fl_ListBox *selStopBits;
|
||||
extern Fl_Check_Button *btnAUTOCRLF;
|
||||
extern Fl_Counter2 *cntrAUTOCRLF;
|
||||
extern Fl_Check_Button *btnCRCRLF;
|
||||
|
|
@ -369,14 +367,13 @@ extern Fl_Group *tabRig;
|
|||
extern Fl_Tabs *tabsRig;
|
||||
extern Fl_Check_Button *btnPTTrightchannel;
|
||||
extern Fl_Group *grpHWPTT;
|
||||
#include <FL/Fl_Input_Choice.H>
|
||||
extern Fl_Input_Choice *inpTTYdev;
|
||||
extern Fl_Round_Button *btnTTYptt;
|
||||
extern Fl_ListBox *inpTTYdev;
|
||||
extern Fl_Round_Button *btnRTSptt;
|
||||
extern Fl_Round_Button *btnRTSplusV;
|
||||
extern Fl_Round_Button *btnDTRptt;
|
||||
extern Fl_Round_Button *btnDTRplusV;
|
||||
extern Fl_Button *btnInitHWPTT;
|
||||
extern Fl_Round_Button *btnTTYptt;
|
||||
extern Fl_Round_Button *btnUsePPortPTT;
|
||||
extern Fl_Round_Button *btnUseUHrouterPTT;
|
||||
extern Fl_Group *grpPTTdelays;
|
||||
|
|
@ -386,11 +383,11 @@ extern Fl_Check_Button *chkUSERIGCAT;
|
|||
extern Fl_Group *grpRigCAT;
|
||||
extern Fl_Output *txtXmlRigFilename;
|
||||
extern Fl_Button *btnSelectRigXmlFile;
|
||||
extern Fl_Input_Choice *inpXmlRigDevice;
|
||||
extern Fl_ListBox *inpXmlRigDevice;
|
||||
extern Fl_Value_Input2 *cntRigCatRetries;
|
||||
extern Fl_Value_Input2 *cntRigCatTimeout;
|
||||
extern Fl_Value_Input2 *cntRigCatWait;
|
||||
extern Fl_Choice *mnuXmlRigBaudrate;
|
||||
extern Fl_ListBox *listbox_xml_rig_baudrate;
|
||||
extern Fl_Counter2 *valRigCatStopbits;
|
||||
extern Fl_Button *btnInitRIGCAT;
|
||||
extern Fl_Check_Button *btnRigCatEcho;
|
||||
|
|
@ -404,21 +401,22 @@ extern Fl_Check_Button *chk_restore_tio;
|
|||
#include "rigio.h"
|
||||
extern Fl_Button *btnRevertRIGCAT;
|
||||
extern Fl_Check_Button *chkRigCatVSP;
|
||||
extern Fl_Value_Input2 *cntRigCatInitDelay;
|
||||
extern Fl_Group *tabHamlib;
|
||||
extern Fl_Check_Button *chkUSEHAMLIB;
|
||||
extern Fl_Group *grpHamlib;
|
||||
extern Fl_ComboBox *cboHamlibRig;
|
||||
extern Fl_Input_Choice *inpRIGdev;
|
||||
extern Fl_ListBox *cboHamlibRig;
|
||||
extern Fl_ListBox *inpRIGdev;
|
||||
extern Fl_Value_Input2 *cntHamlibRetries;
|
||||
extern Fl_Value_Input2 *cntHamlibTimeout;
|
||||
extern Fl_Value_Input2 *cntHamlibWriteDelay;
|
||||
extern Fl_Value_Input2 *cntHamlibWait;
|
||||
extern Fl_Choice *mnuBaudRate;
|
||||
extern Fl_ListBox *listbox_baudrate;
|
||||
extern Fl_Counter2 *valHamRigStopbits;
|
||||
extern Fl_Counter2 *cntHamlibTimeout0;
|
||||
extern Fl_Input2 *inpHamlibConfig;
|
||||
extern Fl_Button *btnInitHAMLIB;
|
||||
extern Fl_Choice *mnuSideband;
|
||||
extern Fl_ListBox *listbox_sideband;
|
||||
extern Fl_Round_Button *btnHamlibCMDptt;
|
||||
extern Fl_Check_Button *btnHamlibDTRplus;
|
||||
extern Fl_Check_Button *chkHamlibRTSplus;
|
||||
|
|
@ -433,27 +431,27 @@ extern Fl_Group *tabSoundCard;
|
|||
extern Fl_Tabs *tabsSoundCard;
|
||||
extern Fl_Group *tabAudio;
|
||||
extern Fl_Group *AudioOSS;
|
||||
extern Fl_Input_Choice *menuOSSDev;
|
||||
extern Fl_ListBox *menuOSSDev;
|
||||
extern Fl_Group *AudioPort;
|
||||
extern Fl_Choice *menuPortInDev;
|
||||
extern Fl_Choice *menuPortOutDev;
|
||||
extern Fl_ListBox *menuPortInDev;
|
||||
extern Fl_ListBox *menuPortOutDev;
|
||||
extern Fl_Group *AudioPulse;
|
||||
extern Fl_Input2 *inpPulseServer;
|
||||
extern Fl_Group *AudioNull;
|
||||
extern Fl_Round_Button *btnAudioIO[4];
|
||||
extern Fl_Group *tabAudioOpt;
|
||||
extern Fl_Group *grpAudioSampleRate;
|
||||
extern Fl_Choice *menuInSampleRate;
|
||||
extern Fl_Choice *menuOutSampleRate;
|
||||
extern Fl_ListBox *menuInSampleRate;
|
||||
extern Fl_ListBox *menuOutSampleRate;
|
||||
#include <FL/fl_ask.H>
|
||||
extern Fl_Choice *menuSampleConverter;
|
||||
extern Fl_ListBox *menuSampleConverter;
|
||||
extern Fl_Spinner2 *cntRxRateCorr;
|
||||
extern Fl_Spinner2 *cntTxRateCorr;
|
||||
extern Fl_Spinner2 *cntTxOffset;
|
||||
extern Fl_Group *tabMixer;
|
||||
extern void resetMixerControls();
|
||||
extern Fl_Check_Button *btnMixer;
|
||||
extern Fl_Input_Choice *menuMix;
|
||||
extern Fl_ListBox *menuMix;
|
||||
extern Fl_Light_Button *btnMicIn;
|
||||
extern void setMixerInput(int);
|
||||
extern Fl_Light_Button *btnLineIn;
|
||||
|
|
@ -467,7 +465,7 @@ extern Fl_Check_Button *btnPTTrightchannel2;
|
|||
extern Fl_Check_Button *btnQSK2;
|
||||
extern Fl_Check_Button *chkPseudoFSK2;
|
||||
extern Fl_Group *tabWavFile;
|
||||
extern Fl_Choice *mnuWavSampleRate;
|
||||
extern Fl_ListBox *listbox_wav_samplerate;
|
||||
extern Fl_Group *tabID;
|
||||
extern Fl_Tabs *tabsID;
|
||||
extern Fl_Group *tabRsID;
|
||||
|
|
@ -476,7 +474,7 @@ extern Fl_Button *bRSIDRxModes;
|
|||
extern Fl_Check_Button *chkRSidWideSearch;
|
||||
extern Fl_Check_Button *chkRSidMark;
|
||||
extern Fl_Check_Button *chkRSidAutoDisable;
|
||||
extern Fl_Choice *mnu_RsID_errors;
|
||||
extern Fl_ListBox *listbox_rsid_errors;
|
||||
extern Fl_Value_Slider2 *sldrRSIDsquelch;
|
||||
extern Fl_Check_Button *chkRSidShowAlert;
|
||||
extern Fl_Check_Button *chkRetainFreqLock;
|
||||
|
|
@ -561,7 +559,7 @@ extern Fl_Input *inputKmlRootFile;
|
|||
extern Fl_Counter *cntKmlMergeDistance;
|
||||
extern Fl_Counter *cntKmlRetentionTime;
|
||||
extern Fl_Spinner2 *cntKmlRefreshInterval;
|
||||
extern Fl_Choice *selKmlBalloonStyle;
|
||||
extern Fl_ListBox *listbox_kml_balloon_style;
|
||||
extern Fl_Input *btnKmlCommand;
|
||||
extern Fl_Button *btlTestKmlCommand;
|
||||
extern Fl_Button *btnSelectKmlDestDir;
|
||||
|
|
@ -583,6 +581,7 @@ extern Fl_Input2 *txtQRZpathname;
|
|||
extern Fl_Input2 *inpQRZusername;
|
||||
extern Fl_Input2 *inpQRZuserpassword;
|
||||
extern Fl_Button *btnQRZpasswordShow;
|
||||
extern Fl_Check_Button *btn_notes_address;
|
||||
extern Fl_Input2 *inpEQSL_id;
|
||||
extern Fl_Input2 *inpEQSL_pwd;
|
||||
extern Fl_Button *btnEQSL_pwd_show;
|
||||
|
|
@ -606,6 +605,7 @@ extern Fl_Counter2 *cntTrackFreqMax;
|
|||
#include <FL/Fl_Float_Input.H>
|
||||
extern Fl_Float_Input *stationary_lat;
|
||||
extern Fl_Float_Input *stationary_lon;
|
||||
#include <FL/Fl_Input_Choice.H>
|
||||
extern Fl_Input_Choice *inpGPSdev;
|
||||
#include <FL/Fl_Spinner.H>
|
||||
extern Fl_Output *gps_pos_lat;
|
||||
|
|
@ -618,6 +618,7 @@ extern Fl_Group *tabDLFlights;
|
|||
#include <FL/Fl_Browser.H>
|
||||
extern Fl_Browser *flight_browser;
|
||||
extern Fl_Button *flight_docs_refresh_a;
|
||||
#include <FL/Fl_Choice.H>
|
||||
extern Fl_Choice *flight_payload_list;
|
||||
extern Fl_Button *payload_autoconfigure_a;
|
||||
extern Fl_Choice *flight_payload_transmission_list;
|
||||
|
|
|
|||
|
|
@ -776,7 +776,7 @@ static void autoconfigure_rtty_shift(const Json::Value &value)
|
|||
/* I love floats :-( */
|
||||
if (diff < 0.1 && diff > -0.1)
|
||||
{
|
||||
selShift->value(search);
|
||||
selShift->index(search);
|
||||
selCustomShift->deactivate();
|
||||
progdefaults.rtty_shift = search;
|
||||
return;
|
||||
|
|
@ -785,7 +785,7 @@ static void autoconfigure_rtty_shift(const Json::Value &value)
|
|||
|
||||
/* If not found (i.e., we found the terminating 0, and haven't returned)
|
||||
* then search == the index of the "Custom" menu item */
|
||||
selShift->value(search);
|
||||
selShift->index(search);
|
||||
selCustomShift->activate();
|
||||
progdefaults.rtty_shift = -1;
|
||||
selCustomShift->value(shift);
|
||||
|
|
@ -804,7 +804,7 @@ static void autoconfigure_rtty_baud(const Json::Value &value)
|
|||
double diff = rtty::BAUD[search] - baud;
|
||||
if (diff < 0.01 && diff > -0.01)
|
||||
{
|
||||
selBaud->value(search);
|
||||
selBaud->index(search);
|
||||
progdefaults.rtty_baud = search;
|
||||
return;
|
||||
}
|
||||
|
|
@ -829,14 +829,14 @@ static void autoconfigure_rtty_encoding(const Json::Value &value)
|
|||
else
|
||||
return;
|
||||
|
||||
selBits->value(select);
|
||||
selBits->index(select);
|
||||
progdefaults.rtty_bits = select;
|
||||
|
||||
/* From selBits' callback */
|
||||
if (select == 0)
|
||||
{
|
||||
progdefaults.rtty_parity = RTTY_PARITY_NONE;
|
||||
selParity->value(RTTY_PARITY_NONE);
|
||||
selParity->index(RTTY_PARITY_NONE);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -865,7 +865,7 @@ static void autoconfigure_rtty_parity(const Json::Value &value)
|
|||
else
|
||||
return;
|
||||
|
||||
selParity->value(select);
|
||||
selParity->index(select);
|
||||
progdefaults.rtty_parity = select;
|
||||
}
|
||||
|
||||
|
|
@ -899,7 +899,7 @@ static void autoconfigure_rtty_stop(const Json::Value &value)
|
|||
return;
|
||||
|
||||
progdefaults.rtty_stop = select;
|
||||
selStopBits->value(select);
|
||||
selStopBits->index(select);
|
||||
}
|
||||
|
||||
static void autoconfigure_dominoex(const Json::Value &settings)
|
||||
|
|
|
|||
|
|
@ -604,6 +604,7 @@ extern Fl_Counter2 *cntTrackFreqMax;
|
|||
#include <FL/Fl_Float_Input.H>
|
||||
extern Fl_Float_Input *stationary_lat;
|
||||
extern Fl_Float_Input *stationary_lon;
|
||||
#include <FL/Fl_Input_Choice.H>
|
||||
extern Fl_Input_Choice *inpGPSdev;
|
||||
#include <FL/Fl_Spinner.H>
|
||||
extern Fl_Output *gps_pos_lat;
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue