# HG changeset patch # User Jake Merdich jake@merdich.com # Date 1541876657 18000 # Sat Nov 10 14:04:17 2018 -0500 # Node ID 6c90bb305ac2a037008c2132ce836da228619b06 # Parent 88a8f540abef2a884e286f0e7cd9ed39d4ea16cf Fix missing arguments in csvdump script. Fixes #6227.

diff --git a/csvdump/csvdump.py b/csvdump/csvdump.py --- a/csvdump/csvdump.py +++ b/csvdump/csvdump.py @@ -74,11 +74,11 @@ class CsvDumpWindow(gtk.Window): self.w_radio.connect("changed", self.select_radio) self.tips.set_tip(self.w_radio, "Select radio model") self.w_radio.show() - hbox.pack_start(self.w_radio, 1, , ) + hbox.pack_start(self.w_radio, 1, 1, 1)

l = gtk.Label(" on port ") l.show() - hbox.pack_start(l, 0, , ) + hbox.pack_start(l, 0, 0, 0)

ports = platform.get_platform().list_serial_ports() if len(ports) > 0: @@ -89,7 +89,7 @@ class CsvDumpWindow(gtk.Window): self.w_port.connect("changed", self.select_radio) self.tips.set_tip(self.w_port, "Select serial port") self.w_port.show() - hbox.pack_start(self.w_port, 1, , ) + hbox.pack_start(self.w_port, 1, 1, 1)

f.add(hbox) hbox.show() @@ -105,7 +105,7 @@ class CsvDumpWindow(gtk.Window):

self.w_imginfo = gtk.Label("No image") self.w_imginfo.show() - vbox.pack_start(self.w_imginfo, 0, , ) + vbox.pack_start(self.w_imginfo, 0, 0, 0)

hbox = gtk.HBox(True, 2) hbox.set_border_width(2) @@ -114,17 +114,17 @@ class CsvDumpWindow(gtk.Window): self.w_dli.connect("clicked", lambda x: self.fn_download()) self.tips.set_tip(self.w_dli, "Download image from radio") self.w_dli.show() - hbox.pack_start(self.w_dli, 0, , ) + hbox.pack_start(self.w_dli, 0, 0, 0)

self.w_uli = StdButton("Upload") self.w_uli.set_sensitive(False) self.w_uli.connect("clicked", lambda x: self.fn_upload()) self.tips.set_tip(self.w_uli, "Upload image to radio") self.w_uli.show() - hbox.pack_start(self.w_uli, 0, , ) + hbox.pack_start(self.w_uli, 0, 0, 0)

hbox.show() - vbox.pack_start(hbox, 0, , ) + vbox.pack_start(hbox, 0, 0, 0)

vbox.show() self.w_imgframe.add(vbox) @@ -154,21 +154,21 @@ class CsvDumpWindow(gtk.Window):

l = gtk.Label("File") l.show() - hbox.pack_start(l, 0, , ) + hbox.pack_start(l, 0, 0, 0)

self.w_filename = gtk.Entry() self.w_filename.connect("changed", self.file_changed) self.tips.set_tip(self.w_filename, "Path to CSV file") self.w_filename.show() - hbox.pack_start(self.w_filename, 1, , ) + hbox.pack_start(self.w_filename, 1, 1, 1)

bb = StdButton("Browse") bb.connect("clicked", self.pick_file) bb.show() - hbox.pack_start(bb, 0, , ) + hbox.pack_start(bb, 0, 0, 0)

hbox.show() - vbox.pack_start(hbox, 0, , ) + vbox.pack_start(hbox, 0, 0, 0)

hbox = gtk.HBox(True, 2) hbox.set_border_width(2) @@ -181,7 +181,7 @@ class CsvDumpWindow(gtk.Window): self.tips.set_tip(self.w_export, "Export radio memories to CSV file") self.w_export.show() - hbox.pack_start(self.w_export, 0, , ) + hbox.pack_start(self.w_export, 0, 0, 0)

def import_handler(x): return self.fn_iport(self.w_filename.get_text()) @@ -191,10 +191,10 @@ class CsvDumpWindow(gtk.Window): self.tips.set_tip(self.w_import, "Import radio memories from CSV file") self.w_import.show() - hbox.pack_start(self.w_import, 0, , ) + hbox.pack_start(self.w_import, 0, 0, 0)

hbox.show() - vbox.pack_start(hbox, 0, , ) + vbox.pack_start(hbox, 0, 0, 0)

vbox.show() self.w_fileframe.add(vbox) @@ -225,10 +225,10 @@ class CsvDumpWindow(gtk.Window):

vbox = gtk.VBox(False, 2)

- vbox.pack_start(self.make_radio_sel(), 0, , ) - vbox.pack_start(self.make_image_ctl(), 0, , ) - vbox.pack_start(self.make_file_ctl(), 0, , ) - vbox.pack_start(self.make_status_bar(), 0, , ) + vbox.pack_start(self.make_radio_sel(), 0, 0, 0) + vbox.pack_start(self.make_image_ctl(), 0, 0, 0) + vbox.pack_start(self.make_file_ctl(), 0, 0, 0) + vbox.pack_start(self.make_status_bar(), 0, 0, 0)

vbox.show() self.add(vbox)