Fixed to display the right icons for the channels context menu

Added a warn MessageBox

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7344 b45a01b8-16f6-495d-af2f-9b41ad6348cc

retroshare-gui/src/gui/Identity/IdDialog.cpp

@@ -630,13 +630,24 @@ void IdDialog::removeIdentity()
 		std::cerr << std::endl;
 		return;
 	}
+	
+		QString queryWrn;
+	  queryWrn.clear();
+	  queryWrn.append(tr("Do you really want to delete this Identity ?"));
+	
+	if ((QMessageBox::question(this, tr("Really delete? "),queryWrn,QMessageBox::Yes|QMessageBox::No, QMessageBox::Yes))== QMessageBox::Yes)
+		{
+      std::string keyId = item->text(RSID_COL_KEYID).toStdString();
+
+      uint32_t dummyToken = 0;
+      RsGxsIdGroup group;
+      group.mMeta.mGroupId=RsGxsGroupId(keyId);
+      rsIdentity->deleteIdentity(dummyToken, group);
+		}
+		else
+			return;
 
-	std::string keyId = item->text(RSID_COL_KEYID).toStdString();
 
-	uint32_t dummyToken = 0;
-	RsGxsIdGroup group;
-	group.mMeta.mGroupId=RsGxsGroupId(keyId);
-	rsIdentity->deleteIdentity(dummyToken, group);
 
 }
 

retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp

@@ -44,6 +44,7 @@
 #define IMAGE_COPYLINK       ":/images/copyrslink.png"
 #define IMAGE_EDIT           ":/images/edit_16.png"
 #define IMAGE_SHARE           ":/images/share-icon-16.png"
+#define IMAGE_TABNEW           ":/images/tab-new.png"
 
 #define TOKEN_TYPE_LISTING          1
 #define TOKEN_TYPE_SUBSCRIBE_CHANGE 2
@@ -219,7 +220,7 @@ void GxsGroupFrameDialog::groupTreeCustomPopupMenu(QPoint /*point*/)
 	}
 
 	if (mMessageWidget) {
-		action = contextMnu.addAction(QIcon(""), tr("Open in new tab"), this, SLOT(openInNewTab()));
+		action = contextMnu.addAction(QIcon(IMAGE_TABNEW), tr("Open in new tab"), this, SLOT(openInNewTab()));
 		if (mGroupId.isNull() || messageWidget(mGroupId, true)) {
 			action->setEnabled(false);
 		}

retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp

@@ -75,9 +75,9 @@ QString GxsChannelDialog::icon(IconType type)
 {
 	switch (type) {
 	case ICON_NAME:
-		return ":/images/add_channel24.png";
+		return ":/images/channels24.png";
 	case ICON_NEW:
-		return ":/images/new_forum16.png";
+		return ":/images/add_channel24.png";
 	case ICON_YOUR_GROUP:
 		return ":/images/channelsblue.png";
 	case ICON_SUBSCRIBED_GROUP:

retroshare-gui/src/gui/images.qrc

@@ -436,6 +436,7 @@
         <file>images/sound.png</file>
         <file>images/tab-dock.png</file>
         <file>images/tab-undock.png</file>
+        <file>images/tab-new.png</file>
         <file>images/tag24.png</file>
         <file>images/transferupdown.png</file>
         <file>images/tools_wizard.png</file>