From 0a6fbe28e37f2ca74fb9001334bdb452d11479a9 Mon Sep 17 00:00:00 2001 From: WS64 Date: Sun, 17 Aug 2014 12:02:24 +0200 Subject: [PATCH] Reaarange cancel buttons to the left --- .../filemanager/filemanagersetdefaults.lua | 47 ++++++++++--------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/frontend/apps/filemanager/filemanagersetdefaults.lua b/frontend/apps/filemanager/filemanagersetdefaults.lua index d263aec7b..84a089a73 100644 --- a/frontend/apps/filemanager/filemanagersetdefaults.lua +++ b/frontend/apps/filemanager/filemanagersetdefaults.lua @@ -130,6 +130,14 @@ function SetDefaults:init() title = self.defaults_name[i] .. ":", buttons = { { + { + text = _("Cancel"), + enabled = true, + callback = function() + self:close() + UIManager:show(menu_container) + end + }, { text = "true", enabled = true, @@ -160,14 +168,6 @@ function SetDefaults:init() UIManager:show(menu_container) end }, - { - text = _("Cancel"), - enabled = true, - callback = function() - self:close() - UIManager:show(menu_container) - end - }, }, }, input_type = settings_type, @@ -188,21 +188,6 @@ function SetDefaults:init() title = self.defaults_name[i] .. ":", buttons = { { - { - text = _("OK"), - enabled = true, - callback = function() - self.defaults_value[i] = _G[self.defaults_name[i]] - if _G[self.defaults_name[i]] ~= settype(self.set_dialog:getInputText(),settings_type) then - _G[self.defaults_name[i]] = settype(self.set_dialog:getInputText(),settings_type) - settings_changed = true - end - self.results[i].text = setdisplayname(i) - self:close() - self.defaults_menu:swithItemTable("Defaults", self.results, i) - UIManager:show(menu_container) - end, - }, { text = _("Cancel"), enabled = true, @@ -211,6 +196,21 @@ function SetDefaults:init() UIManager:show(menu_container) end, }, + { + text = _("OK"), + enabled = true, + callback = function() + if _G[self.defaults_name[i]] ~= settype(self.set_dialog:getInputText(),settings_type) then + _G[self.defaults_name[i]] = settype(self.set_dialog:getInputText(),settings_type) + settings_changed = true + end + self.defaults_value[i] = _G[self.defaults_name[i]] + self.results[i].text = setdisplayname(i) + self:close() + self.defaults_menu:swithItemTable("Defaults", self.results, i) + UIManager:show(menu_container) + end, + }, }, }, input_type = settings_type, @@ -329,5 +329,6 @@ function SetDefaults:SaveSettings() end file:close() UIManager:show(InfoMessage:new{text = _("Default settings successfully saved!")}) + settings_changed = false end return SetDefaults