change interface style, add top menu

modules/mainmenu/characterlist.lua

@@ -56,7 +56,7 @@ function CharacterList.create(characters, premDays)
     charactersWindow:destroy()
   end
 
-  charactersWindow = UI.loadAndDisplayLocked('/mainmenu/ui/charlist.otui')
+  charactersWindow = UI.loadAndDisplay('/mainmenu/ui/charlist.otui')
   characterList = charactersWindow:getChildById('characterList')
   local accountStatusLabel = charactersWindow:getChildById('accountStatusLabel')
   charactersWindow.onKeyPress = onCharactersWindowKeyPress

modules/mainmenu/entergame.lua

@@ -38,7 +38,7 @@ end
 
 -- public functions
 function EnterGame.create()
-  enterGameWindow = UI.loadAndDisplayLocked('/mainmenu/ui/entergamewindow.otui')
+  enterGameWindow = UI.loadAndDisplay('/mainmenu/ui/entergamewindow.otui')
 end
 
 function EnterGame.destroy()

modules/mainmenu/mainmenu.otmod

@@ -1,12 +1,13 @@
 Module
   name: mainmenu
-  description: Create the game mainmenu, where everything starts
+  description: Create the game main menu
   author: OTClient team
   website: https://github.com/edubart/otclient
   version: 0.2
   autoLoad: true
   dependencies:
     - core
+    - topmenu
 
   onLoad: |
     require 'mainmenu'
@@ -15,6 +16,7 @@ Module
 
     if not initialized then
       MainMenu.create()
+      EnterGame.create()
       initialized = true
     end
     return true

modules/mainmenu/ui/charlist.otui

@@ -69,4 +69,5 @@ MainWindow
       function(self)
         self:getParent():unlock()
         self:getParent():hide()
+        EnterGame.create()
       end

modules/mainmenu/ui/loginpanel.otui

@@ -0,0 +1,47 @@
+RoundedRectPanel
+  id: loginPanel
+  background-color: #000000e5
+  size: 192 164
+  anchors.centerIn: parent
+  margin.top: 64
+  opacity: 0
+
+  LargerLabel
+    text: Account name
+    anchors.left: parent.left
+    anchors.top: parent.top
+    margin.left: 16
+    margin.top: 12
+
+  LineEdit
+    id: accountNameLineEdit
+    text: otclient0
+    anchors.left: parent.left
+    anchors.right: parent.right
+    anchors.top: prev.bottom
+    margin.left: 14
+    margin.right: 14
+
+  LargerLabel
+    text: Password
+    anchors.left: parent.left
+    anchors.top: prev.bottom
+    margin.left: 16
+    margin.top: 8
+
+  PasswordLineEdit
+    id: accountPasswordLineEdit
+    text: 123456
+    anchors.left: parent.left
+    anchors.right: parent.right
+    anchors.top: prev.bottom
+    margin.left: 14
+    margin.right: 14
+
+  Button
+    id: loginButton
+    text: Login
+    anchors.bottom: parent.bottom
+    anchors.horizontalCenter: parent.horizontalCenter
+    margin.bottom: 20
+    onClick: EnterGame.doLogin()

modules/mainmenu/ui/mainmenu.otui

@@ -10,31 +10,8 @@ Panel
     source: /mainmenu/ui/background.png
     smooth: true
     fixed ratio: true
-  anchors.fill: parent
+  anchors.top: topMenu.bottom
+  anchors.left: parent.left
+  anchors.right: parent.right
+  anchors.bottom: parent.bottom
   focusable: false
-
-  RoundedPanel
-    id: mainMenu
-    size: 144 162
-    anchors.left: parent.left
-    anchors.bottom: parent.bottom
-    margin.left: 60
-    margin.bottom: 70
-    layout: verticalBox
-
-    MenuButton
-      text: Enter Game
-      margin.top: 18
-      onClick: EnterGame.create()
-
-    MenuButton
-      text: Options
-      onClick: UI.loadAndDisplayLocked("/mainmenu/ui/optionswindow.otui")
-
-    MenuButton
-      text: Info
-      onClick: UI.loadAndDisplayLocked("/mainmenu/ui/infowindow.otui")
-
-    MenuButton
-      text: Exit
-      onClick: exit()