diff --git a/src/Icons/skin/delete22.png b/src/Icons/skin/delete22.png
new file mode 100644
index 000000000..bb8442533
Binary files /dev/null and b/src/Icons/skin/delete22.png differ
diff --git a/src/Icons/skin/delete_perm22.png b/src/Icons/skin/delete_perm22.png
new file mode 100644
index 000000000..336be3803
Binary files /dev/null and b/src/Icons/skin/delete_perm22.png differ
diff --git a/src/Icons/skin/pause22.png b/src/Icons/skin/pause22.png
new file mode 100644
index 000000000..642d1dcba
Binary files /dev/null and b/src/Icons/skin/pause22.png differ
diff --git a/src/Icons/skin/play22.png b/src/Icons/skin/play22.png
new file mode 100644
index 000000000..5516f87a2
Binary files /dev/null and b/src/Icons/skin/play22.png differ
diff --git a/src/icons.qrc b/src/icons.qrc
index 6cb0c83fa..1cee22384 100644
--- a/src/icons.qrc
+++ b/src/icons.qrc
@@ -24,6 +24,7 @@
Icons/skin/handle-icon.gif
Icons/skin/url.png
Icons/skin/stalledUP.png
+ Icons/skin/delete_perm22.png
Icons/skin/filteractive.png
Icons/skin/connected.png
Icons/skin/pausedDL.png
@@ -37,10 +38,13 @@
Icons/skin/qb_question.png
Icons/skin/download.png
Icons/skin/open.png
+ Icons/skin/play22.png
Icons/skin/qbittorrent16.png
Icons/skin/downloading.png
Icons/skin/filterinactive.png
+ Icons/skin/pause22.png
Icons/skin/pause_all.png
+ Icons/skin/delete22.png
Icons/skin/play_all.png
Icons/skin/pause.png
Icons/skin/firewalled.png
diff --git a/src/torrentpersistentdata.h b/src/torrentpersistentdata.h
index a9a88cdd3..bdb1ae352 100644
--- a/src/torrentpersistentdata.h
+++ b/src/torrentpersistentdata.h
@@ -222,7 +222,7 @@ public:
QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent-resume"));
QHash all_data = settings.value("torrents", QHash()).toHash();
QHash data = all_data[hash].toHash();
- qDebug("TorrentPersistentData: getSavePath %s", data["save_path"].toString().toLocal8Bit().data());
+ //qDebug("TorrentPersistentData: getSavePath %s", data["save_path"].toString().toLocal8Bit().data());
return data["save_path"].toString();
}
diff --git a/src/webui.qrc b/src/webui.qrc
index fb1c22824..6af00ad25 100644
--- a/src/webui.qrc
+++ b/src/webui.qrc
@@ -14,7 +14,6 @@
webui/css/mocha.css
webui/css/dynamicTable.css
webui/css/style.css
- webui/css/mootabs1.2.css
webui/scripts/excanvas-compressed.js
webui/scripts/mocha.js
webui/scripts/mocha-init.js
@@ -23,7 +22,7 @@
webui/scripts/dynamicTable.js
webui/scripts/client.js
webui/scripts/download.js
- webui/scripts/mootabs1.2.js
webui/scripts/progressbar.js
+ webui/scripts/contextmenu.js
diff --git a/src/webui/css/mootabs1.2.css b/src/webui/css/mootabs1.2.css
deleted file mode 100644
index 029e1cff9..000000000
--- a/src/webui/css/mootabs1.2.css
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * MIT License
- * Copyright (c) 2008 Christophe Dumez
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/*
- * Original code from http://www.silverscripting.com/mootabs/
- * Edited by Christophe Dumez
- */
-
-.toolbarTabs {
- padding: 0 5px 2px 2px;
- background: url(../images/skin/tabs.gif) repeat-x;
- background-position: left -70px;
- overflow: visible;
-}
-
-.mootabs_title {
- padding-top: 1px;
- list-style: none;
- margin: 0;
- padding: 0;
- line-height: 16px;
- font-size: 11px;
-}
-
-.mootabs_title li {
- display: block;
- float: left;
- margin: 0 0 5px 0;
- cursor: pointer;
- background: url(../images/skin/tabs.gif) repeat-x;
- background-position: left -35px;
-
-}
-
-.mootabs_title li.active {
- background: url(../images/skin/tabs.gif) repeat-x;
- background-position: left 0;
-}
-
-.mootabs_title li a {
- display: block;
- margin-left: 8px;
- padding: 6px 16px 5px 10px;
- text-align: center;
- font-weight: normal;
- color: #141414;
- background: url(../images/skin/tabs.gif) repeat-x;
- background-position: right -35px;
-}
-
-.mootabs_title li.active a {
- color: #141414;
- font-weight: bold;
- background: url(../images/skin/tabs.gif) repeat-x;
- background-position: right 0;
-}
-
-.mootabs_panel {
- display: none;
- background-color: #ddd;
- position: relative;
- width: 100%;
- top: -1px;
- clear: both;
- overflow: auto;
-
-}
-
-.mootabs_panel.active {
- background-color: #e6e6e6;
- display: block;
-}
\ No newline at end of file
diff --git a/src/webui/css/style.css b/src/webui/css/style.css
index 8b3d9f82a..ae798abb3 100644
--- a/src/webui/css/style.css
+++ b/src/webui/css/style.css
@@ -154,3 +154,19 @@ a.propButton {
a.propButton img {
margin-bottom: -4px;
}
+
+/* context menu specific */
+#contextmenu { border:1px solid #999; padding:0; background:#eee; width:200px; list-style-type:none; display:none; }
+#contextmenu .separator { border-top:1px solid #999; }
+#contextmenu li { margin:0; padding:0; }
+#contextmenu li a { display:block; padding:5px 10px 5px 35px; width:155px; font-size:12px; text-decoration:none; font-family:tahoma,arial,sans-serif; color:#000; background-position:8px 2px; background-repeat:no-repeat; }
+#contextmenu li a:hover { background-color:#ddd; }
+#contextmenu li a.disabled { color:#ccc; font-style:italic; }
+#contextmenu li a.disabled:hover { background-color:#eee; }
+
+/* context menu items */
+#contextmenu li a.pause { background-image:url(../images/skin/pause22.png); }
+#contextmenu li a.start { background-image:url(../images/skin/play22.png); }
+#contextmenu li a.recheck { background-image:url(../images/oxygen/gear.png); }
+#contextmenu li a.delete { background-image:url(../images/skin/delete22.png); }
+#contextmenu li a.deleteHD { background-image:url(../images/skin/delete_perm22.png); }
diff --git a/src/webui/index.html b/src/webui/index.html
index 2b9935dec..bd9e3e07a 100644
--- a/src/webui/index.html
+++ b/src/webui/index.html
@@ -16,6 +16,7 @@
+
@@ -75,5 +76,12 @@
+