Ticket #4465: scanhelpers.patch

libs/libmythtv/scanwizardhelpers.h

@@ -412 +412 @@
 class ScanFrequency: public LineEditSetting, public TransientStorage
 {
   public:
-    ScanFrequency() : LineEditSetting(this)
+    ScanFrequency(bool in_kHz = false) : LineEditSetting(this)
     {
-        setLabel(QObject::tr("Frequency"));
-        setHelpText(QObject::tr("Frequency (Option has no default)\n"
-                                "The frequency for this channel in Hz."));
+        QString hz = (in_kHz) ? "kHz" : "Hz";
+        setLabel(QObject::tr("Frequency") + " (" + hz + ")");
+        setHelpText(QObject::tr(
+                        "Frequency (Option has no default).\n"
+                        "The frequency for this channel in") + " " + hz + ".");
     };
 };
 
-class ScanSymbolRate: public LineEditSetting, public TransientStorage
+class ScanSymbolRate: public ComboBoxSetting, public TransientStorage
 {
   public:
-    ScanSymbolRate() : LineEditSetting(this)
+    ScanSymbolRate() : ComboBoxSetting(this, true)
     {
         setLabel(QObject::tr("Symbol Rate"));
-        setHelpText(QObject::tr("Symbol Rate (Option has no default)"));
+        setHelpText(QObject::tr("Symbol Rate (Symbols/second).\n"
+                                "Most dvb-s transponders transmit at 27500000 Sym/s "
+                                "but anything could be used!"));
+        addSelection("3333000");
+        addSelection("22000000");
+        addSelection("27500000", "27500000", true);
+        addSelection("28000000");
+        addSelection("28500000");
+        addSelection("29900000");
     };
 };
 
@@ -696 +706 @@
             new VerticalConfigurationGroup(false,true);
         VerticalConfigurationGroup *right =
             new VerticalConfigurationGroup(false,true);
-        left->addChild(pfrequency  = new ScanFrequency());
+        left->addChild(pfrequency  = new ScanFrequency(true));
         left->addChild(ppolarity   = new ScanPolarity());
         left->addChild(psymbolrate = new ScanSymbolRate());
         right->addChild(pfec       = new ScanFec());

libs/libmythtv/transporteditor.cpp

@@ -456 +456 @@
     };
 };
 
-class DVBSymbolRate : public LineEditSetting, public MuxDBStorage
+class DVBSymbolRate : public ComboBoxSetting, public MuxDBStorage
 {
   public:
     DVBSymbolRate(const MultiplexID *id) :
-        LineEditSetting(this), MuxDBStorage(this, id, "symbolrate")
+        ComboBoxSetting(this, true), MuxDBStorage(this, id, "symbolrate")
     {
         setLabel(QObject::tr("Symbol Rate"));
-        setHelpText(QObject::tr("Symbol Rate (Option has no default)"));
+        setHelpText(QObject::tr("Symbol Rate (Symbols/second).\n"
+                                "Most dvb-s transponders transmit at 27500000 Sym/s "
+                                "but anything could be used!"));
+        addSelection("3333000");
+        addSelection("22000000");
+        addSelection("27500000", "27500000", true);
+        addSelection("28000000");
+        addSelection("28500000");
+        addSelection("29900000");
     };
 };