From c307a7477aaaf1ad0a79288ca8bc3d705028de7c Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Tue, 14 Dec 2010 19:40:51 +0000
Subject: [PATCH] Simplify toolbar

---
 src/mainwindow.cpp        | 2 +-
 src/mainwindow.ui         | 3 ---
 src/webui/html/index.html | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 39d858473..8df5e2155 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -111,7 +111,7 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo
   actionAbout->setIcon(misc::getIcon("help-about"));
   actionBugReport->setIcon(misc::getIcon("tools-report-bug"));
   actionDecreasePriority->setIcon(misc::getIcon("go-down"));
-  actionDelete->setIcon(misc::getIcon("edit-delete"));
+  actionDelete->setIcon(misc::getIcon("list-remove"));
   actionDocumentation->setIcon(misc::getIcon("help-contents"));
   actionDonate_money->setIcon(misc::getIcon("wallet-open"));
   actionExit->setIcon(misc::getIcon("application-exit"));
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 9b5b77ae7..7e72f8a58 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -123,7 +123,6 @@
     <bool>false</bool>
    </attribute>
    <addaction name="actionOpen"/>
-   <addaction name="separator"/>
    <addaction name="actionDelete"/>
    <addaction name="separator"/>
    <addaction name="actionStart"/>
@@ -133,8 +132,6 @@
    <addaction name="actionIncreasePriority"/>
    <addaction name="actionOptions"/>
    <addaction name="separator"/>
-   <addaction name="actionExit"/>
-   <addaction name="separator"/>
    <addaction name="actionLock_qBittorrent"/>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>
diff --git a/src/webui/html/index.html b/src/webui/html/index.html
index 7de33792d..2e8730f56 100644
--- a/src/webui/html/index.html
+++ b/src/webui/html/index.html
@@ -72,7 +72,7 @@
 			<div id="mochaToolbar">
 				<a id="uploadButton"><img class="mochaToolButton" title="_(Download local torrent)" src="theme/list-add" width="32" height="32" onload="fixPNG(this)"/></a>
 				<a id="downloadButton"><img class="mochaToolButton" title="_(Download from URL)" src="theme/insert-link" width="32" height="32" onload="fixPNG(this)"/></a>
-			  <a id="deleteButton" class="divider"><img class="mochaToolButton" title="_(Delete)" src="theme/edit-delete" width="32" height="32" onload="fixPNG(this)"/></a>
+			  <a id="deleteButton" class="divider"><img class="mochaToolButton" title="_(Delete)" src="theme/list-remove" width="32" height="32" onload="fixPNG(this)"/></a>
 			  <a id="deletePermButton"><img class="mochaToolButton" title="_(Delete from HD)" src="images/skin/delete_perm.png" width="32" height="32" onload="fixPNG(this)"/></a>
 				<a id="resumeButton" class="divider"><img class="mochaToolButton" title="_(Start)" src="theme/media-playback-start" width="32" height="32" onload="fixPNG(this)"/></a>
 				<a id="pauseButton"><img class="mochaToolButton" title="_(Pause)" src="theme/media-playback-pause" width="32" height="32" onload="fixPNG(this)"/></a>