From 663659577cbb2d160422af56e7262061a234a964 Mon Sep 17 00:00:00 2001 From: defnax Date: Thu, 2 Jul 2009 23:47:38 +0000 Subject: [PATCH] reorder transfer context menu git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1314 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/TransfersDialog.cpp | 44 ++++++++++--------- retroshare-gui/src/gui/images.qrc | 3 ++ retroshare-gui/src/gui/images/fileopen.png | Bin 0 -> 465 bytes retroshare-gui/src/gui/images/folderopen.png | Bin 0 -> 779 bytes retroshare-gui/src/gui/images/resume.png | Bin 0 -> 478 bytes 5 files changed, 26 insertions(+), 21 deletions(-) create mode 100644 retroshare-gui/src/gui/images/fileopen.png create mode 100644 retroshare-gui/src/gui/images/folderopen.png create mode 100644 retroshare-gui/src/gui/images/resume.png diff --git a/retroshare-gui/src/gui/TransfersDialog.cpp b/retroshare-gui/src/gui/TransfersDialog.cpp index 3e9ccfb7d..15c1c0413 100644 --- a/retroshare-gui/src/gui/TransfersDialog.cpp +++ b/retroshare-gui/src/gui/TransfersDialog.cpp @@ -49,9 +49,12 @@ #define IMAGE_PLAY ":/images/player_play.png" #define IMAGE_COPYLINK ":/images/copyrslink.png" #define IMAGE_PASTELINK ":/images/pasterslink.png" -#define IMAGE_PAUSE ":/images/pause.png" -#define IMAGE_RESUME ":/images/start.png" -#define IMAGE_OPENFOLDER ":/images/folder_green.png" +#define IMAGE_PAUSE ":/images/pause.png" +#define IMAGE_RESUME ":/images/resume.png" +#define IMAGE_OPENFOLDER ":/images/folderopen.png" +#define IMAGE_OPENFILE ":/images/fileopen.png" +#define IMAGE_STOP ":/images/stop.png" + /** Constructor */ TransfersDialog::TransfersDialog(QWidget *parent) @@ -200,9 +203,21 @@ void TransfersDialog::downloadListCostumPopupMenu( QPoint point ) playAct = new QAction(QIcon(IMAGE_PLAY), tr( "Play" ), this ); connect( playAct , SIGNAL( triggered() ), this, SLOT( playSelectedTransfer() ) ); } + + pauseAct = new QAction(QIcon(IMAGE_PAUSE), tr("Pause"), this); + connect(pauseAct, SIGNAL(triggered()), this, SLOT(pauseFileTransfer())); + + resumeAct = new QAction(QIcon(IMAGE_RESUME), tr("Resume"), this); + connect(resumeAct, SIGNAL(triggered()), this, SLOT(resumeFileTransfer())); cancelAct = new QAction(QIcon(IMAGE_CANCEL), tr( "Cancel" ), this ); connect( cancelAct , SIGNAL( triggered() ), this, SLOT( cancel() ) ); + + openfolderAct = new QAction(QIcon(IMAGE_OPENFOLDER), tr("Open Folder"), this); + connect(openfolderAct, SIGNAL(triggered()), this, SLOT(openFolderTransfer())); + + clearcompletedAct = new QAction(QIcon(IMAGE_CLEARCOMPLETED), tr( "Clear Completed" ), this ); + connect( clearcompletedAct , SIGNAL( triggered() ), this, SLOT( clearcompleted() ) ); copylinkAct = new QAction(QIcon(IMAGE_COPYLINK), tr( "Copy retroshare Link" ), this ); connect( copylinkAct , SIGNAL( triggered() ), this, SLOT( copyLink() ) ); @@ -210,24 +225,12 @@ void TransfersDialog::downloadListCostumPopupMenu( QPoint point ) pastelinkAct = new QAction(QIcon(IMAGE_PASTELINK), tr( "Paste retroshare Link" ), this ); connect( pastelinkAct , SIGNAL( triggered() ), this, SLOT( pasteLink() ) ); - clearcompletedAct = new QAction(QIcon(IMAGE_CLEARCOMPLETED), tr( "Clear Completed" ), this ); - connect( clearcompletedAct , SIGNAL( triggered() ), this, SLOT( clearcompleted() ) ); - rootisnotdecoratedAct = new QAction(QIcon(), tr( "Set Root is not Decorated" ), this ); connect( rootisnotdecoratedAct , SIGNAL( triggered() ), this, SLOT( rootisnotdecorated() ) ); rootisdecoratedAct = new QAction(QIcon(), tr( "Set Root is Decorated" ), this ); connect( rootisdecoratedAct , SIGNAL( triggered() ), this, SLOT( rootdecorated() ) ); - pauseAct = new QAction(QIcon(IMAGE_PAUSE), tr("Pause file transfer"), this); - connect(pauseAct, SIGNAL(triggered()), this, SLOT(pauseFileTransfer())); - - resumeAct = new QAction(QIcon(IMAGE_RESUME), tr("Resume file transfer"), this); - connect(resumeAct, SIGNAL(triggered()), this, SLOT(resumeFileTransfer())); - - openfolderAct = new QAction(QIcon(IMAGE_OPENFOLDER), tr("Open transfer folder"), this); - connect(openfolderAct, SIGNAL(triggered()), this, SLOT(openFolderTransfer())); - QMenu *viewMenu = new QMenu( tr("View"), this ); viewMenu->addAction(rootisnotdecoratedAct); viewMenu->addAction(rootisdecoratedAct); @@ -238,17 +241,16 @@ void TransfersDialog::downloadListCostumPopupMenu( QPoint point ) contextMnu.addAction(playAct); } contextMnu.addSeparator(); - + contextMnu.addAction( pauseAct); + contextMnu.addAction( resumeAct); contextMnu.addAction( cancelAct); contextMnu.addSeparator(); - contextMnu.addAction( copylinkAct); - contextMnu.addAction( pastelinkAct); + contextMnu.addAction( openfolderAct); contextMnu.addSeparator(); contextMnu.addAction( clearcompletedAct); contextMnu.addSeparator(); - contextMnu.addAction(pauseAct); - contextMnu.addAction(resumeAct); - contextMnu.addAction(openfolderAct); + contextMnu.addAction( copylinkAct); + contextMnu.addAction( pastelinkAct); contextMnu.addSeparator(); contextMnu.addMenu( viewMenu); contextMnu.exec( mevent->globalPos() ); diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index ed6072e6b..2ac8bc114 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -40,6 +40,8 @@ images/FileTypeVideo.png images/fonts.png images/folder16.png + images/folderopen.png + images/fileopen.png images/add-friend24.png images/add-share24.png images/add_24x24.png @@ -263,6 +265,7 @@ images/replymailall24-hover.png images/reload24.png images/reset.png + images/resume.png images/retro4.png images/RetroShare16.png images/retrosharelogo1.png diff --git a/retroshare-gui/src/gui/images/fileopen.png b/retroshare-gui/src/gui/images/fileopen.png new file mode 100644 index 0000000000000000000000000000000000000000..965bf4e81f7d4deba37c4791c2ff1706610ecb2e GIT binary patch literal 465 zcmV;?0WSWDP)WdKcYATc!{L3L*!GB7YTATcpIGch_bG$1Q5F)%RM{uz1z000McNliru z(*^_#5gz!ELBRk3010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00AjU zL_t(|+NF`dPQx$|#?MWZe+`8v0W|RM@bC$?JPGnt)4$P-==kw zOVUgYpovx!NQL(8?s^W@?5a*7leC~Wn-F$BA>!N1+b0~pk9@8DTj?)NBQF}o=*Nc} zR07MK50Q!%2(0M2d;I#XbZ94z%@#Dnftg=J75;)<2a z8Q^qo93ZZ92vFuDk;b<$odVpiUwZ~YVx;$lyO%|_{lA|dwTcDRsUrSS00000NkvXX Hu0mjfUkbQL literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/images/folderopen.png b/retroshare-gui/src/gui/images/folderopen.png new file mode 100644 index 0000000000000000000000000000000000000000..bbe4fc78f8947e6f170df37703e31720793efecb GIT binary patch literal 779 zcmV+m1N8ifP)ApsaF+N>mg zi=`7*B}s!s!E$=p?zTX=^)H;IpfrPyvNz_xSM4Cf07RZ}2=}Hf5Vbrro~%0qLsw9C zpaW+0>l>iz<{v<69#BUBJ<4Jgi;_FbbF6O<#b;{i#Z@~!ZbW8m+j<`1Yldz0g2Z%C zf8rqS54|&EUoU7u29_7u($d{dmn*XfWu*W$mkCZbg2*8sM!giK?>Kq73JuXpXmW^^ zPD0oJUU5t~f`Pb-rqWs<$r*?U`fi#90xy^ty@>7oU5w&15M!=FFiV&fRXzepOK50S>iTXKOff2Hx}a2+08mtoz>J`we?pZ^HT? zPWxuq?GEO-8;Zv|LCIKz(l*)x>ostJ?_O_4p6J3){R{M@fs~O#OpBY1y)B}|4LskZEhHk(= zT!*Tr=XjLQP7(n&?KlHSvYVNwH0!$ploZ<_jrW-VYc~9>736RgArTGZXk!l`4VjuQ z{Z0Tfof# zgQy$9|1q>hE)PXj1qDnn#=YP77;eA1#jxPREEI)s1?*g`3^GzO3`gD`K{0^^#*qFk z%fR`Ei(!`X0!9Y1fah|T|JcOgZcx=xVTf25`X8qWTCdQ|e;AfWu7-=l-N44jiXn*+)a3b}0Kl-$bA!u&DP;+U zZ&!XY@M>~1%rd|q@+{~A??1d}c)tHRLv>sY!!OpK3``4H|Nk@ijng0u1O5Ypwj!6!Z3h|8R##dDPnwL3<7L|4Bgi{82Gsbi1&h^ zm>|O+re6#~Y{Cp|9Bd3%2gYg@~ugiZK*fp7O$1Ak}0DzE& UjPjQ#uK)l507*qoM6N<$g1aZqH2?qr literal 0 HcmV?d00001