From 6cc5c28d15f45aee5c15d2560d9743d824d99ad3 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 25 Jan 2019 13:45:56 +1100 Subject: Fix UI extension removal App-templates & keymap names had their extensions removed twice. Confusing for filenames containing dots. --- release/scripts/modules/bpy/path.py | 5 +++-- release/scripts/modules/rna_keymap_ui.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'release/scripts/modules') diff --git a/release/scripts/modules/bpy/path.py b/release/scripts/modules/bpy/path.py index d236af87052..845475b9180 100644 --- a/release/scripts/modules/bpy/path.py +++ b/release/scripts/modules/bpy/path.py @@ -201,7 +201,7 @@ _display_name_literals = { } -def display_name(name): +def display_name(name, *, has_ext=True): """ Creates a display string from name to be used menus and the user interface. Capitalize the first letter in all lowercase names, @@ -209,7 +209,8 @@ def display_name(name): filenames and module names. """ - name = _os.path.splitext(basename(name))[0] + if has_ext: + name = _os.path.splitext(basename(name))[0] # string replacements for disp_value, file_value in _display_name_literals.items(): diff --git a/release/scripts/modules/rna_keymap_ui.py b/release/scripts/modules/rna_keymap_ui.py index 9d6020dc5ea..a6826c1d13c 100644 --- a/release/scripts/modules/rna_keymap_ui.py +++ b/release/scripts/modules/rna_keymap_ui.py @@ -369,7 +369,7 @@ def draw_keymaps(context, layout): spref = context.space_data # row.prop_search(wm.keyconfigs, "active", wm, "keyconfigs", text="Key Config") - text = bpy.path.display_name(kc_active.name) + text = bpy.path.display_name(kc_active.name, has_ext=False) if not text: text = "Blender (default)" -- cgit v1.2.3