From 34ba69e319b6bc6acffd3b1cac3d8a91209d7bd1 Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Mon, 23 Nov 2009 13:35:46 +0000
Subject: [PATCH] - Fixed several issues with Web UI

---
 src/eventmanager.cpp              | 7 +++++--
 src/httpconnection.cpp            | 2 +-
 src/webui/scripts/client.js       | 5 +++--
 src/webui/scripts/dynamicTable.js | 6 +++---
 src/webui/scripts/mocha-init.js   | 6 +++---
 src/webui/uploadframe.html        | 2 ++
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/eventmanager.cpp b/src/eventmanager.cpp
index 2e689044c..489082578 100644
--- a/src/eventmanager.cpp
+++ b/src/eventmanager.cpp
@@ -109,9 +109,12 @@ void EventManager::modifiedTorrent(QTorrentHandle h)
   event["progress"] = QVariant(h.progress());
   event["dlspeed"] = QVariant(tr("%1/s", "e.g. 120 KiB/s").arg(misc::friendlyUnit(h.download_payload_rate())));
   if(BTSession->isQueueingEnabled()) {
-    event["priority"] = QVariant(h.queue_position());
+    if(h.queue_position() >= 0)
+      event["priority"] = QVariant(QString::number(h.queue_position()));
+    else
+      event["priority"] = "*";
   } else {
-    event["priority"] = -1;
+    event["priority"] = "*";
   }
   event["upspeed"] = QVariant(tr("%1/s", "e.g. 120 KiB/s").arg(misc::friendlyUnit(h.upload_payload_rate())));
   QString seeds = QString::number(h.num_seeds());
diff --git a/src/httpconnection.cpp b/src/httpconnection.cpp
index bf49d7d84..d3a9ed439 100644
--- a/src/httpconnection.cpp
+++ b/src/httpconnection.cpp
@@ -107,7 +107,7 @@ QString HttpConnection::translateDocument(QString data) {
   bool found = false;
   do {
     found = false;
-    QRegExp regex("_\\(([\\w\\s?!]+)\\)");
+    QRegExp regex("_\\(([\\w\\s?!\\.]+)\\)");
     i = regex.indexIn(data, i);
     if(i >= 0) {
       qDebug("Found translatable string: %s", regex.cap(1).toUtf8().data());
diff --git a/src/webui/scripts/client.js b/src/webui/scripts/client.js
index 4000ee110..0910e2fa5 100644
--- a/src/webui/scripts/client.js
+++ b/src/webui/scripts/client.js
@@ -93,11 +93,12 @@ window.addEvent('domready', function(){
                 row[8] = event.upspeed;
 		row[9] = event.eta;
 		row[10] = event.ratio;
-		if(row[2] != -1)
+		if(row[2] != "*")
 			queueing_enabled = true;
                if(!torrent_hashes.contains(event.hash)) {
                   // New unfinished torrent
-                  //torrent_hashes[torrent_hashes.length] = event.hash;
+                  torrent_hashes[torrent_hashes.length] = event.hash;
+		  //alert("Inserting row");
                   myTable.insertRow(event.hash, row);
                 } else {
                   // Update torrent data
diff --git a/src/webui/scripts/dynamicTable.js b/src/webui/scripts/dynamicTable.js
index a024c66db..1003fb395 100644
--- a/src/webui/scripts/dynamicTable.js
+++ b/src/webui/scripts/dynamicTable.js
@@ -78,7 +78,7 @@ var dynamicTable = new Class	({
                  var trs = this.table.getElements('tr');
                         trs.each(function(tr,i){
                                 var tds = tr.getElements('td');
-                                tds.getLast().removeClass('invisible');
+                                tds[2].removeClass('invisible');
                         }.bind(this));
                 this.priority_hidden = false;
         },
@@ -126,8 +126,6 @@ var dynamicTable = new Class	({
 		//this.removeRow(id);
 		var tr = new Element('tr');
 		this.rows[id] = tr;
-		// Apply filter
-		this.applyFilterOnRow(tr, status);
 		for(var i=0; i<row.length; i++)
 		{
 			var td = new Element('td');
@@ -209,6 +207,8 @@ var dynamicTable = new Class	({
 
 		tr.injectInside(this.table);
 		this.altRow();
+		// Apply filter
+		//this.applyFilterOnRow(tr, status);
 	},
 	
 	selectAll: function() {
diff --git a/src/webui/scripts/mocha-init.js b/src/webui/scripts/mocha-init.js
index faccb7fd8..e3b5cb317 100644
--- a/src/webui/scripts/mocha-init.js
+++ b/src/webui/scripts/mocha-init.js
@@ -23,7 +23,7 @@ initializeWindows = function(){
 		new Event(e).stop();
 		new MochaUI.Window({
 			id: 'downloadPage',
-			title: 'Download from URLs',
+			title: "(Download from URL)",
 			loadMethod: 'iframe',
 			contentURL:'download.html',
 			scrollbars: false,
@@ -41,7 +41,7 @@ initializeWindows = function(){
 		new Event(e).stop();
 		new MochaUI.Window({
 			id: 'uploadPage',
-			title: 'Upload torrent file',
+			title: "_(Download local torrent)",
 			loadMethod: 'iframe',
 			contentURL:'upload.html',
 			scrollbars: false,
@@ -106,7 +106,7 @@ initializeWindows = function(){
 		new Event(e).stop();
 		new MochaUI.Window({
 			id: 'bugPage',
-			title: 'Report a Bug',
+			title: '_(Report a bug)',
 			loadMethod: 'iframe',
 			contentURL: 'http://bugs.qbittorrent.org/',
 			width: 650,
diff --git a/src/webui/uploadframe.html b/src/webui/uploadframe.html
index c413f9c0e..ac2cb137f 100644
--- a/src/webui/uploadframe.html
+++ b/src/webui/uploadframe.html
@@ -6,6 +6,7 @@
         <link rel="stylesheet" href="css/style.css" type="text/css" />
         <link rel="stylesheet" href="css/mocha.css" type="text/css" />
         <script type="text/javascript" src="scripts/mootools-1.2-core-yc.js" charset="utf-8"></script>
+        <script type="text/javascript" src="scripts/mocha.js"></script>
         <!-- <script type="text/javascript" src="scripts/upload.js" charset="utf-8"></script> -->
 <script type="text/javascript">
 function submitForm(form) {
@@ -15,6 +16,7 @@ function submitForm(form) {
   }
   document.uploadForm.submit();
   window.parent.showSuccess();
+  //MochaUI.closeAll();
 }
 </script>
 </head>