Commit da1a3943 authored by Matyáš Latner's avatar Matyáš Latner

Merge branch 'feature-officescreen' into 'V3.3'

#508 Added office button to the main menu



See merge request !443
parents 97f87eb7 2e110004
......@@ -22,6 +22,7 @@ loading_status_assets=Kopírují se soubory…
loading_status_sync=Synchronizují se data…
mainmenu_games=Hry
mainmenu_office=Kancelář
mainmenu_halloffame=Síň slávy
mainmenu_statistics=Statistiky
mainmenu_encyclopedia=Encyklopedie
......
......@@ -23,6 +23,7 @@ loading_status_sync=Daten werden synchronisiert…
mainmenu_games=Spiele
mainmenu_office=Büro
mainmenu_halloffame=Ruhmeshalle
mainmenu_statistics=Statistiken
mainmenu_encyclopedia=Enzyklopädie
......
......@@ -22,6 +22,7 @@ loading_status_assets=Kopírujú sa súbory…
loading_status_sync=Synchronizujú sa data…
mainmenu_games=Hry
mainmenu_office=Kancelária
mainmenu_halloffame=Sieň slávy
mainmenu_statistics=Štatistiky
mainmenu_encyclopedia=Encyklopédia
......
......@@ -44,6 +44,8 @@ public class ApplicationAtlasManager extends TablexiaAtlasManager implements IAp
public static final String MAINMENU_ICON_GAMES_UNPRESSED = MAINMENU_PATH + "icon_games_unpressed";
public static final String MAINMENU_ICON_HALLOFFAME_PRESSED = MAINMENU_PATH + "icon_halloffame_pressed";
public static final String MAINMENU_ICON_HALLOFFAME_UNPRESSED = MAINMENU_PATH + "icon_halloffame_unpressed";
public static final String MAINMENU_ICON_OFFICE_PRESSED = MAINMENU_PATH + "icon_office_pressed";
public static final String MAINMENU_ICON_OFFICE_UNPRESSED = MAINMENU_PATH + "icon_office_unpressed";
public static final String MAINMENU_ICON_PROFILE_PRESSED = MAINMENU_PATH + "icon_profile_pressed";
public static final String MAINMENU_ICON_PROFILE_UNPRESSED = MAINMENU_PATH + "icon_profile_unpressed";
public static final String MAINMENU_ICON_LOGOUT_PRESSED = MAINMENU_PATH + "icon_logout_pressed";
......
......@@ -50,6 +50,7 @@ public class ApplicationTextManager extends TablexiaDataManager<I18NBundle> impl
public static final String LANGUAGE_GERMAN = "language_german";
public static final String MAINMENU_GAMES = "mainmenu_games";
public static final String MAINMENU_OFFICE = "mainmenu_office";
public static final String MAINMENU_HALLOFFAME = "mainmenu_halloffame";
public static final String MAINMENU_STATISTICS = "mainmenu_statistics";
public static final String MAINMENU_ENCYCLOPEDIA = "mainmenu_encyclopedia";
......
......@@ -18,6 +18,7 @@ import cz.nic.tablexia.menu.IMenuItem;
import cz.nic.tablexia.menu.game.GameMenuDefinition;
import cz.nic.tablexia.screen.about.AboutScreen;
import cz.nic.tablexia.screen.encyclopedia.EncyclopediaScreen;
import cz.nic.tablexia.screen.gamemenu.OfficeMenuScreen;
import cz.nic.tablexia.screen.halloffame.HallOfFameScreen;
import cz.nic.tablexia.screen.profile.ProfileScreen;
import cz.nic.tablexia.screen.statistics.StatisticsScreen;
......@@ -32,6 +33,7 @@ public enum MainMenuDefinition implements IMenuItem {
ApplicationBus.getInstance().post(new SubMenuControlEvent(MainMenu.class, this, SubMenuControlEvent.SubMenuAction.TOGGLE)).asynchronously();
}
},
OFFICE (false, new String[]{ApplicationAtlasManager.MAINMENU_ICON_OFFICE_UNPRESSED, ApplicationAtlasManager.MAINMENU_ICON_OFFICE_PRESSED}, ApplicationTextManager.ApplicationTextsAssets.MAINMENU_OFFICE, null, AbstractMenu.MenuAction.CLOSE, new Tablexia.ChangeScreenEvent(OfficeMenuScreen.class, TablexiaApplication.ScreenTransaction.FADE)),
HALL_OF_FAME (false, new String[]{ApplicationAtlasManager.MAINMENU_ICON_HALLOFFAME_UNPRESSED, ApplicationAtlasManager.MAINMENU_ICON_HALLOFFAME_PRESSED}, ApplicationTextManager.ApplicationTextsAssets.MAINMENU_HALLOFFAME, null, AbstractMenu.MenuAction.CLOSE, new Tablexia.ChangeScreenEvent(HallOfFameScreen.class, TablexiaApplication.ScreenTransaction.FADE)),
STATISTICS (false, new String[]{ApplicationAtlasManager.MAINMENU_ICON_STATISTICS_UNPRESSED, ApplicationAtlasManager.MAINMENU_ICON_STATISTICS_PRESSED}, ApplicationTextManager.ApplicationTextsAssets.MAINMENU_STATISTICS, null, AbstractMenu.MenuAction.CLOSE, new Tablexia.ChangeScreenEvent(StatisticsScreen.class, TablexiaApplication.ScreenTransaction.FADE)),
ENCYCLOPEDIA (false, new String[]{ApplicationAtlasManager.MAINMENU_ICON_ENCYCLOPEDIA_UNPRESSED, ApplicationAtlasManager.MAINMENU_ICON_ENCYCLOPEDIA_PRESSED}, ApplicationTextManager.ApplicationTextsAssets.MAINMENU_ENCYCLOPEDIA, null, AbstractMenu.MenuAction.CLOSE, new Tablexia.ChangeScreenEvent(EncyclopediaScreen.class, TablexiaApplication.ScreenTransaction.FADE)),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment