Multiple fixes. Closes #24; Closes #30

- Fix #24: make 'Auto' a checkbox
 - Fix #30 via habitat-cpp-connector submodule: squid proxies
 - Remove 'Test' prepended to update message.
pull/2/head
Daniel Richman 2012-11-02 17:23:41 +00:00
rodzic 59a93b2743
commit aee14af900
5 zmienionych plików z 26 dodań i 21 usunięć

@ -1 +1 @@
Subproject commit 86ba7e2dccebad50850ae8864d3d56805542d09c
Subproject commit 9a02072c8e1e8aee5b62503afcb27745279b8eb6

Wyświetl plik

@ -1891,14 +1891,7 @@ Fl_Value_Slider2 *sldrRTTYbandwidth=(Fl_Value_Slider2 *)0;
static void cb_sldrRTTYbandwidth(Fl_Value_Slider2* o, void*) {
progdefaults.RTTY_BW = o->value();
progdefaults.RTTY_BW_AUTO = false;
progdefaults.changed = true;
}
Fl_Button *RTTYbandwidthAuto=(Fl_Button *)0;
static void cb_RTTYbandwidthAuto(Fl_Button*, void*) {
progdefaults.RTTY_BW_AUTO = true;
resetRTTY();
RTTYbandwidthAuto->value(false);
progdefaults.changed = true;
}
@ -1910,6 +1903,14 @@ resetRTTY();
progdefaults.changed = true;
}
Fl_Check_Button *RTTYbandwidthAuto=(Fl_Check_Button *)0;
static void cb_RTTYbandwidthAuto(Fl_Check_Button* o, void*) {
progdefaults.RTTY_BW_AUTO = o->value();
resetRTTY();
progdefaults.changed = true;
}
Fl_Group *tabTHOR=(Fl_Group *)0;
Fl_Input2 *txtTHORSecondary=(Fl_Input2 *)0;
@ -6120,9 +6121,6 @@ an merging"));
o->value(progdefaults.RTTY_BW);
o->labelsize(FL_NORMAL_SIZE); o->textsize(FL_NORMAL_SIZE);
} // Fl_Value_Slider2* sldrRTTYbandwidth
{ RTTYbandwidthAuto = new Fl_Button(390, 325, 65, 20, _("Auto"));
RTTYbandwidthAuto->callback((Fl_Callback*)cb_RTTYbandwidthAuto);
} // Fl_Button* RTTYbandwidthAuto
{ Fl_Counter2* o = selCustomShift = new Fl_Counter2(36, 103, 100, 20, _("Custom shift"));
selCustomShift->tooltip(_("Input carrier shift"));
selCustomShift->box(FL_UP_BOX);
@ -6142,6 +6140,11 @@ an merging"));
o->lstep(10.0);
o->labelsize(FL_NORMAL_SIZE);
} // Fl_Counter2* selCustomShift
{ Fl_Check_Button* o = RTTYbandwidthAuto = new Fl_Check_Button(395, 325, 70, 20, _("Auto"));
RTTYbandwidthAuto->down_box(FL_DOWN_BOX);
RTTYbandwidthAuto->callback((Fl_Callback*)cb_RTTYbandwidthAuto);
o->value(progdefaults.RTTY_BW_AUTO);
} // Fl_Check_Button* RTTYbandwidthAuto
o->end();
} // Fl_Group* o
tabRTTY->end();

Wyświetl plik

@ -2460,19 +2460,13 @@ progdefaults.changed = true;}
label {Receive filter bandwidth}
callback {progdefaults.RTTY_BW = o->value();
progdefaults.RTTY_BW_AUTO = false;
RTTYbandwidthAuto->value(false);
progdefaults.changed = true;}
tooltip {Adjust the DSP bandwidth} xywh {85 325 300 20} type Horizontal align 5 minimum 5 maximum 1000 step 1 value 25 textsize 14
code0 {o->value(progdefaults.RTTY_BW);}
code1 {o->labelsize(FL_NORMAL_SIZE); o->textsize(FL_NORMAL_SIZE);}
class Fl_Value_Slider2
}
Fl_Button RTTYbandwidthAuto {
label Auto
callback {progdefaults.RTTY_BW_AUTO = true;
resetRTTY();
progdefaults.changed = true;}
xywh {390 325 65 20}
}
Fl_Counter selCustomShift {
label {Custom shift}
callback {progdefaults.rtty_custom_shift = o->value();
@ -2483,6 +2477,14 @@ progdefaults.changed = true;}
code1 {o->labelsize(FL_NORMAL_SIZE);}
class Fl_Counter2
}
Fl_Check_Button RTTYbandwidthAuto {
label Auto
callback {progdefaults.RTTY_BW_AUTO = o->value();
resetRTTY();
progdefaults.changed = true;}
xywh {395 325 70 20} down_box DOWN_BOX
code0 {o->value(progdefaults.RTTY_BW_AUTO);}
}
}
}
Fl_Group tabTHOR {

Wyświetl plik

@ -127,7 +127,7 @@ void *UpdateThread::run()
/* Called by main thread only, while holding lock */
static void got_update(void *)
{
int c = fl_choice2("Test %s", "Close", "Open in browser", NULL,
int c = fl_choice2("%s", "Close", "Open in browser", NULL,
update_text.c_str());
if (c)
{

Wyświetl plik

@ -255,8 +255,8 @@ extern Fl_Check_Button *chkPseudoFSK;
extern Fl_Choice *mnuRTTYAFCSpeed;
extern Fl_Check_Button *chkXagc;
extern Fl_Value_Slider2 *sldrRTTYbandwidth;
extern Fl_Button *RTTYbandwidthAuto;
extern Fl_Counter2 *selCustomShift;
extern Fl_Check_Button *RTTYbandwidthAuto;
extern Fl_Group *tabTHOR;
extern Fl_Input2 *txtTHORSecondary;
extern Fl_Check_Button *valTHOR_FILTER;