From 5f63a3fcce93dc3d07d46e5e080faf5a744314e7 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Fri, 25 Oct 2013 14:07:52 -0700 Subject: [PATCH] Remove the help/files command The local docs it tries to open don't actually exists and if they're ever added, the help contents command opens them anyway so I'm not sure what the intended purpose of the command ever was. --- .../libaegisub/include/libaegisub/util_osx.h | 5 ----- aegisub/libaegisub/osx/util.mm | 7 ------- aegisub/src/command/help.cpp | 17 ----------------- aegisub/src/command/icon.cpp | 1 - aegisub/src/libresrc/default_menu.json | 1 - aegisub/src/libresrc/osx/default_menu.json | 1 - 6 files changed, 32 deletions(-) diff --git a/aegisub/libaegisub/include/libaegisub/util_osx.h b/aegisub/libaegisub/include/libaegisub/util_osx.h index b10764279..7fcd6d1b3 100644 --- a/aegisub/libaegisub/include/libaegisub/util_osx.h +++ b/aegisub/libaegisub/include/libaegisub/util_osx.h @@ -94,10 +94,5 @@ std::string GetBundleExecutablePath(); std::string GetBundleAuxillaryExecutablePath(std::string const& executableName); std::string GetApplicationSupportDirectory(); - -/// @brief Open a URI using the Launcher. -/// @param location URI of file -/// @note If this is a FILE or DIRECTORY the path must be ABSOLUTE no 'file://' -void OpenLocation(std::string const& location); } // namespace util } // namespace agi diff --git a/aegisub/libaegisub/osx/util.mm b/aegisub/libaegisub/osx/util.mm index d0cbbf704..f2837a997 100644 --- a/aegisub/libaegisub/osx/util.mm +++ b/aegisub/libaegisub/osx/util.mm @@ -101,12 +101,5 @@ std::string GetApplicationSupportDirectory() { } } -void OpenLocation(std::string const& location) { - @autoreleasepool { - NSURL *url = [NSURL fileURLWithPath:[NSString stringWithUTF8String:location.c_str()]]; - LSOpenCFURLRef((CFURLRef)url, NULL); - } -} - } } diff --git a/aegisub/src/command/help.cpp b/aegisub/src/command/help.cpp index 5b69da57f..9c9280697 100644 --- a/aegisub/src/command/help.cpp +++ b/aegisub/src/command/help.cpp @@ -38,7 +38,6 @@ #include "../options.h" #include -#include #include @@ -76,19 +75,6 @@ struct help_contents : public Command { } }; -#ifdef __WXMAC__ -struct help_files : public Command { - CMD_NAME("help/files") - STR_MENU("All Fil&es") - STR_DISP("All Files") - STR_HELP("Resource files") - - void operator()(agi::Context *) { - agi::util::OpenLocation((agi::util::GetBundleSharedSupportDirectory() + "/doc").c_str()); - } -}; -#endif - struct help_forums : public Command { CMD_NAME("help/forums") STR_MENU("&Forums") @@ -138,9 +124,6 @@ namespace cmd { void init_help() { reg(agi::util::make_unique()); reg(agi::util::make_unique()); -#ifdef __WXMAC__ - reg(agi::util::make_unique()); -#endif reg(agi::util::make_unique()); reg(agi::util::make_unique()); reg(agi::util::make_unique()); diff --git a/aegisub/src/command/icon.cpp b/aegisub/src/command/icon.cpp index de08b0a71..2522c5c89 100644 --- a/aegisub/src/command/icon.cpp +++ b/aegisub/src/command/icon.cpp @@ -112,7 +112,6 @@ INSERT_ICON("grid/line/next/create", button_audio_commit) INSERT_ICON("grid/tag/cycle_hiding", toggle_tag_hiding) INSERT_ICON("help/bugs", bugtracker_button) INSERT_ICON("help/contents", contents_button) -INSERT_ICON("help/files", contents_button) INSERT_ICON("help/forums", forums_button) INSERT_ICON("help/irc", irc_button) INSERT_ICON("help/video", visual_help) diff --git a/aegisub/src/libresrc/default_menu.json b/aegisub/src/libresrc/default_menu.json index da3ca6c8e..43003d0e5 100644 --- a/aegisub/src/libresrc/default_menu.json +++ b/aegisub/src/libresrc/default_menu.json @@ -202,7 +202,6 @@ "main/help" : [ { "command" : "help/contents" }, {}, - { "command" : "help/files" }, { "command" : "help/website" }, { "command" : "help/forums" }, { "command" : "help/bugs" }, diff --git a/aegisub/src/libresrc/osx/default_menu.json b/aegisub/src/libresrc/osx/default_menu.json index e26cec985..e794d6c43 100644 --- a/aegisub/src/libresrc/osx/default_menu.json +++ b/aegisub/src/libresrc/osx/default_menu.json @@ -201,7 +201,6 @@ "main/help" : [ { "command" : "help/contents" }, {}, - { "command" : "help/files" }, { "command" : "help/website" }, { "command" : "help/forums" }, { "command" : "help/bugs" },