mirror of
https://github.com/cyberboy666/r_e_c_u_r.git
synced 2025-12-05 16:00:06 +01:00
Merge pull request #104 from doctea/master
Sort sampler and shader browser files in the menus alphabetically
This commit is contained in:
@@ -79,7 +79,7 @@ class BrowserMenu(Menu):
|
|||||||
root, dirs, files = next(os.walk(current_path))
|
root, dirs, files = next(os.walk(current_path))
|
||||||
|
|
||||||
indent = ' ' * 4 * (current_level)
|
indent = ' ' * 4 * (current_level)
|
||||||
for folder in dirs:
|
for folder in sorted(dirs):
|
||||||
is_open, char = self._check_folder_state(folder)
|
is_open, char = self._check_folder_state(folder)
|
||||||
self.menu_list.append(dict(name='{}{}{}'.format(indent, folder, char), slot='x'))
|
self.menu_list.append(dict(name='{}{}{}'.format(indent, folder, char), slot='x'))
|
||||||
if (is_open):
|
if (is_open):
|
||||||
@@ -87,6 +87,7 @@ class BrowserMenu(Menu):
|
|||||||
next_level = current_level + 1
|
next_level = current_level + 1
|
||||||
self._add_folder_to_browser_list(next_path, next_level)
|
self._add_folder_to_browser_list(next_path, next_level)
|
||||||
|
|
||||||
|
files.sort()
|
||||||
for f in files:
|
for f in files:
|
||||||
split_name = os.path.splitext(f)
|
split_name = os.path.splitext(f)
|
||||||
if (split_name[1].lower() in ['.mp4', '.mkv', '.avi', '.mov']):
|
if (split_name[1].lower() in ['.mp4', '.mkv', '.avi', '.mov']):
|
||||||
@@ -202,7 +203,7 @@ class ShadersMenu(Menu):
|
|||||||
root, dirs, files = next(os.walk(current_path))
|
root, dirs, files = next(os.walk(current_path))
|
||||||
|
|
||||||
indent = ' ' * 4 * (current_level)
|
indent = ' ' * 4 * (current_level)
|
||||||
for folder in dirs:
|
for folder in sorted(dirs):
|
||||||
is_open, char = self._check_folder_state(folder)
|
is_open, char = self._check_folder_state(folder)
|
||||||
self.menu_list.append(dict(name='{}{}{}'.format(indent, folder, char), is_shader=False))
|
self.menu_list.append(dict(name='{}{}{}'.format(indent, folder, char), is_shader=False))
|
||||||
if (is_open):
|
if (is_open):
|
||||||
@@ -210,6 +211,7 @@ class ShadersMenu(Menu):
|
|||||||
next_level = current_level + 1
|
next_level = current_level + 1
|
||||||
self._add_folder_to_shaders_list(next_path, next_level)
|
self._add_folder_to_shaders_list(next_path, next_level)
|
||||||
|
|
||||||
|
files.sort()
|
||||||
for f in files:
|
for f in files:
|
||||||
split_name = os.path.splitext(f)
|
split_name = os.path.splitext(f)
|
||||||
if (split_name[1].lower() in ['.frag', '.shader', '.glsl', '.glslf', '.fsh']):
|
if (split_name[1].lower() in ['.frag', '.shader', '.glsl', '.glslf', '.fsh']):
|
||||||
|
|||||||
Reference in New Issue
Block a user