From 220df6ca499fa70c7baa0396d1167d2f47d0eca4 Mon Sep 17 00:00:00 2001 From: MaysWind Date: Thu, 11 Feb 2021 01:18:48 +0800 Subject: [PATCH] add option for changing task order by drag-and-drop --- src/langs/zh_Hans.txt | 1 + src/langs/zh_Hant.txt | 1 + src/scripts/config/constants.js | 1 + src/scripts/config/defaultLanguage.js | 1 + src/scripts/controllers/list.js | 4 ++++ src/scripts/controllers/settings-ariang.js | 4 ++++ src/scripts/services/ariaNgSettingService.js | 6 ++++++ src/views/settings-ariang.html | 11 +++++++++++ 8 files changed, 29 insertions(+) diff --git a/src/langs/zh_Hans.txt b/src/langs/zh_Hans.txt index 04b2aa1..8ed43f8 100644 --- a/src/langs/zh_Hans.txt +++ b/src/langs/zh_Hans.txt @@ -175,6 +175,7 @@ Add New RPC Setting=添加新 RPC 设置 Are you sure you want to remove rpc setting "{{rpcName}}"?=您是否要删除 RPC 设置 "{{rpcName}}"? Updating Global Stat Interval=全局状态更新间隔 Updating Task Information Interval=任务信息更新间隔 +Change Tasks Order by Drag-and-drop=拖拽任务排序 Action After Creating New Tasks=创建新任务后执行操作 Navigate to Task List Page=转到任务列表页面 Navigate to Task Detail Page=转到任务详情页面 diff --git a/src/langs/zh_Hant.txt b/src/langs/zh_Hant.txt index d7ac63e..fbf8923 100644 --- a/src/langs/zh_Hant.txt +++ b/src/langs/zh_Hant.txt @@ -175,6 +175,7 @@ Add New RPC Setting=加入新 RPC 設定 Are you sure you want to remove rpc setting "{{rpcName}}"?=您是否要刪除 RPC 設定 "{{rpcName}}"? Updating Global Stat Interval=全域狀態更新間隔 Updating Task Information Interval=工作資訊更新間隔 +Change Tasks Order by Drag-and-drop=拖拽工作排序 Action After Creating New Tasks=建立新工作後執行操作 Navigate to Task List Page=轉到工作清單頁面 Navigate to Task Detail Page=轉到工作詳情頁面 diff --git a/src/scripts/config/constants.js b/src/scripts/config/constants.js index a6dd62c..6a49a71 100644 --- a/src/scripts/config/constants.js +++ b/src/scripts/config/constants.js @@ -37,6 +37,7 @@ extendRpcServers: [], globalStatRefreshInterval: 1000, downloadTaskRefreshInterval: 1000, + dragAndDropTasks: true, rpcListDisplayOrder: 'recentlyUsed', afterCreatingNewTask: 'task-list', removeOldTaskAfterRetrying: false, diff --git a/src/scripts/config/defaultLanguage.js b/src/scripts/config/defaultLanguage.js index ecbd1cf..9163424 100644 --- a/src/scripts/config/defaultLanguage.js +++ b/src/scripts/config/defaultLanguage.js @@ -179,6 +179,7 @@ 'Are you sure you want to remove rpc setting "{{rpcName}}"?': 'Are you sure you want to remove rpc setting "{{rpcName}}"?', 'Updating Global Stat Interval': 'Updating Global Stat Interval', 'Updating Task Information Interval': 'Updating Task Information Interval', + 'Change Tasks Order by Drag-and-drop': 'Change Tasks Order by Drag-and-drop', 'Action After Creating New Tasks': 'Action After Creating New Tasks', 'Navigate to Task List Page': 'Navigate to Task List Page', 'Navigate to Task Detail Page': 'Navigate to Task Detail Page', diff --git a/src/scripts/controllers/list.js b/src/scripts/controllers/list.js index 0e3fde8..67854a5 100644 --- a/src/scripts/controllers/list.js +++ b/src/scripts/controllers/list.js @@ -79,6 +79,10 @@ }; $scope.isSupportDragTask = function () { + if (!ariaNgSettingService.getDragAndDropTasks()) { + return false; + } + var displayOrder = ariaNgCommonService.parseOrderType(ariaNgSettingService.getDisplayOrder()); return location === 'waiting' && displayOrder.type === 'default'; diff --git a/src/scripts/controllers/settings-ariang.js b/src/scripts/controllers/settings-ariang.js index b0ea437..ff447a5 100644 --- a/src/scripts/controllers/settings-ariang.js +++ b/src/scripts/controllers/settings-ariang.js @@ -185,6 +185,10 @@ ariaNgSettingService.setRPCListDisplayOrder(value); }; + $scope.setDragAndDropTasks = function (value) { + ariaNgSettingService.setDragAndDropTasks(value); + }; + $scope.setAfterCreatingNewTask = function (value) { ariaNgSettingService.setAfterCreatingNewTask(value); }; diff --git a/src/scripts/services/ariaNgSettingService.js b/src/scripts/services/ariaNgSettingService.js index 3b1eebc..d11bc89 100644 --- a/src/scripts/services/ariaNgSettingService.js +++ b/src/scripts/services/ariaNgSettingService.js @@ -391,6 +391,12 @@ setDownloadTaskRefreshInterval: function (value) { setOption('downloadTaskRefreshInterval', Math.max(parseInt(value), 0)); }, + getDragAndDropTasks: function () { + return getOption('dragAndDropTasks'); + }, + setDragAndDropTasks: function (value) { + setOption('dragAndDropTasks', value); + }, getRPCListDisplayOrder: function () { return getOption('rpcListDisplayOrder'); }, diff --git a/src/views/settings-ariang.html b/src/views/settings-ariang.html index e4e8b6f..90971e1 100644 --- a/src/views/settings-ariang.html +++ b/src/views/settings-ariang.html @@ -135,6 +135,17 @@ +
+
+ Change Tasks Order by Drag-and-drop +
+
+ +
+
RPC List Display Order