mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-08 12:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sort items in Scripts menu by file name and move Open Script Folder item at the bottom (with a separator)

Browse Source
This commit is contained in:
David Capello 2018-11-16 17:46:54 -03:00
parent 3c2d02a7c7
commit 4e29e07eee
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/app/app_menus.cpp
View File

@ -358,7 +358,7 @@ void AppMenus::reload()
std::string scriptsDir = rf.getFirstOrCreateDefault();
scriptsDir = base::get_file_path(scriptsDir);
if (base::is_directory(scriptsDir)) {
loadScriptsSubmenu(scriptsMenu->getSubmenu(), scriptsDir);
loadScriptsSubmenu(scriptsMenu->getSubmenu(), scriptsDir, true);
}
#else
// Scripting is not available
@ -396,13 +396,19 @@ void AppMenus::reload()
}
#ifdef ENABLE_SCRIPTING
void AppMenus::loadScriptsSubmenu(ui::Menu* menu, const std::string& dir)
void AppMenus::loadScriptsSubmenu(ui::Menu* menu,
const std::string& dir,
const bool rootLevel)
{
Command* cmd_run_script =
Commands::instance()->byId(CommandId::RunScript());
auto files = base::list_files(dir);
std::sort(files.begin(), files.end());
std::sort(files.begin(), files.end(),
[](const std::string& a, const std::string& b) {
return base::compare_filenames(a, b) < 0;
});
int insertPos = 0;
for (auto fn : files) {
std::string fullFn = base::join_path(dir, fn);
AppMenuItem* menuitem = nullptr;
@ -422,15 +428,18 @@ void AppMenus::loadScriptsSubmenu(ui::Menu* menu, const std::string& dir)
}
else if (base::is_directory(fullFn)) {
Menu* submenu = new Menu();
loadScriptsSubmenu(submenu, fullFn);
loadScriptsSubmenu(submenu, fullFn, false);
menuitem = new AppMenuItem(
base::get_file_title(fn).c_str());
menuitem->setSubmenu(submenu);
}
if (menuitem)
menu->addChild(menuitem);
if (menuitem) {
menu->insertChild(insertPos++, menuitem);
}
}
if (rootLevel && insertPos > 0)
menu->insertChild(insertPos, new MenuSeparator());
}
#endif

4
src/app/app_menus.h
View File

@ -78,7 +78,9 @@ namespace app {
void createNativeSubmenus(os::Menu* osMenu, const ui::Menu* uiMenu);
#ifdef ENABLE_SCRIPTING
void loadScriptsSubmenu(ui::Menu* menu, const std::string& dir);
void loadScriptsSubmenu(ui::Menu* menu,
const std::string& dir,
const bool rootLevel);
#endif
std::unique_ptr<Menu> m_rootMenu;