From 8e831eb756ef28b2d4ec02088acedfcbba0e29cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Fdez?= <paziusss@gmail.com>
Date: Sat, 11 Apr 2020 17:45:37 +0200
Subject: [PATCH] desktop: disable battery on touch menu and reader footer
 isDesktop and isEmulator are now different entities

---
 frontend/apps/reader/modules/readerfont.lua   | 2 +-
 frontend/apps/reader/modules/readerfooter.lua | 3 +++
 frontend/device/sdl/device.lua                | 1 -
 frontend/document/canvascontext.lua           | 1 +
 frontend/fontlist.lua                         | 2 +-
 frontend/ui/elements/font_settings.lua        | 6 +++---
 frontend/ui/widget/touchmenu.lua              | 4 +++-
 7 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/frontend/apps/reader/modules/readerfont.lua b/frontend/apps/reader/modules/readerfont.lua
index 23aee7bb1..958e71cba 100644
--- a/frontend/apps/reader/modules/readerfont.lua
+++ b/frontend/apps/reader/modules/readerfont.lua
@@ -51,7 +51,7 @@ function ReaderFont:init()
     end
     -- build face_table for menu
     self.face_table = {}
-    if Device:isAndroid() or Device:isDesktop() then
+    if Device:isAndroid() or Device:isDesktop() or Device:isEmulator() then
         table.insert(self.face_table, require("ui/elements/font_settings"):getMenuTable())
     end
     local face_list = cre.getFontFaces()
diff --git a/frontend/apps/reader/modules/readerfooter.lua b/frontend/apps/reader/modules/readerfooter.lua
index 550d04d8e..2da007a4b 100644
--- a/frontend/apps/reader/modules/readerfooter.lua
+++ b/frontend/apps/reader/modules/readerfooter.lua
@@ -336,6 +336,9 @@ function ReaderFooter:init()
     if not Device:hasFrontlight() then
         MODE.frontlight = nil
     end
+    if Device:isDesktop() then
+        MODE.battery = nil
+    end
     for k, v in pairs(MODE) do
         mode_tbl[v] = k
     end
diff --git a/frontend/device/sdl/device.lua b/frontend/device/sdl/device.lua
index 267a29943..a7960dc8e 100644
--- a/frontend/device/sdl/device.lua
+++ b/frontend/device/sdl/device.lua
@@ -74,7 +74,6 @@ local Emulator = Device:new{
     hasFrontlight = yes,
     hasWifiToggle = yes,
     hasWifiManager = yes,
-    isDesktop = yes,
 }
 
 local Linux = Device:new{
diff --git a/frontend/document/canvascontext.lua b/frontend/document/canvascontext.lua
index 5bd6ee157..ce7f5a3e6 100644
--- a/frontend/document/canvascontext.lua
+++ b/frontend/document/canvascontext.lua
@@ -38,6 +38,7 @@ function CanvasContext:init(device)
     self.screen = device.screen
     self.isAndroid = device.isAndroid
     self.isDesktop = device.isDesktop
+    self.isEmulator = device.isEmulator
     self.isKindle = device.isKindle
     self.should_restrict_JIT = device.should_restrict_JIT
     self:setColorRenderingEnabled(device.screen.isColorEnabled())
diff --git a/frontend/fontlist.lua b/frontend/fontlist.lua
index 3c8cd9846..6b9e463d5 100644
--- a/frontend/fontlist.lua
+++ b/frontend/fontlist.lua
@@ -84,7 +84,7 @@ local function isInFontsBlacklist(f)
 end
 
 local function getExternalFontDir()
-    if CanvasContext.isAndroid() or CanvasContext.isDesktop() then
+    if CanvasContext.isAndroid() or CanvasContext.isDesktop() or CanvasContext.isEmulator() then
         return require("frontend/ui/elements/font_settings"):getPath()
     else
         return os.getenv("EXT_FONT_DIR")
diff --git a/frontend/ui/elements/font_settings.lua b/frontend/ui/elements/font_settings.lua
index 540361902..4d7c8a467 100644
--- a/frontend/ui/elements/font_settings.lua
+++ b/frontend/ui/elements/font_settings.lua
@@ -26,7 +26,7 @@ end
 -- user font path, should be rw. On linux/mac it goes under $HOME.
 -- on Android it goes in the primary storage (internal/sd)
 local function getUserDir()
-    if Device:isDesktop() then
+    if Device:isDesktop() or Device:isEmulator() then
         local home = os.getenv("HOME")
         if home then return home..DESKTOP_USER_FONT_DIR end
     elseif Device:isAndroid() then
@@ -37,7 +37,7 @@ end
 
 -- system (ttf) fonts are available on linux and android but not on mac
 local function getSystemDir()
-    if Device:isDesktop() then
+    if Device:isDesktop() or Device:isEmulator() then
         if util.pathExists(LINUX_SYSTEM_FONT_DIR) then
             return LINUX_SYSTEM_FONT_DIR
         else return nil end
@@ -91,7 +91,7 @@ function FontSettings:getMenuTable()
         end,
     }}
 
-    if Device:isDesktop() then table.insert(t, 2, {
+    if Device:isDesktop() or Device:isEmulator() then table.insert(t, 2, {
             text = _("Open fonts folder"),
             keep_menu_open = true,
             callback = openFontDir,
diff --git a/frontend/ui/widget/touchmenu.lua b/frontend/ui/widget/touchmenu.lua
index c0c313bef..9c53e799a 100644
--- a/frontend/ui/widget/touchmenu.lua
+++ b/frontend/ui/widget/touchmenu.lua
@@ -660,7 +660,9 @@ function TouchMenu:updateItems()
             batt_symbol = ""
         end
     end
-    time_info_txt = BD.wrap(time_info_txt) .. " " .. BD.wrap("⌁") .. BD.wrap(batt_symbol) ..  BD.wrap(batt_lvl .. "%")
+    if not Device:isDesktop() then
+        time_info_txt = BD.wrap(time_info_txt) .. " " .. BD.wrap("⌁") .. BD.wrap(batt_symbol) ..  BD.wrap(batt_lvl .. "%")
+    end
     self.time_info:setText(time_info_txt)
 
     -- recalculate dimen based on new layout