September 2020 - Developers - lists.chirpmyradio.com

[chirp_devel] [PATCH] [thd74] Add a Kenwood d74 driver
by Angus Ainslie 14 Nov '21

14 Nov '21

# HG changeset patch # User Angus Ainslie <angus(a)akkea.ca> # Date 1592188302 25200 # Sun Jun 14 19:31:42 2020 -0700 # Branch py3 # Node ID eb35a46c5f7e43518f6adc88768107efc0a3d402 # Parent b1e01577ff2505de7fcca665bf3d6af296f0f7ca [thd74] Add a Kenwood d74 driver Based on code from Tom Hayward, Eric Wolak, William McKeehan https://chirp.danplanet.com/issues/4129 This works with python3 no idea about python2 diff --git a/chirp/drivers/thd74.py b/chirp/drivers/thd74.py new file mode 100644 --- /dev/null +++ b/chirp/drivers/thd74.py @@ -0,0 +1,571 @@ +import logging +import struct +import binascii + +import time + +from chirp import directory, bitwise, errors, chirp_common, memmap +from chirp.settings import RadioSettingGroup, RadioSetting, RadioSettings, \ + RadioSettingValueInteger, RadioSettingValueString, \ + RadioSettingValueList, RadioSettingValueBoolean, \ + InvalidValueError + +from . import thd72 +from chirp.util import hexprint + +LOG = logging.getLogger(__name__) + +# Save files from MCP-D74 have a 256-byte header, and possibly some oddness +# TH-D74 memory map + +# 0x02000: memory flags, 4 bytes per memory +# 0x04000: memories, each 40 bytes long +# 0x10000: names, each 16 bytes long, null padded, ascii encoded + +# memory channel +# 0 1 2 3 4 5 6 7 8 9 a b c d e f +# [freq ] ? mode tmode/duplex rtone ctone dtcs cross_mode [offset] ? + +# frequency is 32-bit unsigned little-endian Hz + +DEFAULT_PROG_VFO = ( + (136000000, 174000000), + (410000000, 470000000), + (118000000, 136000000), + (136000000, 174000000), + (320000000, 400000000), + (400000000, 524000000), +) + +# Some of the blocks written by MCP have a length set of less than 0x00/256 +BLOCK_SIZES = { + 0x0003: 0x00B4, + 0x0007: 0x0068, +} + +mem_format = """ +// TODO: find lockout + +#seekto 0x10c0; +struct { + char power_on_msg[16]; + char modem_name[16]; +} onmsg_name; + +#seekto 0x1200; +struct { + char callsign[8]; +} callsign; + +#seekto 0x02000; +struct { +// 4 bytes long + u8 disabled; + u8 unk; + u8 group; + u8 unk2; +} flag[1032]; + +#seekto 0x04000; +// TODO: deal with the 16-byte trailers of every block +struct { + struct { + ul32 freq; + ul32 offset; + + u8 tuning_step:4, + unk:4; + u8 mode:4, + unk1:4; + u8 tone_mode:4, + duplex:4; + u8 rtone; + + u8 ctone; + u8 dtcs; + u8 cross_mode:4 + digital_squelch:4; + char urcall[8]; + char rpt1[8]; + char rpt2[8]; + + u8 digital_squelch_code; + + } mem[6]; + + u8 pad[16]; +} memory[1167]; // TODO: correct number of memories + +#seekto 0x10000; +struct { + char name[16]; +} channel_name[1000]; + +#seekto 0x14700; +struct { + char name[16]; +} wx_name[10]; + +#seekto 0x144d0; +struct { + char name[16]; +} call_name[6]; + +#seekto 0x14800; +struct { + char name[16]; +} group_name[31]; +""" + +STEPS = [5.0, 6.25, None, None, 10.0, 12.5, 15.0, 20.0, 25.0, 50.0, 100.0, 9.0] +MODES = [ + "FM", + "DV", + "AM", + "LSB", + "USB", + "CW", + "NFM", + "DV" +] + +def hex(data): + data_txt = "" + for idx in range(0, len(data), 16): + bytes = binascii.hexlify(str(data[idx:idx+16]).encode('utf8')).upper() + for idx in range(0, len(bytes), 2): + data_txt += str(bytes[idx:idx+2]) + " " + data_txt += "\n" + return data_txt.strip() + +class SProxy(object): + def __init__(self, delegate): + self.delegate = delegate + + def read(self, len): + r = self.delegate.read(len) + LOG.debug("READ\n" + hex(r)) + return r + + def write(self, data): + LOG.debug("WRITE\n" + hex(data)) + return self.delegate.write(str(data)) + + @property + def timeout(self): + return self.delegate.timeout + + @timeout.setter + def timeout(self, timeout): + self.delegate.timeout = timeout + + + +(a)directory.register +class THD74Radio(thd72.THD72Radio): + MODEL = "TH-D74 (clone mode)" + #MODEL = "TH-D74" + _memsize = 500480 + # I think baud rate might be ignored by USB-Serial stack of the D74's + # on-board FTDI chip, but it doesn't seem to hurt. + BAUD_RATE = 115200 + + + #def __init__(self, pipe): + # pipe = SProxy(pipe) + # super(THD74Radio, self).__init__(pipe) + + def get_features(self): + rf = super(THD74Radio, self).get_features() + rf.has_tuning_step = True + return rf + + def process_mmap(self): + self._memobj = bitwise.parse(mem_format, self._mmap) + self._dirty_blocks = [] + + def sync_in(self): + # self._detect_baud() + self._mmap = self.download() + self.process_mmap() + + def sync_out(self): + if len(self._dirty_blocks): + self.upload(self._dirty_blocks) + else: + self.upload() + + def read_block(self, block, count=256): + cmd = struct.pack(">cHH", b"R", block, count%256) + print( "Read cmd %s" % cmd ) + self.pipe.write(''.join(chr(b) for b in cmd)) + + r = self.pipe.read(5) + if len(r) != 5: + raise Exception("Did not receive block response") + + print( "Read input %s %i %i %i %i" % ( r, ord(r[1]), ord(r[2]), ord(r[3]), ord(r[4] ))) + + #cmd, _block, _ = struct.unpack(">cHH", b''.join(ord(b) for b in r)) + cmd = r[0] + _block = (ord(r[1]) << 8) + ord(r[2]) + if cmd != 'W' or _block != block: + raise Exception("Invalid response: %s %i %i" % (cmd, block, _block)) + + data = "" + while len(data) < count: + data += self.pipe.read(count - len(data)) + + self.pipe.write(chr(0x06)) + if self.pipe.read(1) != chr(0x06): + raise Exception("Did not receive post-block ACK!") + + return data + + def write_block(self, block, map, count=256): + #print("Write block ", block ) + c = struct.pack(">cHH", b"W", block, count%256) + base = block * 256 + data = map[base:base + count] + # It's crucial that these are written together. Otherwise the radio + # will fail to ACK under some conditions. + c_d = ''.join(chr(b) for b in c) + data + self.pipe.write(c_d) + + ack = self.pipe.read(1) + + if len(ack) == 0: + print("read timed out block %d - trying again" % block ) + time.sleep(0.5) + ack = self.pipe.read(1) + + if ack != chr(0x06): + print("Block %d write failed %d" % ( block, ord(ack))) + + return ack == chr(0x06) + + def _unlock(self): + """Voodoo sequence of operations to get the radio to accept our programming.""" + + h = self.read_block(0, 6) + + unlock = ("\x57\x00\x00\x00\x30\xff\x01\xff\x00\x00\xff\xff\xff\xff\xff\x01" + + "\x00\x00\x00\x03\x01\x00\x00\x00\x00\x02\x00\x30\x30\x30\x00\xff" + + "\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff" + + "\xff\xff\xff\xff\xff") + + self.pipe.write(unlock) + + ack = self.pipe.read(1) + + if ack != chr(0x06): + raise errors.RadioError("Expected ack but got {} ({})".format(ord(ack), type(ack))) + + c = struct.pack(">cHH", b"W", 0, 0x38C8) + self.pipe.write(''.join(chr(b) for b in c)) + # magic unlock sequence + unlock = [0xFF] * 8 + [0] * 160 + [0xFF] * 32 + unlock = "".join([chr(x) for x in unlock]) + self.pipe.write(unlock) + + time.sleep(0.01) + ack = self.pipe.read(1) + + if ack != chr(0x06): + raise errors.RadioError("Expected ack but got {} ({})".format(ord(ack), type(ack))) + + def download(self, raw=False, blocks=None): + if blocks is None: + blocks = list(range(int(self._memsize / 256))) + else: + blocks = [b for b in blocks if b < int(self._memsize / 256)] + + if self.command("0M PROGRAM", 2, timeout=1.5) != "0M": + raise errors.RadioError("Radio didn't go into PROGRAM mode") + + allblocks = list(range(int(self._memsize / 256))) + self.pipe.baudrate = 57600 + try: + self.pipe.setRTS() + except AttributeError: + self.pipe.rts = True + self.pipe.read(1) + data = "" + LOG.debug("reading blocks %d..%d" % (blocks[0], blocks[-1])) + total = len(blocks) + count = 0 + for i in allblocks: + if i not in blocks: + data += 256 * '\xff' + continue + data += self.read_block(i) + count += 1 + if self.status_fn: + s = chirp_common.Status() + s.msg = "Cloning from radio" + s.max = total + s.cur = count + self.status_fn(s) + + + self.pipe.write("E") + if raw: + return data + return memmap.MemoryMap(data) + + def upload(self, blocks=None): + # MCP-D74 sets DTR, so we should too + try: + self.pipe.setDTR() + except AttributeError: + self.pipe.dtr = True + + if blocks is None: + blocks = list(range((int(self._memsize / 256)) - 2)) + else: + blocks = [b for b in blocks if b < int(self._memsize / 256)] + + if self.command("0M PROGRAM", 2, timeout=1.5) != "0M": + raise errors.RadioError("Radio didn't go into PROGRAM mode") + + if self._unlock(): + raise errors.RadioError("Unlock failed") + + # This block definitely isn't written conventionally, so we let _unlock + # handle it and skip. + if 0 in blocks: + blocks.remove(0) + + # For some reason MCP-D74 skips this block. If we don't, we'll get a NACK + # on the next one. There is also a more than 500 ms delay for the ACK. + if 1279 in blocks: + blocks.remove(1279) + + print("writing blocks %d..%d" % (blocks[0], blocks[-1])) + total = len(blocks) + count = 0 + for i in blocks: + time.sleep(0.001) + r = self.write_block(i, self._mmap, BLOCK_SIZES.get(i, 256)) + count += 1 + if not r: + raise errors.RadioError("write of block %i failed" % i) + if self.status_fn: + s = chirp_common.Status() + s.msg = "Cloning to radio" + s.max = total + s.cur = count + self.status_fn(s) + + lock = ("\x57\x00\x00\x00\x06\x02\x01\xff\x00\x00\xff") + self.pipe.write(lock) + + self.pipe.write("F") + # clear out blocks we uploaded from the dirty blocks list + self._dirty_blocks = [b for b in self._dirty_blocks if b not in blocks] + + def command(self, cmd, response_length, timeout=0.5): + start = time.time() + + LOG.debug("PC->D72: %s" % cmd) + default_timeout = self.pipe.timeout + self.pipe.write(cmd + "\r") + self.pipe.timeout = timeout + try: + data = self.pipe.read(response_length + 1) + LOG.debug("D72->PC: %s" % data.strip()) + finally: + self.pipe.timeout = default_timeout + return data.strip() + + def get_raw_memory(self, number): + bank = number // 6 + idx = number % 6 + + _mem = self._memobj.memory[bank].mem[idx] + return repr(_mem) + \ + repr(self._memobj.flag[number]) + + def get_id(self): + r = self.command("ID", 9) + if r.startswith("ID "): + return r.split(" ")[1] + else: + raise errors.RadioError("No response to ID command") + + def set_channel_name(self, number, name): + name = name[:16] + '\x00' * 16 + if number < 999: + self._memobj.channel_name[number].name = name[:16] + self.add_dirty_block(self._memobj.channel_name[number]) + elif number >= 1020 and number < 1030: + number -= 1020 + self._memobj.wx_name[number].name = name[:16] + self.add_dirty_block(self._memobj.wx_name[number]) + + def get_memory(self, number): + if isinstance(number, str): + try: + number = thd72.THD72_SPECIAL[number] + except KeyError: + raise errors.InvalidMemoryLocation("Unknown channel %s" % + number) + + if number < 0 or number > (max(thd72.THD72_SPECIAL.values()) + 1): + raise errors.InvalidMemoryLocation( + "Number must be between 0 and 999") + + bank = number // 6 + idx = number % 6 + + #print("reading memory #%d bank %d entry %d" %(number, bank, idx)) + _mem = self._memobj.memory[bank].mem[idx] + flag = self._memobj.flag[number] + + #print("Memory mode %d" % _mem.mode) + if _mem.mode < len( MODES ) and MODES[_mem.mode] == "DV": + mem = chirp_common.DVMemory() + else: + mem = chirp_common.Memory() + + mem.number = number + + if number > 999: + mem.extd_number = thd72.THD72_SPECIAL_REV[number] + if flag.disabled == 0xFF: + mem.empty = True + return mem + + mem.name = self.get_channel_name(number) + mem.freq = int(_mem.freq) + mem.tmode = thd72.TMODES[int(_mem.tone_mode)] + mem.rtone = chirp_common.TONES[_mem.rtone] + mem.ctone = chirp_common.TONES[_mem.ctone] + mem.dtcs = chirp_common.DTCS_CODES[_mem.dtcs] + mem.duplex = thd72.DUPLEX[int(_mem.duplex)] + mem.offset = _mem.offset + mem.mode = MODES[int(_mem.mode)] + mem.tuning_step = STEPS[_mem.tuning_step] + + if mem.mode == "DV": + mem.dv_urcall = _mem.urcall + mem.dv_rpt1call = _mem.rpt1 + mem.dv_rpt2call = _mem.rpt2 + mem.dv_code = _mem.digital_squelch_code + + if number < 999: + # mem.skip = chirp_common.SKIP_VALUES[int(flag.skip)] + mem.cross_mode = chirp_common.CROSS_MODES[_mem.cross_mode] + if number > 999: + mem.cross_mode = chirp_common.CROSS_MODES[0] + mem.immutable = ["number", "bank", "extd_number", "cross_mode"] + if number >= 1020 and number < 1030: + mem.immutable += ["freq", "offset", "tone", "mode", + "tmode", "ctone", "skip"] # FIXME: ALL + else: + mem.immutable += ["name"] + + return mem + + def set_memory(self, mem): + LOG.debug("set_memory(%d)" % mem.number) + if mem.number < 0 or mem.number > (max(thd72.THD72_SPECIAL.values()) + 1): + raise errors.InvalidMemoryLocation( + "Number must be between 0 and 999") + + # weather channels can only change name, nothing else + if mem.number >= 1020 and mem.number < 1030: + self.set_channel_name(mem.number, mem.name) + return + + flag = self._memobj.flag[mem.number] + self.add_dirty_block(self._memobj.flag[mem.number]) + + # only delete non-WX channels + was_empty = flag.disabled == 0xf + if mem.empty: + flag.disabled = 0xf + return + flag.disabled = 0 + + bank = mem.number // 6 + idx = mem.number % 6 + + print("seting memory #%d bank %d entry %d" %(mem.number, bank, idx)) + _mem = self._memobj.memory[bank].mem[idx] + self.add_dirty_block(_mem) + if was_empty: + self.initialize(_mem) + + _mem.freq = mem.freq + + if mem.number < 999: + self.set_channel_name(mem.number, mem.name) + + _mem.tone_mode = thd72.TMODES_REV[mem.tmode] + _mem.rtone = chirp_common.TONES.index(mem.rtone) + _mem.ctone = chirp_common.TONES.index(mem.ctone) + _mem.dtcs = chirp_common.DTCS_CODES.index(mem.dtcs) + _mem.cross_mode = chirp_common.CROSS_MODES.index(mem.cross_mode) + _mem.duplex = thd72.DUPLEX_REV[mem.duplex] + _mem.offset = mem.offset + _mem.mode = thd72.MODES_REV[mem.mode] + + prog_vfo = thd72.get_prog_vfo(mem.freq) + #flag.prog_vfo = prog_vfo + + #if mem.number < 999: + # flag.skip = chirp_common.SKIP_VALUES.index(mem.skip) + + + @staticmethod + def _add_00_pad(val, length): + return val.ljust(length, "\x00")[:length] + + + @classmethod + def apply_callsign(cls, setting, obj): + callsign = setting.value.get_value().upper() + setattr(obj, "callsign", cls._add_00_pad(callsign, 8)) + + + @classmethod + def apply_power_on_msg(cls, setting, obj): + msg = setting.value.get_value() + setattr(obj, "power_on_msg", cls._add_00_pad(msg, 16)) + + + def _get_general_settings(self): + menu = RadioSettingGroup("general", "General") + cs = self._memobj.callsign + + val = RadioSettingValueString( + 0, 6, str(cs.callsign).rstrip("\x00")) + rs = RadioSetting("cs.callsign", "Callsign", val) + rs.set_apply_callback(self.apply_callsign, cs) + menu.append(rs) + + msg = self._memobj.onmsg_name + + val = RadioSettingValueString( + 0, 16, str(msg.power_on_msg).rstrip("\x00")) + rs = RadioSetting("msg.power_on_msg", "Power on message", val) + rs.set_apply_callback(self.apply_power_on_msg, msg) + menu.append(rs) + + return menu + + + def _get_settings(self): + top = RadioSettings(self._get_general_settings()) + return top + + + def get_settings(self): + try: + return self._get_settings() + except: + import traceback + LOG.error("Failed to parse settings: %s", traceback.format_exc()) + return None +

4 4

[chirp_devel] Radio services wiki
by Bernhard Hailer 07 Oct '20

07 Oct '20

All, how do I add a new article to the Wiki library? I tried and can't, I guess I need permissions to do so. After sifting through all of our tickets more than once, I got the feeling that a lot of users are either totally oblivious of where on the spectrum they may legally operate, or are feeling too comfortable using radios which aren't specifically approved for a service like e.g. GMRS. I collected a few pointers for first-time radio users. I know (and appreciate) that the Chirp community is pretty liberal about this, but I think we should be telling people that there are some legal restrictions to consider. And if it's just to cover our own back. Let me know what you think. 73 Bernhard AE6YN -- h1. Am I actually allowed to use this radio? {{>toc}} Chirp can help you to program a multitude of different radios - from little toys to complicated commercial devices. While Chirp allows you to do that, please don't if you don't have clear permission to use the radio afterwards. All countries have laws and regulations controlling the use of two-way radios. Unfortunately, by law you cannot just go and use any radio for any purpose. The regulations in most countries are very similar: the basic rule is that there must be a license of some sort, and that * this license has either been granted for a specific service to a specific radio make and model by the telecommunications authority of your country (the radio has been approved and carries a label which says so), * or it has been bestowed on a person (e.g. a radio amateur, after passing an exam). In some cases, both must be in place: for example, to use the General Mobile Radio Service (GMRS) in the United States, a user must obtain a license, but the radio must still be specifically approved for GMRS. Radios without a stamp by the local telecommunications authority can only be used by licensed radio amateurs - and even then these radios can only be used on specific frequencies (the ham bands). Here is a list of a few Region 1 (EU) and 2 (US) radio services and their requirements. This list is by no means complete and varies from country to country. h2. Citizen Band Radio Service (CBRS, CB radio, 11 meter band) Available in many countries. Depending on the country you live in, 40 or 80 channels are available. Modulation is in FM, AM, or SSB, often with specific channels allowing only one specific mode. CB radios must have approval. Power is limited to usually 4 watts; the use of amplifiers is expressively prohibited. h2. PMR446 (EU countries, India; UHF - 446.0..446.2 MHz): Private Mobile Radio. (In the US, PMR falls into the 70cm ham band and therefore cannot be used.) No personal license required, but requires PMR approved radios. 16 available channels. In many countries, antennas must be fixed and power must be 0.5W; some allow mobile radios with higher power output. Digital radios double the amount of available channels. h2. FRS (USA; UHF - 462 and 467 MHz): Family Radio Service No personal license required, but FRS approved radios are required. 22 available channels. Antennas cannot be detachable and power must be 0.5W. All channels are shared with GMRS (see below). h2. GMRS (USA; UHF - 462 and 467 MHz): General Mobile Radio Service A 10 year personal license is required and costs a small fee, but the service still requires GMRS approved radios. Handhelds up to 0.5 or 5W and mobiles up to 50W are allowed (not on all channels!); there even are repeaters possible. 30 available channels, most of which are shared with FRS (see below). The user must state her or his call sign on a regular basis while using the service. h2. MURS (USA; VHF - 151 and 154 MHz): Multi-Use Radio Service No personal license required, but MURS approved radios are required. 5 available channels, AM or FM. Some bandwidth restrictions apply. Antennas do not need to be fixed; power must be 2W or less. h2. Amateur Radio Amateur radio offers a lot of frequencies and bands to select from, at power outputs up into the range of kilowatts. To be allowed to operate on any of them, one must undergo an exam showing that he or she is knowledgeable enough to prevent interference and injuries. On the other side, a radio amateur does not need to use approved radios and can even build one herself or himself. The radio amateur must state her or his call sign on a regular basis while using ham bands. h2. Commercial radios Commercial radios often are entirely different animals. They can operate in VHF or UHF, but also on 700, 800, or 900 MHz ranges. They may be digital (P25, DMR, etc.), they may be trunked (i.e. use a central station which assigns channels). These frequencies are assigned to specific purposes, and can only be used by licensed personnel. h2. Summary * Various radio services regulate exactly which frequencies you can use. The wide availability of cheap radios with wide frequency ranges does not mean that you actually may use all of that. * Don't transmit anywhere! In the best case you might just irritate someone, in the worst you might interfere with traffic a life is depending on. * Don't transmit in any mode (FM, AM, DMR, SSB, what-have-you). It may not be approved for the service you're using. * Also, while it's technically possible to use that Chinese Cheapo on services like PMR or FRS, please reconsider that and buy a radio which has been approved for the service instead. Getting caught with an illegal radio is not only expensive (the fines can be quite hefty), it can bring other legal hassle and damage your reputation with the authorities. Q: Does that mean that the $20 radio I plan to buy is illegal to use? A: Yep. Unless you're a licensed radio amateur. And then you can use it only on ham bands. Q: But I will only use FRS (or PMR446) frequencies, and these are license-free! A: Still not legal. The radio must have been approved for the service by the telecommunications authority of your country and carry a label which says so.

2 2

[chirp_devel] [PATCH] Normalized dialog box affirmative buttons to follow gnome human interface guidelines and added alternative button order for other platforms. Fixes #8271
by Kosta A. 07 Oct '20

07 Oct '20

# HG changeset patch # User Kosta A. <ve7kcy(a)gmail.com> # Date 1600853926 25200 # Wed Sep 23 02:38:46 2020 -0700 # Node ID 42b1e50fcf7a40ab591074fba9f3808805590f2f # Parent 1a49ad2e84e305b56a3bdeb823266e1219f34e02 Normalized dialog box affirmative buttons to follow gnome human interface guidelines and added alternative button order for other platforms. Fixes #8271. diff --git a/chirp/ui/bandplans.py b/chirp/ui/bandplans.py --- a/chirp/ui/bandplans.py +++ b/chirp/ui/bandplans.py @@ -47,7 +47,7 @@ # Check for duplicates. duplicates = [x for x in plan.BANDS if x == band] if len(duplicates) > 1: - LOG.warn("Bandplan %s has duplicates %s" % + LOG.debug("Bandplan %s has duplicates %s" % (name, duplicates)) # Add repeater inputs. rpt_input = band.inverse() diff --git a/chirp/ui/clone.py b/chirp/ui/clone.py --- a/chirp/ui/clone.py +++ b/chirp/ui/clone.py @@ -44,13 +44,16 @@ class CloneSettingsDialog(gtk.Dialog): - def __make_field(self, label, widget): - l = gtk.Label(label) - self.__table.attach(l, 0, 1, self.__row, self.__row+1) - self.__table.attach(widget, 1, 2, self.__row, self.__row+1) + def __make_field(self, text, widget): + label = gtk.Label(text) + label.set_alignment(1.0, 0.5) + self.__table.attach(label, 0, 1, self.__row, self.__row+1, + xpadding=6, ypadding=3) + self.__table.attach(widget, 1, 2, self.__row, self.__row+1, + xpadding=6, ypadding=3) self.__row += 1 - l.show() + label.show() widget.show() def __make_port(self, port): @@ -123,17 +126,15 @@ def __make_ui(self, settings): self.__table = gtk.Table(3, 2) - self.__table.set_row_spacings(3) - self.__table.set_col_spacings(10) self.__row = 0 self.__port = self.__make_port(settings and settings.port or None) self.__modl = self.__make_model() self.__vend = self.__make_vendor(self.__modl) - self.__make_field(_("Port"), self.__port) - self.__make_field(_("Vendor"), self.__vend) - self.__make_field(_("Model"), self.__modl) + self.__make_field(_("Serial Port:"), self.__port) + self.__make_field(_("Vendor:"), self.__vend) + self.__make_field(_("Model:"), self.__modl) if settings and settings.radio_class: common.combo_select(self.__vend, settings.radio_class.VENDOR) @@ -144,21 +145,21 @@ self.__modl.set_sensitive(False) self.__table.show() - self.vbox.pack_start(self.__table, 1, 1, 1) + self.vbox.pack_start(self.__table, False, True, 2) def __init__(self, settings=None, parent=None, title=_("Radio")): buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OK, gtk.RESPONSE_OK) gtk.Dialog.__init__(self, title, parent=parent, + buttons=buttons, flags=gtk.DIALOG_MODAL) + self.set_default_response(gtk.RESPONSE_OK) + self.set_alternative_button_order([gtk.RESPONSE_OK, + gtk.RESPONSE_CANCEL]) + self.__make_ui(settings) - self.__cancel_button = self.add_button(gtk.STOCK_CANCEL, - gtk.RESPONSE_CANCEL) - self.__okay_button = self.add_button(gtk.STOCK_OK, - gtk.RESPONSE_OK) - self.__okay_button.grab_default() - self.__okay_button.grab_focus() + def run(self): r = gtk.Dialog.run(self) diff --git a/chirp/ui/editorset.py b/chirp/ui/editorset.py --- a/chirp/ui/editorset.py +++ b/chirp/ui/editorset.py @@ -276,7 +276,7 @@ choices = [x.VARIANT for x in devices] d = inputdialog.ChoiceDialog(choices) - text = _("The {vendor} {model} has multiple independent sub-devices") + text = _("The {vendor} {model} has multiple independent sub-devices.") d.label.set_text(text.format(vendor=radio.VENDOR, model=radio.MODEL) + os.linesep + _("Choose one to import from:")) r = d.run() diff --git a/chirp/ui/importdialog.py b/chirp/ui/importdialog.py --- a/chirp/ui/importdialog.py +++ b/chirp/ui/importdialog.py @@ -396,19 +396,19 @@ all.connect("clicked", self.__select_all, True) all.set_size_request(50, 25) all.show() - hbox.pack_start(all, 0, 0, 0) + hbox.pack_start(all, False, False, 1) none = gtk.Button(_("None")) none.connect("clicked", self.__select_all, False) none.set_size_request(50, 25) none.show() - hbox.pack_start(none, 0, 0, 0) + hbox.pack_start(none, False, False, 1) inv = gtk.Button(_("Inverse")) inv.connect("clicked", self.__select_all, None) inv.set_size_request(50, 25) inv.show() - hbox.pack_start(inv, 0, 0, 0) + hbox.pack_start(inv, False, False, 1) frame = gtk.Frame(_("Select")) frame.show() @@ -424,49 +424,49 @@ incr.connect("clicked", self.__incrnew, 100) incr.set_size_request(50, 25) incr.show() - hbox.pack_start(incr, 0, 0, 0) + hbox.pack_start(incr, False, False, 1) incr = gtk.Button("+10") incr.connect("clicked", self.__incrnew, 10) incr.set_size_request(50, 25) incr.show() - hbox.pack_start(incr, 0, 0, 0) + hbox.pack_start(incr, False, False, 1) incr = gtk.Button("+1") incr.connect("clicked", self.__incrnew, 1) incr.set_size_request(50, 25) incr.show() - hbox.pack_start(incr, 0, 0, 0) + hbox.pack_start(incr, False, False, 1) decr = gtk.Button("-1") decr.connect("clicked", self.__incrnew, -1) decr.set_size_request(50, 25) decr.show() - hbox.pack_start(decr, 0, 0, 0) + hbox.pack_start(decr, False, False, 1) decr = gtk.Button("-10") decr.connect("clicked", self.__incrnew, -10) decr.set_size_request(50, 25) decr.show() - hbox.pack_start(decr, 0, 0, 0) + hbox.pack_start(decr, False, False, 1) decr = gtk.Button("-100") decr.connect("clicked", self.__incrnew, -100) decr.set_size_request(50, 25) decr.show() - hbox.pack_start(decr, 0, 0, 0) + hbox.pack_start(decr, False, False, 1) auto = gtk.Button(_("Auto")) auto.connect("clicked", self.__autonew) auto.set_size_request(50, 25) auto.show() - hbox.pack_start(auto, 0, 0, 0) + hbox.pack_start(auto, False, False, 1) revr = gtk.Button(_("Reverse")) revr.connect("clicked", self.__revrnew) revr.set_size_request(50, 25) revr.show() - hbox.pack_start(revr, 0, 0, 0) + hbox.pack_start(revr, False, False, 1) frame = gtk.Frame(_("Adjust New Location")) frame.show() @@ -482,7 +482,7 @@ confirm.connect("toggled", __set_confirm) confirm.show() - hbox.pack_start(confirm, 0, 0, 0) + hbox.pack_start(confirm, False, False, 1) frame = gtk.Frame(_("Options")) frame.add(hbox) @@ -494,16 +494,16 @@ def make_controls(self): hbox = gtk.HBox(False, 2) - hbox.pack_start(self.make_select(), 0, 0, 0) - hbox.pack_start(self.make_adjust(), 0, 0, 0) + hbox.pack_start(self.make_select(), False, False, 1) + hbox.pack_start(self.make_adjust(), False, False, 1) # hbox.pack_start(self.make_options(), 0, 0, 0) hbox.show() return hbox def build_ui(self): - self.vbox.pack_start(self.make_view(), 1, 1, 1) - self.vbox.pack_start(self.make_controls(), 0, 0, 0) + self.vbox.pack_start(self.make_view(), True, True, 1) + self.vbox.pack_start(self.make_controls(), False, False, 0) def record_use_of(self, number): lo, hi = self.dst_radio.get_features().memory_bounds @@ -578,12 +578,17 @@ ACTION = _("Import") def __init__(self, src_radio, dst_radio, parent=None): + buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, + gtk.STOCK_OK, gtk.RESPONSE_OK) gtk.Dialog.__init__(self, - buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK, - gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL), title=self.TITLE, + buttons=buttons, parent=parent) + self.set_default_response(gtk.RESPONSE_OK) + self.set_alternative_button_order([gtk.RESPONSE_OK, + gtk.RESPONSE_CANCEL]) + self.col_import = 0 self.col_nloc = 1 self.col_oloc = 2 diff --git a/chirp/ui/inputdialog.py b/chirp/ui/inputdialog.py --- a/chirp/ui/inputdialog.py +++ b/chirp/ui/inputdialog.py @@ -22,69 +22,91 @@ LOG = logging.getLogger(__name__) -class TextInputDialog(gtk.Dialog): - def respond_ok(self, _): - self.response(gtk.RESPONSE_OK) +class ChoiceDialog(gtk.Dialog): - def __init__(self, **args): - buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, - gtk.STOCK_OK, gtk.RESPONSE_OK) - gtk.Dialog.__init__(self, buttons=buttons, **args) + def _make_ui(self, choices): + self._table = gtk.Table(1, 2) self.label = gtk.Label() - self.label.set_size_request(300, 100) - # pylint: disable-msg=E1101 - self.vbox.pack_start(self.label, 1, 1, 0) - - self.text = gtk.Entry() - self.text.connect("activate", self.respond_ok, None) - # pylint: disable-msg=E1101 - self.vbox.pack_start(self.text, 1, 1, 0) - + self.label.set_alignment(0.0, 0.5) + self.label.set_size_request(384, -1) self.label.show() - self.text.show() - - -class ChoiceDialog(gtk.Dialog): - editable = False - - def __init__(self, choices, **args): - buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, - gtk.STOCK_OK, gtk.RESPONSE_OK) - gtk.Dialog.__init__(self, buttons=buttons, **args) - - self.label = gtk.Label() - self.label.set_size_request(300, 100) - # pylint: disable-msg=E1101 - self.vbox.pack_start(self.label, 1, 1, 0) - self.label.show() + self._table.attach(self.label, 0, 1, 0, 1, xpadding=6, ypadding=3) try: default = choices[0] except IndexError: default = None - self.choice = make_choice(sorted(choices), self.editable, default) - # pylint: disable-msg=E1101 - self.vbox.pack_start(self.choice, 1, 1, 0) + self.choice = make_choice(sorted(choices), False, default) self.choice.show() + self._table.attach(self.choice, 0, 1, 1, 2, xpadding=6, ypadding=3) + + self._table.show() + self.vbox.pack_start(self._table, True, True, 2) + + def __init__(self, choices, **args): + buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, + gtk.STOCK_OK, gtk.RESPONSE_OK) + gtk.Dialog.__init__(self, buttons=buttons, **args) self.set_default_response(gtk.RESPONSE_OK) + self.set_alternative_button_order([gtk.RESPONSE_OK, + gtk.RESPONSE_CANCEL]) + + self._make_ui(choices) -class EditableChoiceDialog(ChoiceDialog): - editable = True +class FieldDialog(gtk.Dialog): + + def _make_ui(self): + self._table = gtk.Table(1, 2) + self._table.show() + self._row = 0 + + self.vbox.pack_start(self._table, True, True, 2) + + def __init__(self, **args): + buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, + gtk.STOCK_OK, gtk.RESPONSE_OK) + gtk.Dialog.__init__(self, buttons=buttons, **args) + self.set_default_response(gtk.RESPONSE_OK) + self.set_alternative_button_order([gtk.RESPONSE_OK, + gtk.RESPONSE_CANCEL]) + + self._fields = {} + + self._make_ui() - def __init__(self, choices, **args): - ChoiceDialog.__init__(self, choices, **args) + def response(self, _): + LOG.debug("Blocking response") + return + + def add_field(self, name, widget, validator=None): + label = gtk.Label(name + ":") + label.set_alignment(1.0, 0.5) + label.show() - self.choice.child.set_activates_default(True) + widget.set_size_request(160, -1) + widget.show() + + self._table.attach(label, 0, 1, self._row, self._row+1, + xpadding=6, ypadding=3) + self._table.attach(widget, 1, 2, self._row, self._row+1, + xpadding=6, ypadding=3) + self._row += 1 + + self._fields[name] = widget + + def get_field(self, name): + return self._fields.get(name, None) class ExceptionDialog(gtk.MessageDialog): def __init__(self, exception, **args): gtk.MessageDialog.__init__(self, buttons=gtk.BUTTONS_OK, type=gtk.MESSAGE_ERROR, **args) + self.set_default_response(gtk.RESPONSE_OK) self.set_property("text", _("An error has occurred")) self.format_secondary_text(str(exception)) @@ -94,64 +116,3 @@ LOG.error("--- Exception Dialog: %s ---" % exception) LOG.error(traceback.format_exc(limit=100)) LOG.error("----------------------------") - - -class FieldDialog(gtk.Dialog): - def __init__(self, **kwargs): - if "buttons" not in kwargs.keys(): - kwargs["buttons"] = (gtk.STOCK_OK, gtk.RESPONSE_OK, - gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL) - - self.__fields = {} - self.set_default_response(gtk.RESPONSE_OK) - - gtk.Dialog.__init__(self, **kwargs) - - def response(self, _): - LOG.debug("Blocking response") - return - - def add_field(self, label, widget, validator=None): - box = gtk.HBox(True, 2) - - lab = gtk.Label(label) - lab.show() - - widget.set_size_request(150, -1) - widget.show() - - box.pack_start(lab, 0, 0, 0) - box.pack_start(widget, 0, 0, 0) - box.show() - - # pylint: disable-msg=E1101 - self.vbox.pack_start(box, 0, 0, 0) - - self.__fields[label] = widget - - def get_field(self, label): - return self.__fields.get(label, None) - - -class OverwriteDialog(gtk.MessageDialog): - def __init__(self, filename): - gtk.Dialog.__init__(self, - buttons=(_("Overwrite"), gtk.RESPONSE_OK, - gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)) - - self.set_property("text", _("File Exists")) - - text = \ - _("The file {name} already exists. " - "Do you want to overwrite it?").format(name=filename) - - self.format_secondary_text(text) - -if __name__ == "__main__": - # pylint: disable-msg=C0103 - d = FieldDialog(buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK)) - d.add_field("Foo", gtk.Entry()) - d.add_field("Bar", make_choice(["A", "B"])) - d.run() - gtk.main() - d.destroy() diff --git a/chirp/ui/mainapp.py b/chirp/ui/mainapp.py --- a/chirp/ui/mainapp.py +++ b/chirp/ui/mainapp.py @@ -161,9 +161,12 @@ esets.append(self.tabs.get_nth_page(i)) d = gtk.Dialog(title="Diff Radios", - buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK, - gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL), + buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, + gtk.STOCK_OK, gtk.RESPONSE_OK), parent=self) + d.set_default_response(gtk.RESPONSE_OK) + d.set_alternative_button_order([gtk.RESPONSE_OK, + gtk.RESPONSE_CANCEL]) label = gtk.Label("") label.set_markup("<b>-1</b> for either Mem # does a full-file hex " + @@ -296,8 +299,11 @@ choice = miscwidgets.make_choice(sorted(radiolist.keys()), False, sorted(radiolist.keys())[0]) d = gtk.Dialog(title="Detection Failed", - buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK, - gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)) + buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, + gtk.STOCK_OK, gtk.RESPONSE_OK)) + d.set_default_response(gtk.RESPONSE_OK) + d.set_alternative_button_order([gtk.RESPONSE_OK, + gtk.RESPONSE_CANCEL]) d.vbox.pack_start(lab, 0, 0, 0) d.vbox.pack_start(choice, 0, 0, 0) d.vbox.set_spacing(5) @@ -481,10 +487,22 @@ return if os.path.exists(fname): - dlg = inputdialog.OverwriteDialog(fname) - owrite = dlg.run() + dlg = miscwidgets.YesNoDialog( + title=_("Save As"), + parent=self, + buttons=(gtk.STOCK_NO, gtk.RESPONSE_NO, + gtk.STOCK_YES, gtk.RESPONSE_YES)) + dlg.set_default_response(gtk.RESPONSE_NO) + dlg.set_alternative_button_order([gtk.RESPONSE_YES, + gtk.RESPONSE_NO]) + dlg.set_text( + _("{name} already exists." + os.linesep + + "Do you want to replace it?").format(name=fname)) + + res = dlg.run() dlg.destroy() - if owrite == gtk.RESPONSE_OK: + + if res == gtk.RESPONSE_OK: break else: break @@ -812,10 +830,16 @@ if eset.is_modified(): dlg = miscwidgets.YesNoDialog( - title=_("Save Changes?"), parent=self, - buttons=(gtk.STOCK_YES, gtk.RESPONSE_YES, + title=_("Save Changes"), + parent=self, + buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_NO, gtk.RESPONSE_NO, - gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)) + gtk.STOCK_YES, gtk.RESPONSE_YES)) + dlg.set_default_response(gtk.RESPONSE_YES) + dlg.set_alternative_button_order([gtk.RESPONSE_YES, + gtk.RESPONSE_NO, + gtk.RESPONSE_CANCEL]) + dlg.set_text(_("File is modified, save changes before closing?")) res = dlg.run() dlg.destroy() @@ -1407,18 +1431,30 @@ else: defname = "radio" - filen = platform.get_platform().gui_save_file(default_name=defname, + fname = platform.get_platform().gui_save_file(default_name=defname, types=types) - if not filen: + if not fname: return - if os.path.exists(filen): - dlg = inputdialog.OverwriteDialog(filen) - owrite = dlg.run() + if os.path.exists(fname): + dlg = miscwidgets.YesNoDialog( + title=_("Export"), + parent=self, + buttons=(gtk.STOCK_NO, gtk.RESPONSE_NO, + gtk.STOCK_YES, gtk.RESPONSE_YES)) + dlg.set_default_response(gtk.RESPONSE_NO) + dlg.set_alternative_button_order([gtk.RESPONSE_YES, + gtk.RESPONSE_NO]) + dlg.set_text( + _("{name} already exists." + os.linesep + + "Do you want to replace it?").format(name=fname)) + + res = dlg.run() dlg.destroy() - if owrite != gtk.RESPONSE_OK: + + if res != gtk.RESPONSE_OK: return - os.remove(filen) + os.remove(fname) count = eset.do_export(filen) reporting.report_model_usage(eset.rthread.radio, "export", count > 0) @@ -1472,28 +1508,43 @@ radio_name = "%s %s %s" % (eset.rthread.radio.VENDOR, eset.rthread.radio.MODEL, eset.rthread.radio.VARIANT) - d = gtk.Dialog(title=_("Select Columns"), + d = gtk.Dialog(title=_("Choose Columns"), parent=self, - buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK, - gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)) - - vbox = gtk.VBox() - vbox.show() - sw = gtk.ScrolledWindow() - sw.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC) - sw.add_with_viewport(vbox) - sw.show() - d.vbox.pack_start(sw, 1, 1, 1) + buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, + gtk.STOCK_OK, gtk.RESPONSE_OK)) + d.set_default_response(gtk.RESPONSE_OK) + d.set_alternative_button_order([gtk.RESPONSE_OK, + gtk.RESPONSE_CANCEL]) d.set_size_request(-1, 300) d.set_resizable(False) - labelstr = _("Visible columns for {radio}").format(radio=radio_name) - label = gtk.Label(labelstr) + text = _("Select the columns you want to display for {radio}.").format(radio=radio_name) + label = gtk.Label(text) + label.set_line_wrap(True) + label.set_size_request(240, -1) label.show() - vbox.pack_start(label) + d.vbox.pack_start(label, False, False, 2) + + model = gtk.ListStore(bool, str) + view = gtk.TreeView(model) + view.set_headers_visible(False) + view.show() - fields = [] - memedit = eset.get_current_editor() # .editors["memedit"] + def _toggle(rend, path, model, *ignore): + if path is not None: + itr = model.get_iter(path) + model[itr][0] = not model[itr][0] + + rend = gtk.CellRendererToggle() + rend.connect("toggled", _toggle, model) + col = gtk.TreeViewColumn(None, rend, active=0) + view.append_column(col) + + rend = gtk.CellRendererText() + col = gtk.TreeViewColumn(None, rend, text=1) + view.append_column(col) + + memedit = eset.get_current_editor() unsupported = memedit.get_unsupported_columns() for colspec in memedit.cols: if colspec[0].startswith("_"): @@ -1502,20 +1553,22 @@ continue label = colspec[0] visible = memedit.get_column_visible(memedit.col(label)) - widget = gtk.CheckButton(label) - widget.set_active(visible) - fields.append(widget) - vbox.pack_start(widget, 1, 1, 1) - widget.show() + model.append([visible, label]) + + sw = gtk.ScrolledWindow() + sw.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC) + sw.add_with_viewport(view) + sw.show() + d.vbox.pack_start(sw, True, True, 2) res = d.run() selected_columns = [] if res == gtk.RESPONSE_OK: - for widget in fields: - colnum = memedit.col(widget.get_label()) - memedit.set_column_visible(colnum, widget.get_active()) - if widget.get_active(): - selected_columns.append(widget.get_label()) + for row in model: + colnum = memedit.col(row[1]) + memedit.set_column_visible(colnum, row[0]) + if row[0]: + selected_columns.append(row[1]) d.destroy() @@ -1598,7 +1651,7 @@ d.label.set_text(_("Choose a language or Auto to use the " "operating system default. You will need to " "restart the application before the change " - "will take effect")) + "will take effect.")) d.label.set_line_wrap(True) r = d.run() if r == gtk.RESPONSE_OK: diff --git a/chirp/ui/memdetail.py b/chirp/ui/memdetail.py --- a/chirp/ui/memdetail.py +++ b/chirp/ui/memdetail.py @@ -176,7 +176,7 @@ def _add(self, tab, row, name, editor, text, colindex=0): label = gtk.Label(text + ":") - label.set_alignment(0.0, 0.5) + label.set_alignment(1.0, 0.5) label.show() tab.attach(label, colindex, colindex + 1, row, row + 1, xoptions=gtk.FILL, yoptions=0, xpadding=6, ypadding=3) @@ -292,8 +292,12 @@ title="Memory Properties", flags=gtk.DIALOG_MODAL, parent=parent, - buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK, - gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)) + buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, + gtk.STOCK_OK, gtk.RESPONSE_OK)) + self.set_default_response(gtk.RESPONSE_OK) + self.set_alternative_button_order([gtk.RESPONSE_OK, + gtk.RESPONSE_CANCEL]) + self.set_size_request(-1, 500) self._tips = gtk.Tooltips() diff --git a/chirp/ui/memedit.py b/chirp/ui/memedit.py --- a/chirp/ui/memedit.py +++ b/chirp/ui/memedit.py @@ -60,6 +60,8 @@ self.set_property("text", _("Invalid value for this field")) self.format_secondary_text(str(exception)) + self.set_default_response(gtk.RESPONSE_OK) + def iter_prev(store, iter): row = store.get_path(iter)[0] @@ -1477,20 +1479,28 @@ loc, filled = store.get(iter, self.col(_("Loc")), self.col("_filled")) if filled and not always: - d = miscwidgets.YesNoDialog(title=_("Overwrite?"), - buttons=(gtk.STOCK_YES, 1, - gtk.STOCK_NO, 2, - gtk.STOCK_CANCEL, 3, - "All", 4)) + d = miscwidgets.YesNoDialog( + title=_("Overwrite"), + parent=None, + buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, + gtk.STOCK_NO, gtk.RESPONSE_NO, + _("Yes to All"), gtk.RESPONSE_ACCEPT, + gtk.STOCK_YES, gtk.RESPONSE_YES)) + d.set_default_response(gtk.RESPONSE_YES) + d.set_alternative_button_order([gtk.RESPONSE_YES, + gtk.RESPONSE_ACCEPT, + gtk.RESPONSE_NO, + gtk.RESPONSE_CANCEL]) + d.set_text( _("Overwrite location {number}?").format(number=loc)) r = d.run() d.destroy() - if r == 4: + if r == gtk.RESPONSE_ACCEPT: always = True - elif r == 3: + elif r == gtk.RESPONSE_CANCEL: break - elif r == 2: + elif r == gtk.RESPONSE_NO: iter = store.iter_next(iter) continue @@ -1508,16 +1518,22 @@ errs = [x for x in msgs if isinstance(x, chirp_common.ValidationError)] if errs: - d = miscwidgets.YesNoDialog(title=_("Incompatible Memory"), - buttons=(gtk.STOCK_OK, 1, - gtk.STOCK_CANCEL, 2)) + d = miscwidgets.YesNoDialog( + title=_("Incompatible Memory"), + parent=None, + buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, + gtk.STOCK_OK, gtk.RESPONSE_OK)) + d.set_default_response(gtk.RESPONSE_OK) + d.set_alternative_button_order([gtk.RESPONSE_OK, + gtk.RESPONSE_CANCEL]) + d.set_text( _("Pasted memory {number} is not compatible with " "this radio because:").format(number=src_number) + os.linesep + os.linesep.join(msgs)) r = d.run() d.destroy() - if r == 2: + if r == gtk.RESPONSE_CANCEL: break else: iter = store.iter_next(iter) diff --git a/chirp/ui/miscwidgets.py b/chirp/ui/miscwidgets.py --- a/chirp/ui/miscwidgets.py +++ b/chirp/ui/miscwidgets.py @@ -603,13 +603,24 @@ class YesNoDialog(gtk.Dialog): def __init__(self, title="", parent=None, buttons=None): - gtk.Dialog.__init__(self, title=title, parent=parent, buttons=buttons) + gtk.Dialog.__init__(self, + title=title, + parent=parent, + buttons=buttons) + + self._table = gtk.Table(1, 2) self._label = gtk.Label("") + self._label.set_alignment(0.0, 0.5) + self._label.set_line_wrap(True) + self._label.set_size_request(384, -1) self._label.show() + self._table.attach(self._label, 0, 1, 0, 1, + xpadding=6, ypadding=3) + self._table.show() # pylint: disable-msg=E1101 - self.vbox.pack_start(self._label, 1, 1, 1) + self.vbox.pack_start(self._table, True, True, 2) def set_text(self, text): self._label.set_text(text) diff --git a/chirp/ui/settingsedit.py b/chirp/ui/settingsedit.py --- a/chirp/ui/settingsedit.py +++ b/chirp/ui/settingsedit.py @@ -135,7 +135,7 @@ # Label label = gtk.Label(element.get_shortname() + ":") - label.set_alignment(0.0, 0.5) + label.set_alignment(1.0, 0.5) label.show() table.attach(label, 0, 1, row, row + 1, diff --git a/chirp/ui/shiftdialog.py b/chirp/ui/shiftdialog.py --- a/chirp/ui/shiftdialog.py +++ b/chirp/ui/shiftdialog.py @@ -30,6 +30,8 @@ title=_("Shift"), buttons=(gtk.STOCK_CLOSE, gtk.RESPONSE_OK)) + self.set_default_response(gtk.RESPONSE_OK) + self.set_position(gtk.WIN_POS_CENTER_ALWAYS) self.rthread = rthread

2 1

[chirp_devel] New IC-7300 Driver
by Rick (AA0RD) DeWitt 07 Oct '20

07 Oct '20

New IC-7300 driver, Issue #4013. -- Rick DeWitt AA0RD Sequim, Washington, USA 98382 (360) 681-3494

2 1

[chirp_devel] Some Wiki Edits
by Rick (AA0RD) DeWitt 07 Oct '20

07 Oct '20

Dan- Could you please add these two friends of CHIRP to the Wiki Honor roll page- Damon Schaefer (K9CQB) and the Loudoun County, VA ARES club - TYT-UV800D (Graciously donated!) Bill Peterson (K7WWP) - Icom IC-7300 And I suggest the following wording be changed on the DevelopersToneModes page- Under Radio Behavior, Icom/Kenwood style: Change: No Icom (that I'm aware of) can use the two values for separate TX and RX tones, nor can *most* Kenwoods. To: So far, only the Icom IC-2730 supports the use of the two values for separate TX and RX tones, called TON.TSQ mode in the radio menu. Most Kenwood radios do not. I can make these changes if you authorize it. -- Rick DeWitt AA0RD Sequim, Washington, USA 98382 (360) 681-3494

2 1

[chirp_devel] [PATCH] [UV-5R] Add support for XXX.XXX Work Mode Offsets
by Jim Unroe 26 Sep '20

26 Sep '20

# HG changeset patch # User Jim Unroe <rock.unroe(a)gmail.com> # Date 1601156825 14400 # Sat Sep 26 17:47:05 2020 -0400 # Node ID a5d8aac0f6bddaf098b798f01cfbcdc8193bae39 # Parent fbfbef9154def77ef9398dbe373df1640f5a6e2e [UV-5R] Add support for XXX.XXX Work Mode Offsets The original UV-5R only supported VFO offsets up to 69.95 MHz. Current models support VFO offsets up to 999.999 MHz. This patch expands the Work Mode Settings VFO A/B Offset settings to match the range of the current models. fixes #6719 diff -r fbfbef9154de -r a5d8aac0f6bd chirp/drivers/uv5r.py --- a/chirp/drivers/uv5r.py Sat Sep 26 15:03:50 2020 -0400 +++ b/chirp/drivers/uv5r.py Sat Sep 26 17:47:05 2020 -0400 @@ -152,9 +152,7 @@ #seekto 0x0F10; struct { u8 freq[8]; - u8 unknown1; - u8 offset[4]; - u8 unknown2; + u8 offset[6]; ul16 rxtone; ul16 txtone; u8 unused1:7, @@ -176,9 +174,7 @@ #seekto 0x0F30; struct { u8 freq[8]; - u8 unknown1; - u8 offset[4]; - u8 unknown2; + u8 offset[6]; ul16 rxtone; ul16 txtone; u8 unused1:7, @@ -1462,25 +1458,25 @@ real_offset = 0 for byte in bytes: real_offset = (real_offset * 10) + byte - return chirp_common.format_freq(real_offset * 10000) + return chirp_common.format_freq(real_offset * 1000) def apply_offset(setting, obj): - value = chirp_common.parse_freq(str(setting.value)) / 10000 - for i in range(3, -1, -1): + value = chirp_common.parse_freq(str(setting.value)) / 1000 + for i in range(5, -1, -1): obj.offset[i] = value % 10 value /= 10 val1a = RadioSettingValueString( 0, 10, convert_bytes_to_offset(_vfoa.offset)) rs = RadioSetting("vfoa.offset", - "VFO A Offset (0.00-69.95)", val1a) + "VFO A Offset (0.0-999.999)", val1a) rs.set_apply_callback(apply_offset, _vfoa) workmode.append(rs) val1b = RadioSettingValueString( 0, 10, convert_bytes_to_offset(_vfob.offset)) rs = RadioSetting("vfob.offset", - "VFO B Offset (0.00-69.95)", val1b) + "VFO B Offset (0.0-999.999)", val1b) rs.set_apply_callback(apply_offset, _vfob) workmode.append(rs)

1 0

[chirp_devel] [PATCH] [TI-F8+] Add support for TechSide TI-F8+
by Jim Unroe 26 Sep '20

26 Sep '20

# HG changeset patch # User Jim Unroe <rock.unroe(a)gmail.com> # Date 1601147030 14400 # Sat Sep 26 15:03:50 2020 -0400 # Node ID fbfbef9154def77ef9398dbe373df1640f5a6e2e # Parent 2d7b5508d8950df775754f0587b7c7856e1c2302 [TI-F8+] Add support for TechSide TI-F8+ This patch adds support for the TechSide TI-F8+ (variant of Baofeng BF-F8HP) related to #8187 diff -r 2d7b5508d895 -r fbfbef9154de chirp/drivers/uv5r.py --- a/chirp/drivers/uv5r.py Tue Sep 08 11:53:20 2020 -0700 +++ b/chirp/drivers/uv5r.py Sat Sep 26 15:03:50 2020 -0400 @@ -1173,10 +1173,11 @@ RadioSettingValueBoolean(_settings.voice)) advanced.append(rs) else: - rs = RadioSetting("voice", "Voice", - RadioSettingValueList( - VOICE_LIST, VOICE_LIST[_settings.voice])) - advanced.append(rs) + if self.MODEL != "TI-F8+": + rs = RadioSetting("voice", "Voice", + RadioSettingValueList( + VOICE_LIST, VOICE_LIST[_settings.voice])) + advanced.append(rs) rs = RadioSetting("screv", "Scan Resume", RadioSettingValueList( @@ -1886,11 +1887,16 @@ MODEL = "UV-5XP" +class TSTIF8Alias(chirp_common.Alias): + VENDOR = "TechSide" + MODEL = "TI-F8+" + + @directory.register class BaofengBFF8HPRadio(BaofengUV5R): VENDOR = "Baofeng" MODEL = "BF-F8HP" - ALIASES = [RT5_TPAlias, ROGA5SAlias, UV5XPAlias] + ALIASES = [RT5_TPAlias, ROGA5SAlias, UV5XPAlias, TSTIF8Alias] _basetype = BASETYPE_F8HP _idents = [UV5R_MODEL_291, UV5R_MODEL_A58

1 0

[chirp_devel] [PATCH] Memory editor controls to use Gtk.Toolbar with collapsable overflow menu. Fixes 8259
by Kosta A. 18 Sep '20

18 Sep '20

# HG changeset patch # User Kosta A. <ve7kcy(a)gmail.com> # Date 1600414573 25200 # Fri Sep 18 00:36:13 2020 -0700 # Node ID 1a49ad2e84e305b56a3bdeb823266e1219f34e02 # Parent 2d7b5508d8950df775754f0587b7c7856e1c2302 Memory editor controls to use Gtk.Toolbar with collapsable overflow menu. Fixes 8259. diff --git a/chirp/ui/memedit.py b/chirp/ui/memedit.py --- a/chirp/ui/memedit.py +++ b/chirp/ui/memedit.py @@ -1178,11 +1178,16 @@ self._config.set_int(self._limit_key(which), int(sb.get_value())) def make_controls(self, min, max): + vbox = gtk.VBox(False, 2) + + toolbar = gtk.Toolbar() + toolbar.set_style(gtk.TOOLBAR_BOTH_HORIZ) + toolbar.set_show_arrow(True) + hbox = gtk.HBox(False, 2) lab = gtk.Label(_("Memory Range:")) - lab.show() - hbox.pack_start(lab, 0, 0, 0) + hbox.pack_start(lab, False, False, 2) lokey = self._limit_key("lo") hikey = self._limit_key("hi") @@ -1194,24 +1199,23 @@ self.lo_limit_adj = gtk.Adjustment(lostart, min, max-1, 1, 10) lo = gtk.SpinButton(self.lo_limit_adj) lo.connect("value-changed", self._store_limit, "lo") - lo.show() - hbox.pack_start(lo, 0, 0, 0) - - lab = gtk.Label(" - ") - lab.show() - hbox.pack_start(lab, 0, 0, 0) + hbox.pack_start(lo, False, False, 2) self.hi_limit_adj = gtk.Adjustment(histart, min+1, max, 1, 10) hi = gtk.SpinButton(self.hi_limit_adj) hi.connect("value-changed", self._store_limit, "hi") - hi.show() - hbox.pack_start(hi, 0, 0, 0) + hbox.pack_start(hi, False, False, 2) + + item = gtk.ToolItem() + item.add(hbox) + toolbar.add(item) - refresh = gtk.Button(_("Refresh")) - refresh.set_relief(gtk.RELIEF_NONE) + sep = gtk.SeparatorToolItem() + toolbar.add(sep) + + refresh = gtk.ToolButton(gtk.STOCK_REFRESH) refresh.connect("clicked", lambda x: self.prefill()) - refresh.show() - hbox.pack_start(refresh, 0, 0, 0) + toolbar.add(refresh) def activate_go(widget): refresh.clicked() @@ -1226,41 +1230,43 @@ lo.connect_after("activate", activate_go) hi.connect_after("activate", activate_go) - sep = gtk.VSeparator() - sep.show() - hbox.pack_start(sep, 0, 0, 2) + sep = gtk.SeparatorToolItem() + toolbar.add(sep) - showspecial = gtk.ToggleButton(_("Special Channels")) - showspecial.set_relief(gtk.RELIEF_NONE) + showspecial = gtk.ToggleToolButton() + showspecial.set_label(_("Special Channels")) + showspecial.set_stock_id(gtk.STOCK_ABOUT) + showspecial.set_is_important(True) showspecial.set_active(self.show_special) showspecial.connect("toggled", lambda x: self.set_show_special(x.get_active())) - showspecial.show() - hbox.pack_start(showspecial, 0, 0, 0) + toolbar.add(showspecial) - showempty = gtk.ToggleButton(_("Show Empty")) - showempty.set_relief(gtk.RELIEF_NONE) + showempty = gtk.ToggleToolButton() + showempty.set_label(_("Empty Channels")) + showempty.set_stock_id(gtk.STOCK_SELECT_ALL) + showempty.set_is_important(True) showempty.set_active(self.show_empty) showempty.connect("toggled", lambda x: self.set_show_empty(x.get_active())) - showempty.show() - hbox.pack_start(showempty, 0, 0, 0) + toolbar.add(showempty) + + sep = gtk.SeparatorToolItem() + toolbar.add(sep) - sep = gtk.VSeparator() - sep.show() - hbox.pack_start(sep, 0, 0, 2) - - props = gtk.Button(_("Properties")) - props.set_relief(gtk.RELIEF_NONE) - props.connect("clicked", + properties = gtk.ToolButton() + properties.set_stock_id(gtk.STOCK_PROPERTIES) + properties.set_label(_("Properties")) + properties.set_is_important(True) + properties.connect("clicked", lambda x: self.hotkey( gtk.Action("properties", "", "", 0))) - props.show() - hbox.pack_start(props, 0, 0, 0) + toolbar.add(properties) - hbox.show() + vbox.pack_start(toolbar, False, False, 0) + vbox.show_all() - return hbox + return vbox def set_show_special(self, show): self.show_special = show

1 0

[chirp_devel] [PATCH] [FT-60] Correct characterset to match radio segment display chars. Fixes #8189
by Kosta A. 18 Sep '20

18 Sep '20

# HG changeset patch # User Kosta A. <ve7kcy(a)gmail.com> # Date 1600406688 25200 # Thu Sep 17 22:24:48 2020 -0700 # Node ID ee83a0f7cfbb21413189bead37786c14e8b2c399 # Parent 2d7b5508d8950df775754f0587b7c7856e1c2302 [FT-60] Correct characterset to match radio segment display chars. Fixes #8189 diff --git a/chirp/drivers/ft60.py b/chirp/drivers/ft60.py --- a/chirp/drivers/ft60.py +++ b/chirp/drivers/ft60.py @@ -286,7 +286,7 @@ STEPS = [5.0, 10.0, 12.5, 15.0, 20.0, 25.0, 50.0, 100.0] SKIPS = ["", "S", "P"] DTMF_CHARS = list("0123456789ABCD*#") -CHARSET = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ [?]^__|`?$%&-()*+,-,/|;/=>?@" +CHARSET = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ !`o$%&'()*+,-./|;/=>?@[u]^_" SPECIALS = ["%s%d" % (c, i + 1) for i in range(0, 50) for c in ('L', 'U')]

1 0

Re: [chirp_devel] Getting (Re)started
by Joseph.P.Scanlan＠n7xsd.us 13 Sep '20

13 Sep '20

Well, I have python 2 running well enough for an IC-7000 and IC-2820H but I get an error with my Alinco DJ-G7. Next to look at debug.log… um… I don’t have ~/.chirp/debug.log. Did I break the debug log? Am I doing something silly like looking in the wrong place or for the wrong name? Martin, thanks for offering the help. When I’m looking at the IC-7000 again, I’ll keep you in mind. > On 6Sep2020, at 17:14, Martin Cooper <kd6yam(a)amsat.org> wrote: > > Hi Joseph, > > Welcome back! Just FYI, I'm the last one who was in the icomciv.py code, adding support for the IC-910H and fixing a bug in the IC-7100 code. Since, as you'll know, there's a lot of shared code amongst the CI-V radios, I just wanted to drop you a note and say: if you end up back in that code again, and have questions about what you see, please don't hesitate to ask. I'd be happy to help, if I can. > > Martin. > KD6YAM > > On Sun, Sep 6, 2020 at 12:59 PM Joseph.P.Scanlan--- via chirp_devel <chirp_devel(a)intrepid.danplanet.com <mailto:chirp_devel@intrepid.danplanet.com>> wrote: > The last few years have been a little… distracting but I’m anxious to get back to chirp. I did some work on the Icom IC-7000 driver in the past. So: > > How do I install python-libxslt1, python-gtk2, python-serial, and python-suds on Ubuntu Focal? > Should I be looking at the Python 3 branch instead? > > — Joseph.P.Scanlan(a)n7xsd.us <mailto:Joseph.P.Scanlan@n7xsd.us> > — n7xsd(a)arrl.net <mailto:n7xsd@arrl.net> > — +1-702-896-0507 > > _______________________________________________ > chirp_devel mailing list > chirp_devel(a)intrepid.danplanet.com <mailto:chirp_devel@intrepid.danplanet.com> > http://intrepid.danplanet.com/mailman/listinfo/chirp_devel <http://intrepid.danplanet.com/mailman/listinfo/chirp_devel> > Developer docs: http://chirp.danplanet.com/projects/chirp/wiki/Developers <http://chirp.danplanet.com/projects/chirp/wiki/Developers>

1 0