Listbox initializers

* Corrected initializers for some configuration listbox
    controls
pull/1/head
David Freese 2014-10-29 18:42:20 -05:00
rodzic 411878336b
commit 3dfbfbadfb
2 zmienionych plików z 26 dodań i 26 usunięć

Wyświetl plik

@ -2918,7 +2918,7 @@ Fl_Tabs *tabsRTTY=(Fl_Tabs *)0;
Fl_ListBox *i_listbox_rtty_afc_speed=(Fl_ListBox *)0;
static void cb_i_listbox_rtty_afc_speed(Fl_ListBox* o, void*) {
progdefaults.rtty_afcspeed = o->index()-1;
progdefaults.rtty_afcspeed = o->index();
progdefaults.changed = true;
}
@ -5284,6 +5284,7 @@ Fl_Double_Window* ConfigureDialog() {
tabOperator->tooltip(_("Operator information"));
tabOperator->callback((Fl_Callback*)cb_tabOperator);
tabOperator->when(FL_WHEN_CHANGED);
tabOperator->hide();
{ Fl_Group* o = new Fl_Group(55, 35, 490, 170, _("Station"));
o->box(FL_ENGRAVED_FRAME);
o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE));
@ -6966,11 +6967,11 @@ i on a\ntouch screen device such as a tablet."));
tabWaterfall->end();
} // Fl_Group* tabWaterfall
{ tabModems = new Fl_Group(0, 25, 600, 355, _("Modems"));
tabModems->hide();
{ tabsModems = new Fl_Tabs(0, 25, 600, 355);
tabsModems->selection_color(FL_LIGHT1);
tabsModems->align(Fl_Align(FL_ALIGN_TOP_RIGHT));
{ tabCW = new Fl_Group(0, 50, 600, 330, _("CW"));
tabCW->hide();
{ tabsCW = new Fl_Tabs(0, 50, 600, 330);
tabsCW->selection_color(FL_LIGHT1);
{ Fl_Group* o = new Fl_Group(0, 75, 600, 305, _("General"));
@ -7804,7 +7805,7 @@ i on a\ntouch screen device such as a tablet."));
i_listbox_olivia_bandwidth->align(Fl_Align(FL_ALIGN_RIGHT));
i_listbox_olivia_bandwidth->when(FL_WHEN_RELEASE);
o->add(szOliviaBandwidth);
o->index(progdefaults.oliviabw+1);
o->index(progdefaults.oliviabw);
o->labelsize(FL_NORMAL_SIZE);
i_listbox_olivia_bandwidth->end();
} // Fl_ListBox* i_listbox_olivia_bandwidth
@ -7821,7 +7822,7 @@ i on a\ntouch screen device such as a tablet."));
i_listbox_olivia_tones->align(Fl_Align(FL_ALIGN_RIGHT));
i_listbox_olivia_tones->when(FL_WHEN_RELEASE);
o->add(szOliviaTones);
o->index(progdefaults.oliviatones+1);
o->index(progdefaults.oliviatones);
o->labelsize(FL_NORMAL_SIZE);
i_listbox_olivia_tones->end();
} // Fl_ListBox* i_listbox_olivia_tones
@ -7884,7 +7885,6 @@ i on a\ntouch screen device such as a tablet."));
tabOlivia->end();
} // Fl_Group* tabOlivia
{ tabContestia = new Fl_Group(0, 50, 600, 330, _("Cont\'"));
tabContestia->hide();
{ Fl_Group* o = new Fl_Group(55, 80, 490, 200);
o->box(FL_ENGRAVED_FRAME);
{ Fl_ListBox* o = i_listbox_contestia_bandwidth = new Fl_ListBox(110, 100, 85, 22, _("Bandwidth"));
@ -7900,8 +7900,8 @@ i on a\ntouch screen device such as a tablet."));
i_listbox_contestia_bandwidth->align(Fl_Align(FL_ALIGN_RIGHT));
i_listbox_contestia_bandwidth->when(FL_WHEN_RELEASE);
o->add(szContestiaBandwidth);
o->index(progdefaults.contestiabw +1);
o->labelsize(FL_NORMAL_SIZE);
o->index(progdefaults.contestiabw);
o->labelsize(FL_NORMAL_SIZE);
i_listbox_contestia_bandwidth->end();
} // Fl_ListBox* i_listbox_contestia_bandwidth
{ Fl_ListBox* o = i_listbox_contestia_tones = new Fl_ListBox(371, 100, 70, 22, _("Tones"));
@ -7917,8 +7917,8 @@ i on a\ntouch screen device such as a tablet."));
i_listbox_contestia_tones->align(Fl_Align(FL_ALIGN_RIGHT));
i_listbox_contestia_tones->when(FL_WHEN_RELEASE);
o->add(szContestiaTones);
o->index(progdefaults.contestiatones +1);
o->labelsize(FL_NORMAL_SIZE);
o->index(progdefaults.contestiatones);
o->labelsize(FL_NORMAL_SIZE);
i_listbox_contestia_tones->end();
} // Fl_ListBox* i_listbox_contestia_tones
{ Fl_Group* o = new Fl_Group(93, 139, 414, 131, _("Receive synchronizer"));
@ -8107,8 +8107,8 @@ i on a\ntouch screen device such as a tablet."));
i_listbox_rtty_afc_speed->align(Fl_Align(FL_ALIGN_TOP));
i_listbox_rtty_afc_speed->when(FL_WHEN_RELEASE);
o->add("Slow"); o->add("Normal"); o->add("Fast");
o->index(progdefaults.rtty_afcspeed+1);
o->labelsize(FL_NORMAL_SIZE);
o->index(progdefaults.rtty_afcspeed);
o->labelsize(FL_NORMAL_SIZE);
i_listbox_rtty_afc_speed->end();
} // Fl_ListBox* i_listbox_rtty_afc_speed
{ Fl_Check_Button* o = chkUOSrx = new Fl_Check_Button(211, 128, 63, 22, _("RX - unshift on space"));

Wyświetl plik

@ -322,8 +322,8 @@ static const char szProsigns[] = "~|%|&|+|=|{|}|<|>|[|]| ";} {}
} {
Fl_Group tabOperator {
label Operator
callback {progdefaults.changed = true;} open selected
tooltip {Operator information} xywh {0 25 600 355} when 1
callback {progdefaults.changed = true;} open
tooltip {Operator information} xywh {0 25 600 355} when 1 hide
} {
Fl_Group {} {
label Station open
@ -2767,14 +2767,14 @@ behaves inside the waterfall} xywh {65 207 150 22} box DOWN_BOX color 7 align 8
}
Fl_Group tabModems {
label Modems open
xywh {0 25 600 355} hide
xywh {0 25 600 355}
} {
Fl_Tabs tabsModems {open
xywh {0 25 600 355} selection_color 50 align 9
} {
Fl_Group tabCW {
label CW open
xywh {0 50 600 330}
xywh {0 50 600 330} hide
} {
Fl_Tabs tabsCW {open
xywh {0 50 600 330} selection_color 50
@ -3446,7 +3446,7 @@ resetOLIVIA();
progdefaults.changed = true;} open
tooltip {Select bandwidth} xywh {110 96 85 22} box DOWN_BOX color 7 align 8
code0 {o->add(szOliviaBandwidth);}
code1 {o->index(progdefaults.oliviabw+1);
code1 {o->index(progdefaults.oliviabw);
o->labelsize(FL_NORMAL_SIZE);}
class Fl_ListBox
} {}
@ -3458,7 +3458,7 @@ resetOLIVIA();
progdefaults.changed = true;} open
tooltip {Select number of tones} xywh {371 96 70 22} box DOWN_BOX color 7 align 8
code0 {o->add(szOliviaTones);}
code1 {o->index(progdefaults.oliviatones+1);
code1 {o->index(progdefaults.oliviatones);
o->labelsize(FL_NORMAL_SIZE);}
class Fl_ListBox
} {}
@ -3502,7 +3502,7 @@ progdefaults.changed = true;}
}
Fl_Group tabContestia {
label {Cont'} open
xywh {0 50 600 330} hide
xywh {0 50 600 330}
} {
Fl_Group {} {open
xywh {55 80 490 200} box ENGRAVED_FRAME
@ -3515,8 +3515,8 @@ resetCONTESTIA();
progdefaults.changed = true;} open
tooltip {Select bandwidth} xywh {110 100 85 22} box DOWN_BOX color 7 align 8
code0 {o->add(szContestiaBandwidth);}
code1 {o->index(progdefaults.contestiabw +1);
o->labelsize(FL_NORMAL_SIZE);}
code1 {o->index(progdefaults.contestiabw);}
code2 {o->labelsize(FL_NORMAL_SIZE);}
class Fl_ListBox
} {}
Fl_Group i_listbox_contestia_tones {
@ -3524,11 +3524,11 @@ progdefaults.changed = true;} open
callback {progdefaults.contestiatones = o->index();
set_contestia_default_integ();
resetCONTESTIA();
progdefaults.changed = true;} open
progdefaults.changed = true;} open selected
tooltip {Select number of tones} xywh {371 100 70 22} box DOWN_BOX color 7 align 8
code0 {o->add(szContestiaTones);}
code1 {o->index(progdefaults.contestiatones +1);
o->labelsize(FL_NORMAL_SIZE);}
code1 {o->index(progdefaults.contestiatones);}
code2 {o->labelsize(FL_NORMAL_SIZE);}
class Fl_ListBox
} {}
Fl_Group {} {
@ -3657,12 +3657,12 @@ progdefaults.changed = true;}
} {
Fl_Group i_listbox_rtty_afc_speed {
label {AFC speed}
callback {progdefaults.rtty_afcspeed = o->index()-1;
callback {progdefaults.rtty_afcspeed = o->index();
progdefaults.changed = true;} open
tooltip {AFC tracking speed} xywh {107 128 90 22} box DOWN_BOX color 7
code0 {o->add("Slow"); o->add("Normal"); o->add("Fast");}
code1 {o->index(progdefaults.rtty_afcspeed+1);
o->labelsize(FL_NORMAL_SIZE);}
code1 {o->index(progdefaults.rtty_afcspeed);}
code2 {o->labelsize(FL_NORMAL_SIZE);}
class Fl_ListBox
} {}
Fl_Check_Button chkUOSrx {