diff --git a/src/tr-web-control/template/dialog-torrent-attribute-add-tracker.html b/src/tr-web-control/template/dialog-torrent-attribute-add-tracker.html
index 486526d..827c019 100644
--- a/src/tr-web-control/template/dialog-torrent-attribute-add-tracker.html
+++ b/src/tr-web-control/template/dialog-torrent-attribute-add-tracker.html
@@ -7,83 +7,99 @@
 	</div>
 	<div data-options="region:'south',border:false" style="text-align:right;padding:6px;">
 		<span id="text-nochange" style="display:none;"></span>
+		<a id="torrent-attribute-add-tracker-button-search-best-ip" class="easyui-linkbutton" data-options="iconCls:'icon-search',plain:true" href="javascript:void(0);">Best Trackers</a>
+		<a id="torrent-attribute-add-tracker-button-search-all-ip" class="easyui-linkbutton" data-options="iconCls:'icon-search',plain:true" href="javascript:void(0);">All Trackers</a>
 		<a id="torrent-attribute-add-tracker-button-ok" class="easyui-linkbutton" data-options="iconCls:'icon-ok',plain:true" href="javascript:void(0);">Ok</a>
 		<a id="torrent-attribute-add-tracker-button-cancel" class="easyui-linkbutton" data-options="iconCls:'icon-cancel',plain:true"
 		   href="javascript:void(0);">Cancel</a>
 	</div>
 </div>
 <script type="text/javascript">
-	(function (thisDialog) {
-		var title = "tip".split(",");
-		var torrent = transmission.torrents.all[system.currentTorrentId];
+    (function (thisDialog) {
+        var title = "tip".split(",");
+        var torrent = transmission.torrents.all[system.currentTorrentId];
 
-		$.each(title, function (i, item) {
-			thisDialog.find("#dialog-torrent-attribute-add-tracker-" + item).html(system.lang.dialog[
-				"torrent-attribute-add-tracker"][item]);
-		});
+        $.each(title, function (i, item) {
+            thisDialog.find("#dialog-torrent-attribute-add-tracker-" + item).html(system.lang.dialog[
+                "torrent-attribute-add-tracker"][item]);
+        });
 
-		thisDialog.find(".title").css({
-			background: "#e6e6e6"
-		});
+        thisDialog.find(".title").css({
+            background: "#e6e6e6"
+        });
 
-		title = "button-ok,button-cancel".split(",");
-		$.each(title, function (i, item) {
-			thisDialog.find("#torrent-attribute-add-tracker-" + item).html(system.lang.dialog["public"][item]);
-		});
+        title = "button-ok,button-cancel".split(",");
+        $.each(title, function (i, item) {
+            thisDialog.find("#torrent-attribute-add-tracker-" + item).html(system.lang.dialog["public"][item]);
+        });
 
-		thisDialog.find("#text-nochange").html(system.lang["public"]["text-nochange"]);
+        thisDialog.find("#text-nochange").html(system.lang["public"]["text-nochange"]);
 
-		// 确认
-		thisDialog.find("#torrent-attribute-add-tracker-button-ok").click(function () {
-			var urls = thisDialog.find("#txtTrackers").val();
-			var button = $(this);
+        // 确认
+        thisDialog.find("#torrent-attribute-add-tracker-button-ok").click(function () {
+            var urls = thisDialog.find("#txtTrackers").val();
+            var button = $(this);
 
-			if (urls != "") {
-				var newTrackers = [];
-				var items = urls.split("\n");
-				$.each(items, function(index, value) {
-					if (isURL(value) && newTrackers.indexOf(value)==-1) {
-						newTrackers.push(value);
-					}
-				});
-				if (newTrackers.length==0) {
-					thisDialog.find("#text-nochange").html(system.lang["public"]["text-nochange"]).fadeInAndOut();
-					return;
-				}
-				var icon = button.linkbutton("options").iconCls;
-				button.linkbutton({
-					disabled: true,
-					iconCls: "icon-loading"
-				});
-				transmission.exec({
-					method: "torrent-set",
-					arguments: {
-						ids: system.currentTorrentId,
-						trackerAdd: newTrackers
-					}
-				}, function (data) {
-					button.linkbutton({
-						iconCls: icon,
-						disabled: false
-					});
+            if (urls != "") {
+                var newTrackers = [];
+                var items = urls.split("\n");
+                $.each(items, function(index, value) {
+                    if (isURL(value) && newTrackers.indexOf(value)==-1) {
+                        newTrackers.push(value);
+                    }
+                });
+                if (newTrackers.length==0) {
+                    thisDialog.find("#text-nochange").html(system.lang["public"]["text-nochange"]).fadeInAndOut();
+                    return;
+                }
+                var icon = button.linkbutton("options").iconCls;
+                button.linkbutton({
+                    disabled: true,
+                    iconCls: "icon-loading"
+                });
+                transmission.exec({
+                    method: "torrent-set",
+                    arguments: {
+                        ids: system.currentTorrentId,
+                        trackerAdd: newTrackers
+                    }
+                }, function (data) {
+                    button.linkbutton({
+                        iconCls: icon,
+                        disabled: false
+                    });
 
-					if (data.result == "success") {
-						system.getTorrentInfos(system.currentTorrentId);
-						thisDialog.dialog("close");
-					}
-				});
-			} else {
-				thisDialog.find("#text-nochange").html(system.lang["public"]["text-nochange"]).fadeInAndOut();
-			}
+                    if (data.result == "success") {
+                        system.getTorrentInfos(system.currentTorrentId);
+                        thisDialog.dialog("close");
+                    }
+                });
+            } else {
+                thisDialog.find("#text-nochange").html(system.lang["public"]["text-nochange"]).fadeInAndOut();
+            }
 
-		});
+        });
+		
+        thisDialog.find("#torrent-attribute-add-tracker-button-search-best-ip").click(function () {
+            var trackersURL = "https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_best_ip.txt"
+            $.get(trackersURL,function(data){
+                $("#txtTrackers").html(data);
+            });
+        });
 
-		thisDialog.find("#torrent-attribute-add-tracker-button-cancel").click(function () {
-			thisDialog.dialog("close");
-		});
+        thisDialog.find("#torrent-attribute-add-tracker-button-search-all-ip").click(function () {
+            var trackersURL="https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_all_ip.txt"
+            $.get(trackersURL,function(data){
+                $("#txtTrackers").html(data);
+            });
+        });
 
-		function isURL(v) {
-			return /^[a-zA-z]+:\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&amp;:/~\+#]*[\w\-\@?^=%&amp;/~\+#])?$/.test(v);
-		}
-	})($("#dialog-torrent-attribute-add-tracker"));
+        thisDialog.find("#torrent-attribute-add-tracker-button-cancel").click(function () {
+            thisDialog.dialog("close");
+        });
+
+        function isURL(v) {
+            return /^[a-zA-z]+:\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&amp;:/~\+#]*[\w\-\@?^=%&amp;/~\+#])?$/.test(v);
+        }
+    })($("#dialog-torrent-attribute-add-tracker"));
 </script>
\ No newline at end of file