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

Fix merge: menus.

pull/1/head
John Greb 2015-05-15 19:57:05 +01:00
rodzic d84430b94c
commit 453706a94f
3 zmienionych plików z 24 dodań i 28 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -5607,7 +5607,7 @@ Fl_Double_Window* ConfigureDialog() {
tabOperator->tooltip(_("Operator information"));
tabOperator->callback((Fl_Callback*)cb_tabOperator);
tabOperator->when(FL_WHEN_CHANGED);
{ Fl_Group* o = new Fl_Group(55, 35, 490, 170, _("Station"));
{ Fl_Group* o = new Fl_Group(55, 35, 490, 200, _("Station"));
o->box(FL_ENGRAVED_FRAME);
o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE));
{ inpMyCallsign = new Fl_Input2(160, 64, 110, 24, _("Callsign:"));
@ -5680,7 +5680,8 @@ Fl_Double_Window* ConfigureDialog() {
inpMyAntenna->when(FL_WHEN_RELEASE);
inpMyAntenna->labelsize(FL_NORMAL_SIZE);
} // Fl_Input2* inpMyAntenna
{ Fl_Input* o = MyRadio = new Fl_Input(132, 200, 320, 25, _("Radio:"));
{ Fl_Input* o = MyRadio = new Fl_Input(160, 200, 320, 24, _("Radio:"));
MyRadio->tooltip(_("Short description of radio"));
MyRadio->callback((Fl_Callback*)cb_MyRadio);
o->value(progdefaults.myRadio.c_str());
} // Fl_Input* MyRadio

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

@ -366,7 +366,7 @@ static const char szProsigns[] = "~|%|&|+|=|{|}|<|>|[|]| ";} {}
} {
Fl_Group {} {
label Station open
xywh {55 35 490 170} box ENGRAVED_FRAME align 21
xywh {55 35 490 200} box ENGRAVED_FRAME align 21
} {
Fl_Input inpMyCallsign {
label {Callsign:}
@ -435,7 +435,7 @@ btnApplyConfig->activate();}
progdefaults.changed = true;
dl_fldigi::changed(dl_fldigi::CH_INFO);
btnApplyConfig->activate();}
xywh {132 200 320 25}
tooltip {Short description of radio} xywh {160 200 320 24}
code0 {o->value(progdefaults.myRadio.c_str());}
}
}

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

@ -1011,8 +1011,7 @@ void startup_modem(modem* m, int f)
trx_mode id = m->get_mode();
if (!bHAB)
{
if (!bHAB) {
if (id == MODE_CW) {
cntCW_WPM->show();
btnCW_Default->show();
@ -1024,7 +1023,7 @@ void startup_modem(modem* m, int f)
}
}
if (!bWF_only) {
if ((!bHAB) && (!bWF_only)) {
if (id >= MODE_WEFAX_FIRST && id <= MODE_WEFAX_LAST) {
center_group->hide();
wefax_group->show();
@ -4052,6 +4051,20 @@ _FL_MULTI_LABEL, 0, 14, 0},
{0,0,0,0,0,0,0,0,0},
{ _("&Logbook"), 0, 0, 0, FL_SUBMENU, FL_NORMAL_LABEL, 0, 14, 0},
{ icons::make_icon_label(_("View")), 'l', (Fl_Callback*)cb_mnuShowLogbook, 0, FL_MENU_DIVIDER, _FL_MULTI_LABEL, 0, 14, 0},
{ icons::make_icon_label(_("ADIF")), 0, 0, 0, FL_SUBMENU, _FL_MULTI_LABEL, 0, 14, 0},
{ icons::make_icon_label(_("Merge...")), 0, (Fl_Callback*)cb_mnuMergeADIF_log, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{ icons::make_icon_label(_("Export...")), 0, (Fl_Callback*)cb_mnuExportADIF_log, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{0,0,0,0,0,0,0,0,0},
{ icons::make_icon_label(_("Reports")), 0, 0, 0, FL_SUBMENU | FL_MENU_DIVIDER, _FL_MULTI_LABEL, 0, 14, 0},
{ icons::make_icon_label(_("Text...")), 0, (Fl_Callback*)cb_mnuExportTEXT_log, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{ icons::make_icon_label(_("CSV...")), 0, (Fl_Callback*)cb_mnuExportCSV_log, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{ icons::make_icon_label(_("Cabrillo...")), 0, (Fl_Callback*)cb_Export_Cabrillo, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{0,0,0,0,0,0,0,0,0},
{ icons::make_icon_label(_("New")), 0, (Fl_Callback*)cb_mnuNewLogbook, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{ icons::make_icon_label(_("Open...")), 0, (Fl_Callback*)cb_mnuOpenLogbook, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{ icons::make_icon_label(_("Save")), 0, (Fl_Callback*)cb_mnuSaveLogbook, 0, FL_MENU_DIVIDER, _FL_MULTI_LABEL, 0, 14, 0},
{ LOG_CONNECT_SERVER, 0, cb_log_server, 0, FL_MENU_TOGGLE, FL_NORMAL_LABEL, 0, 14, 0},
{0,0,0,0,0,0,0,0,0},
{_("DL Client"), 0, 0, 0, FL_SUBMENU, FL_NORMAL_LABEL, 0, 14, 0},
@ -4061,28 +4074,10 @@ _FL_MULTI_LABEL, 0, 14, 0},
{ icons::make_icon_label(_("Tracker"), pskr_icon), 0, cb_mnuVisitTracker, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{ icons::make_icon_label(_("habitat"), pskr_icon), 0, cb_mnuVisitHabitat, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{ icons::make_icon_label(_("Help"), pskr_icon), 0, cb_mnuVisitDLHelp, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{ icons::make_icon_label(_("View")), 'l', (Fl_Callback*)cb_mnuShowLogbook, 0, FL_MENU_DIVIDER, _FL_MULTI_LABEL, 0, 14, 0},
{ icons::make_icon_label(_("ADIF")), 0, 0, 0, FL_SUBMENU, _FL_MULTI_LABEL, 0, 14, 0},
{ icons::make_icon_label(_("Merge...")), 0, (Fl_Callback*)cb_mnuMergeADIF_log, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{ icons::make_icon_label(_("Export...")), 0, (Fl_Callback*)cb_mnuExportADIF_log, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{0,0,0,0,0,0,0,0,0},
{ icons::make_icon_label(_("Reports")), 0, 0, 0, FL_SUBMENU | FL_MENU_DIVIDER, _FL_MULTI_LABEL, 0, 14, 0},
{ icons::make_icon_label(_("Text...")), 0, (Fl_Callback*)cb_mnuExportTEXT_log, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{ icons::make_icon_label(_("CSV...")), 0, (Fl_Callback*)cb_mnuExportCSV_log, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{ icons::make_icon_label(_("Cabrillo...")), 0, (Fl_Callback*)cb_Export_Cabrillo, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{0,0,0,0,0,0,0,0,0},
{ icons::make_icon_label(_("New")), 0, (Fl_Callback*)cb_mnuNewLogbook, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{ icons::make_icon_label(_("Open...")), 0, (Fl_Callback*)cb_mnuOpenLogbook, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{ icons::make_icon_label(_("Save")), 0, (Fl_Callback*)cb_mnuSaveLogbook, 0, FL_MENU_DIVIDER, _FL_MULTI_LABEL, 0, 14, 0},
{ LOG_CONNECT_SERVER, 0, cb_log_server, 0, FL_MENU_TOGGLE, FL_NORMAL_LABEL, 0, 14, 0},
{0,0,0,0,0,0,0,0,0},
{" ", 0, 0, 0, FL_MENU_INACTIVE, FL_NORMAL_LABEL, 0, 14, 0},
{_("&Help"), 0, 0, 0, FL_SUBMENU, FL_NORMAL_LABEL, 0, 14, 0},
#ifndef NDEBUG
// settle the gmfsk vs fldigi argument once and for all
@ -8447,7 +8442,7 @@ void set_rtty_shift(int shift)
return;
// Static const array otherwise will be built at each call.
static const int shifts[] = { 23, 85, 160, 170, 182, 200, 240, 350, 425, 850 };
static const int shifts[] = { 23, 85, 160, 170, 182, 200, 240, 350, 425, 600, 850 };
size_t i;
for (i = 0; i < sizeof(shifts)/sizeof(*shifts); i++)
if (shifts[i] == shift)
@ -8465,7 +8460,7 @@ void set_rtty_baud(float baud)
// Static const array otherwise will be rebuilt at each call.
static const float bauds[] = {
45.0f, 45.45f, 50.0f, 56.0f, 75.0f,
100.0f, 110.0f, 150.0f, 200.0f, 300.0f
100.0f, 110.0f, 150.0f, 200.0f, 300.0f, 600.0f, 1200.0f
};
for (size_t i = 0; i < sizeof(bauds)/sizeof(*bauds); i++) {
if (bauds[i] == baud) {