Archives
/
koreader
mirror of https://github.com/koreader/koreader
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Profiles: fix updating gestures (#11072)

Browse Source
reviewable/pr11088/r1
hius07 6 months ago committed by GitHub
parent 2e2ca76a03
commit 51f3115b90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 41 additions and 55 deletions
Show Stats Download Patch File Download Diff File

6
frontend/apps/reader/modules/readerstyletweak.lua
Unescape Escape View File

@ -566,10 +566,8 @@ You can enable individual tweaks on this book with a tap, or view more details a
if self.tweaks_in_dispatcher[item.id] then
self.tweaks_in_dispatcher[item.id] = nil
dispatcherUnregisterStyleTweak(item.id)
local Profiles = self.ui.profiles
if Profiles then
Profiles:updateGestures(self.dispatcher_prefix..item.id)
Profiles:updateProfiles(self.dispatcher_prefix..item.id)
if self.ui.profiles then
self.ui.profiles:updateProfiles(self.dispatcher_prefix..item.id)
end
else
self.tweaks_in_dispatcher[item.id] = item.title

36
plugins/gestures.koplugin/main.lua
Unescape Escape View File

@ -1202,4 +1202,40 @@ function Gestures:onFlushSettings()
end
end
function Gestures:updateProfiles(action_old_name, action_new_name)
for section, gestures in pairs(self.settings_data.data) do -- custom_multiswipes, gesture_fm, gesture_reader
for gesture_name, gesture in pairs(gestures) do
if gesture[action_old_name] then
if gesture.settings and gesture.settings.order then
for i, action in ipairs(gesture.settings.order) do
if action == action_old_name then
if action_new_name then
gesture.settings.order[i] = action_new_name
else
table.remove(gesture.settings.order, i)
if #gesture.settings.order == 0 then
gesture.settings.order = nil
if next(gesture.settings) == nil then
gesture.settings = nil
end
end
end
break
end
end
end
gesture[action_old_name] = nil
if action_new_name then
gesture[action_new_name] = true
else
if next(gesture) == nil then
self.settings_data.data[section][gesture_name] = nil
end
end
self.updated = true
end
end
end
end
return Gestures

54
plugins/profiles.koplugin/main.lua
Unescape Escape View File

@ -154,7 +154,6 @@ function Profiles:getSubMenuItems()
callback = function(touchmenu_instance)
if v.settings.registered then
dispatcherUnregisterProfile(k)
self:updateGestures(self.prefix..k)
self:updateProfiles(self.prefix..k)
self.data[k].settings.registered = nil
else
@ -184,7 +183,6 @@ function Profiles:getSubMenuItems()
if v.settings.registered then
dispatcherUnregisterProfile(k)
dispatcherRegisterProfile(new_name)
self:updateGestures(self.prefix..k, self.prefix..new_name)
self:updateProfiles(self.prefix..k, self.prefix..new_name)
end
self.data[k] = nil
@ -226,7 +224,6 @@ function Profiles:getSubMenuItems()
self:updateAutostart(k)
if v.settings.registered then
dispatcherUnregisterProfile(k)
self:updateGestures(self.prefix..k)
self:updateProfiles(self.prefix..k)
end
self.data[k] = nil
@ -367,54 +364,6 @@ function Profiles:getProfileFromCurrentDocument(new_name)
return profile
end
function Profiles:updateGestures(action_old_name, action_new_name)
local gestures_path = FFIUtil.joinPath(DataStorage:getSettingsDir(), "gestures.lua")
local all_gestures = LuaSettings:open(gestures_path) -- in file
if not all_gestures then return end
local updated = false
for section, gestures in pairs(all_gestures.data) do -- custom_multiswipes, fm, reader sections
for gesture_name, gesture in pairs(gestures) do
if gesture[action_old_name] then
local gesture_loaded = self.ui.gestures.gestures[gesture_name] -- in memory
if gesture.settings and gesture.settings.order then
for i, action in ipairs(gesture.settings.order) do
if action == action_old_name then
if action_new_name then
gesture.settings.order[i] = action_new_name
gesture_loaded.settings.order[i] = action_new_name
else
table.remove(gesture.settings.order, i)
table.remove(gesture_loaded.settings.order, i)
if #gesture.settings.order == 0 then
gesture.settings.order = nil
if next(gesture.settings) == nil then
gesture.settings = nil
end
end
end
break
end
end
end
gesture[action_old_name] = nil
gesture_loaded[action_old_name] = nil
if action_new_name then
gesture[action_new_name] = true
gesture_loaded[action_new_name] = true
else
if next(gesture) == nil then
all_gestures.data[section][gesture_name] = nil
end
end
updated = true
end
end
end
if updated then
all_gestures:flush()
end
end
function Profiles:updateProfiles(action_old_name, action_new_name)
for _, profile in pairs(self.data) do
if profile[action_old_name] then
@ -440,6 +389,9 @@ function Profiles:updateProfiles(action_old_name, action_new_name)
self.updated = true
end
end
if self.ui.gestures then -- search and update the profile action in assigned gestures
self.ui.gestures:updateProfiles(action_old_name, action_new_name)
end
end
function Profiles:updateAutostart(old_name, new_name)

Write Preview
Loading…
Cancel
Save