Merge #c25befb

Author: freQniK

src/kv/meile.kv

@@ -45,7 +45,7 @@ WindowManager:
         orientation: 'vertical'
         md_bg_color: get_color_from_hex("#121212")
         MDFloatLayout:
-            size_hint_y: .11
+            size_hint_y: .1
 
             Image:
                 source: root.get_logo()

src/main/main.py

@@ -2,14 +2,13 @@
 from ui.screens import MainWindow,  PreLoadWindow, WalletRestore
 from typedef.win import WindowNames
 from conf.meile_config import MeileGuiConfig
-
+from helpers.res import Resolution
 
 from kivy.lang import Builder
 from kivymd.app import MDApp
 from kivymd.theming import ThemeManager
 from kivy.utils import get_color_from_hex
-from kivy.config import Config
-MeileConfig = MeileGuiConfig()        
+from kivy.config import Config        
 from screeninfo import get_monitors
 
 
@@ -20,6 +19,11 @@ class MyMainApp(MDApp):
     manager = None
     def __init__(self,**kwargs):
         super(MyMainApp,self).__init__(**kwargs)
+        from kivy.core.window import Window
+        
+        if Window.size[0] != dim[0] and Window.size[1] != dim[1]:
+            Window.size = (dim[0], dim[1])
+
 
     def build(self):
 
@@ -38,27 +42,16 @@ def build(self):
         #MeileConfig.read_configuration(MeileGuiConfig, MeileGuiConfig.CONFFILE)
         return self.manager
 
-if len(get_monitors()) == 1:
-    print("ONE MONITOR")
-    primary_monitor = get_monitors()[0]
-else:
-    for m in get_monitors():
-        print(str(m))
-        if m.is_primary:
-            primary_monitor = m
-            
-dim = []
-dim.append(primary_monitor.width)
-dim.append(primary_monitor.height)        
-l = int((dim[0] - 1280)/2)
-t = int((dim[1] - 800)/2)
+MeileConfig = MeileGuiConfig()
+
+dim = Resolution().set_dimensions()
 
-Config.set('kivy','window_icon',MeileConfig.resource_path("../imgs/icon.png"))
+Config.set('kivy','window_icon',MeileConfig.resource_path("imgs/icon.png"))
 Config.set('input', 'mouse', 'mouse,disable_multitouch')
-Config.set('graphics', 'width', '1280')
-Config.set('graphics', 'height', '800')
-Config.set('graphics', 'left', l)
-Config.set('graphics', 'top', t)
+Config.set('graphics', 'width', dim[0])
+Config.set('graphics', 'height', dim[1])
+Config.set('graphics', 'left', dim[2])
+Config.set('graphics', 'top', dim[3])
 Config.write()
 
 app = MyMainApp()

src/typedef/konstants.py

@@ -577,6 +577,7 @@ class MeileColors():
     DIALOG_BG_COLOR2         = "#181818"
     INDICATOR                = "#00DD21"
     INACTIVE_DIALOG_BG_COLOR = "#50507c"
+    MAP_BG_COLOR             = "#232227"
     ROW_HOVER                = "#39363c"
     FONT_FACE                = "../fonts/mplus-2c-bold.ttf"
     FONT_FACE_ARIAL          = "../fonts/arial-unicode-ms.ttf"

src/ui/screens.py

@@ -773,14 +773,14 @@ def build_node_data(self, ncountry):
     def build_meile_map(self):
 
         if not self.MeileMapBuilt:
-            self.MeileMap = MapView(zoom=2)
+            self.MeileMap = MapView(zoom=2,
+                                    background_color=get_color_from_hex(MeileColors.MAP_BG_COLOR))
             source = MapSource(url=MeileColors.ARCGIS_MAP,
                                cache_key="meile-map-canvas-dark-grey-base-2",
                                tile_size=256,
                                image_ext="png",
                                attribution="@ Meile",
-                               size_hint=(.7,1),
-                               min_zoom=2)
+                               min_zoom=1)
             #self.MeileMap.map_source = "osm"
             self.MeileMap.map_source = source
 
@@ -817,7 +817,7 @@ def build_meile_map(self):
             self.MeileMapBuilt = True
 
     def check_boundaries(self, instance, value):
-        if self.MeileMap.zoom == 2:
+        if self.MeileMap.zoom == 1:
             self.recenter_map()
 
     def add_country_rv_data(self, NodeCountries):
@@ -1271,7 +1271,7 @@ def Refresh(self):
 
     def recenter_map(self):
         self.MeileMap.zoom = 2
-        self.MeileMap.center_on(0.0, 0.0)
+        self.MeileMap.center_on(0, 0)
 
     def get_continent_coordinates(self, c):
         loc = self.MeileLand.ContinentLatLong[c]