From 3091c30ff66e6564a2f87dea3254ce5a1b535a9b Mon Sep 17 00:00:00 2001
From: ngosang <diegodelasheras@gmail.com>
Date: Sun, 12 Jul 2015 16:40:25 +0200
Subject: [PATCH] Changes in Force Resume icon and menu order

Conflicts:
	src/gui/transferlistwidget.cpp
---
 src/gui/transferlistwidget.cpp          |  24 +++++++++---------------
 src/icons.qrc                           |   1 +
 src/icons/oxygen/media-seek-forward.png | Bin 0 -> 1220 bytes
 3 files changed, 10 insertions(+), 15 deletions(-)
 create mode 100644 src/icons/oxygen/media-seek-forward.png

diff --git a/src/gui/transferlistwidget.cpp b/src/gui/transferlistwidget.cpp
index f1aa75f6f..6d227d08a 100644
--- a/src/gui/transferlistwidget.cpp
+++ b/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;
diff --git a/src/icons.qrc b/src/icons.qrc
index 860c6653d..cb9afd6ce 100644
--- a/src/icons.qrc
+++ b/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>
diff --git a/src/icons/oxygen/media-seek-forward.png b/src/icons/oxygen/media-seek-forward.png
new file mode 100644
index 0000000000000000000000000000000000000000..51881ea8dfbabd8bc7c015a28636d3259d3e0272
GIT binary patch
literal 1220
zcmV;#1UvhQP)<h;3K|Lk000e1NJLTq001BW001Be1ONa4*>kdg00002b3#c}2nbc|
zMg#x=010qNS#tmY19kua19ky@)q>0b000?uMObuGZ)S9NVRB^vcXxL#X>MzCV_|S*
zE^l&Yo9;Xs000C-Nkl<Z7#Rh@Pl%jn9RT3x{l59Pv%58kQZl%W3PKvBmq1)Wq@|6Q
z6q7<Ft;DJ*#DfY35B_0^7#78Y=59fdHZ-YL(h5N|Y11AGG4xPsh=-_%f!Pvilg;kz
z%s1cr{(PPk008(!zdVtSI$&gkv9X)+T6N{eGXMZm007oUaoUNp9Et!Wm881wTspHh
z1^`k3;LIS_oGQcC+)N`YsMLD;x;m<fvuXYG6o3=}e!4d<#%eaTtunG=*&?>xciUL8
zXrPv^rKf(j0gwW)_DEbRD~*Y%L-zZKfvyg+Mq|gjt{WKYscxqu>+b<6z)$wZ^|CUx
zX^+S3vrAu+B!nz$ZQF3k2Ocm`-A;#oz5yxl!$Djvt5e$!I%KZ}9kp7L1d3v=F|+Ay
z*DV^TuBFF*Ii-TUR#s>3IcU{GmJIau_4M@&^bPbaShQ%jM}5{kGi5ceK?*+@#jSR@
zW!YEkGtkvht0W0;dQ=FZHP_g&>3N%$bSCN3zZzHM)9r9->aZ09JzX8OTBTBX%T={n
zt*ftZ!IGy<O|`>(n)-u&d12n)^mzyE*3;4Tu8&I+c*Eb#?Uy7;0t5U*SK9yQUsvVv
zyxizIV2@g@mb~L{0CsG<;15VDwXU9?&*^I9<??uyk7Y9t*`=?eQmZtscmpssvE_Hp
zBdK(B^bCE<OqP#T<v=#`Nnu;4B<$GoCw~D`6Wg}@)_EjJt)up^nXDY>lu_1tKv$9l
zlBsPI7bRabGqt7F_kymcCACWJV_I1nb;_v7mUL7q3B2vD@Ss<8H8$Nb_kfNIdY+V2
zDtlx_8FfMkBnb(8=s)h-XX>7RdEfhbdRhe}BuNONig8G`gg}5w$Aa3|9FtVKYDse3
zmk<bdB_YOD8HePqR#AjN-?H7l?>ThzELqg^Eyoc;QQVP)GOpq#wSSw-iY$ahyZp$v
zLC=C^OTOpp2q7!7n`*?(Dqan>TV}FW7Q(XcI0;y=XxS+zK?qqZyP+21)hb?hzqaGL
ziAJkcobXiuLrcEvBnU;T)p*N9&HZ@2dT|!#Dt(u2Xf)=sBLcwCH+=(yBAaXc&nx;W
zaqh)gMVyIAjq^55H5#p~2=Hac5sIwUXiWV^sKq4CQ1Q~(*;?O!UA1M$%*<StWyO<<
zEX(F*W_DcmPkl9KUmDW^>kike3;rrOtjMyCS}jRJ$g);r>asstP;<>XqyW$Ejq9<}
znD~U}tmx_Ks8paRT8%rNcgs*ux}6T4-+&Z=XCH}6vC^6;j{1V3TCI|VBFo<Ndr4nM
zx}A=ke-B6j;F-NH#%j@+TJ*5bc+f{BAG+g)8@3GeRMIt1UDyCf0f1))vF20^vuv(a
z1d>WeSFM&N&ZhMXQvgx`0FIC1v=gx$0)d1iN%x&gXI>ry04V?faJ(N+IGPT`$Oz*!
ij+<UfS6-e00Pug})byBbWOJ_o0000<MNUMnLSTaBc0j!V

literal 0
HcmV?d00001