Ticket #4465: scanhelpers.patch

File scanhelpers.patch, 3.4 KB (added by Matthew Wire <devel@…>, 14 years ago)
  • libs/libmythtv/scanwizardhelpers.h

     
    412412class ScanFrequency: public LineEditSetting, public TransientStorage
    413413{
    414414  public:
    415     ScanFrequency() : LineEditSetting(this)
     415    ScanFrequency(bool in_kHz = false) : LineEditSetting(this)
    416416    {
    417         setLabel(QObject::tr("Frequency"));
    418         setHelpText(QObject::tr("Frequency (Option has no default)\n"
    419                                 "The frequency for this channel in Hz."));
     417        QString hz = (in_kHz) ? "kHz" : "Hz";
     418        setLabel(QObject::tr("Frequency") + " (" + hz + ")");
     419        setHelpText(QObject::tr(
     420                        "Frequency (Option has no default).\n"
     421                        "The frequency for this channel in") + " " + hz + ".");
    420422    };
    421423};
    422424
    423 class ScanSymbolRate: public LineEditSetting, public TransientStorage
     425class ScanSymbolRate: public ComboBoxSetting, public TransientStorage
    424426{
    425427  public:
    426     ScanSymbolRate() : LineEditSetting(this)
     428    ScanSymbolRate() : ComboBoxSetting(this, true)
    427429    {
    428430        setLabel(QObject::tr("Symbol Rate"));
    429         setHelpText(QObject::tr("Symbol Rate (Option has no default)"));
     431        setHelpText(QObject::tr("Symbol Rate (Symbols/second).\n"
     432                                "Most dvb-s transponders transmit at 27500000 Sym/s "
     433                                "but anything could be used!"));
     434        addSelection("3333000");
     435        addSelection("22000000");
     436        addSelection("27500000", "27500000", true);
     437        addSelection("28000000");
     438        addSelection("28500000");
     439        addSelection("29900000");
    430440    };
    431441};
    432442
     
    696706            new VerticalConfigurationGroup(false,true);
    697707        VerticalConfigurationGroup *right =
    698708            new VerticalConfigurationGroup(false,true);
    699         left->addChild(pfrequency  = new ScanFrequency());
     709        left->addChild(pfrequency  = new ScanFrequency(true));
    700710        left->addChild(ppolarity   = new ScanPolarity());
    701711        left->addChild(psymbolrate = new ScanSymbolRate());
    702712        right->addChild(pfec       = new ScanFec());
  • libs/libmythtv/transporteditor.cpp

     
    456456    };
    457457};
    458458
    459 class DVBSymbolRate : public LineEditSetting, public MuxDBStorage
     459class DVBSymbolRate : public ComboBoxSetting, public MuxDBStorage
    460460{
    461461  public:
    462462    DVBSymbolRate(const MultiplexID *id) :
    463         LineEditSetting(this), MuxDBStorage(this, id, "symbolrate")
     463        ComboBoxSetting(this, true), MuxDBStorage(this, id, "symbolrate")
    464464    {
    465465        setLabel(QObject::tr("Symbol Rate"));
    466         setHelpText(QObject::tr("Symbol Rate (Option has no default)"));
     466        setHelpText(QObject::tr("Symbol Rate (Symbols/second).\n"
     467                                "Most dvb-s transponders transmit at 27500000 Sym/s "
     468                                "but anything could be used!"));
     469        addSelection("3333000");
     470        addSelection("22000000");
     471        addSelection("27500000", "27500000", true);
     472        addSelection("28000000");
     473        addSelection("28500000");
     474        addSelection("29900000");
    467475    };
    468476};
    469477