mirror of
https://github.com/kk7ds/chirp.git
synced 2024-09-22 02:57:20 +00:00
Use logging in chirpui/*.py (#2347)
This commit is contained in:
Zach Welch
parent
01ddf80ebe
commit
9527877306
@ -14,10 +14,13 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import gtk
|
||||
import logging
|
||||
from chirp import bandplan, bandplan_na, bandplan_au
|
||||
from chirp import bandplan_iaru_r1, bandplan_iaru_r2, bandplan_iaru_r3
|
||||
from chirpui import inputdialog
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class BandPlans(object):
|
||||
def __init__(self, config):
|
||||
@ -44,7 +47,8 @@ class BandPlans(object):
|
||||
# Check for duplicates.
|
||||
duplicates = [x for x in plan.BANDS if x == band]
|
||||
if len(duplicates) > 1:
|
||||
print "Bandplan %s has duplicates %s" % (name, duplicates)
|
||||
LOG.warn("Bandplan %s has duplicates %s" %
|
||||
(name, duplicates))
|
||||
# Add repeater inputs.
|
||||
rpt_input = band.inverse()
|
||||
if rpt_input not in plan.BANDS:
|
||||
@ -102,6 +106,7 @@ class BandPlans(object):
|
||||
self._config.set_bool(shortname, selection == details[0],
|
||||
"bandplan")
|
||||
if selection == details[0]:
|
||||
print "Selected band plan %s: %s" % (shortname, selection)
|
||||
LOG.info("Selected band plan %s: %s" %
|
||||
(shortname, selection))
|
||||
|
||||
d.destroy()
|
||||
|
||||
@ -16,12 +16,15 @@
|
||||
import gtk
|
||||
import gobject
|
||||
import time
|
||||
import logging
|
||||
|
||||
from gobject import TYPE_INT, TYPE_STRING, TYPE_BOOLEAN
|
||||
|
||||
from chirp import chirp_common
|
||||
from chirpui import common, miscwidgets
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class MappingNamesJob(common.RadioJob):
|
||||
def __init__(self, model, editor, cb):
|
||||
@ -378,7 +381,8 @@ class MappingMembershipEditor(common.Editor):
|
||||
(min, max) = self._rf.memory_bounds
|
||||
for i in range(min, max+1):
|
||||
self.refresh_memory(i)
|
||||
print "Got all %s info in %s" % (self._type, (time.time() - start))
|
||||
LOG.debug("Got all %s info in %s" %
|
||||
(self._type, (time.time() - start)))
|
||||
|
||||
def refresh_mappings(self, and_memories=False):
|
||||
def got_mappings():
|
||||
|
||||
@ -14,6 +14,7 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import threading
|
||||
import logging
|
||||
import os
|
||||
|
||||
import gtk
|
||||
@ -22,6 +23,8 @@ import gobject
|
||||
from chirp import platform, directory, detect, chirp_common
|
||||
from chirpui import miscwidgets, cloneprog, inputdialog, common, config
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
AUTO_DETECT_STRING = "Auto Detect (Icom Only)"
|
||||
|
||||
|
||||
@ -188,7 +191,7 @@ class CloneSettingsDialog(gtk.Dialog):
|
||||
common.show_error(
|
||||
_("Internal error: Unable to upload to {model}").format(
|
||||
model=model))
|
||||
print self.__vendors
|
||||
LOG.info(self.__vendors)
|
||||
return None
|
||||
|
||||
conf = config.get("state")
|
||||
@ -222,7 +225,7 @@ class CloneThread(threading.Thread):
|
||||
self.__cancelled = True
|
||||
|
||||
def run(self):
|
||||
print "Clone thread started"
|
||||
LOG.debug("Clone thread started")
|
||||
|
||||
gobject.idle_add(self.__progw.show)
|
||||
|
||||
@ -237,7 +240,7 @@ class CloneThread(threading.Thread):
|
||||
emsg = None
|
||||
except Exception, e:
|
||||
common.log_exception()
|
||||
print _("Clone failed: {error}").format(error=e)
|
||||
LOG.error(_("Clone failed: {error}").format(error=e))
|
||||
emsg = e
|
||||
|
||||
gobject.idle_add(self.__progw.hide)
|
||||
@ -245,7 +248,7 @@ class CloneThread(threading.Thread):
|
||||
# NB: Compulsory close of the radio's serial connection
|
||||
self.__radio.pipe.close()
|
||||
|
||||
print "Clone thread ended"
|
||||
LOG.debug("Clone thread ended")
|
||||
|
||||
if self.__cback and not self.__cancelled:
|
||||
gobject.idle_add(self.__cback, self.__radio, emsg)
|
||||
|
||||
@ -21,10 +21,13 @@ import threading
|
||||
import time
|
||||
import os
|
||||
import traceback
|
||||
import logging
|
||||
|
||||
from chirp import errors
|
||||
from chirpui import reporting, config
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
CONF = config.get()
|
||||
|
||||
|
||||
@ -78,9 +81,7 @@ gobject.type_register(Editor)
|
||||
|
||||
def DBG(*args):
|
||||
if False:
|
||||
print " ".join(args)
|
||||
|
||||
VERBOSE = False
|
||||
LOG.debug(" ".join(args))
|
||||
|
||||
|
||||
class RadioJob:
|
||||
@ -111,17 +112,17 @@ class RadioJob:
|
||||
DBG("Running %s (%s %s)" % (self.func,
|
||||
str(self.args),
|
||||
str(self.kwargs)))
|
||||
if VERBOSE:
|
||||
print self.desc
|
||||
DBG(self.desc)
|
||||
result = func(*self.args, **self.kwargs)
|
||||
except errors.InvalidMemoryLocation, e:
|
||||
result = e
|
||||
except Exception, e:
|
||||
print "Exception running RadioJob: %s" % e
|
||||
LOG.error("Exception running RadioJob: %s" % e)
|
||||
log_exception()
|
||||
print "Job Args: %s" % str(self.args)
|
||||
print "Job KWArgs: %s" % str(self.kwargs)
|
||||
print "Job Called from:%s%s" % (os.linesep, "".join(self.tb[:-1]))
|
||||
LOG.error("Job Args: %s" % str(self.args))
|
||||
LOG.error("Job KWArgs: %s" % str(self.kwargs))
|
||||
LOG.error("Job Called from:%s%s" %
|
||||
(os.linesep, "".join(self.tb[:-1])))
|
||||
result = e
|
||||
|
||||
if self.cb:
|
||||
@ -134,8 +135,8 @@ class RadioJob:
|
||||
try:
|
||||
func = getattr(self.target, self.func)
|
||||
except AttributeError, e:
|
||||
print "No such radio function `%s' in %s" % (self.func,
|
||||
self.target)
|
||||
LOG.error("No such radio function `%s' in %s" %
|
||||
(self.func, self.target))
|
||||
return
|
||||
|
||||
self._execute(self.target, func)
|
||||
@ -261,7 +262,7 @@ class RadioThread(threading.Thread, gobject.GObject):
|
||||
last_job_desc = job.desc
|
||||
self.unlock()
|
||||
|
||||
print "RadioThread exiting"
|
||||
LOG.debug("RadioThread exiting")
|
||||
|
||||
|
||||
def log_exception():
|
||||
@ -270,9 +271,9 @@ def log_exception():
|
||||
|
||||
reporting.report_exception(traceback.format_exc(limit=30))
|
||||
|
||||
print "-- Exception: --"
|
||||
traceback.print_exc(limit=30, file=sys.stdout)
|
||||
print "------"
|
||||
LOG.error("-- Exception: --")
|
||||
LOG.error(traceback.format_exc(limit=30))
|
||||
LOG.error("----------------")
|
||||
|
||||
|
||||
def show_error(msg, parent=None):
|
||||
@ -417,7 +418,7 @@ def show_diff_blob(title, result):
|
||||
except Exception:
|
||||
fontsize = 11
|
||||
if fontsize < 4 or fontsize > 144:
|
||||
print "Unsupported diff_fontsize %i. Using 11." % fontsize
|
||||
LOG.info("Unsupported diff_fontsize %i. Using 11." % fontsize)
|
||||
fontsize = 11
|
||||
|
||||
lines = result.split(os.linesep)
|
||||
|
||||
@ -15,9 +15,12 @@
|
||||
|
||||
import gtk
|
||||
import gobject
|
||||
import logging
|
||||
|
||||
from chirpui import common, miscwidgets
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
WIDGETW = 80
|
||||
WIDGETH = 30
|
||||
|
||||
@ -96,24 +99,24 @@ class DStarEditor(common.Editor):
|
||||
def __cs_changed(self, cse):
|
||||
job = None
|
||||
|
||||
print "Callsigns: %s" % cse.get_callsigns()
|
||||
LOG.debug("Callsigns: %s" % cse.get_callsigns())
|
||||
if cse == self.editor_ucall:
|
||||
job = common.RadioJob(None,
|
||||
"set_urcall_list",
|
||||
cse.get_callsigns())
|
||||
print "Set urcall"
|
||||
LOG.debug("Set urcall")
|
||||
elif cse == self.editor_rcall:
|
||||
job = common.RadioJob(None,
|
||||
"set_repeater_call_list",
|
||||
cse.get_callsigns())
|
||||
print "Set rcall"
|
||||
LOG.debug("Set rcall")
|
||||
elif cse == self.editor_mcall:
|
||||
job = common.RadioJob(None,
|
||||
"set_mycall_list",
|
||||
cse.get_callsigns())
|
||||
|
||||
if job:
|
||||
print "Submitting job to update call lists"
|
||||
LOG.debug("Submitting job to update call lists")
|
||||
self.rthread.submit(job)
|
||||
|
||||
self.emit("changed")
|
||||
@ -154,7 +157,7 @@ class DStarEditor(common.Editor):
|
||||
if self.loaded:
|
||||
return
|
||||
self.loaded = True
|
||||
print "Loading callsigns..."
|
||||
LOG.debug("Loading callsigns...")
|
||||
|
||||
def set_ucall(calls):
|
||||
self.editor_ucall.set_callsigns(calls)
|
||||
|
||||
@ -16,11 +16,14 @@
|
||||
import os
|
||||
import gtk
|
||||
import gobject
|
||||
import logging
|
||||
|
||||
from chirp import chirp_common, directory, generic_csv, generic_xml
|
||||
from chirpui import memedit, dstaredit, bankedit, common, importdialog
|
||||
from chirpui import inputdialog, reporting, settingsedit, radiobrowser, config
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class EditorSet(gtk.VBox):
|
||||
__gsignals__ = {
|
||||
@ -220,7 +223,7 @@ class EditorSet(gtk.VBox):
|
||||
memedit.prefill()
|
||||
|
||||
def editor_changed(self, target_editor=None):
|
||||
print "%s changed" % target_editor
|
||||
LOG.debug("%s changed" % target_editor)
|
||||
if not isinstance(self.radio, chirp_common.LiveRadio):
|
||||
self.modified = True
|
||||
self.update_tab()
|
||||
@ -252,7 +255,7 @@ class EditorSet(gtk.VBox):
|
||||
return
|
||||
|
||||
count = dialog.do_import(dst_rthread)
|
||||
print "Imported %i" % count
|
||||
LOG.debug("Imported %i" % count)
|
||||
dst_rthread._qunlock()
|
||||
|
||||
if count > 0:
|
||||
|
||||
@ -16,10 +16,13 @@
|
||||
import gtk
|
||||
import gobject
|
||||
import pango
|
||||
import logging
|
||||
|
||||
from chirp import errors, chirp_common, generic_xml, import_logic
|
||||
from chirpui import common
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class WaitWindow(gtk.Window):
|
||||
def __init__(self, msg, parent=None):
|
||||
@ -174,15 +177,15 @@ class ImportDialog(gtk.Dialog):
|
||||
mem = self.src_radio.get_memory(old)
|
||||
if isinstance(mem, chirp_common.DVMemory):
|
||||
if mem.dv_urcall not in ulist:
|
||||
print "Adding %s to ucall list" % mem.dv_urcall
|
||||
LOG.debug("Adding %s to ucall list" % mem.dv_urcall)
|
||||
ulist.append(mem.dv_urcall)
|
||||
ulist_changed = True
|
||||
if mem.dv_rpt1call not in rlist:
|
||||
print "Adding %s to rcall list" % mem.dv_rpt1call
|
||||
LOG.debug("Adding %s to rcall list" % mem.dv_rpt1call)
|
||||
rlist.append(mem.dv_rpt1call)
|
||||
rlist_changed = True
|
||||
if mem.dv_rpt2call not in rlist:
|
||||
print "Adding %s to rcall list" % mem.dv_rpt2call
|
||||
LOG.debug("Adding %s to rcall list" % mem.dv_rpt2call)
|
||||
rlist.append(mem.dv_rpt2call)
|
||||
rlist_changed = True
|
||||
|
||||
@ -231,13 +234,13 @@ class ImportDialog(gtk.Dialog):
|
||||
if not dst_banks or not src_banks:
|
||||
raise Exception()
|
||||
except Exception:
|
||||
print "One or more of the radios doesn't support banks"
|
||||
LOG.error("One or more of the radios doesn't support banks")
|
||||
return
|
||||
|
||||
if not isinstance(self.dst_radio, generic_xml.XMLRadio) and \
|
||||
len(dst_banks) != len(src_banks):
|
||||
print "Source and destination radios have " + \
|
||||
"a different number of banks"
|
||||
LOG.warn("Source and destination radios have "
|
||||
"a different number of banks")
|
||||
else:
|
||||
self.dst_radio.set_banks(src_banks)
|
||||
|
||||
@ -250,7 +253,7 @@ class ImportDialog(gtk.Dialog):
|
||||
|
||||
for old, new, name, comm in import_list:
|
||||
i += 1
|
||||
print "%sing %i -> %i" % (self.ACTION, old, new)
|
||||
LOG.debug("%sing %i -> %i" % (self.ACTION, old, new))
|
||||
|
||||
src = self.src_radio.get_memory(old)
|
||||
|
||||
@ -262,7 +265,7 @@ class ImportDialog(gtk.Dialog):
|
||||
"name": name,
|
||||
"comment": comm})
|
||||
except import_logic.ImportError, e:
|
||||
print e
|
||||
LOG.error(e)
|
||||
error_messages[new] = str(e)
|
||||
continue
|
||||
|
||||
@ -322,7 +325,7 @@ class ImportDialog(gtk.Dialog):
|
||||
column.set_cell_data_func(rend, self._render, k)
|
||||
|
||||
if k in self.tips.keys():
|
||||
print "Doing %s" % k
|
||||
LOG.debug("Doing %s" % k)
|
||||
lab = gtk.Label(self.caps[k])
|
||||
column.set_widget(lab)
|
||||
tips.set_tip(lab, self.tips[k])
|
||||
@ -512,10 +515,11 @@ class ImportDialog(gtk.Dialog):
|
||||
if mem and not mem.empty and number not in self.used_list:
|
||||
self.used_list.append(number)
|
||||
except errors.InvalidMemoryLocation:
|
||||
print "Location %i empty or at limit of destination radio" % number
|
||||
LOG.error("Location %i empty or at limit of destination radio" %
|
||||
number)
|
||||
except errors.InvalidDataError, e:
|
||||
print "Got error from radio, assuming %i beyond limits: %s" % \
|
||||
(number, e)
|
||||
LOG.error("Got error from radio, assuming %i beyond limits: %s" %
|
||||
(number, e))
|
||||
|
||||
def populate_list(self):
|
||||
start, end = self.src_radio.get_features().memory_bounds
|
||||
|
||||
@ -14,10 +14,13 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import gtk
|
||||
import logging
|
||||
|
||||
from miscwidgets import make_choice
|
||||
from chirpui import reporting
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class TextInputDialog(gtk.Dialog):
|
||||
def respond_ok(self, _):
|
||||
@ -88,9 +91,9 @@ class ExceptionDialog(gtk.MessageDialog):
|
||||
import traceback
|
||||
import sys
|
||||
reporting.report_exception(traceback.format_exc(limit=30))
|
||||
print "--- Exception Dialog: %s ---" % exception
|
||||
traceback.print_exc(limit=100, file=sys.stdout)
|
||||
print "----------------------------"
|
||||
LOG.error("--- Exception Dialog: %s ---" % exception)
|
||||
LOG.error(traceback.format_exc(limit=100))
|
||||
LOG.error("----------------------------")
|
||||
|
||||
|
||||
class FieldDialog(gtk.Dialog):
|
||||
@ -105,7 +108,7 @@ class FieldDialog(gtk.Dialog):
|
||||
gtk.Dialog.__init__(self, **kwargs)
|
||||
|
||||
def response(self, _):
|
||||
print "Blocking response"
|
||||
LOG.debug("Blocking response")
|
||||
return
|
||||
|
||||
def add_field(self, label, widget, validator=None):
|
||||
|
||||
@ -15,10 +15,13 @@
|
||||
|
||||
import gtk
|
||||
import os
|
||||
import logging
|
||||
|
||||
from chirp import chirp_common, settings
|
||||
from chirpui import miscwidgets, common
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
POL = ["NN", "NR", "RN", "RR"]
|
||||
|
||||
|
||||
@ -224,7 +227,7 @@ class MemoryDetailEditor(gtk.Dialog):
|
||||
try:
|
||||
_img = self._editors[name][2]
|
||||
except KeyError:
|
||||
print self._editors.keys()
|
||||
LOG.error(self._editors.keys())
|
||||
if msg is None:
|
||||
_img.clear()
|
||||
self._tips.set_tip(_img, "")
|
||||
|
||||
@ -27,11 +27,14 @@ from gobject import TYPE_INT, \
|
||||
import gobject
|
||||
import pickle
|
||||
import os
|
||||
import logging
|
||||
|
||||
from chirpui import common, shiftdialog, miscwidgets, config, memdetail
|
||||
from chirpui import bandplans
|
||||
from chirp import chirp_common, errors, directory, import_logic
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
import sys
|
||||
@ -143,7 +146,7 @@ class MemoryEditor(common.Editor):
|
||||
offset *= -1
|
||||
|
||||
if dup not in self.choices[_("Duplex")]:
|
||||
print "Duplex %s not supported by this radio" % dup
|
||||
LOG.warn("Duplex %s not supported by this radio" % dup)
|
||||
return
|
||||
|
||||
if offset:
|
||||
@ -155,7 +158,7 @@ class MemoryEditor(common.Editor):
|
||||
if ts in self.choices[_("Tune Step")]:
|
||||
self.store.set(iter, self.col(_("Tune Step")), ts)
|
||||
else:
|
||||
print "Tune step %s not supported by this radio" % ts
|
||||
LOG.warn("Tune step %s not supported by this radio" % ts)
|
||||
|
||||
def get_ts(path):
|
||||
return self.store.get(iter, self.col(_("Tune Step")))[0]
|
||||
@ -164,19 +167,19 @@ class MemoryEditor(common.Editor):
|
||||
if mode in self.choices[_("Mode")]:
|
||||
self.store.set(iter, self.col(_("Mode")), mode)
|
||||
else:
|
||||
print "Mode %s not supported by this radio (%s)" % (
|
||||
mode, self.choices[_("Mode")])
|
||||
LOG.warn("Mode %s not supported by this radio (%s)" %
|
||||
(mode, self.choices[_("Mode")]))
|
||||
|
||||
def set_tone(tone):
|
||||
if tone in self.choices[_("Tone")]:
|
||||
self.store.set(iter, self.col(_("Tone")), tone)
|
||||
else:
|
||||
print "Tone %s not supported by this radio" % tone
|
||||
LOG.warn("Tone %s not supported by this radio" % tone)
|
||||
|
||||
try:
|
||||
new = chirp_common.parse_freq(new)
|
||||
except ValueError, e:
|
||||
print e
|
||||
LOG.error(e)
|
||||
new = None
|
||||
|
||||
if not self._features.has_nostep_tuning:
|
||||
@ -335,7 +338,7 @@ class MemoryEditor(common.Editor):
|
||||
iter = self.store.get_iter(path)
|
||||
if not self.store.get(iter, self.col("_filled"))[0] and \
|
||||
self.store.get(iter, self.col(_("Frequency")))[0] == 0:
|
||||
print _("Editing new item, taking defaults")
|
||||
LOG.error(_("Editing new item, taking defaults"))
|
||||
self.insert_new(iter)
|
||||
|
||||
colnum = self.col(cap)
|
||||
@ -357,7 +360,7 @@ class MemoryEditor(common.Editor):
|
||||
new = funcs[cap](rend, path, new, colnum)
|
||||
|
||||
if new is None:
|
||||
print _("Bad value for {col}: {val}").format(col=cap, val=new)
|
||||
LOG.error(_("Bad value for {col}: {val}").format(col=cap, val=new))
|
||||
return
|
||||
|
||||
if self.store.get_column_type(colnum) == TYPE_INT:
|
||||
@ -451,7 +454,7 @@ class MemoryEditor(common.Editor):
|
||||
newpos, = store.get(_iter, self.col(_("Loc")))
|
||||
newpos += delta
|
||||
|
||||
print "Insert easy: %i" % delta
|
||||
LOG.debug("Insert easy: %i" % delta)
|
||||
|
||||
mem = self.insert_new(iter, newpos)
|
||||
job = common.RadioJob(None, "set_memory", mem)
|
||||
@ -962,7 +965,7 @@ class MemoryEditor(common.Editor):
|
||||
if i not in default_col_order:
|
||||
raise Exception()
|
||||
except Exception, e:
|
||||
print e
|
||||
LOG.error(e)
|
||||
col_order = default_col_order
|
||||
|
||||
non_editable = ["Loc"]
|
||||
@ -1113,7 +1116,7 @@ class MemoryEditor(common.Editor):
|
||||
while iter:
|
||||
loc, = self.store.get(iter, self.col(_("Loc")))
|
||||
if loc == number:
|
||||
print "Deleting %i" % number
|
||||
LOG.debug("Deleting %i" % number)
|
||||
# FIXME: Make the actual remove happen on callback
|
||||
self.store.remove(iter)
|
||||
job = common.RadioJob(None, "erase_memory", number)
|
||||
@ -1299,7 +1302,7 @@ class MemoryEditor(common.Editor):
|
||||
for feature, colname in maybe_hide:
|
||||
if feature.startswith("has_"):
|
||||
supported = self._features[feature]
|
||||
print "%s supported: %s" % (colname, supported)
|
||||
LOG.info("%s supported: %s" % (colname, supported))
|
||||
elif feature.startswith("valid_"):
|
||||
supported = len(self._features[feature]) != 0
|
||||
|
||||
@ -1439,7 +1442,7 @@ class MemoryEditor(common.Editor):
|
||||
try:
|
||||
src_features, mem_list = pickle.loads(text)
|
||||
except Exception:
|
||||
print "Paste failed to unpickle"
|
||||
LOG.error("Paste failed to unpickle")
|
||||
return
|
||||
|
||||
if (paths[0][0] + len(mem_list)) > self._rows_in_store:
|
||||
|
||||
@ -18,9 +18,12 @@ import gobject
|
||||
import pango
|
||||
|
||||
import os
|
||||
import logging
|
||||
|
||||
from chirp import platform
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class KeyedListWidget(gtk.HBox):
|
||||
__gsignals__ = {
|
||||
@ -128,7 +131,7 @@ class KeyedListWidget(gtk.HBox):
|
||||
(store, iter) = self.__view.get_selection().get_selected()
|
||||
return store.get(iter, 0)[0]
|
||||
except Exception, e:
|
||||
print "Unable to find selected: %s" % e
|
||||
LOG.error("Unable to find selected: %s" % e)
|
||||
return None
|
||||
|
||||
def select_item(self, key):
|
||||
@ -298,7 +301,7 @@ class ListWidget(gtk.HBox):
|
||||
(lst, iter) = self._view.get_selection().get_selected()
|
||||
lst.remove(iter)
|
||||
except Exception, e:
|
||||
print "Unable to remove selected: %s" % e
|
||||
LOG.error("Unable to remove selected: %s" % e)
|
||||
|
||||
def get_selected(self, take_default=False):
|
||||
(lst, iter) = self._view.get_selection().get_selected()
|
||||
@ -416,7 +419,7 @@ class TreeWidget(ListWidget):
|
||||
elif isinstance(vals, tuple):
|
||||
self._add_item(parent, *vals)
|
||||
else:
|
||||
print "Unknown type: %s" % vals
|
||||
LOG.error("Unknown type: %s" % vals)
|
||||
|
||||
def set_values(self, vals):
|
||||
self._store.clear()
|
||||
@ -586,7 +589,7 @@ class LatLonEntry(gtk.Entry):
|
||||
try:
|
||||
return self.parse_dms(string)
|
||||
except Exception, e:
|
||||
print "DMS: %s" % e
|
||||
LOG.error("DMS: %s" % e)
|
||||
|
||||
raise Exception("Invalid format")
|
||||
|
||||
|
||||
@ -3,10 +3,13 @@ import gobject
|
||||
import pango
|
||||
import re
|
||||
import os
|
||||
import logging
|
||||
|
||||
from chirp import bitwise
|
||||
from chirpui import common, config
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
CONF = config.get()
|
||||
|
||||
|
||||
@ -90,7 +93,7 @@ class FixedEntry(gtk.Entry):
|
||||
except Exception:
|
||||
fontsize = 10
|
||||
if fontsize < 4 or fontsize > 144:
|
||||
print "Unsupported browser_fontsize %i. Using 10." % fontsize
|
||||
LOG.warn("Unsupported browser_fontsize %i. Using 10." % fontsize)
|
||||
fontsize = 11
|
||||
|
||||
fontdesc = pango.FontDescription("Courier bold %i" % fontsize)
|
||||
|
||||
@ -50,12 +50,12 @@ except:
|
||||
|
||||
def should_report():
|
||||
if not ENABLED:
|
||||
LOG.debug("Not reporting due to recent failure")
|
||||
LOG.info("Not reporting due to recent failure")
|
||||
return False
|
||||
|
||||
conf = config.get()
|
||||
if conf.get_bool("no_report"):
|
||||
LOG.debug("Reporting disabled")
|
||||
LOG.info("Reporting disabled")
|
||||
return False
|
||||
|
||||
return True
|
||||
@ -65,7 +65,7 @@ def _report_model_usage(model, direction, success):
|
||||
global ENABLED
|
||||
if direction not in ["live", "download", "upload",
|
||||
"import", "export", "importsrc"]:
|
||||
print "Invalid direction `%s'" % direction
|
||||
LOG.warn("Invalid direction `%s'" % direction)
|
||||
return True # This is a bug, but not fatal
|
||||
|
||||
model = "%s_%s" % (model.VENDOR, model.MODEL)
|
||||
|
||||
@ -15,11 +15,14 @@
|
||||
|
||||
import gtk
|
||||
import gobject
|
||||
import logging
|
||||
|
||||
from chirp import chirp_common
|
||||
from chirp import settings
|
||||
from chirpui import common, miscwidgets
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class RadioSettingProxy(settings.RadioSetting):
|
||||
def __init__(self, setting, editor):
|
||||
@ -91,8 +94,8 @@ class SettingsEditor(common.Editor):
|
||||
elif isinstance(value, settings.RadioSettingValueString):
|
||||
value.set_value(widget.get_text())
|
||||
else:
|
||||
print "Unsupported widget type %s for %s" % \
|
||||
(element.value.__class__, element.get_name())
|
||||
LOG.error("Unsupported widget type %s for %s" %
|
||||
(element.value.__class__, element.get_name()))
|
||||
|
||||
self._changed = True
|
||||
self._save_settings()
|
||||
@ -181,7 +184,7 @@ class SettingsEditor(common.Editor):
|
||||
widget.set_text(str(value).rstrip())
|
||||
widget.connect("changed", self._save_setting, value)
|
||||
else:
|
||||
print "Unsupported widget type: %s" % value.__class__
|
||||
LOG.error("Unsupported widget type: %s" % value.__class__)
|
||||
|
||||
widget.set_sensitive(value.get_mutable())
|
||||
widget.show()
|
||||
|
||||
@ -17,9 +17,12 @@
|
||||
import gtk
|
||||
import gobject
|
||||
import threading
|
||||
import logging
|
||||
|
||||
from chirp import errors, chirp_common
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class ShiftDialog(gtk.Dialog):
|
||||
def __init__(self, rthread, parent=None):
|
||||
@ -59,7 +62,7 @@ class ShiftDialog(gtk.Dialog):
|
||||
src = i.number
|
||||
dst = src + delta
|
||||
|
||||
print "Moving %i to %i" % (src, dst)
|
||||
LOG.info("Moving %i to %i" % (src, dst))
|
||||
self.status(_("Moving {src} to {dst}").format(src=src,
|
||||
dst=dst),
|
||||
count / len(memories))
|
||||
@ -95,7 +98,7 @@ class ShiftDialog(gtk.Dialog):
|
||||
if pos > ulimit and not endokay:
|
||||
raise errors.InvalidMemoryLocation(_("No space to insert a row"))
|
||||
|
||||
print "Found a hole: %i" % pos
|
||||
LOG.debug("Found a hole: %i" % pos)
|
||||
|
||||
return mems
|
||||
|
||||
@ -109,7 +112,7 @@ class ShiftDialog(gtk.Dialog):
|
||||
self.rthread.radio.erase_memory(start)
|
||||
return ret
|
||||
else:
|
||||
print "No memory list?"
|
||||
LOG.warn("No memory list?")
|
||||
return 0
|
||||
|
||||
def _delete_hole(self, start, all=False):
|
||||
@ -119,7 +122,7 @@ class ShiftDialog(gtk.Dialog):
|
||||
self.rthread.radio.erase_memory(count+start)
|
||||
return count
|
||||
else:
|
||||
print "No memory list?"
|
||||
LOG.warn("No memory list?")
|
||||
return 0
|
||||
|
||||
def finished(self):
|
||||
|
||||
Loading…
Reference in New Issue
Block a user