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

updated and merged, rerun fluid to update confdialog

pull/4/head
James Coxon 2016-08-02 21:38:14 +01:00
rodzic 892162ac86
commit a9cbbaf77d
3 zmienionych plików z 6 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
habitat-cpp-connector

@ -1 +1 @@
Subproject commit bb18817c6890598a5adad5bbe3ae674be4435a9b Subproject commit 54a6061be583f52e3c14db92f79a6a0abdd06dd0

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

@ -6450,7 +6450,6 @@ Fl_Double_Window* ConfigureDialog() {
{ Fl_Check_Button* o = btnNoiseOn = new Fl_Check_Button(93, 269, 70, 15, _("Noise on")); { Fl_Check_Button* o = btnNoiseOn = new Fl_Check_Button(93, 269, 70, 15, _("Noise on"));
btnNoiseOn->down_box(FL_DOWN_BOX); btnNoiseOn->down_box(FL_DOWN_BOX);
btnNoiseOn->callback((Fl_Callback*)cb_btnNoiseOn); btnNoiseOn->callback((Fl_Callback*)cb_btnNoiseOn);
btnNoiseOn->deactivate();
o->value(progdefaults.noise); o->value(progdefaults.noise);
} // Fl_Check_Button* btnNoiseOn } // Fl_Check_Button* btnNoiseOn
{ Fl_Counter2* o = noiseDB = new Fl_Counter2(340, 264, 130, 21, _("dB")); { Fl_Counter2* o = noiseDB = new Fl_Counter2(340, 264, 130, 21, _("dB"));
@ -6467,7 +6466,6 @@ Fl_Double_Window* ConfigureDialog() {
noiseDB->callback((Fl_Callback*)cb_noiseDB); noiseDB->callback((Fl_Callback*)cb_noiseDB);
noiseDB->align(Fl_Align(FL_ALIGN_LEFT)); noiseDB->align(Fl_Align(FL_ALIGN_LEFT));
noiseDB->when(FL_WHEN_CHANGED); noiseDB->when(FL_WHEN_CHANGED);
noiseDB->deactivate();
o->value(progdefaults.s2n); o->value(progdefaults.s2n);
o->lstep(1); o->lstep(1);
} // Fl_Counter2* noiseDB } // Fl_Counter2* noiseDB
@ -10850,7 +10848,7 @@ definition"));
tabSoundCard->hide(); tabSoundCard->hide();
{ tabsSoundCard = new Fl_Tabs(0, 25, 600, 360); { tabsSoundCard = new Fl_Tabs(0, 25, 600, 360);
tabsSoundCard->selection_color(FL_LIGHT1); tabsSoundCard->selection_color(FL_LIGHT1);
{ tabAudio = new Fl_Group(0, 50, 600, 330, _("Devices")); { tabAudio = new Fl_Group(0, 50, 600, 335, _("Devices"));
{ AudioOSS = new Fl_Group(55, 65, 490, 45); { AudioOSS = new Fl_Group(55, 65, 490, 45);
AudioOSS->box(FL_ENGRAVED_FRAME); AudioOSS->box(FL_ENGRAVED_FRAME);
{ btnAudioIO[0] = new Fl_Round_Button(65, 75, 53, 25, _("OSS")); { btnAudioIO[0] = new Fl_Round_Button(65, 75, 53, 25, _("OSS"));

10
src/dialogs/confdialog.h
Wyświetl plik

@ -528,17 +528,16 @@ extern Fl_Check_Button *chk_flrig_keys_modem;
extern Fl_Group *tabSoundCard; extern Fl_Group *tabSoundCard;
extern Fl_Tabs *tabsSoundCard; extern Fl_Tabs *tabsSoundCard;
extern Fl_Group *tabAudio; extern Fl_Group *tabAudio;
extern Fl_Group *AudioTCP; extern Fl_Group *AudioOSS;
extern Fl_Input2 *inpIPServerHost; #include <FL/Fl_Input_Choice.H>
extern Fl_Input2 *inpIPServerPort; extern Fl_Input_Choice *menuOSSDev;
extern Fl_Group *AudioUDP;
extern Fl_Round_Button *btnAudioIO[5];
extern Fl_Group *AudioPort; extern Fl_Group *AudioPort;
extern Fl_Choice *menuPortInDev; extern Fl_Choice *menuPortInDev;
extern Fl_Choice *menuPortOutDev; extern Fl_Choice *menuPortOutDev;
extern Fl_Group *AudioPulse; extern Fl_Group *AudioPulse;
extern Fl_Input2 *inpPulseServer; extern Fl_Input2 *inpPulseServer;
extern Fl_Group *AudioNull; extern Fl_Group *AudioNull;
extern Fl_Round_Button *btnAudioIO[4];
extern Fl_Group *tabAudioOpt; extern Fl_Group *tabAudioOpt;
extern Fl_Group *grpAudioSampleRate; extern Fl_Group *grpAudioSampleRate;
extern Fl_ListBox *menuInSampleRate; extern Fl_ListBox *menuInSampleRate;
@ -670,7 +669,6 @@ extern Fl_Counter2 *cntTrackFreqMax;
#include <FL/Fl_Float_Input.H> #include <FL/Fl_Float_Input.H>
extern Fl_Float_Input *stationary_lat; extern Fl_Float_Input *stationary_lat;
extern Fl_Float_Input *stationary_lon; extern Fl_Float_Input *stationary_lon;
#include <FL/Fl_Input_Choice.H>
extern Fl_Input_Choice *inpGPSdev; extern Fl_Input_Choice *inpGPSdev;
#include <FL/Fl_Spinner.H> #include <FL/Fl_Spinner.H>
extern Fl_Output *gps_pos_lat; extern Fl_Output *gps_pos_lat;