# HG changeset patch # User Dan Drogichen # Date 1406300313 25200 # Fri Jul 25 07:58:33 2014 -0700 # Node ID 999b58451087a1b219a45227f9db744dc392def5 # Parent 73e127bbd9813b6cf966bdca1fefdc6c4ecac058 [developer] More informative Diff tabs window title - #1787 Replace the constant string "Differences" in the 'Diff tabs' window title with an abridged version of the log message, showing the filnames and memory channels selected. #1787 diff -r 73e127bbd981 -r 999b58451087 chirpui/mainapp.py --- a/chirpui/mainapp.py Tue Jul 22 19:31:33 2014 -0400 +++ b/chirpui/mainapp.py Fri Jul 25 07:58:33 2014 -0700 @@ -201,6 +201,12 @@ print "Selected %s@%i and %s@%i" % (sel_a, sel_chan_a, sel_b, sel_chan_b) + name_a = os.path.basename (sel_a) + name_a = name_a[:name_a.rindex(")")] + name_b = os.path.basename (sel_b) + name_b = name_b[:name_b.rindex(")")] + diffwintitle = "%s@%i diff %s@%i" % ( + name_a, sel_chan_a, name_b, sel_chan_b) eset_a = esets[choices.index(sel_a)] eset_b = esets[choices.index(sel_b)] @@ -208,7 +214,7 @@ def _show_diff(mem_b, mem_a): # Step 3: Show the diff diff = common.simple_diff(mem_a, mem_b) - common.show_diff_blob("Differences", diff) + common.show_diff_blob(diffwintitle, diff) def _get_mem_b(mem_a): # Step 2: Get memory b @@ -237,7 +243,7 @@ diffsonly = True else: diffsonly = False - common.show_diff_blob("Differences", + common.show_diff_blob(diffwintitle, common.simple_diff(a, b, diffsonly)) else: common.show_error("Cannot diff whole live-mode radios!")