← Back to branch summary

~ubuntu-branches/ubuntu/trusty/fldigi/trusty

« back to all changes in this revision

Viewing changes to src/dialogs/fl_digi.cxx

  • Committer: Package Import Robot
  • Author(s): Kamal Mostafa
  • Date: 2013-02-02 11:52:30 UTC
  • mfrom: (1.1.64)
  • Revision ID: package-import@ubuntu.com-20130202115230-kea12fgypzi0c2uk
Tags: 3.21.67-2
* Debian packaging:
  - debian/fldigi.menu: use absolute path to menu icons

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/dialogs/fl_digi.cxx
653
653
// Olivia
654
654
void set_olivia_default_integ()
655
655
{
 
656
        if (!progdefaults.olivia_reset_fec) return;
 
657
 
656
658
        int tones = progdefaults.oliviatones;
657
659
        int bw = progdefaults.oliviabw;
658
660
 
915
917
                wefax_pic::hide_both();
916
918
        }
917
919
 
918
 
        if (id == MODE_RTTY)
919
 
            sldrRTTYbandwidth->value(progdefaults.RTTY_BW);
920
 
        else if (id >= MODE_PSK_FIRST && id <= MODE_PSK_LAST)
 
920
        if (id == MODE_RTTY) {
 
921
                sldrRTTYbandwidth->value(progdefaults.RTTY_BW);
 
922
                if (mvsquelch) {
 
923
                        mvsquelch->value(progStatus.VIEWER_rttysquelch);
 
924
                        mvsquelch->range(-12.0, 6.0);
 
925
                }
 
926
                if (sldrViewerSquelch) {
 
927
                        sldrViewerSquelch->value(progStatus.VIEWER_rttysquelch);
 
928
                        sldrViewerSquelch->range(-12.0, 6.0);
 
929
                }
 
930
        } else if (id >= MODE_PSK_FIRST && id <= MODE_PSK_LAST) {
921
931
                m->set_sigsearch(SIGSEARCH);
 
932
                if (mvsquelch) {
 
933
                        mvsquelch->value(progStatus.VIEWER_psksquelch);
 
934
                        mvsquelch->range(-3.0, 6.0);
 
935
                }
 
936
                if (sldrViewerSquelch) {
 
937
                        sldrViewerSquelch->value(progStatus.VIEWER_psksquelch);
 
938
                        sldrViewerSquelch->range(-3.0, 6.0);
 
939
                }
 
940
        }
922
941
 
923
942
        if (m->get_cap() & modem::CAP_AFC) {
924
943
                btnAFC->value(progStatus.afconoff);
2558
2577
 
2559
2578
void cb_mvsquelch(Fl_Widget *w, void *d)
2560
2579
{
2561
 
        progStatus.VIEWERsquelch = mvsquelch->value();
 
2580
        if (active_modem->get_mode() == MODE_RTTY)
 
2581
                progStatus.VIEWER_rttysquelch = mvsquelch->value();
 
2582
        else
 
2583
                progStatus.VIEWER_psksquelch = mvsquelch->value();
 
2584
 
2562
2585
        if (sldrViewerSquelch)
2563
 
                sldrViewerSquelch->value(progStatus.VIEWERsquelch);
 
2586
                sldrViewerSquelch->value(mvsquelch->value());
2564
2587
}
2565
2588
 
2566
2589
void cb_btnClearMViewer(Fl_Widget *w, void *d)
4794
4817
                        qsoSave3->callback(qsoSave_cb, 0);
4795
4818
                        qsoSave3->tooltip(_("Save"));
4796
4819
 
4797
 
                        fl_font(FL_HELVETICA, FL_NORMAL_SIZE);
 
4820
                        fl_font(FL_HELVETICA, 14);//FL_NORMAL_SIZE);
4798
4821
                        const char *label2a = _("On");
4799
4822
                        const char *label3a = _("Off");
4800
4823
                        const char *label4a = _("Call");
4802
4825
                        const char *label6a = _("# R");
4803
4826
                        const char *label7a = _("Ex");
4804
4827
                        const char *xData = "00000";
4805
 
                        const char *xCall = "WW8WWW";//"WW8WWW/WWWW";
 
4828
                        const char *xCall = "WW8WWW/WW";//"WW8WWW/WWWW";
4806
4829
                        int   wData = static_cast<int>(fl_width(xData));
4807
4830
                        int   wCall = static_cast<int>(fl_width(xCall));
4808
4831
 
4984
5007
                                        // squelch
4985
5008
                                        mvsquelch = new Fl_Value_Slider2(g->x()+2, g->y()+1, g->w() - 75 - 2, g->h()-2);
4986
5009
                                        mvsquelch->type(FL_HOR_NICE_SLIDER);
4987
 
                                        mvsquelch->range(-6.0, 20.0);
4988
 
                                        mvsquelch->value(progStatus.VIEWERsquelch);
4989
 
                                        mvsquelch->step(0.5);
 
5010
                                        mvsquelch->range(-3.0, 6.0);
 
5011
                                        mvsquelch->value(progStatus.VIEWER_psksquelch);
 
5012
                                        mvsquelch->step(0.1);
4990
5013
                                        mvsquelch->color( fl_rgb_color(
4991
5014
                                                progdefaults.bwsrSliderColor.R, 
4992
5015
                                                progdefaults.bwsrSliderColor.G,