Browse Source

merge AriaNg commit #6f3fe70a68809079fc9b29d9affa5a96a212781b, #db6699084d8c00b3a3c734e34a6b7f6bb1d4eb61, #cff87831ac1930ef6f34430ee4ba3dd03c1d158b, #ff014806667b93c87b2a497e10c7a84bec603202

MaysWind 5 years ago
parent
commit
50dbef5631

+ 1 - 0
app/langs/zh_Hans.txt

@@ -183,6 +183,7 @@ Navigate to Downloading Tasks Page=转到正在下载列表页面
 Stay on Current Page=留在当前页面
 Remove Old Tasks After Retrying=重试任务后删除原任务
 Confirm Task Removal=任务删除前确认
+Include Prefix When Copying From Task Details=任务详情页复制时包括前缀
 Default Window Position=默认窗口位置
 Last Position=上次使用的位置
 Screen Center=屏幕中心

+ 1 - 0
app/langs/zh_Hant.txt

@@ -183,6 +183,7 @@ Navigate to Downloading Tasks Page=轉到正在下載工作頁面
 Stay on Current Page=留在目前頁面
 Remove Old Tasks After Retrying=重試工作後刪除原工作
 Confirm Task Removal=工作刪除前確認
+Include Prefix When Copying From Task Details=工作詳情頁複製時包括前綴
 Default Window Position=預設窗口位置
 Last Position=上次使用的位置
 Screen Center=螢幕中央

+ 1 - 0
app/scripts/config/constants.js

@@ -40,6 +40,7 @@
         afterCreatingNewTask: 'task-list',
         removeOldTaskAfterRetrying: false,
         confirmTaskRemoval: true,
+        includePrefixWhenCopyingFromTaskDetails: true,
         afterRetryingTask: 'task-list-downloading',
         displayOrder: 'default:asc',
         fileListDisplayOrder: 'default:asc',

+ 1 - 0
app/scripts/config/defaultLanguage.js

@@ -187,6 +187,7 @@
             'Stay on Current Page': 'Stay on Current Page',
             'Remove Old Tasks After Retrying': 'Remove Old Tasks After Retrying',
             'Confirm Task Removal': 'Confirm Task Removal',
+            'Include Prefix When Copying From Task Details': 'Include Prefix When Copying From Task Details',
             'Default Window Position': 'Default Window Position',
             'Last Position': 'Last Position',
             'Screen Center': 'Screen Center',

+ 4 - 0
app/scripts/controllers/settings-ariang.js

@@ -233,6 +233,10 @@
             ariaNgSettingService.setConfirmTaskRemoval(value);
         };
 
+        $scope.setIncludePrefixWhenCopyingFromTaskDetails = function (value) {
+            ariaNgSettingService.setIncludePrefixWhenCopyingFromTaskDetails(value);
+        };
+
         $scope.setAfterRetryingTask = function (value) {
             ariaNgSettingService.setAfterRetryingTask(value);
         };

+ 6 - 2
app/scripts/controllers/task-detail.js

@@ -656,8 +656,12 @@
                 value += angular.element(element).text().trim();
             });
 
-            var info = name + ': ' + value;
-            clipboard.copyText(info);
+            if (ariaNgSettingService.getIncludePrefixWhenCopyingFromTaskDetails()) {
+                var info = name + ': ' + value;
+                clipboard.copyText(info);
+            } else {
+                clipboard.copyText(value);
+            };
         };
 
         $scope.openLocalDirectory = function (dir, filename) {

+ 6 - 0
app/scripts/services/ariaNgSettingService.js

@@ -387,6 +387,12 @@
             setConfirmTaskRemoval: function (value) {
                 setOption('confirmTaskRemoval', value);
             },
+            getIncludePrefixWhenCopyingFromTaskDetails: function () {
+                return getOption('includePrefixWhenCopyingFromTaskDetails');
+            },
+            setIncludePrefixWhenCopyingFromTaskDetails: function (value) {
+                setOption('includePrefixWhenCopyingFromTaskDetails', value);
+            },
             getAfterRetryingTask: function () {
                 return getOption('afterRetryingTask');
             },

+ 11 - 0
app/views/settings-ariang.html

@@ -189,6 +189,17 @@
                             </select>
                         </div>
                     </div>
+                    <div class="row">
+                        <div class="setting-key setting-key-without-desc col-sm-4">
+                            <span translate>Include Prefix When Copying From Task Details</span>
+                        </div>
+                        <div class="setting-value col-sm-8">
+                            <select class="form-control" style="width: 100%;" ng-model="context.settings.includePrefixWhenCopyingFromTaskDetails"
+                                    ng-change="setIncludePrefixWhenCopyingFromTaskDetails(context.settings.includePrefixWhenCopyingFromTaskDetails)"
+                                    ng-options="option.value as (option.name | translate) for option in context.trueFalseOptions">
+                            </select>
+                        </div>
+                    </div>
                     <div class="row">
                         <div class="setting-key setting-key-without-desc col-sm-4">
                             <span translate>Default Window Position</span>