diff --git a/forge-gui-desktop/src/main/java/forge/menus/HelpMenu.java b/forge-gui-desktop/src/main/java/forge/menus/HelpMenu.java index 69a108996c1..4d3b658d108 100644 --- a/forge-gui-desktop/src/main/java/forge/menus/HelpMenu.java +++ b/forge-gui-desktop/src/main/java/forge/menus/HelpMenu.java @@ -57,8 +57,7 @@ public void actionPerformed(ActionEvent e) { private static JMenu getMenu_Troubleshooting() { final Localizer localizer = Localizer.getInstance(); JMenu mnu = new JMenu(localizer.getMessage("lblTroubleshooting")); - mnu.add(getMenuItem_UrlLink("How to Provide a Useful Bug Report", "http://www.slightlymagic.net/forum/viewtopic.php?f=26&t=9621")); - mnu.addSeparator(); + mnu.add(getMenuItem_OpenLogFile()); mnu.add(getMenuItem_ReadMeFile()); return mnu; } @@ -76,8 +75,8 @@ private static JMenu getMenu_GettingStarted() { JMenu mnu = new JMenu(localizer.getMessage("lblGettingStarted")); mnu.add(getMenuItem_HowToPlayFile()); mnu.addSeparator(); - mnu.add(getMenuItem_UrlLink("Forge Wiki", "http://www.slightlymagic.net/wiki/Forge", KeyStroke.getKeyStroke(KeyEvent.VK_F1, 0))); - mnu.add(getMenuItem_UrlLink("What is Forge?", "http://www.slightlymagic.net/forum/viewtopic.php?f=26&t=468")); + mnu.add(getMenuItem_UrlLink("Forge Wiki", "https://github.com/Card-Forge/forge/wiki", KeyStroke.getKeyStroke(KeyEvent.VK_F1, 0))); + mnu.add(getMenuItem_UrlLink("What is Forge?", "https://github.com/Card-Forge/forge/wiki#what-is-forge")); return mnu; } @@ -94,6 +93,13 @@ private static JMenuItem getMenuItem_ReadMeFile() { return menuItem; } + private static JMenuItem getMenuItem_OpenLogFile() { + final Localizer localizer = Localizer.getInstance(); + JMenuItem menuItem = new JMenuItem(localizer.getMessage("lblOpenLogFile")); + menuItem.addActionListener(getOpenFileAction(getAbsoluteFile(ForgeConstants.LOG_FILE))); + return menuItem; + } + private static JMenuItem getMenuItem_License() { final Localizer localizer = Localizer.getInstance(); JMenuItem menuItem = new JMenuItem(localizer.getMessage("lblForgeLicense")); @@ -132,6 +138,14 @@ protected static File getFile(String filename) { return file; } + protected static File getAbsoluteFile(String filename) { + File file = null; + if (FileUtil.doesFileExist(filename)) { + file = new File(filename); + } + return file; + } + /** * @see http://stackoverflow.com/questions/6273221/open-a-text-file-in-the-default-text-editor-via-java */ diff --git a/forge-gui/res/languages/de-DE.properties b/forge-gui/res/languages/de-DE.properties index acfe7c194dc..ebbe811523f 100644 --- a/forge-gui/res/languages/de-DE.properties +++ b/forge-gui/res/languages/de-DE.properties @@ -342,6 +342,7 @@ lblTroubleshooting=Fehlerbehebung lblArticles=Artikel lblGettingStarted=Starthilfe lblHowtoPlay=Wie man spielt +lblOpenLogFile=Open Log File lblForgeLicense=Forge Lizenzhinweis lblReleaseNotes=Versionshinweise #GameMenu.java diff --git a/forge-gui/res/languages/en-US.properties b/forge-gui/res/languages/en-US.properties index e17084bcf6b..57571d216b1 100644 --- a/forge-gui/res/languages/en-US.properties +++ b/forge-gui/res/languages/en-US.properties @@ -254,7 +254,7 @@ lblYoureRunning=You''re running lblYouNeedAtLeastJavaVersion=You need at least version 1.8.0_101. lblImportPictures=Import data from a local directory. lblReportBug=Something broken? -lblHowToPlay=Rules of the Game. +lblHowToPlay=How to Play lblLicensing=Forge legal. ContentDownloaders=Content Downloaders ReleaseNotes=Release Notes @@ -342,6 +342,7 @@ lblTroubleshooting=Troubleshooting lblArticles=Articles lblGettingStarted=Getting Started lblHowtoPlay=How to Play +lblOpenLogFile=Open Log File lblForgeLicense=Forge License lblReleaseNotes=Release Notes #GameMenu.java diff --git a/forge-gui/res/languages/es-ES.properties b/forge-gui/res/languages/es-ES.properties index 3a0b3a2dfa1..7bf89c5ffbc 100644 --- a/forge-gui/res/languages/es-ES.properties +++ b/forge-gui/res/languages/es-ES.properties @@ -342,6 +342,7 @@ lblTroubleshooting=Solución de problemas lblArticles=Artículos (Inglés) lblGettingStarted=Empezando (Inglés) lblHowtoPlay=Cómo jugar (Inglés) +lblOpenLogFile=Open Log File lblForgeLicense=Licencia de Forge lblReleaseNotes=Notas de la versión #GameMenu.java diff --git a/forge-gui/res/languages/fr-FR.properties b/forge-gui/res/languages/fr-FR.properties index d7e2164bf94..3b2a3f2ec5b 100644 --- a/forge-gui/res/languages/fr-FR.properties +++ b/forge-gui/res/languages/fr-FR.properties @@ -342,6 +342,7 @@ lblTroubleshooting=Dépannage lblArticles=Articles lblGettingStarted=Mise en route lblHowtoPlay=Comment jouer +lblOpenLogFile=Open Log File lblForgeLicense=Forger une licence lblReleaseNotes=Notes de version #GameMenu.java diff --git a/forge-gui/res/languages/it-IT.properties b/forge-gui/res/languages/it-IT.properties index 3e44164bf2b..9e7b2afcc8b 100644 --- a/forge-gui/res/languages/it-IT.properties +++ b/forge-gui/res/languages/it-IT.properties @@ -341,6 +341,7 @@ lblTroubleshooting=Risoluzione dei problemi lblArticles=Articoli lblGettingStarted=Per iniziare lblHowtoPlay=Come giocare +lblOpenLogFile=Open Log File lblForgeLicense=Licenza di Forge lblReleaseNotes=Note di rilascio #GameMenu.java diff --git a/forge-gui/res/languages/ja-JP.properties b/forge-gui/res/languages/ja-JP.properties index 9ddb9041e9c..85db3fde3f2 100644 --- a/forge-gui/res/languages/ja-JP.properties +++ b/forge-gui/res/languages/ja-JP.properties @@ -342,6 +342,7 @@ lblTroubleshooting=トラブルシューティング lblArticles=記事 lblGettingStarted=はじめに lblHowtoPlay=ゲームのルール。 +lblOpenLogFile=Open Log File lblForgeLicense=Forge ライセンス lblReleaseNotes=リリースノート #GameMenu.java diff --git a/forge-gui/res/languages/pt-BR.properties b/forge-gui/res/languages/pt-BR.properties index a798cd2e484..3c7f5d11050 100644 --- a/forge-gui/res/languages/pt-BR.properties +++ b/forge-gui/res/languages/pt-BR.properties @@ -354,6 +354,7 @@ lblTroubleshooting=Solução de Problemas lblArticles=Artigos lblGettingStarted=Primeiros Passos lblHowtoPlay=Como Jogar +lblOpenLogFile=Open Log File lblForgeLicense=Licença do Forge lblReleaseNotes=Notas da Versão #GameMenu.java diff --git a/forge-gui/res/languages/zh-CN.properties b/forge-gui/res/languages/zh-CN.properties index 4516d13c1a0..5e813b9df19 100644 --- a/forge-gui/res/languages/zh-CN.properties +++ b/forge-gui/res/languages/zh-CN.properties @@ -342,6 +342,7 @@ lblTroubleshooting=故障排除 lblArticles=文章 lblGettingStarted=如何开始 lblHowtoPlay=如何玩 +lblOpenLogFile=Open Log File lblForgeLicense=Forge许可证 lblReleaseNotes=更新日志 #GameMenu.java diff --git a/forge-gui/src/main/java/forge/model/FModel.java b/forge-gui/src/main/java/forge/model/FModel.java index 18ed1dcf03e..98ed3d4127e 100644 --- a/forge-gui/src/main/java/forge/model/FModel.java +++ b/forge-gui/src/main/java/forge/model/FModel.java @@ -110,9 +110,10 @@ public static void initialize(final IProgressBar progressBar, Function