Merge branch 'fix-mobile-home' into 'master'

Restore mobile home screen buttons

See merge request core-developers/forge!2045

forge-gui-android/project.properties

@@ -8,4 +8,5 @@
 # project structure.
 
 # Project target.
+project.type=0
 target=android-20

forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuAchievements.java

@@ -59,9 +59,9 @@ public enum VSubmenuAchievements implements IVSubmenu<CSubmenuAchievements> {
 
     // Fields used with interface IVDoc
     private DragCell parentCell;
-    private final DragTab tab = new DragTab(localizer.getMessage("Achievements"));
+    private final DragTab tab = new DragTab(localizer.getMessage("lblAchievements"));
     private final FLabel lblTitle = new FLabel.Builder()
-        .text(localizer.getMessage("Achievements")).fontAlign(SwingConstants.CENTER)
+        .text(localizer.getMessage("lblAchievements")).fontAlign(SwingConstants.CENTER)
         .opaque(true).fontSize(16).build();
     private final FComboBox<AchievementCollection> cbCollections = new FComboBox<AchievementCollection>();
     private final TrophyCase trophyCase = new TrophyCase();
@@ -169,7 +169,7 @@ public enum VSubmenuAchievements implements IVSubmenu<CSubmenuAchievements> {
      */
     @Override
     public String getMenuTitle() {
-        return localizer.getMessage("Achievements");
+        return localizer.getMessage("lblAchievements");
     }
 
     /* (non-Javadoc)

forge-gui-mobile/src/forge/screens/home/HomeScreen.java

@@ -19,9 +19,7 @@ import forge.toolbox.FButton;
 import forge.toolbox.FEvent;
 import forge.toolbox.FEvent.FEventHandler;
 import forge.toolbox.FLabel;
-import forge.toolbox.FOptionPane;
 import forge.toolbox.FScrollPane;
-import forge.util.Callback;
 import forge.util.Localizer;
 import forge.util.Utils;
 
@@ -59,7 +57,7 @@ public class HomeScreen extends FScreen {
                 LoadGameMenu.getPreferredScreen().open();
             }
         });
-        addButton(localizer.getMessage("lblOnlineMultiplayer"), new FEventHandler() {
+        addButton(localizer.getMessage("lblPlayOnline"), new FEventHandler() {
             @Override
             public void handleEvent(FEvent e) {
                 activeButtonIndex = 2;
@@ -85,37 +83,20 @@ public class HomeScreen extends FScreen {
                 Forge.openScreen(deckManager);
             }
         });
-        addButton(localizer.getMessage("Achievements"), new FEventHandler() {
+        addButton(localizer.getMessage("lblAchievements"), new FEventHandler() {
             @Override
             public void handleEvent(FEvent e) {
                 activeButtonIndex = 4;
                 AchievementsScreen.show();
             }
         });
-        addButton(localizer.getMessage("lblGameSettings"), new FEventHandler() {
+        addButton(localizer.getMessage("lblSettings"), new FEventHandler() {
             @Override
             public void handleEvent(FEvent e) {
                 activeButtonIndex = 5;
                 SettingsScreen.show(true);
             }
         });
-        addButton(localizer.getMessage("lblExit"), new FEventHandler() {
-            @Override
-            public void handleEvent(FEvent e) {
-                activeButtonIndex = 6;
-                FOptionPane.showConfirmDialog(
-                        localizer.getMessage("lblAreYouSureYouWishExitForge"),
-                        localizer.getMessage("lblExitForge"),
-                        localizer.getMessage("lblExit"), localizer.getMessage("lblCancel"), false, new Callback<Boolean>() {
-                            @Override
-                            public void run(Boolean result) {
-                                if (result) {
-                                    Forge.exit(true);
-                                }
-                            }
-                        });
-            }
-        });
         baseButtonCount = buttons.size();
     }
 

forge-gui/res/languages/de-DE.properties

@@ -175,7 +175,7 @@ nlEnableMusic=Hintergrundmusik während des Spiels
 nlAltSoundSystem=Nutze alternatives Sound-System (nur nutzen, wenn es Probleme mit fehlenden Geräuschen gibt)
 KeyboardShortcuts=Tastenkombinationen
 # VSubmenuAchievements.java
-Achievements=Erfolge
+lblAchievements=Erfolge
 # VSubmenuDownloaders.java
 btnDownloadSetPics=Bilder(LQ) Sets herunterladen
 btnDownloadPics=Bilder(LQ) Karten herunterladen
@@ -880,3 +880,5 @@ ttType=Typ
 #HomeScreen.java
 lblNewGame=Neues Spiel
 lblLoadGame=Spiel laden
+lblPlayOnline=Online spielen
+lblSettings=Spieleinstellungen

forge-gui/res/languages/en-US.properties

@@ -175,7 +175,7 @@ nlEnableMusic=Enable background music during the game
 nlAltSoundSystem=Use the alternate sound system (only use if you have issues with sound not playing or disappearing)
 KeyboardShortcuts=Keyboard Shortcuts
 # VSubmenuAchievements.java
-Achievements=Achievements
+lblAchievements=Achievements
 # VSubmenuDownloaders.java
 btnDownloadSetPics=Download LQ Set Pictures
 btnDownloadPicsHQ=Download HQ Card Pictures (Very Slow!)
@@ -379,8 +379,8 @@ lblWinston=Winston
 lblGauntlet=Gauntlet
 lblTournament=Tournament
 lblQuest=Quest
-lblQuestDraft=QuestDraft
+lblQuestDraft=Quest Draft
-lblPlanarConquest=PlanarConquest
+lblPlanarConquest=Planar Conquest
 lblPuzzle=Puzzle
 lblPuzzleDesc=Solve a puzzle from the given game state
 lblDeckManager=Deck Manager
@@ -880,3 +880,5 @@ ttType=Type
 #HomeScreen.java
 lblNewGame=New Game
 lblLoadGame=Load Game
+lblPlayOnline=Play Online
+lblSettings=Settings

forge-gui/res/languages/es-es.properties

@@ -175,7 +175,7 @@ nlEnableMusic=Habilitar música de fondo durante el juego
 nlAltSoundSystem=Use el sistema de sonido alternativo (solo use si tiene problemas con el sonido que no se reproduce o desaparece)
 KeyboardShortcuts=Atajos de teclado
 # VSubmenuAchievements.java
-Achievements=Logros
+lblAchievements=Logros
 # VSubmenuDownloaders.java
 btnDownloadSetPics=Descargar todos los Sets de Cartas
 btnDownloadPics=Descargar todas las Cartas
@@ -880,3 +880,5 @@ ttType=Type
 #HomeScreen.java
 lblNewGame=Nueva partida
 lblLoadGame=Cargar partida
+lblPlayOnline=Jugar en linea
+lblSettings=Configuración