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

@@ -50,8 +50,11 @@
 #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_RESUME				       ":/images/resume.png"
-#define IMAGE_OPENFOLDER			":/images/folder_green.png"
+#define IMAGE_OPENFOLDER			     ":/images/folderopen.png"
+#define IMAGE_OPENFILE			       ":/images/fileopen.png"
+#define IMAGE_STOP			           ":/images/stop.png"
+
 
 /** Constructor */
 TransfersDialog::TransfersDialog(QWidget *parent)
@@ -201,33 +204,33 @@ void TransfersDialog::downloadListCostumPopupMenu( QPoint point )
       		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() ) );
 
       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( openfolderAct);
-      contextMnu.addAction( pastelinkAct);
       contextMnu.addSeparator();
       contextMnu.addAction( clearcompletedAct);
       contextMnu.addSeparator();
-      contextMnu.addAction(pauseAct);
+      contextMnu.addAction( copylinkAct);
-      contextMnu.addAction(resumeAct);
+      contextMnu.addAction( pastelinkAct);
-      contextMnu.addAction(openfolderAct);
       contextMnu.addSeparator();
 	    contextMnu.addMenu( viewMenu);
       contextMnu.exec( mevent->globalPos() );

retroshare-gui/src/gui/images.qrc

@@ -40,6 +40,8 @@
         <file>images/FileTypeVideo.png</file>
         <file>images/fonts.png</file>
         <file>images/folder16.png</file>
+        <file>images/folderopen.png</file>
+        <file>images/fileopen.png</file>
         <file>images/add-friend24.png</file>
         <file>images/add-share24.png</file>
         <file>images/add_24x24.png</file>
@@ -263,6 +265,7 @@
         <file>images/replymailall24-hover.png</file>
         <file>images/reload24.png</file>
         <file>images/reset.png</file>
+        <file>images/resume.png</file>
         <file>images/retro4.png</file>
         <file>images/RetroShare16.png</file>
         <file>images/retrosharelogo1.png</file>