ABC Assist: selected value is emphasized with an arrow

ABC Assist: selected value is emphasized with an arrow

Author: jwdj

tune_actions.py

@@ -307,7 +307,7 @@ def get_columns_for_value(self, context, value, show_value_column, fixed_font=Tr
                 t = UrlTuple(self.get_action_url(params), desc)
                 columns.append(t)
             else:
-                columns.append(desc) # self.html_selected_item(context, value, desc)
+                columns.append(self.html_selected_item(context, value, desc))
 
         return columns
 
@@ -340,10 +340,9 @@ def get_values_html(self, context):
             result = ''
         return result
 
-    @staticmethod
-    def html_selected_item(context, value, description):
-        # if self.is_current_value(context, value):
-        #    return html_enclose('b', description)  # to make selected item bold
+    def html_selected_item(self, context, value, description):
+        if self.is_current_value(context, value):
+            return description + ' \u25C4'
         return description
 
 
@@ -651,7 +650,7 @@ def length_to_fraction(length):
 
     @staticmethod
     def is_power2(num):
-        return ((num & (num - 1)) == 0) and num != 0
+        return ((num & (num - 1)) == 0) and num > 0
 
     def can_execute(self, context, params=None):
         value = params.get('value')
@@ -883,6 +882,9 @@ def abc_mode_to_number(mode, default=None):
         mode = mode[:3].lower()
         return KeyChangeAction._mode_to_num.get(mode, default)
 
+    def is_current_value(self, context, value):
+        return True
+
 
 class KeySignatureChangeAction(KeyChangeAction):
     values = [
@@ -1029,8 +1031,7 @@ def can_execute(self, context, params=None):
             value = params.get('value')
             if value is None:
                 return True
-            match = self.get_match(context)
-            return match is None or value != match.group('clefname')
+            return not self.is_current_value(context, value)
         return False
 
     def execute(self, context, params=None):
@@ -1045,6 +1046,10 @@ def execute(self, context, params=None):
                     params['value'] = ' clef=' + value
                 super(ClefChangeAction, self).execute(context, params)
 
+    def is_current_value(self, context, value):
+        match = self.get_match(context)
+        return match and value == match.group('clefname')
+
 
 class StaffTransposeChangeAction(ValueChangeAction):
     values = [
@@ -1290,24 +1295,28 @@ def __init__(self, keyword):
         url = 'http://moinejf.free.fr/abcm2ps-doc/{0}.xhtml'.format(urllib.parse.quote(keyword))
         super(UrlAction, self).__init__('lookup_abcm2ps', url)
 
-
 class Abc2MidiUrlAction(UrlAction):
     def __init__(self, keyword):
-        url = 'http://ifdo.pugmarks.com/~seymour/runabc/abcguide/abc2midi_body.html#{0}'.format(urllib.parse.quote(keyword))
+        url = 'https://abcmidi.sourceforge.io/#{0}'.format(urllib.parse.quote(keyword))
         super(UrlAction, self).__init__('lookup_abc2midi', url)
 
+
 class AbcStandardUrlAction(UrlAction):
     def __init__(self):
         super(AbcStandardUrlAction, self).__init__('lookup_abc_standard')
 
     def get_url(self, context):
-        version = context.get_matchgroup('version', '2.1')
+        version = self.get_version_from_context(context)
         return 'http://abcnotation.com/wiki/abc:standard:v{0}'.format(version)
 
     def can_execute(self, context, params=None):
-        version = context.get_matchgroup('version', '2.1')
+        version = self.get_version_from_context(context)
         return version.startswith('2.')
 
+    @staticmethod
+    def get_version_from_context(context):
+        return context.get_matchgroup('version', '2.1')
+
     def get_outer_text(self, context):
         return None