diff --git a/src/base-config/keyboard.json b/src/base-config/keyboard.json index acc3ab53ccc..d129d202ac7 100644 --- a/src/base-config/keyboard.json +++ b/src/base-config/keyboard.json @@ -317,5 +317,8 @@ ], "file.rename": [ "F2" + ], + "help.support": [ + "F1" ] } diff --git a/src/brackets.config.json b/src/brackets.config.json index 06794edbb7d..64721d1e198 100644 --- a/src/brackets.config.json +++ b/src/brackets.config.json @@ -6,10 +6,11 @@ "about_icon" : "styles/images/brackets_icon.svg", "update_info_url" : "http://dev.brackets.io/updates/stable/", "how_to_use_url" : "https://github.com/adobe/brackets/wiki/How-to-Use-Brackets", + "support_url" : "https://github.com/adobe/brackets/wiki/Troubleshooting", + "suggest_feature_url" : "https://github.com/adobe/brackets/wiki/Suggest-a-Feature", + "get_involved_url" : "https://github.com/adobe/brackets/blob/master/CONTRIBUTING.md", "glob_help_url" : "https://github.com/adobe/brackets/wiki/Using-File-Filters", - "forum_url" : "https://groups.google.com/forum/?fromgroups#!forum/brackets-dev", "release_notes_url" : "https://github.com/adobe/brackets/wiki/Release-Notes", - "report_issue_url" : "https://github.com/adobe/brackets/wiki/How-to-Report-an-Issue", "twitter_url" : "https://twitter.com/brackets", "troubleshoot_url" : "https://github.com/adobe/brackets/wiki/Troubleshooting#wiki-livedev", "twitter_name" : "@brackets", diff --git a/src/command/Commands.js b/src/command/Commands.js index 19363371c85..9dbd356269a 100644 --- a/src/command/Commands.js +++ b/src/command/Commands.js @@ -129,9 +129,10 @@ define(function (require, exports, module) { // HELP exports.HELP_CHECK_FOR_UPDATE = "help.checkForUpdate"; // HelpCommandHandlers.js _handleCheckForUpdates() exports.HELP_HOW_TO_USE_BRACKETS = "help.howToUseBrackets"; // HelpCommandHandlers.js _handleLinkMenuItem() - exports.HELP_FORUM = "help.forum"; // HelpCommandHandlers.js _handleLinkMenuItem() + exports.HELP_SUPPORT = "help.support"; // HelpCommandHandlers.js _handleLinkMenuItem() + exports.HELP_SUGGEST = "help.suggest"; // HelpCommandHandlers.js _handleLinkMenuItem() exports.HELP_RELEASE_NOTES = "help.releaseNotes"; // HelpCommandHandlers.js _handleLinkMenuItem() - exports.HELP_REPORT_AN_ISSUE = "help.reportAnIssue"; // HelpCommandHandlers.js _handleLinkMenuItem() + exports.HELP_GET_INVOLVED = "help.getInvolved"; // HelpCommandHandlers.js _handleLinkMenuItem() exports.HELP_SHOW_EXT_FOLDER = "help.showExtensionsFolder"; // HelpCommandHandlers.js _handleShowExtensionsFolder() exports.HELP_TWITTER = "help.twitter"; // HelpCommandHandlers.js _handleLinkMenuItem() diff --git a/src/command/DefaultMenus.js b/src/command/DefaultMenus.js index 005a419e602..56ff64834f4 100644 --- a/src/command/DefaultMenus.js +++ b/src/command/DefaultMenus.js @@ -157,14 +157,17 @@ define(function (require, exports, module) { if (brackets.config.how_to_use_url) { menu.addMenuItem(Commands.HELP_HOW_TO_USE_BRACKETS); } - if (brackets.config.forum_url) { - menu.addMenuItem(Commands.HELP_FORUM); + if (brackets.config.support_url) { + menu.addMenuItem(Commands.HELP_SUPPORT); + } + if (brackets.config.suggest_feature_url) { + menu.addMenuItem(Commands.HELP_SUGGEST); } if (brackets.config.release_notes_url) { menu.addMenuItem(Commands.HELP_RELEASE_NOTES); } - if (brackets.config.report_issue_url) { - menu.addMenuItem(Commands.HELP_REPORT_AN_ISSUE); + if (brackets.config.get_involved_url) { + menu.addMenuItem(Commands.HELP_GET_INVOLVED); } menu.addMenuDivider(); diff --git a/src/config.json b/src/config.json index 6997198aa0d..68eeaca4c15 100644 --- a/src/config.json +++ b/src/config.json @@ -5,10 +5,11 @@ "about_icon": "styles/images/brackets_icon.svg", "update_info_url": "http://dev.brackets.io/updates/stable/", "how_to_use_url": "https://github.com/adobe/brackets/wiki/How-to-Use-Brackets", + "support_url": "https://github.com/adobe/brackets/wiki/Troubleshooting", + "suggest_feature_url": "https://github.com/adobe/brackets/wiki/Suggest-a-Feature", + "get_involved_url": "https://github.com/adobe/brackets/blob/master/CONTRIBUTING.md", "glob_help_url": "https://github.com/adobe/brackets/wiki/Using-File-Filters", - "forum_url": "https://groups.google.com/forum/?fromgroups#!forum/brackets-dev", "release_notes_url": "https://github.com/adobe/brackets/wiki/Release-Notes", - "report_issue_url": "https://github.com/adobe/brackets/wiki/How-to-Report-an-Issue", "twitter_url": "https://twitter.com/brackets", "troubleshoot_url": "https://github.com/adobe/brackets/wiki/Troubleshooting#wiki-livedev", "twitter_name": "@brackets", diff --git a/src/help/HelpCommandHandlers.js b/src/help/HelpCommandHandlers.js index 700642467a3..bd5c8a3fd04 100644 --- a/src/help/HelpCommandHandlers.js +++ b/src/help/HelpCommandHandlers.js @@ -125,9 +125,10 @@ define(function (require, exports, module) { CommandManager.register(Strings.CMD_CHECK_FOR_UPDATE, Commands.HELP_CHECK_FOR_UPDATE, _handleCheckForUpdates); CommandManager.register(Strings.CMD_HOW_TO_USE_BRACKETS, Commands.HELP_HOW_TO_USE_BRACKETS, _handleLinkMenuItem(brackets.config.how_to_use_url)); - CommandManager.register(Strings.CMD_FORUM, Commands.HELP_FORUM, _handleLinkMenuItem(brackets.config.forum_url)); + CommandManager.register(Strings.CMD_SUPPORT, Commands.HELP_SUPPORT, _handleLinkMenuItem(brackets.config.support_url)); + CommandManager.register(Strings.CMD_SUGGEST, Commands.HELP_SUGGEST, _handleLinkMenuItem(brackets.config.suggest_feature_url)); CommandManager.register(Strings.CMD_RELEASE_NOTES, Commands.HELP_RELEASE_NOTES, _handleLinkMenuItem(brackets.config.release_notes_url)); - CommandManager.register(Strings.CMD_REPORT_AN_ISSUE, Commands.HELP_REPORT_AN_ISSUE, _handleLinkMenuItem(brackets.config.report_issue_url)); + CommandManager.register(Strings.CMD_GET_INVOLVED, Commands.HELP_GET_INVOLVED, _handleLinkMenuItem(brackets.config.get_involved_url)); CommandManager.register(Strings.CMD_SHOW_EXTENSIONS_FOLDER, Commands.HELP_SHOW_EXT_FOLDER, _handleShowExtensionsFolder); CommandManager.register(Strings.CMD_TWITTER, Commands.HELP_TWITTER, _handleLinkMenuItem(brackets.config.twitter_url)); CommandManager.register(Strings.CMD_ABOUT, Commands.HELP_ABOUT, _handleAboutDialog); diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 1cebf4c6bef..a6d0603ec7e 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -346,9 +346,10 @@ define({ "HELP_MENU" : "Help", "CMD_CHECK_FOR_UPDATE" : "Check for Updates", "CMD_HOW_TO_USE_BRACKETS" : "How to Use {APP_NAME}", - "CMD_FORUM" : "{APP_NAME} Forum", + "CMD_SUPPORT" : "{APP_NAME} Support", + "CMD_SUGGEST" : "Suggest a Feature", "CMD_RELEASE_NOTES" : "Release Notes", - "CMD_REPORT_AN_ISSUE" : "Report an Issue", + "CMD_GET_INVOLVED" : "Get Involved", "CMD_SHOW_EXTENSIONS_FOLDER" : "Show Extensions Folder", "CMD_TWITTER" : "{TWITTER_NAME} on Twitter", "CMD_ABOUT" : "About {APP_TITLE}",