diff --git a/frontend/apps/reader/modules/readerdevicestatus.lua b/frontend/apps/reader/modules/readerdevicestatus.lua index e057a30b9..1e5827794 100644 --- a/frontend/apps/reader/modules/readerdevicestatus.lua +++ b/frontend/apps/reader/modules/readerdevicestatus.lua @@ -182,7 +182,7 @@ function ReaderDeviceStatus:addToMainMenu(menu_items) end, keep_menu_open = true, callback = function(touchmenu_instance) - local DoubleSpinWidget = require("/ui/widget/doublespinwidget") + local DoubleSpinWidget = require("ui/widget/doublespinwidget") local thresholds_widget thresholds_widget = DoubleSpinWidget:new{ title_text = _("Battery level alert thresholds"), diff --git a/frontend/apps/reader/modules/readertypography.lua b/frontend/apps/reader/modules/readertypography.lua index ad2fe7235..1d1a7c952 100644 --- a/frontend/apps/reader/modules/readertypography.lua +++ b/frontend/apps/reader/modules/readertypography.lua @@ -360,7 +360,7 @@ When the book's language tag is not among our presets, no specific features will return _("Left/right minimal sizes: language defaults") end, callback = function() - local DoubleSpinWidget = require("/ui/widget/doublespinwidget") + local DoubleSpinWidget = require("ui/widget/doublespinwidget") local cre = require("document/credocument"):engineInit() local hyph_alg, alg_left_hyphen_min, alg_right_hyphen_min = cre.getSelectedHyphDict() -- luacheck: no unused local hyph_limits_widget = DoubleSpinWidget:new{ diff --git a/frontend/fontlist.lua b/frontend/fontlist.lua index 61564a6ff..70d5fee22 100644 --- a/frontend/fontlist.lua +++ b/frontend/fontlist.lua @@ -95,7 +95,7 @@ end local function getExternalFontDir() if CanvasContext:hasSystemFonts() then - return require("frontend/ui/elements/font_settings"):getPath() + return require("ui/elements/font_settings"):getPath() else return os.getenv("EXT_FONT_DIR") end diff --git a/frontend/ui/data/onetime_migration.lua b/frontend/ui/data/onetime_migration.lua index fd40bcae5..ee2abf5dc 100644 --- a/frontend/ui/data/onetime_migration.lua +++ b/frontend/ui/data/onetime_migration.lua @@ -6,7 +6,7 @@ local DataStorage = require("datastorage") local ffiUtil = require("ffi/util") local lfs = require("libs/libkoreader-lfs") local logger = require("logger") -local LuaSettings = require("frontend/luasettings") +local LuaSettings = require("luasettings") local SQ3 = require("lua-ljsqlite3/init") local util = require("util") local _ = require("gettext") diff --git a/plugins/autowarmth.koplugin/main.lua b/plugins/autowarmth.koplugin/main.lua index 7e6216b5d..4fa87fdb7 100644 --- a/plugins/autowarmth.koplugin/main.lua +++ b/plugins/autowarmth.koplugin/main.lua @@ -8,7 +8,7 @@ local CheckButton = require("ui/widget/checkbutton") local ConfirmBox = require("ui/widget/confirmbox") local Device = require("device") local DateTimeWidget = require("ui/widget/datetimewidget") -local DoubleSpinWidget = require("/ui/widget/doublespinwidget") +local DoubleSpinWidget = require("ui/widget/doublespinwidget") local DeviceListener = require("device/devicelistener") local Dispatcher = require("dispatcher") local Event = require("ui/event") diff --git a/plugins/movetoarchive.koplugin/main.lua b/plugins/movetoarchive.koplugin/main.lua index e13f84713..5cca19767 100644 --- a/plugins/movetoarchive.koplugin/main.lua +++ b/plugins/movetoarchive.koplugin/main.lua @@ -5,10 +5,10 @@ local DocSettings = require("docsettings") local Event = require("ui/event") local FileManager = require("apps/filemanager/filemanager") local InfoMessage = require("ui/widget/infomessage") -local LuaSettings = require("frontend/luasettings") +local LuaSettings = require("luasettings") local UIManager = require("ui/uimanager") local WidgetContainer = require("ui/widget/container/widgetcontainer") -local util = require("frontend/util") +local util = require("util") local BaseUtil = require("ffi/util") local _ = require("gettext") diff --git a/plugins/newsdownloader.koplugin/main.lua b/plugins/newsdownloader.koplugin/main.lua index 48e2f9c32..ab166b3a5 100644 --- a/plugins/newsdownloader.koplugin/main.lua +++ b/plugins/newsdownloader.koplugin/main.lua @@ -7,7 +7,7 @@ local ReadHistory = require("readhistory") local FFIUtil = require("ffi/util") local FeedView = require("feed_view") local InfoMessage = require("ui/widget/infomessage") -local LuaSettings = require("frontend/luasettings") +local LuaSettings = require("luasettings") local UIManager = require("ui/uimanager") local KeyValuePage = require("ui/widget/keyvaluepage") local InputDialog = require("ui/widget/inputdialog") diff --git a/plugins/wallabag.koplugin/main.lua b/plugins/wallabag.koplugin/main.lua index aa3647278..3bab4c651 100644 --- a/plugins/wallabag.koplugin/main.lua +++ b/plugins/wallabag.koplugin/main.lua @@ -22,7 +22,7 @@ local FileManager = require("apps/filemanager/filemanager") local InfoMessage = require("ui/widget/infomessage") local InputDialog = require("ui/widget/inputdialog") local JSON = require("json") -local LuaSettings = require("frontend/luasettings") +local LuaSettings = require("luasettings") local Math = require("optmath") local MultiConfirmBox = require("ui/widget/multiconfirmbox") local MultiInputDialog = require("ui/widget/multiinputdialog") diff --git a/spec/unit/luadata_spec.lua b/spec/unit/luadata_spec.lua index bb435b03f..d07baf5a3 100644 --- a/spec/unit/luadata_spec.lua +++ b/spec/unit/luadata_spec.lua @@ -4,7 +4,7 @@ describe("luadata module", function() require("commonrequire") DataStorage = require("datastorage") lfs = require("libs/libkoreader-lfs") - Settings = require("frontend/luadata"):open(DataStorage:getDataDir() .. "/this-is-not-a-valid-file") + Settings = require("luadata"):open(DataStorage:getDataDir() .. "/this-is-not-a-valid-file") end) it("should handle undefined keys", function() diff --git a/spec/unit/luasettings_spec.lua b/spec/unit/luasettings_spec.lua index 020a4abb2..7c4347c31 100644 --- a/spec/unit/luasettings_spec.lua +++ b/spec/unit/luasettings_spec.lua @@ -3,7 +3,7 @@ describe("luasettings module", function() setup(function() require("commonrequire") DataStorage = require("datastorage") - Settings = require("frontend/luasettings"):open(DataStorage:getDataDir() .. "/this-is-not-a-valid-file") + Settings = require("luasettings"):open(DataStorage:getDataDir() .. "/this-is-not-a-valid-file") end) it("should handle undefined keys", function()