From a83744289fcf3cbae74ce95c6c963861c76fe986 Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Mon, 23 Nov 2009 13:56:10 +0000
Subject: [PATCH] - Web UI: Display selected filter as selected

---
 src/httpconnection.cpp      |  4 ++--
 src/webui/css/style.css     |  9 +++++++++
 src/webui/index.html        | 10 +++++-----
 src/webui/scripts/client.js |  7 +++++++
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/httpconnection.cpp b/src/httpconnection.cpp
index d3a9ed439..8365296c7 100644
--- a/src/httpconnection.cpp
+++ b/src/httpconnection.cpp
@@ -110,7 +110,7 @@ QString HttpConnection::translateDocument(QString data) {
     QRegExp regex("_\\(([\\w\\s?!\\.]+)\\)");
     i = regex.indexIn(data, i);
     if(i >= 0) {
-      qDebug("Found translatable string: %s", regex.cap(1).toUtf8().data());
+      //qDebug("Found translatable string: %s", regex.cap(1).toUtf8().data());
       QString word = regex.cap(1);
       QString translation = word;
       int context_index= 0;
@@ -118,7 +118,7 @@ QString HttpConnection::translateDocument(QString data) {
         translation = qApp->translate(contexts[context_index].c_str(), word.toLocal8Bit().data(), 0, QCoreApplication::UnicodeUTF8, 1);
         ++context_index;
       }while(translation == word && context_index < 7);
-      qDebug("Translation is %s", translation.toUtf8().data());
+      //qDebug("Translation is %s", translation.toUtf8().data());
       data = data.replace(i, regex.matchedLength(), translation);
       i += translation.length();
       found = true;
diff --git a/src/webui/css/style.css b/src/webui/css/style.css
index ac6f3fa41..1ee31c133 100644
--- a/src/webui/css/style.css
+++ b/src/webui/css/style.css
@@ -130,7 +130,12 @@ hr {
 	list-style-type: none;
 }
 
+#Filters ul li {
+	margin-left: -16px;
+}
+
 #Filters ul img {
+	padding-left: 4px;
 	padding-right: 2px;
 	margin-top: 2px;
 }
@@ -139,3 +144,7 @@ hr {
 	vertical-align: top;
 }
 
+.selectedFilter {
+	background-color: #354158;
+	color: #000;
+}
diff --git a/src/webui/index.html b/src/webui/index.html
index 33dad6e87..560e6b212 100644
--- a/src/webui/index.html
+++ b/src/webui/index.html
@@ -75,11 +75,11 @@
 			<table>
 				<tr><td id="Filters">
 				<ul>
-					<li><a href="#" onclick="setFilter('all');"><img src="images/oxygen/folder.png"/>_(All)</li>
-					<li><a href="#" onclick="setFilter('downloading');"><img src="images/skin/downloading.png"/>_(Downloading)</li>
-					<li><a href="#" onclick="setFilter('completed');"><img src="images/skin/seeding.png"/>_(Completed)</li>
-					<li><a href="#" onclick="setFilter('active');"><img src="images/oxygen/draw-triangle2.png"/>_(Active)</li>
-					<li><a href="#" onclick="setFilter('inactive');"><img src="images/oxygen/draw-rectangle.png"/>_(Inactive)</li>
+					<li class="selectedFilter" id="all_filter"><a href="#" onclick="setFilter('all');"><img src="images/oxygen/folder.png"/>_(All)</li>
+					<li id="downloading_filter"><a href="#" onclick="setFilter('downloading');"><img src="images/skin/downloading.png"/>_(Downloading)</li>
+					<li id="completed_filter"><a href="#" onclick="setFilter('completed');"><img src="images/skin/seeding.png"/>_(Completed)</li>
+					<li id="active_filter"><a href="#" onclick="setFilter('active');"><img src="images/oxygen/draw-triangle2.png"/>_(Active)</li>
+					<li id="inactive_filter"><a href="#" onclick="setFilter('inactive');"><img src="images/oxygen/draw-rectangle.png"/>_(Inactive)</li>
 				</ul>
 				</td>
 			<td id="Transfers">
diff --git a/src/webui/scripts/client.js b/src/webui/scripts/client.js
index 0910e2fa5..abdec30c0 100644
--- a/src/webui/scripts/client.js
+++ b/src/webui/scripts/client.js
@@ -129,6 +129,13 @@ window.addEvent('domready', function(){
 // 	ajaxfn.periodical(5000);
 
 	setFilter = function(f) {
+	  // Visually Select the right filter
+	  $("all_filter").removeClass("selectedFilter");
+	  $("downloading_filter").removeClass("selectedFilter");
+	  $("completed_filter").removeClass("selectedFilter");
+	  $("active_filter").removeClass("selectedFilter");
+	  $("inactive_filter").removeClass("selectedFilter");
+	  $(f+"_filter").addClass("selectedFilter");
 	  myTable.setFilter(f);
 	  ajaxfn();
 	}