- Removed all usages of the old windows icon (rstray3.png) and used the standard icon of the application

- Added possibility to change the icon of the GxsGroupDialog

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

retroshare-gui/src/gui/FileTransfer/DetailsDialog.ui

@@ -13,19 +13,15 @@
   <property name="windowTitle">
    <string>Details</string>
   </property>
-  <property name="windowIcon">
-   <iconset resource="images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
-  </property>
   <layout class="QGridLayout">
    <item row="0" column="0" colspan="3">
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tabGeneral">
       <attribute name="icon">
-       <iconset resource="images.qrc">
+       <iconset resource="../images.qrc">
         <normaloff>:/images/blockdevice.png</normaloff>:/images/blockdevice.png</iconset>
       </attribute>
       <attribute name="title">
@@ -45,7 +41,7 @@
               <string/>
              </property>
              <property name="pixmap">
-              <pixmap resource="images.qrc">:/images/graph-downloaded.png</pixmap>
+              <pixmap resource="../images.qrc">:/images/graph-downloaded.png</pixmap>
              </property>
             </widget>
            </item>
@@ -66,7 +62,7 @@
               <string/>
              </property>
              <property name="pixmap">
-              <pixmap resource="images.qrc">:/images/graph-downloading.png</pixmap>
+              <pixmap resource="../images.qrc">:/images/graph-downloading.png</pixmap>
              </property>
             </widget>
            </item>
@@ -87,7 +83,7 @@
               <string/>
              </property>
              <property name="pixmap">
-              <pixmap resource="images.qrc">:/images/graph-notdownload.png</pixmap>
+              <pixmap resource="../images.qrc">:/images/graph-notdownload.png</pixmap>
              </property>
             </widget>
            </item>
@@ -121,7 +117,7 @@
               <string/>
              </property>
              <property name="pixmap">
-              <pixmap resource="images.qrc">:/images/graph-checking.png</pixmap>
+              <pixmap resource="../images.qrc">:/images/graph-checking.png</pixmap>
              </property>
             </widget>
            </item>
@@ -199,7 +195,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="images.qrc"/>
+  <include location="../images.qrc"/>
  </resources>
  <connections>
   <connection>

retroshare-gui/src/gui/FileTransfer/TurtleRouterDialog.ui

@@ -13,10 +13,6 @@
   <property name="windowTitle">
    <string>Router Statistics</string>
   </property>
-  <property name="windowIcon">
-   <iconset resource="images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
-  </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <widget class="QTreeWidget" name="_f2f_TW">
@@ -32,8 +28,6 @@
    </item>
   </layout>
  </widget>
- <resources>
+ <resources/>
-  <include location="images.qrc"/>
- </resources>
  <connections/>
 </ui>

retroshare-gui/src/gui/FileTransfer/TurtleRouterStatistics.ui

@@ -13,10 +13,6 @@
   <property name="windowTitle">
    <string>Router Statistics</string>
   </property>
-  <property name="windowIcon">
-   <iconset resource="images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
-  </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <widget class="QSplitter" name="splitter">
@@ -48,8 +44,6 @@
    </item>
   </layout>
  </widget>
- <resources>
+ <resources/>
-  <include location="images.qrc"/>
- </resources>
  <connections/>
 </ui>

retroshare-gui/src/gui/MainWindow.cpp

@@ -1048,6 +1048,8 @@ void SetForegroundWindowInternal(HWND hWnd)
 			return _instance->gxschannelDialog;
 		case Forums:
 			return _instance->gxsforumDialog;
+		case Posted:
+			return _instance->postedDialog;
 #ifdef BLOGS
 		case Blogs:
 			return _instance->blogsFeed;
@@ -1452,7 +1454,6 @@ void MainWindow::externalLinkActivated(const QUrl &url)
 	if(!already_warned)
 	{
 		QMessageBox mb(QObject::tr("Confirmation"), QObject::tr("Do you want this link to be handled by your system?")+"<br/><br/>"+ url.toString()+"<br/><br/>"+tr("Make sure this link has not been forged to drag you to a malicious website."), QMessageBox::Question, QMessageBox::Yes,QMessageBox::No, 0);
-		mb.setWindowIcon(QIcon(QString::fromUtf8(":/images/rstray3.png")));
 
 		QCheckBox *checkbox = new QCheckBox(tr("Don't ask me again")) ;
 		mb.layout()->addWidget(checkbox) ;
@@ -1475,13 +1476,11 @@ void MainWindow::retroshareLinkActivated(const QUrl &url)
         // QUrl can't handle the old RetroShare link format properly
         if (url.host().isEmpty()) {
             QMessageBox mb("RetroShare", tr("It seems to be an old RetroShare link. Please use copy instead."), QMessageBox::Critical, QMessageBox::Ok, 0, 0);
-            mb.setWindowIcon(QIcon(":/images/rstray3.png"));
             mb.exec();
             return;
         }
 
         QMessageBox mb("RetroShare", tr("The file link is malformed."), QMessageBox::Critical, QMessageBox::Ok, 0, 0);
-        mb.setWindowIcon(QIcon(":/images/rstray3.png"));
         mb.exec();
         return;
     }

retroshare-gui/src/gui/PhotoShare/AlbumDialog.ui

@@ -13,10 +13,6 @@
   <property name="windowTitle">
    <string>Album</string>
   </property>
-  <property name="windowIcon">
-   <iconset resource="../images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
-  </property>
   <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>

retroshare-gui/src/gui/PhotoShare/PhotoDialog.ui

@@ -13,10 +13,6 @@
   <property name="windowTitle">
    <string>PhotoShare</string>
   </property>
-  <property name="windowIcon">
-   <iconset resource="../images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
-  </property>
   <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>

retroshare-gui/src/gui/Posted/PostedGroupDialog.h

@@ -41,9 +41,6 @@ protected:
 	virtual bool service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta);
 	virtual bool service_loadGroup(uint32_t token, Mode mode, RsGroupMetaData& groupMetaData, QString &description);
 	virtual bool service_EditGroup(uint32_t &token, RsGroupMetaData &editedMeta);
-
-private:
-	RsPostedGroup mTopic;
 };
 
 #endif

retroshare-gui/src/gui/QuickStartWizard2.ui

@@ -28,10 +28,6 @@
   <property name="windowTitle">
    <string>Quick Start Wizard</string>
   </property>
-  <property name="windowIcon">
-   <iconset resource="images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
-  </property>
   <property name="modal">
    <bool>true</bool>
   </property>

retroshare-gui/src/gui/RetroShareLink.cpp

@@ -1056,7 +1056,6 @@ static void processList(const QStringList &list, const QString &textSingular, co
 			question += "<br><br>" + content + "</body></html>";
 
 			QMessageBox mb(QObject::tr("Confirmation"), question, QMessageBox::Question, QMessageBox::Yes,QMessageBox::No, 0);
-			mb.setWindowIcon(QIcon(QString::fromUtf8(":/images/rstray3.png")));
 			if (mb.exec() == QMessageBox::No) {
 				return 0;
 			}
@@ -1497,7 +1496,6 @@ static void processList(const QStringList &list, const QString &textSingular, co
 
 	if (result.isEmpty() == false) {
 		QMessageBox mb(QObject::tr("Result"), "<html><body>" + result + "</body></html>", QMessageBox::Information, QMessageBox::Ok, 0, 0);
-		mb.setWindowIcon(QIcon(QString::fromUtf8(":/images/rstray3.png")));
 		mb.exec();
 	}
 

retroshare-gui/src/gui/ServicePermissionDialog.ui

@@ -13,10 +13,6 @@
   <property name="windowTitle">
    <string>Service permissions</string>
   </property>
-  <property name="windowIcon">
-   <iconset resource="images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
-  </property>
   <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>

retroshare-gui/src/gui/chat/ChatDialog.cpp

@@ -256,7 +256,6 @@ void ChatDialog::init(const RsPeerId &peerId, const QString &title)
 
 		// more than one ssl ids online or all offline
 		QMessageBox mb(QMessageBox::Warning, "RetroShare", tr("Your friend has more than one locations.\nPlease choose one of it to chat with."), QMessageBox::Ok);
-		mb.setWindowIcon(QIcon(":/images/rstray3.png"));
 		mb.exec();
 	} else {
         getChat(peerId, forceFocus ? RS_CHAT_OPEN | RS_CHAT_FOCUS : RS_CHAT_OPEN);

retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp

@@ -266,7 +266,6 @@ void ChatLobbyDialog::changeNickname()
 	QInputDialog dialog;
 	dialog.setWindowTitle(tr("Change nick name"));
 	dialog.setLabelText(tr("Please enter your new nick name"));
-	dialog.setWindowIcon(QIcon(":/images/rstray3.png"));
 
 	std::string nickName;
 	rsMsgs->getNickNameForChatLobby(lobbyId, nickName);

retroshare-gui/src/gui/chat/ChatTabWidget.cpp

@@ -26,7 +26,6 @@
 #include "gui/common/StatusDefs.h"
 #include "rshare.h"
 
-#define IMAGE_WINDOW         ":/images/rstray3.png"
 #define IMAGE_TYPING         ":/images/typing.png"
 #define IMAGE_CHAT           ":/images/chat.png"
 

retroshare-gui/src/gui/chat/PopupChatWindow.cpp

@@ -35,7 +35,7 @@
 #include <retroshare/rsmsgs.h>
 #include <retroshare/rsnotify.h>
 
-#define IMAGE_WINDOW         ":/images/rstray3.png"
+
 #define IMAGE_TYPING         ":/images/typing.png"
 #define IMAGE_CHAT           ":/images/chat.png"
 
@@ -100,8 +100,6 @@ PopupChatWindow::PopupChatWindow(bool tabbed, QWidget *parent, Qt::WindowFlags f
 		/* signal toggled is called */
 		ui.actionSetOnTop->setChecked(Settings->valueFromGroup("ChatWindow", "OnTop", false).toBool());
 	}
-
-	setWindowIcon(QIcon(IMAGE_WINDOW));
 }
 
 /** Destructor. */
@@ -285,7 +283,7 @@ void PopupChatWindow::calculateTitle(ChatDialog *dialog)
 		if (cd && cd->hasPeerStatus()) {
 			icon = QIcon(StatusDefs::imageIM(cd->getPeerStatus()));
 		} else {
-			icon = QIcon(IMAGE_WINDOW);
+			icon = qApp->windowIcon();
 		}
 	}
 

retroshare-gui/src/gui/common/Emoticons.cpp

@@ -134,7 +134,6 @@ void Emoticons::showSmileyWidget(QWidget *parent, QWidget *button, const char *s
 
     smWidget->setAttribute( Qt::WA_DeleteOnClose);
     smWidget->setWindowTitle("Emoticons");
-    smWidget->setWindowIcon(QIcon(QString(":/images/rstray3.png")));
     smWidget->setBaseSize(countPerLine*buttonWidth, rowCount*buttonHeight);
 
     //Warning: this part of code was taken from kadu instant messenger;

retroshare-gui/src/gui/common/RsCollectionFile.cpp

@@ -205,7 +205,6 @@ void RsCollectionFile::recursAddElements(QDomDocument& doc,const ColFileInfo& co
 static void showErrorBox(const QString& fileName, const QString& error)
 {
 	QMessageBox mb(QMessageBox::Warning, QObject::tr("Failed to process collection file"), QObject::tr("The collection file %1 could not be opened.\nReported error is: \n\n%2").arg(fileName).arg(error), QMessageBox::Ok);
-	mb.setWindowIcon(QIcon(":/images/rstray3.png"));
 	mb.exec();
 }
 

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

@@ -118,9 +118,15 @@ void GxsGroupDialog::init()
 	initMode();
 }
 
+QIcon GxsGroupDialog::serviceWindowIcon()
+{
+	return qApp->windowIcon();
+}
+
 void GxsGroupDialog::showEvent(QShowEvent*)
 {
 	ui.headerFrame->setHeaderImage(serviceImage());
+	setWindowIcon(serviceWindowIcon());
 
 	initUi();
 }
@@ -374,7 +380,6 @@ void GxsGroupDialog::updateFromExistingMeta(const QString &description)
 		case GXS_CIRCLE_TYPE_EXTERNAL:
 			ui.typeGroup->setChecked(true);
 			ui.circleComboBox->loadCircles(GXS_CIRCLE_CHOOSER_EXTERNAL, mGrpMeta.mCircleId);
-
 			break;
 		default:
 			std::cerr << "CreateCircleDialog::updateCircleGUI() INVALID mCircleType";
@@ -411,7 +416,6 @@ void GxsGroupDialog::submitGroup()
 
 		case MODE_EDIT:
 		{
-
 			editGroup();
 		}
 		break;
@@ -494,7 +498,6 @@ bool GxsGroupDialog::prepareGroupMetaData(RsGroupMetaData &meta)
 	std::cerr << " External: " << meta.mCircleId;
 	std::cerr << std::endl;
 
-
 	return true;
 }
 
@@ -582,8 +585,8 @@ void GxsGroupDialog::setGroupSignFlags(uint32_t signFlags)
 	}
 
 	/* guess at comments */
-	if ((signFlags & RSGXS_GROUP_SIGN_PUBLISH_THREADHEAD)
+	if ((signFlags & RSGXS_GROUP_SIGN_PUBLISH_THREADHEAD) &&
-			&& (signFlags & RSGXS_GROUP_SIGN_AUTHOR_IFNOPUBSIGN))
+	    (signFlags & RSGXS_GROUP_SIGN_AUTHOR_IFNOPUBSIGN))
 	{
 		ui.comments_allowed->setChecked(true);
 	}

retroshare-gui/src/gui/gxs/GxsGroupDialog.h

@@ -165,6 +165,7 @@ protected:
 
 	virtual void initUi() = 0;
 	virtual QPixmap serviceImage() = 0;
+	virtual QIcon serviceWindowIcon();
 
 	void setUiText(UiType uiType, const QString &text);
 
@@ -201,7 +202,6 @@ protected:
 	QString getDescription();
 
 private slots:
-
 	/* actions to take.... */
 	void cancelDialog();
 
@@ -246,7 +246,6 @@ private:
 	uint32_t mDefaultsFlags;
 
 protected:
-
 	/** Qt Designer generated object */
 	Ui::GxsGroupDialog ui;
 };

retroshare-gui/src/gui/gxs/GxsGroupDialog.ui

@@ -11,11 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Create New</string>
+   <string notr="true">Create New</string>
-  </property>
-  <property name="windowIcon">
-   <iconset>
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
    <property name="margin">

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

@@ -97,11 +97,11 @@ QPixmap GxsChannelGroupDialog::serviceImage()
 	break;
 		case MODE_SHOW:
 		return QPixmap(":/images/channels.png");
-		break;
 	case MODE_EDIT:
 		return QPixmap(":/images/channels.png");
-		break;
 	}
+
+	return QPixmap();
 }
 
 bool GxsChannelGroupDialog::service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta)

retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.h

@@ -39,7 +39,6 @@ protected:
 	virtual bool service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta);
 	virtual bool service_loadGroup(uint32_t token, Mode mode, RsGroupMetaData& groupMetaData, QString &description);
 	virtual bool service_EditGroup(uint32_t &token, RsGroupMetaData &editedMeta);
-
 };
 
 #endif

retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp

@@ -77,7 +77,6 @@ void GxsForumGroupDialog::initUi()
 		break;
 	case MODE_SHOW:
 		setUiText(UITYPE_SERVICE_HEADER, tr("Forum"));
-
 		break;
 	case MODE_EDIT:
 		setUiText(UITYPE_SERVICE_HEADER, tr("Edit Forum"));

retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.h

@@ -39,8 +39,6 @@ protected:
 	virtual bool service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta);
 	virtual bool service_loadGroup(uint32_t token, Mode mode, RsGroupMetaData& groupMetaData, QString &description);
 	virtual bool service_EditGroup(uint32_t &token, RsGroupMetaData &editedMeta);
-
-
 };
 
 #endif

retroshare-gui/src/gui/im_history/ImHistoryBrowser.ui

@@ -13,10 +13,6 @@
   <property name="windowTitle">
    <string>Message History</string>
   </property>
-  <property name="windowIcon">
-   <iconset resource="../images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
-  </property>
   <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>

retroshare-gui/src/gui/msgs/MessageWidget.cpp

@@ -333,7 +333,6 @@ void MessageWidget::getcurrentrecommended()
 
 		if (rsFiles->FileRequest(fi.fname, fi.hash, fi.size, "", RS_FILE_REQ_ANONYMOUS_ROUTING, srcIds) == false) {
 			QMessageBox mb(QObject::tr("File Request canceled"), QObject::tr("The following has not been added to your download list, because you already have it:\n    ") + QString::fromUtf8(fi.fname.c_str()), QMessageBox::Critical, QMessageBox::Ok, 0, 0);
-			mb.setWindowIcon(QIcon(QString::fromUtf8(":/images/rstray3.png")));
 			mb.exec();
 		}
 	}

retroshare-gui/src/gui/msgs/MessageWidget.ui

@@ -10,10 +10,6 @@
     <height>539</height>
    </rect>
   </property>
-  <property name="windowIcon">
-   <iconset resource="../images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
-  </property>
   <layout class="QGridLayout" name="gridLayout">
    <property name="leftMargin">
     <number>0</number>

retroshare-gui/src/gui/msgs/MessageWindow.ui

@@ -10,10 +10,6 @@
     <height>539</height>
    </rect>
   </property>
-  <property name="windowIcon">
-   <iconset resource="../images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
-  </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QGridLayout" name="gridLayout">
     <property name="verticalSpacing">

retroshare-gui/src/gui/notifyqt.cpp

@@ -273,7 +273,6 @@ bool NotifyQt::askForPassword(const std::string& key_details, bool prev_is_bad,
 	dialog.setWindowTitle(tr("PGP key passphrase"));
 	dialog.setLabelText((prev_is_bad ? QString("%1\n\n").arg(tr("Wrong password !")) : QString()) + QString("%1:\n    %2").arg(tr("Please enter your PGP password for key"), QString::fromUtf8(key_details.c_str())));
 	dialog.setTextEchoMode(QLineEdit::Password);
-	dialog.setWindowIcon(QIcon(":/images/rstray3.png"));
 	dialog.setModal(true);
 
 	int ret = dialog.exec();
@@ -302,7 +301,7 @@ bool NotifyQt::askForPluginConfirmation(const std::string& plugin_file_name, con
 	text += "</UL>" ;
 
 	dialog.setText(text) ;
-	dialog.setWindowIcon(QIcon(":/images/rstray3.png"));
+	dialog.setWindowIcon(QIcon(":/images/logo/logo_32.png"));
 	dialog.setStandardButtons(QMessageBox::Yes | QMessageBox::No) ;
 
 	int ret = dialog.exec();

retroshare-gui/src/gui/settings/GlobalRouterStatistics.ui

@@ -13,10 +13,6 @@
   <property name="windowTitle">
    <string>Router Statistics</string>
   </property>
-  <property name="windowIcon">
-   <iconset resource="images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
-  </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <widget class="QSplitter" name="splitter">

retroshare-gui/src/gui/settings/NewTag.ui

@@ -13,10 +13,6 @@
   <property name="windowTitle">
    <string>New Tag</string>
   </property>
-  <property name="windowIcon">
-   <iconset resource="../images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
-  </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <item row="0" column="0">
     <layout class="QGridLayout" name="gridLayout">
@@ -93,8 +89,6 @@
    </item>
   </layout>
  </widget>
- <resources>
+ <resources/>
-  <include location="../images.qrc"/>
- </resources>
  <connections/>
 </ui>

retroshare-gui/src/gui/style/StyleDialog.ui

@@ -16,10 +16,6 @@
   <property name="windowTitle">
    <string>Define Style</string>
   </property>
-  <property name="windowIcon">
-   <iconset resource="../images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
-  </property>
   <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
@@ -188,8 +184,6 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
- <resources>
+ <resources/>
-  <include location="../images.qrc"/>
- </resources>
  <connections/>
 </ui>

retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp

@@ -77,9 +77,6 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WindowFlags flags)
 
     //Settings->loadWidgetInformation(this);
 
-    // Setting icons
-    this->setWindowIcon(QIcon(QString::fromUtf8(":/images/rstray3.png")));
-
     /* Create the config pages and actions */
     QActionGroup *grp = new QActionGroup(this);
     QAction *action;

retroshare-gui/src/gui/unfinished/profile/ProfileView.ui

@@ -13,10 +13,6 @@
   <property name="windowTitle">
    <string>Profile View</string>
   </property>
-  <property name="windowIcon">
-   <iconset resource="../images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
-  </property>
   <property name="layoutDirection">
    <enum>Qt::LeftToRight</enum>
   </property>
@@ -49,7 +45,7 @@ border-image: url(:/images/avatar_background.png);
         <string/>
        </property>
        <property name="pixmap">
-        <pixmap resource="../images.qrc">:/images/user/personal64.png</pixmap>
+        <pixmap resource="../../images.qrc">:/images/user/personal64.png</pixmap>
        </property>
        <property name="alignment">
         <set>Qt::AlignCenter</set>
@@ -186,7 +182,7 @@ p, li { white-space: pre-wrap; }
         <string/>
        </property>
        <property name="icon">
-        <iconset resource="../images.qrc">
+        <iconset resource="../../images.qrc">
          <normaloff>:/images/user/kuser24.png</normaloff>:/images/user/kuser24.png</iconset>
        </property>
        <property name="iconSize">
@@ -283,7 +279,7 @@ p, li { white-space: pre-wrap; }
       <string>Close Profile</string>
      </property>
      <property name="icon">
-      <iconset resource="../images.qrc">
+      <iconset resource="../../images.qrc">
        <normaloff>:/images/close_normal.png</normaloff>:/images/close_normal.png</iconset>
      </property>
     </widget>
@@ -291,11 +287,7 @@ p, li { white-space: pre-wrap; }
   </layout>
  </widget>
  <resources>
-  <include location="../images.qrc"/>
+  <include location="../../images.qrc"/>
-  <include location="../images.qrc"/>
-  <include location="../images.qrc"/>
-  <include location="../images.qrc"/>
-  <include location="../images.qrc"/>
  </resources>
  <connections/>
 </ui>

retroshare-gui/src/main.cpp

@@ -92,7 +92,7 @@ static void displayWarningAboutDSAKeys()
 	msgBox.setInformativeText(QObject::tr("DSA keys are not yet supported by this version of RetroShare. All these locations will be unusable. We're very sorry for that."));
 	msgBox.setStandardButtons(QMessageBox::Ok);
 	msgBox.setDefaultButton(QMessageBox::Ok);
-	msgBox.setWindowIcon(QIcon(":/images/rstray3.png"));
+	msgBox.setWindowIcon(QIcon(":/images/logo/logo_32.png"));
 
 	msgBox.exec();
 }
@@ -184,7 +184,7 @@ int main(int argc, char *argv[])
 		msgBox.setInformativeText(QObject::tr("Choose between:<br><ul><li><b>Ok</b> to copy the existing keyring from gnupg (safest bet), or </li><li><b>Close without saving</b> to start fresh with an empty keyring (you will be asked to create a new PGP key to work with RetroShare, or import a previously saved pgp keypair). </li><li><b>Cancel</b> to quit and forge a keyring by yourself (needs some PGP skills)</li></ul>"));
 		msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Discard | QMessageBox::Cancel);
 		msgBox.setDefaultButton(QMessageBox::Ok);
-		msgBox.setWindowIcon(QIcon(":/images/rstray3.png"));
+		msgBox.setWindowIcon(QIcon(":/images/logo/logo_32.png"));
 
 		int ret = msgBox.exec();
 
@@ -213,7 +213,7 @@ int main(int argc, char *argv[])
 		displayWarningAboutDSAKeys();
 
 		QMessageBox mb(QMessageBox::Critical, QObject::tr("RetroShare"), "", QMessageBox::Ok);
-		mb.setWindowIcon(QIcon(":/images/rstray3.png"));
+		mb.setWindowIcon(QIcon(":/images/logo/logo_32.png"));
 
 		switch (initResult) 
 		{

retroshare-gui/src/rshare.cpp

@@ -109,7 +109,7 @@ Rshare::Rshare(QStringList args, int &argc, char **argv, const QString &dir)
 #ifndef __APPLE__
 
   /* set default window icon */
-  setWindowIcon(QIcon(":/images/rstray3.png"));
+  setWindowIcon(QIcon(":/images/logo/logo_32.png"));
 
 #endif
 

retroshare-gui/src/util/EventReceiver.cpp

@@ -121,7 +121,6 @@ bool EventReceiver::sendRetroShareLink(const QString& link)
 			Q_UNUSED(link);
 
 			QMessageBox mb(QMessageBox::Critical, "RetroShare", QObject::tr("Start with a RetroShare link is only supported for Windows."), QMessageBox::Ok);
-			mb.setWindowIcon(QIcon(":/images/rstray3.png"));
 			mb.exec();
 
 			result = false;