Changes in Force Resume icon and menu order

Conflicts:
	src/gui/transferlistwidget.cpp

src/gui/transferlistwidget.cpp

@@ -734,10 +734,10 @@ void TransferListWidget::displayListMenu(const QPoint&)
     // Create actions
     QAction actionStart(IconProvider::instance()->getIcon("media-playback-start"), tr("Resume", "Resume/start the torrent"), 0);
     connect(&actionStart, SIGNAL(triggered()), this, SLOT(startSelectedTorrents()));
-    QAction actionForceStart(tr("Force Resume", "Force Resume/start the torrent"), 0);
-    connect(&actionForceStart, SIGNAL(triggered()), this, SLOT(forceStartSelectedTorrents()));
     QAction actionPause(IconProvider::instance()->getIcon("media-playback-pause"), tr("Pause", "Pause the torrent"), 0);
     connect(&actionPause, SIGNAL(triggered()), this, SLOT(pauseSelectedTorrents()));
+    QAction actionForceStart(IconProvider::instance()->getIcon("media-seek-forward"), tr("Force Resume", "Force Resume/start the torrent"), 0);
+    connect(&actionForceStart, SIGNAL(triggered()), this, SLOT(forceStartSelectedTorrents()));
     QAction actionDelete(IconProvider::instance()->getIcon("edit-delete"), tr("Delete", "Delete the torrent"), 0);
     connect(&actionDelete, SIGNAL(triggered()), this, SLOT(deleteSelectedTorrents()));
     QAction actionPreview_file(IconProvider::instance()->getIcon("view-preview"), tr("Preview file..."), 0);
@@ -835,24 +835,18 @@ void TransferListWidget::displayListMenu(const QPoint&)
             }
         }
         else {
-
-            if (!forced) {
-                if (!has_force) {
-                    listMenu.addAction(&actionForceStart);
-                    has_force = true;
-                }
+            if (forced && !has_start) {
+                listMenu.addAction(&actionStart);
+                has_start = true;
             }
-            else {
-                if (!has_start) {
-                    listMenu.addAction(&actionStart);
-                    has_start = true;
-                }
-            }
-
             if (!has_pause) {
                 listMenu.addAction(&actionPause);
                 has_pause = true;
             }
+            if (!forced && !has_force) {
+                listMenu.addAction(&actionForceStart);
+                has_force = true;
+            }
         }
         if (h.has_metadata() && !has_preview)
             has_preview = true;

src/icons.qrc

@@ -292,6 +292,7 @@
   <file>icons/oxygen/mail-mark-read.png</file>
   <file>icons/oxygen/media-playback-pause.png</file>
   <file>icons/oxygen/media-playback-start.png</file>
+  <file>icons/oxygen/media-seek-forward.png</file>
   <file>icons/oxygen/network-server.png</file>
   <file>icons/oxygen/network-wired.png</file>
   <file>icons/oxygen/object-locked.png</file>