From a706fde2d740f42597fe38d4641d4e4c986647be Mon Sep 17 00:00:00 2001 From: Robert Date: Thu, 13 Sep 2018 13:20:09 +0200 Subject: [PATCH] Cleanup downloadmgr titles (#4222) --- frontend/apps/cloudstorage/cloudstorage.lua | 3 +-- frontend/ui/screensaver.lua | 3 +-- frontend/ui/widget/opdsbrowser.lua | 1 - plugins/newsdownloader.koplugin/main.lua | 4 ---- plugins/send2ebook.koplugin/main.lua | 4 ---- plugins/zsync.koplugin/main.lua | 1 - 6 files changed, 2 insertions(+), 14 deletions(-) diff --git a/frontend/apps/cloudstorage/cloudstorage.lua b/frontend/apps/cloudstorage/cloudstorage.lua index ab913ec74..334598f30 100644 --- a/frontend/apps/cloudstorage/cloudstorage.lua +++ b/frontend/apps/cloudstorage/cloudstorage.lua @@ -206,10 +206,9 @@ function CloudStorage:cloudFile(item, path) }, { { - text = _("Choose download directory by long-pressing"), + text = _("Choose download directory"), callback = function() require("ui/downloadmgr"):new{ - title = _("Choose download directory"), show_hidden = G_reader_settings:readSetting("show_hidden"), onConfirm = function(path_download) self.cs_settings:saveSetting("download_dir", path_download) diff --git a/frontend/ui/screensaver.lua b/frontend/ui/screensaver.lua index 407f7135e..4dab7dc51 100644 --- a/frontend/ui/screensaver.lua +++ b/frontend/ui/screensaver.lua @@ -52,11 +52,10 @@ function Screensaver:chooseFolder() local buttons = {} table.insert(buttons, { { - text = _("Choose screensaver directory by long-pressing"), + text = _("Choose screensaver directory"), callback = function() UIManager:close(self.choose_dialog) require("ui/downloadmgr"):new{ - title = _("Choose screensaver directory"), onConfirm = function(path) logger.dbg("set screensaver directory to", path) G_reader_settings:saveSetting("screensaver_dir", path) diff --git a/frontend/ui/widget/opdsbrowser.lua b/frontend/ui/widget/opdsbrowser.lua index 8f414b71f..44d42be70 100644 --- a/frontend/ui/widget/opdsbrowser.lua +++ b/frontend/ui/widget/opdsbrowser.lua @@ -587,7 +587,6 @@ function OPDSBrowser:showDownloads(item) text = _("Select another directory"), callback = function() require("ui/downloadmgr"):new{ - title = _("Long-press to select directory"), onConfirm = function(path) logger.dbg("set download directory to", path) G_reader_settings:saveSetting("download_dir", path) diff --git a/plugins/newsdownloader.koplugin/main.lua b/plugins/newsdownloader.koplugin/main.lua index eeb286825..75130debc 100644 --- a/plugins/newsdownloader.koplugin/main.lua +++ b/plugins/newsdownloader.koplugin/main.lua @@ -369,11 +369,7 @@ function NewsDownloader:removeNewsButKeepFeedConfig() end function NewsDownloader:setCustomDownloadDirectory() - UIManager:show(InfoMessage:new{ - text = _("To select a folder press down and hold it for 1 second.") - }) require("ui/downloadmgr"):new{ - title = _("Choose download directory"), onConfirm = function(path) logger.dbg("NewsDownloader: set download directory to: ", path) local news_downloader_settings = LuaSettings:open(("%s/%s"):format(DataStorage:getSettingsDir(), news_downloader_config_file)) diff --git a/plugins/send2ebook.koplugin/main.lua b/plugins/send2ebook.koplugin/main.lua index 24e13594e..9128b9547 100644 --- a/plugins/send2ebook.koplugin/main.lua +++ b/plugins/send2ebook.koplugin/main.lua @@ -192,11 +192,7 @@ function Send2Ebook:removeReadActicles() end function Send2Ebook:setCustomDownloadDirectory() - UIManager:show(InfoMessage:new{ - text = _("To select a folder press down and hold it for 1 second.") - }) require("ui/downloadmgr"):new{ - title = _("Choose download directory"), onConfirm = function(path) logger.dbg("Send2Ebook: set download directory to: ", path) send2ebook_settings:saveSetting(config_key_custom_dl_dir, ("%s/"):format(path)) diff --git a/plugins/zsync.koplugin/main.lua b/plugins/zsync.koplugin/main.lua index 4c11e4f88..5bf788d11 100644 --- a/plugins/zsync.koplugin/main.lua +++ b/plugins/zsync.koplugin/main.lua @@ -229,7 +229,6 @@ function ZSync:subscribe() self.received = {} local zsync = self require("ui/downloadmgr"):new{ - title = _("Choose inbox by long-pressing"), show_hidden = G_reader_settings:readSetting("show_hidden"), onConfirm = function(inbox) G_reader_settings:saveSetting("inbox_dir", inbox)