K2HMH/nrsc5-dui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed SDRPlay antenna to combobox

Browse Source
This commit is contained in:
Mark J. Fine 2022-12-07 12:47:24 -05:00
parent edf0b93b97
commit 41295117e8
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nrsc5-dui.py
View File

@ -296,8 +296,8 @@ class NRSC5_DUI(object):
self.txtSDRPlaySer.set_sensitive(useSDRPlay)
self.txtSDRPlaySer.set_can_focus(useSDRPlay)
self.lblSDRPlayAnt.set_sensitive(useSDRPlay)
self.txtSDRPlayAnt.set_sensitive(useSDRPlay)
self.txtSDRPlayAnt.set_can_focus(useSDRPlay)
self.cbxSDRPlayAnt.set_sensitive(useSDRPlay)
self.cbxSDRPlayAnt.set_can_focus(useSDRPlay)
def img_to_pixbuf(self,img):
"""convert PIL.Image to GdkPixbuf.Pixbuf"""
@ -601,9 +601,9 @@ class NRSC5_DUI(object):
self.nrsc5Args.append(self.txtSDRPlaySer.get_text())
# set SDRPlay antenna if not blank
if (self.cbSDRPlay.get_active()) and (self.txtSDRPlayAnt.get_text() != ""):
if (self.cbSDRPlay.get_active()) and (self.cbxSDRPlayAnt.get_active_text() != ""):
self.nrsc5Args.append("-A")
self.nrsc5Args.append("\"Antenna "+self.txtSDRPlayAnt.get_text()+"\"")
self.nrsc5Args.append("\"Antenna "+self.cbxSDRPlayAnt.get_active_text()+"\"")
# set frequency and stream
self.nrsc5Args.append(str(self.spinFreq.get_value()))
@ -1534,7 +1534,7 @@ class NRSC5_DUI(object):
self.txtSDRPlaySer = builder.get_object("txtSDRPlaySer")
self.cbSDRPlay = builder.get_object("cbSDRPlay")
self.lblSDRPlayAnt = builder.get_object("lblSDRPlayAnt")
self.txtSDRPlayAnt = builder.get_object("txtSDRPlayAnt")
self.cbxSDRPlayAnt = builder.get_object("cbxSDRPlayAnt")
self.cbAutoGain = builder.get_object("cbAutoGain")
self.cbDevIP = builder.get_object("cbDevIP")
self.cbLog = builder.get_object("cbLog")
@ -1759,7 +1759,7 @@ class NRSC5_DUI(object):
if ("SDRPlaySer" in config):
self.txtSDRPlaySer.set_text(config["SDRPlaySer"])
if ("SDRPlayAnt" in config):
self.txtSDRPlayAnt.set_text(config["SDRPlayAnt"])
self.cbxSDRPlayAnt.set_active_id("ant"+config["SDRPlayAnt"])
self.cbLog.set_active(config["LogToFile"])
if ("DLoadArt" in config):
self.cbCovers.set_active(config["DLoadArt"])
@ -1850,7 +1850,7 @@ class NRSC5_DUI(object):
"DevIP" : self.txtDevIP.get_text(),
"SDRPlay" : self.cbSDRPlay.get_active(),
"SDRPlaySer" : self.txtSDRPlaySer.get_text(),
"SDRPlayAnt" : self.txtSDRPlayAnt.get_text(),
"SDRPlayAnt" : self.cbxSDRPlayAnt.get_active_text(),
"LogToFile" : self.cbLog.get_active(),
"DLoadArt" : self.cbCovers.get_active(),
"StationArt" : self.cbCoverIncl.get_active(),

15
res/mainForm.glade
View File

@ -1415,6 +1415,7 @@
</packing>
</child>
<child>
<!--
<object class="GtkEntry" id="txtSDRPlayAnt">
<property name="visible">True</property>
<property name="sensitive">False</property>
@ -1423,6 +1424,20 @@
<property name="max_length">1</property>
<property name="max_width_chars">1</property>
</object>
-->
<object class="GtkComboBoxText" id="cbxSDRPlayAnt">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Choose SDRPlay antenna</property>
<property name="has_entry">False</property>
<property name="active">0</property>
<items>
<item translatable="yes" id="antA">A</item>
<item translatable="yes" id="antB">B</item>
<item translatable="yes" id="antC">C</item>
</items>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>