Comment actions now display correct labels instead of indexes

omnivore/tasks/hex_edit/actions.py

@@ -450,11 +450,11 @@ def perform(self, event):
         s = e.segment
         if event.popup_data["in_selection"]:
             ranges = s.get_style_ranges(selected=True)
-            desc = "Enter comment for range %s" % str(ranges)
+            desc = "Enter comment for range %s" % e.get_label_of_ranges(ranges)
         else:
             index = event.popup_data["index"]
             ranges = [(index, index+1)]
-            desc = "Enter comment for location %s" % index
+            desc = "Enter comment for location %s" % e.get_label_at_index(index)
         if ranges:
             prompt_for_comment(e, s, ranges, desc)
 

omnivore/tasks/hex_edit/hex_editor.py

@@ -424,6 +424,15 @@ def convert_ranges(self, from_style, to_style):
         self.selected_ranges = s.get_style_ranges(selected=True)
         self.document.change_count += 1
 
+    def get_label_at_index(self, index):
+        return self.control.table.get_label_at_index(index)
+
+    def get_label_of_ranges(self, ranges):
+        labels = []
+        for start, end in ranges:
+            labels.append("%s-%s" % (self.get_label_at_index(start), self.get_label_at_index(end)))
+        return ", ".join(labels)
+
     def get_segment_from_selection(self):
         # Since we can't handle segments with discontinuous chunks, we'll
         # create a contiguous segment from the first byte of the first range