switched all explicit pixmap from files to shared FilesDefs::getPixmapFromQtResourcePath()

retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp

@@ -30,6 +30,7 @@
 #include <retroshare/rsidentity.h>
 
 #include "gui/common/AvatarDefs.h"
+#include "gui/common/FilesDefs.h"
 #include "util/qtthreadsutils.h"
 #include "gui/Circles/CreateCircleDialog.h"
 #include "gui/gxs/GxsIdDetails.h"
@@ -53,7 +54,7 @@ CreateCircleDialog::CreateCircleDialog()
 	ui.setupUi(this);
 
 	/* Setup Queue */
-	ui.headerFrame->setHeaderImage(QPixmap(":/icons/png/circles.png"));
+    ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/circles.png"));
 
 	// connect up the buttons.
 	connect(ui.addButton, SIGNAL(clicked()), this, SLOT(addMember()));

retroshare-gui/src/gui/FileTransfer/FileTransferInfoWidget.cpp

@@ -23,11 +23,12 @@
 #include <math.h>
 #include <QStylePainter>
 #include <QDebug>
-#include <retroshare/rsfiles.h>
+#include "retroshare/rsfiles.h"
-#include <retroshare/rstypes.h>
+#include "retroshare/rstypes.h"
 #include "util/misc.h"
 #include "FileTransferInfoWidget.h"
-#include <gui/RetroShareLink.h>
+#include "gui/RetroShareLink.h"
+#include "gui/common/FilesDefs.h"
 
 // Variables to decide of display behaviour. All variables are expressed as a factor of font height
 //
@@ -49,10 +50,10 @@ FileTransferInfoWidget::FileTransferInfoWidget(QWidget * /*parent*/, Qt::WindowF
 
         int S = 0.9*QFontMetricsF(font()).height();
 
-    downloadedPixmap = QPixmap(":/icons/tile_downloaded_48.png").scaledToHeight(S,Qt::SmoothTransformation);
+    downloadedPixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/tile_downloaded_48.png").scaledToHeight(S,Qt::SmoothTransformation);
-    downloadingPixmap = QPixmap(":/icons/tile_downloading_48.png").scaledToHeight(S,Qt::SmoothTransformation);
+    downloadingPixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/tile_downloading_48.png").scaledToHeight(S,Qt::SmoothTransformation);
-    notDownloadPixmap = QPixmap(":/icons/tile_inactive_48.png").scaledToHeight(S,Qt::SmoothTransformation);
+    notDownloadPixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/tile_inactive_48.png").scaledToHeight(S,Qt::SmoothTransformation);
-    checkingPixmap = QPixmap(":/icons/tile_checking_48.png").scaledToHeight(S,Qt::SmoothTransformation);
+    checkingPixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/tile_checking_48.png").scaledToHeight(S,Qt::SmoothTransformation);
 
 	setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 }

retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp

@@ -266,7 +266,7 @@ LocalSharedFilesDialog::LocalSharedFilesDialog(QWidget *parent)
     openfolderAct = new QAction(QIcon(IMAGE_OPENFOLDER), tr("Open Folder"), this) ;
     connect(openfolderAct, SIGNAL(triggered()), this, SLOT(openfolder())) ;
 
-    ui.titleBarPixmap->setPixmap(QPixmap(IMAGE_MYFILES)) ;
+    ui.titleBarPixmap->setPixmap(FilesDefs::getPixmapFromQtResourcePath(IMAGE_MYFILES)) ;
 
     ui.dirTreeView->setItemDelegateForColumn(COLUMN_FRIEND_ACCESS,new ShareFlagsItemDelegate()) ;
 }
@@ -498,7 +498,7 @@ void LocalSharedFilesDialog::checkUpdate()
     else
     {
         ui.checkButton->setText(tr("Check files"));
-        ui.hashLabel->setPixmap(QPixmap(IMAGE_HASH_DONE));
+        ui.hashLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(IMAGE_HASH_DONE));
         ui.hashLabel->setToolTip("") ;
     }
 

retroshare-gui/src/gui/GenCertDialog.cpp

@@ -35,6 +35,7 @@
 #include "gui/settings/rsharesettings.h"
 #include "TorControl/TorManager.h"
 #include "util/misc.h"
+#include "gui/common/FilesDefs.h"
 
 #include <retroshare/rsidentity.h>
 #include <retroshare/rsinit.h>
@@ -132,7 +133,7 @@ GenCertDialog::GenCertDialog(bool onlyGenerateIdentity, QWidget *parent)
 	/* Invoke Qt Designer generated QObject setup routine */
 	ui.setupUi(this);
 	
-	//ui.headerFrame->setHeaderImage(QPixmap(":/icons/svg/profile.svg"));
+    //ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/svg/profile.svg"));
 	//ui.headerFrame->setHeaderText(tr("Create a new profile"));
 
 	connect(ui.reuse_existing_node_CB, SIGNAL(triggered()), this, SLOT(switchReuseExistingNode()));
@@ -432,9 +433,9 @@ void GenCertDialog::updateCheckLabels()
     }
 
     if(mEntropyOk)
-		ui.randomness_check_LB->setPixmap(QPixmap(IMAGE_GOOD)) ;
+        ui.randomness_check_LB->setPixmap(FilesDefs::getPixmapFromQtResourcePath(IMAGE_GOOD)) ;
 	else
-		ui.randomness_check_LB->setPixmap(QPixmap(IMAGE_BAD)) ;
+        ui.randomness_check_LB->setPixmap(FilesDefs::getPixmapFromQtResourcePath(IMAGE_BAD)) ;
 
 	setupState();
 }

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

@@ -25,6 +25,7 @@
 #include "util/qtthreadsutils.h"
 #include "gui/settings/rsharesettings.h"
 #include "gui/common/UIStateHelper.h"
+#include "gui/common/FilesDefs.h"
 #include "gui/msgs/MessageComposer.h"
 #include "gui/RetroShareLink.h"
 
@@ -82,7 +83,7 @@ IdDetailsDialog::IdDetailsDialog(const RsGxsGroupId& id, QWidget *parent) :
 
 	Settings->loadWidgetInformation(this);
 
-	ui->headerFrame->setHeaderImage(QPixmap(":/icons/png/person.png"));
+    ui->headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/person.png"));
 	ui->headerFrame->setHeaderText(tr("Person Details"));
 
 	//connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(changeGroup()));

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

@@ -255,7 +255,7 @@ IdDialog::IdDialog(QWidget *parent) : MainPage(parent), ui(new Ui::IdDialog)
 	         this, &IdDialog::chatIdentityItem );
 
 
-	ui->avlabel_Circles->setPixmap(QPixmap(":/icons/png/circles.png"));
+    ui->avlabel_Circles->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/circles.png"));
 
 	ui->headerTextLabel_Circles->setText(tr("Circles"));
 
@@ -459,7 +459,7 @@ void IdDialog::clearPerson()
 {
 	QFontMetricsF f(ui->avLabel_Person->font()) ;
 
-	ui->avLabel_Person->setPixmap(QPixmap(":/icons/png/people.png").scaled(f.height()*4,f.height()*4,Qt::IgnoreAspectRatio,Qt::SmoothTransformation));
+    ui->avLabel_Person->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/people.png").scaled(f.height()*4,f.height()*4,Qt::IgnoreAspectRatio,Qt::SmoothTransformation));
 	ui->headerTextLabel_Person->setText(tr("People"));
 
 	ui->inviteFrame->hide();
@@ -2174,7 +2174,7 @@ void IdDialog::IdListCustomPopupMenu( QPoint )
 			hbox->setSpacing(6);
 
 			QLabel *iconLabel = new QLabel(widget);
-			QPixmap pix = QPixmap(":/images/user/friends24.png").scaledToHeight(QFontMetricsF(iconLabel->font()).height()*1.5);
+            QPixmap pix = FilesDefs::getPixmapFromQtResourcePath(":/images/user/friends24.png").scaledToHeight(QFontMetricsF(iconLabel->font()).height()*1.5);
 			iconLabel->setPixmap(pix);
 			iconLabel->setMaximumSize(iconLabel->frameSize().height() + pix.height(), pix.width());
 			hbox->addWidget(iconLabel);

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

@@ -32,6 +32,7 @@
 
 #include <retroshare/rsidentity.h>
 #include <retroshare/rspeers.h>
+#include "gui/common/FilesDefs.h"
 
 #include <iostream>
 
@@ -47,7 +48,7 @@ IdEditDialog::IdEditDialog(QWidget *parent) :
 
 	ui->setupUi(this);
 
-	ui->headerFrame->setHeaderImage(QPixmap(":/icons/png/person.png"));
+    ui->headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/person.png"));
 	ui->headerFrame->setHeaderText(tr("Create New Identity"));
 
 	/* Setup UI helper */
@@ -199,7 +200,7 @@ void IdEditDialog::setAvatar(const QPixmap &avatar)
 void IdEditDialog::setupExistingId(const RsGxsGroupId& keyId)
 {
 	setWindowTitle(tr("Edit identity"));
-	ui->headerFrame->setHeaderImage(QPixmap(":/icons/png/person.png"));
+    ui->headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/person.png"));
 	ui->headerFrame->setHeaderText(tr("Edit identity"));
 
 	mStateHelper->setLoading(IDEDITDIALOG_LOADID, true);

retroshare-gui/src/gui/LogoBar.cpp

@@ -20,8 +20,9 @@
 
 #include "LogoBar.h"
 
-#include <util/RetroStyleLabel.h>
+#include "util/RetroStyleLabel.h"
-#include <util/MouseEventFilter.h>
+#include "util/MouseEventFilter.h"
+#include "gui/common/FilesDefs.h"
 
 #include <QGridLayout>
 
@@ -42,11 +43,11 @@ void LogoBar::init() {
 	//LogoButton
 	_logoButton = new RetroStyleLabel(this);
 	_logoButton->setPixmaps(
-			QPixmap(":/images/logobar/rslogo2.png"), //Start
+            FilesDefs::getPixmapFromQtResourcePath(":/images/logobar/rslogo2.png"), //Start
 			QPixmap(), //End
 			QPixmap(), //Fill
 
-			QPixmap(":/images/logobar/rslogo2.png"), //Start
+            FilesDefs::getPixmapFromQtResourcePath(":/images/logobar/rslogo2.png"), //Start
 			QPixmap(), //End
 			QPixmap() //Fill
 			);
@@ -59,11 +60,11 @@ void LogoBar::init() {
 	FillLabel1->setPixmaps(
 			QPixmap(), //Start
 			QPixmap(), //End
-			QPixmap(":/images/logobar/logo_bar_fill.png"), //Fill
+            FilesDefs::getPixmapFromQtResourcePath(":/images/logobar/logo_bar_fill.png"), //Fill
 
 			QPixmap(), //Start
 			QPixmap(), //End
-			QPixmap(":/images/logobar/logo_bar_fill.png") //Fill
+            FilesDefs::getPixmapFromQtResourcePath(":/images/logobar/logo_bar_fill.png") //Fill
 			);
 
     //FillLabel2
@@ -71,11 +72,11 @@ void LogoBar::init() {
 	FillLabel2->setPixmaps(
 			QPixmap(), //Start
 			QPixmap(), //End
-			QPixmap(":/images/logobar/logo_bar_fill.png"), //Fill
+            FilesDefs::getPixmapFromQtResourcePath(":/images/logobar/logo_bar_fill.png"), //Fill
 
 			QPixmap(), //Start
 			QPixmap(), //End
-			QPixmap(":/images/logobar/logo_bar_fill.png") //Fill
+            FilesDefs::getPixmapFromQtResourcePath(":/images/logobar/logo_bar_fill.png") //Fill
 			);
 
 	QGridLayout * layout = new QGridLayout(this);

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

@@ -31,7 +31,7 @@ AlbumDialog::AlbumDialog(const RsPhotoAlbum& album, TokenQueue* photoQueue, RsPh
 {
     ui->setupUi(this);
     
-    ui->headerFrame->setHeaderImage(QPixmap(":/images/kview_64.png"));
+    ui->headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/images/kview_64.png"));
     ui->headerFrame->setHeaderText(tr("Album"));
 
     connect(ui->pushButton_PublishPhotos, SIGNAL(clicked()), this, SLOT(updateAlbumPhotos()));
@@ -69,7 +69,7 @@ void AlbumDialog::setUp()
     else
     {
         // display a default Album icon when album has no Thumbnail
-        ui->label_thumbNail->setPixmap(QPixmap(":/images/album_default_128.png"));
+        ui->label_thumbNail->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/album_default_128.png"));
     }
 }
 

retroshare-gui/src/gui/PhotoShare/AlbumGroupDialog.cpp

@@ -99,7 +99,7 @@ void AlbumGroupDialog::initUi()
 
 QPixmap AlbumGroupDialog::serviceImage()
 {
-    return QPixmap(":/images/album_create_64.png");
+    return FilesDefs::getPixmapFromQtResourcePath(":/images/album_create_64.png");
 }
 
 void AlbumGroupDialog::prepareAlbumGroup(RsPhotoAlbum &group, const RsGroupMetaData &meta)
@@ -175,7 +175,7 @@ bool AlbumGroupDialog::service_loadGroup(const RsGxsGenericGroupData *data, Mode
             setLogo(pixmap);
         }
     } else {
-            setLogo(QPixmap(":/images/album_create_64.png"));
+            setLogo(FilesDefs::getPixmapFromQtResourcePath(":/images/album_create_64.png"));
     }
 
     // Load additional data....

retroshare-gui/src/gui/PhotoShare/AlbumItem.cpp

@@ -51,7 +51,7 @@ void AlbumItem::setUp()
     else
     {
         // display a default Album icon when album has no Thumbnail
-        ui->label_Thumbnail->setPixmap(QPixmap(":/images/album_default_128.png"));
+        ui->label_Thumbnail->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/album_default_128.png"));
     }
 }
 

retroshare-gui/src/gui/PhotoShare/PhotoItem.cpp

@@ -59,7 +59,7 @@ PhotoItem::PhotoItem(PhotoShareItemHolder *holder, const QString& path, uint32_t
 
     mPhotoDetails.mOrder = order;
 
-    QPixmap qtn = QPixmap(path);
+    QPixmap qtn = FilesDefs::getPixmapFromQtResourcePath(path);
     mLowResImage = qtn.scaled(512,512, Qt::KeepAspectRatio, Qt::SmoothTransformation);
 
     ui->label_Thumbnail->setPixmap(qtn.scaled(128, 128, Qt::KeepAspectRatio, Qt::SmoothTransformation));

retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp

@@ -38,6 +38,7 @@
 #include <iostream>
 #include <gui/RetroShareLink.h>
 #include <util/imageutil.h>
+#include "gui/common/FilesDefs.h"
 
 /* View Page */
 #define VIEW_POST  1
@@ -56,7 +57,7 @@ PostedCreatePostDialog::PostedCreatePostDialog(RsPosted *posted, const RsGxsGrou
 	connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(close()));
 	connect(ui->addPicButton, SIGNAL(clicked() ), this , SLOT(addPicture()));
 	
-	ui->headerFrame->setHeaderImage(QPixmap(":/icons/png/postedlinks.png"));
+    ui->headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/postedlinks.png"));
 	ui->headerFrame->setHeaderText(tr("Create a new Post"));
 
 	setAttribute ( Qt::WA_DeleteOnClose, true );

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

@@ -21,6 +21,7 @@
 
 #include "PostedGroupDialog.h"
 #include "gui/gxs/GxsIdDetails.h"
+#include "gui/common/FilesDefs.h"
 
 #include <retroshare/rswiki.h>
 #include <iostream>
@@ -89,7 +90,7 @@ void PostedGroupDialog::initUi()
 
 QPixmap PostedGroupDialog::serviceImage()
 {
-	return QPixmap(":/icons/png/posted.png");
+    return FilesDefs::getPixmapFromQtResourcePath(":/icons/png/posted.png");
 }
 
 void PostedGroupDialog::preparePostedGroup(RsPostedGroup &group, const RsGroupMetaData &meta)
@@ -159,7 +160,7 @@ bool PostedGroupDialog::service_loadGroup(const RsGxsGenericGroupData *data, Mod
 
 	}
     else
-		setLogo(QPixmap(":/icons/png/posted.png"));
+        setLogo(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/posted.png"));
 
 	return true;
 }

retroshare-gui/src/gui/Posted/PostedItem.cpp

@@ -490,7 +490,7 @@ void PostedItem::fill()
 		ui->voteUpButton->setDisabled(true);
 		ui->voteDownButton->setDisabled(true);
 
-		ui->thumbnailLabel->setPixmap( QPixmap(":/images/thumb-default.png"));
+        ui->thumbnailLabel->setPixmap( FilesDefs::getPixmapFromQtResourcePath(":/images/thumb-default.png"));
 		ui->fromLabel->setId(mPost.mMeta.mAuthorId);
 		ui->titleLabel->setText(tr( "<p><font color=\"#ff0000\"><b>The author of this message (with ID %1) is banned.</b>").arg(QString::fromStdString(mPost.mMeta.mAuthorId.toStdString()))) ;
 		QDateTime qtime;

retroshare-gui/src/gui/Posted/PostedListWidget.cpp

@@ -30,6 +30,7 @@
 #include "gui/settings/rsharesettings.h"
 #include "PostedItem.h"
 #include "PostedCardView.h"
+#include "gui/common/FilesDefs.h"
 #include "gui/common/UIStateHelper.h"
 #include "gui/RetroShareLink.h"
 #include "util/HandleRichText.h"
@@ -406,7 +407,7 @@ void PostedListWidget::insertPostedDetails(const RsPostedGroup &group)
 	if (group.mGroupImage.mData != NULL) {
 		GxsIdDetails::loadPixmapFromData(group.mGroupImage.mData, group.mGroupImage.mSize, boardImage,GxsIdDetails::ORIGINAL);
 	} else {
-		boardImage = QPixmap(BOARD_DEFAULT_IMAGE);
+        boardImage = FilesDefs::getPixmapFromQtResourcePath(BOARD_DEFAULT_IMAGE);
 	}
 	ui->logoLabel->setPixmap(boardImage);
 	ui->namelabel->setText(QString::fromUtf8(group.mMeta.mGroupName.c_str()));

retroshare-gui/src/gui/QuickStartWizard.cpp

@@ -33,13 +33,14 @@
 #include <retroshare/rstypes.h>
 #include "settings/rsharesettings.h"
 #include "util/QtVersion.h"
+#include "gui/common/FilesDefs.h"
 
 QuickStartWizard::QuickStartWizard(QWidget *parent) :
     QDialog(parent)
 {
     ui.setupUi(this);
 
-    ui.headerFrame->setHeaderImage(QPixmap(":/images/rs_wizard.png"));
+    ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/images/rs_wizard.png"));
     ui.headerFrame->setHeaderText("RetroShare");
 
 	  ui.pagesWizard->setCurrentIndex(0);

retroshare-gui/src/gui/ServicePermissionDialog.cpp

@@ -23,6 +23,7 @@
 #include "ServicePermissionDialog.h"
 #include "ui_ServicePermissionDialog.h"
 #include "settings/rsharesettings.h"
+#include "gui/common/FilesDefs.h"
 
 static ServicePermissionDialog *servicePermissionDialog = NULL;
 
@@ -36,7 +37,7 @@ ServicePermissionDialog::ServicePermissionDialog() :
 
 	Settings->loadWidgetInformation(this);
 	
-	ui->headerFrame->setHeaderImage(QPixmap(":/images/user/servicepermissions64.png"));
+    ui->headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/images/user/servicepermissions64.png"));
     ui->headerFrame->setHeaderText(tr("Service Permissions"));
 
 	connect(ui->buttonBox, SIGNAL(accepted()), this, SLOT(setPermissions()));

retroshare-gui/src/gui/ShareManager.cpp

@@ -38,6 +38,7 @@
 #include "gui/notifyqt.h"
 #include "util/QtVersion.h"
 #include "util/misc.h"
+#include "gui/common/FilesDefs.h"
 
 /* Images for context menu icons */
 #define IMAGE_CANCEL               ":/images/delete.png"
@@ -57,7 +58,7 @@ ShareManager::ShareManager()
     /* Invoke Qt Designer generated QObject setup routine */
     ui.setupUi(this);
 
-    ui.headerFrame->setHeaderImage(QPixmap(":/images/fileshare64.png"));
+    ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/images/fileshare64.png"));
     ui.headerFrame->setHeaderText(tr("Share Manager"));
 
     isLoading = false;

retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp

@@ -409,7 +409,7 @@ void PulseAddDialog::addImage(const QString &path)
 	std::cerr << "PulseAddDialog::addImage() loading image from: " << path.toStdString();
 	std::cerr << std::endl;
 
-	QPixmap qtn = QPixmap(path);
+    QPixmap qtn = FilesDefs::getPixmapFromQtResourcePath(path);
 	if (qtn.isNull()) {
 		std::cerr << "PulseAddDialog::addImage() Invalid Image";
 		std::cerr << std::endl;

retroshare-gui/src/gui/TheWire/PulseTopLevel.cpp

@@ -126,9 +126,9 @@ void PulseTopLevel::setReferenceString(QString ref)
 
 		// set ref icon
 		if (mPulse->mPulseType & WIRE_PULSE_TYPE_REPUBLISH) {
-			label_reficon->setPixmap(QPixmap(":/images/retweet.png"));
+            label_reficon->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/retweet.png"));
 		} else {
-			label_reficon->setPixmap(QPixmap(":/images/reply.png"));
+            label_reficon->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/reply.png"));
 		}
 	}
 

retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp

@@ -67,7 +67,7 @@ void PulseViewGroup::setup()
 		else
 		{
             // default.
-            QPixmap pixmap = QPixmap(":/icons/png/posted.png").scaled(50,50);
+            QPixmap pixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/png/posted.png").scaled(50,50);
 			label_headshot->setPixmap(pixmap);
 		}
 

retroshare-gui/src/gui/TheWire/PulseViewItem.cpp

@@ -281,7 +281,7 @@ void PulseDataItem::showPulse()
 		if (!headshotOkay)
 		{
 			// default.
-			QPixmap pixmap = QPixmap(":/icons/png/posted.png").scaled(50,50);
+            QPixmap pixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/png/posted.png").scaled(50,50);
 			setHeadshot(pixmap);
 		}
 
@@ -346,7 +346,7 @@ void PulseDataItem::showPulse()
 		if (!headshotOkay) 
 		{
 			// default.
-			QPixmap pixmap = QPixmap(":/icons/png/posted.png").scaled(50,50);
+            QPixmap pixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/png/posted.png").scaled(50,50);
 			setHeadshot(pixmap); // QPixmap(":/icons/png/posted.png"));
 		}
 

retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp

@@ -94,7 +94,7 @@ void WireGroupDialog::initUi()
 
 QPixmap WireGroupDialog::serviceImage()
 {
-	return QPixmap(":/icons/wire-circle.png");
+    return FilesDefs::getPixmapFromQtResourcePath(":/icons/wire-circle.png");
 }
 
 void WireGroupDialog::prepareWireGroup(RsWireGroup &group, const RsGroupMetaData &meta)
@@ -178,7 +178,7 @@ bool WireGroupDialog::service_loadGroup(const RsGxsGenericGroupData *data, Mode
 			setLogo(pixmap);
 		}
 	} else {
-			setLogo(QPixmap(":/images/album_create_64.png"));
+            setLogo(FilesDefs::getPixmapFromQtResourcePath(":/images/album_create_64.png"));
 	}
 #endif
 

retroshare-gui/src/gui/TheWire/WireGroupItem.cpp

@@ -66,7 +66,7 @@ void WireGroupItem::setup()
 	else
 	{
 		// default.
-		QPixmap pixmap = QPixmap(":/icons/wire.png").scaled(32,32);
+        QPixmap pixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/wire.png").scaled(32,32);
 		label_headshot->setPixmap(pixmap);
 	}
 	

retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp

@@ -414,7 +414,7 @@ void WikiEditDialog::setNewPage()
 	ui.groupBox_History->hide();
 	ui.pushButton_History->setText(tr("Show Edit History"));
 
-	ui.headerFrame->setHeaderImage(QPixmap(":/images/addpage.png"));
+    ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/images/addpage.png"));
 	ui.headerFrame->setHeaderText(tr("Create New Wiki Page"));
 	setWindowTitle(tr("Create New Wiki Page"));
 
@@ -569,7 +569,7 @@ void WikiEditDialog::setupData(const RsGxsGroupId &groupId, const RsGxsMessageId
 		requestPage(msgId);
 	}
 
-	ui.headerFrame->setHeaderImage(QPixmap(":/images/editpage.png"));
+    ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/images/editpage.png"));
 	ui.headerFrame->setHeaderText(tr("Edit Wiki Page"));
 	setWindowTitle(tr("Edit Wiki Page"));
 

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

@@ -154,7 +154,7 @@ ChatLobbyDialog::ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent, Qt::Wi
 
 	{
 	QIcon icon ;
-	icon.addPixmap(QPixmap(":/icons/png/invite.png")) ;
+    icon.addPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/invite.png")) ;
 	inviteFriendsButton->setIcon(icon) ;
 	inviteFriendsButton->setIconSize(icon_size);
 	}
@@ -196,7 +196,7 @@ ChatLobbyDialog::ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent, Qt::Wi
 
 	{
 	QIcon icon ;
-	icon.addPixmap(QPixmap(":/icons/png/leave.png")) ;
+    icon.addPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/leave.png")) ;
 	unsubscribeButton->setIcon(icon) ;
 	unsubscribeButton->setIconSize(icon_size);
 	}
@@ -994,7 +994,7 @@ void ChatLobbyDialog::setWindowed(bool windowed)
 			mPCWindow->addDialog(this);
 
 		undockButton->setToolTip(tr("Redock to Main window"));
-		icon.addPixmap(QPixmap(":/icons/png/dock.png")) ;
+        icon.addPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/dock.png")) ;
 		undockButton->setIcon(icon) ;
 		undockButton->setIconSize(icon_size);
 	}
@@ -1009,7 +1009,7 @@ void ChatLobbyDialog::setWindowed(bool windowed)
 			chatLobbyPage->addChatPage(this);
 
 		undockButton->setToolTip(tr("Undock to a new window"));
-		icon.addPixmap(QPixmap(":/icons/png/undock.png")) ;
+        icon.addPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/undock.png")) ;
 		undockButton->setIcon(icon) ;
 		undockButton->setIconSize(icon_size);
 	}

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

@@ -1863,7 +1863,7 @@ void ChatWidget::updatePeersCustomStateString(const QString& /*peer_id*/, const
 void ChatWidget::updateStatusString(const QString &statusMask, const QString &statusString, bool permanent)
 {
 	ui->typingLabel->setText(QString(statusMask).arg(trUtf8(statusString.toUtf8()))); // displays info for 5 secs.
-	ui->typingPixmapLabel->setPixmap(QPixmap(":icons/png/typing.png") );
+    ui->typingPixmapLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":icons/png/typing.png") );
 
 	if (statusString == "is typing...") {
 		typing = true;

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

@@ -33,6 +33,7 @@
 #include "gui/common/PeerDefs.h"
 #include "ChatDialog.h"
 #include "gui/ChatLobbyWidget.h"
+#include "gui/common/FilesDefs.h"
 
 CreateLobbyDialog::CreateLobbyDialog(const std::set<RsPeerId>& peer_list, int privacyLevel, QWidget *parent) :
 	QDialog(parent, Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint)
@@ -40,7 +41,7 @@ CreateLobbyDialog::CreateLobbyDialog(const std::set<RsPeerId>& peer_list, int pr
 	ui = new Ui::CreateLobbyDialog() ;
 	ui->setupUi(this);
 
-	ui->headerFrame->setHeaderImage(QPixmap(":/icons/png/chat-lobbies.png"));
+    ui->headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/chat-lobbies.png"));
 	ui->headerFrame->setHeaderText(tr("Create Chat Room"));
 
     RsGxsId default_identity ;

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

@@ -26,6 +26,7 @@
 #include <gui/gxs/GxsIdDetails.h>
 
 #include "AvatarDefs.h"
+#include "gui/common/FilesDefs.h"
 
 void AvatarDefs::getOwnAvatar(QPixmap &avatar, const QString& defaultImage)
 {
@@ -36,7 +37,7 @@ void AvatarDefs::getOwnAvatar(QPixmap &avatar, const QString& defaultImage)
 	rsMsgs->getOwnAvatarData(data, size);
 
 	if (size == 0) {
-		avatar = QPixmap(defaultImage);
+        avatar = FilesDefs::getPixmapFromQtResourcePath(defaultImage);
 		return;
 	}
 
@@ -53,7 +54,7 @@ bool AvatarDefs::getAvatarFromSslId(const RsPeerId& sslId, QPixmap &avatar, cons
     /* get avatar */
     rsMsgs->getAvatarData(RsPeerId(sslId), data, size);
     if (size == 0) {
-        avatar = QPixmap(defaultImage);
+        avatar = FilesDefs::getPixmapFromQtResourcePath(defaultImage);
         return false;
     }
 
@@ -72,7 +73,7 @@ bool AvatarDefs::getAvatarFromGxsId(const RsGxsId& gxsId, QPixmap &avatar, const
 
     if(!rsIdentity->getIdDetails(gxsId, details))
     {
-        avatar = QPixmap(defaultImage);
+        avatar = FilesDefs::getPixmapFromQtResourcePath(defaultImage);
         return false;
     }
 
@@ -107,7 +108,7 @@ bool AvatarDefs::getAvatarFromGpgId(const RsPgpId& gpgId, QPixmap &avatar, const
 	}
 
 	if (size == 0) {
-		avatar = QPixmap(defaultImage);
+        avatar = FilesDefs::getPixmapFromQtResourcePath(defaultImage);
 		return false;
 	}
 

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

@@ -24,6 +24,7 @@
 #include "ui_AvatarDialog.h"
 #include "AvatarDefs.h"
 #include "util/misc.h"
+#include "gui/common/FilesDefs.h"
 
 /** Constructor */
 AvatarDialog::AvatarDialog(QWidget *parent) :
@@ -33,7 +34,7 @@ AvatarDialog::AvatarDialog(QWidget *parent) :
 	/* Invoke Qt Designer generated QObject setup routine */
 	ui->setupUi(this);
 
-	ui->headerFrame->setHeaderImage(QPixmap(":/images/no_avatar_70.png"));
+    ui->headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/images/no_avatar_70.png"));
 	ui->headerFrame->setHeaderText(tr("Set your Avatar picture"));
 
 	connect(ui->avatarButton, SIGNAL(clicked(bool)), this, SLOT(changeAvatar()));

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

@@ -238,7 +238,7 @@ void Emoticons::showSmileyWidget(QWidget *parent, QWidget *button, const char *s
 			QPushButton *button = new QPushButton("", tabGrpWidget);
 			button->setIconSize(QSize(buttonWidth, buttonHeight));
 			button->setFixedSize(QSize(buttonWidth, buttonHeight));
-			button->setIcon(QPixmap(group.value(key)));
+            button->setIcon(FilesDefs::getIconFromQtResourcePath(group.value(key)));
 			button->setToolTip(key);
 			button->setStyleSheet("QPushButton:hover {border: 3px solid #0099cc; border-radius: 3px;}");
 			button->setFlat(true);
@@ -402,7 +402,7 @@ void Emoticons::showStickerWidget(QWidget *parent, QWidget *button, const char *
 			button->setFixedSize(QSize(buttonWidth, buttonHeight));
 			if(!iconcache.contains(fi.absoluteFilePath()))
 			{
-				iconcache.insert(fi.absoluteFilePath(), QPixmap(fi.absoluteFilePath()).scaled(buttonWidth, buttonHeight, Qt::KeepAspectRatio));
+                iconcache.insert(fi.absoluteFilePath(), FilesDefs::getPixmapFromQtResourcePath(fi.absoluteFilePath()).scaled(buttonWidth, buttonHeight, Qt::KeepAspectRatio));
 			}
 			button->setIcon(iconcache[fi.absoluteFilePath()]);
 			button->setToolTip(fi.fileName());

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

@@ -306,7 +306,7 @@ void FriendList::peerTreeWidgetCustomPopupMenu()
     hbox->setSpacing(6);
 
     QLabel *iconLabel = new QLabel(widget);
-    QPixmap pix = QPixmap(":/images/user/friends24.png").scaledToHeight(QFontMetricsF(iconLabel->font()).height()*1.5);
+    QPixmap pix = FilesDefs::getPixmapFromQtResourcePath(":/images/user/friends24.png").scaledToHeight(QFontMetricsF(iconLabel->font()).height()*1.5);
     iconLabel->setPixmap(pix);
     iconLabel->setMaximumSize(iconLabel->frameSize().height() + pix.height(), pix.width());
     hbox->addWidget(iconLabel);
@@ -1006,7 +1006,7 @@ void FriendList::insertPeers()
                     sslItem->setHidden(false);
                     gpg_connected = true;
 
-                    sslOverlayIcon = QPixmap(StatusDefs::imageStatus(bestRSState));
+                    sslOverlayIcon = FilesDefs::getPixmapFromQtResourcePath(StatusDefs::imageStatus(bestRSState));
 
                     connectStateString = StatusDefs::name(rsState);
 
@@ -1024,9 +1024,9 @@ void FriendList::insertPeers()
                     peerState = PEER_STATE_AVAILABLE;
 
                     if (sslDetail.connectState) {
-                        sslOverlayIcon = QPixmap(":/images/connect_creating.png");
+                        sslOverlayIcon = FilesDefs::getPixmapFromQtResourcePath(":/images/connect_creating.png");
                     } else {
-                        sslOverlayIcon = QPixmap(StatusDefs::imageStatus(RS_STATUS_ONLINE));
+                        sslOverlayIcon = FilesDefs::getPixmapFromQtResourcePath(StatusDefs::imageStatus(RS_STATUS_ONLINE));
                     }
 
                     connectStateString = StatusDefs::name(RS_STATUS_ONLINE);
@@ -1037,9 +1037,9 @@ void FriendList::insertPeers()
                     peerState = PEER_STATE_OFFLINE;
                     sslItem->setHidden(mHideUnconnected);
                     if (sslDetail.connectState) {
-                        sslOverlayIcon = QPixmap(":/images/connect_creating.png");
+                        sslOverlayIcon = FilesDefs::getPixmapFromQtResourcePath(":/images/connect_creating.png");
                     } else {
-                        sslOverlayIcon = QPixmap(StatusDefs::imageStatus(RS_STATUS_OFFLINE));
+                        sslOverlayIcon = FilesDefs::getPixmapFromQtResourcePath(StatusDefs::imageStatus(RS_STATUS_OFFLINE));
                     }
 
                     connectStateString = StatusDefs::connectStateWithoutTransportTypeString(sslDetail);
@@ -1099,7 +1099,7 @@ void FriendList::insertPeers()
 
                 if (std::find(privateChatIds.begin(), privateChatIds.end(), sslDetail.id) != privateChatIds.end()) {
                     // private chat is available
-                    sslOverlayIcon = QPixmap(":/images/chat.png");
+                    sslOverlayIcon = FilesDefs::getPixmapFromQtResourcePath(":/images/chat.png");
                     gpg_hasPrivateChat = true;
                 }
                 sslItem->setIcon(COLUMN_NAME, createAvatar(sslAvatar, sslOverlayIcon));
@@ -1138,7 +1138,7 @@ void FriendList::insertPeers()
                 gpgFont = StatusDefs::font(bestRSState);
 
                 if (showInfoAtGpgItem) {
-                    gpgOverlayIcon = QPixmap(StatusDefs::imageStatus(bestRSState));
+                    gpgOverlayIcon = FilesDefs::getPixmapFromQtResourcePath(StatusDefs::imageStatus(bestRSState));
 
                     if (mShowState) {
                         gpgText = StatusDefs::name(bestRSState);
@@ -1164,7 +1164,7 @@ void FriendList::insertPeers()
                         gpgText += tr("Available");
                     }
 
-                    gpgOverlayIcon = QPixmap(IMAGE_AVAILABLE);
+                    gpgOverlayIcon = FilesDefs::getPixmapFromQtResourcePath(IMAGE_AVAILABLE);
                 }
             } else {
                 bestPeerState = PEER_STATE_OFFLINE;
@@ -1178,15 +1178,15 @@ void FriendList::insertPeers()
                         gpgText += StatusDefs::name(RS_STATUS_OFFLINE);
                     }
 
-                    gpgOverlayIcon = QPixmap(StatusDefs::imageStatus(RS_STATUS_OFFLINE));
+                    gpgOverlayIcon = FilesDefs::getPixmapFromQtResourcePath(StatusDefs::imageStatus(RS_STATUS_OFFLINE));
                 }
             }
 
             if (gpg_hasPrivateChat) {
-                gpgOverlayIcon = QPixmap(":/images/chat.png");
+                gpgOverlayIcon = FilesDefs::getPixmapFromQtResourcePath(":/images/chat.png");
             }
 
-            gpgItem->setIcon(COLUMN_NAME, createAvatar(bestAvatar.isNull() ? QPixmap(AVATAR_DEFAULT_IMAGE) : bestAvatar, gpgOverlayIcon));
+            gpgItem->setIcon(COLUMN_NAME, createAvatar(bestAvatar.isNull() ? FilesDefs::getPixmapFromQtResourcePath(AVATAR_DEFAULT_IMAGE) : bestAvatar, gpgOverlayIcon));
 
             /* Create or get gpg label */
             ElidedLabel *gpgNameLabel = NULL;

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

@@ -307,7 +307,7 @@ void NewFriendList::headerContextMenuRequested(QPoint p)
     hbox->setSpacing(6);
 
     QLabel *iconLabel = new QLabel(widget);
-    QPixmap pix = QPixmap(":/images/user/friends24.png").scaledToHeight(QFontMetricsF(iconLabel->font()).height()*1.5);
+    QPixmap pix = FilesDefs::getPixmapFromQtResourcePath(":/images/user/friends24.png").scaledToHeight(QFontMetricsF(iconLabel->font()).height()*1.5);
     iconLabel->setPixmap(pix);
     iconLabel->setMaximumSize(iconLabel->frameSize().height() + pix.height(), pix.width());
     hbox->addWidget(iconLabel);
@@ -533,7 +533,7 @@ void NewFriendList::peerTreeWidgetCustomPopupMenu()
     hbox->setSpacing(6);
 
     QLabel *iconLabel = new QLabel(widget);
-    QPixmap pix = QPixmap(":/images/user/friends24.png").scaledToHeight(QFontMetricsF(iconLabel->font()).height()*1.5);
+    QPixmap pix = FilesDefs::getPixmapFromQtResourcePath(":/images/user/friends24.png").scaledToHeight(QFontMetricsF(iconLabel->font()).height()*1.5);
     iconLabel->setPixmap(pix);
     iconLabel->setMaximumSize(iconLabel->frameSize().height() + pix.height(), pix.width());
     hbox->addWidget(iconLabel);

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

@@ -27,6 +27,7 @@
 
 #include "RSTextBrowser.h"
 #include "RSImageBlockWidget.h"
+#include "gui/common/FilesDefs.h"
 
 #include <retroshare/rsinit.h> //To get RsAccounts
 
@@ -149,7 +150,7 @@ QVariant RSTextBrowser::loadResource(int type, const QUrl &name)
 
 QPixmap RSTextBrowser::getBlockedImage()
 {
-	return QPixmap(":/images/imageblocked_24.png");
+    return FilesDefs::getPixmapFromQtResourcePath(":/images/imageblocked_24.png");
 }
 
 void RSTextBrowser::setImageBlockWidget(RSImageBlockWidget *widget)

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

@@ -29,6 +29,7 @@
 #include <QWidgetAction>
 
 #include "gui/settings/rsharesettings.h"
+#include "gui/common/FilesDefs.h"
 
 RSTreeWidget::RSTreeWidget(QWidget *parent) : QTreeWidget(parent)
 {
@@ -259,7 +260,7 @@ QMenu *RSTreeWidget::createStandardContextMenu(QMenu *contextMenu)
 		hbox->setSpacing(6);
 
 		QLabel *iconLabel = new QLabel(widget);
-		QPixmap pix = QPixmap(":/images/settings.png").scaledToHeight(QFontMetricsF(iconLabel->font()).height()*1.5);
+        QPixmap pix = FilesDefs::getPixmapFromQtResourcePath(":/images/settings.png").scaledToHeight(QFontMetricsF(iconLabel->font()).height()*1.5);
 		iconLabel->setPixmap(pix);
 		iconLabel->setMaximumSize(iconLabel->frameSize().height() + pix.height(), pix.width());
 		hbox->addWidget(iconLabel);

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

@@ -143,7 +143,7 @@ RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName
 	setWindowTitle(QString("%1 - %2").arg(windowTitle()).arg(QFileInfo(_fileName).completeBaseName()));
 	
 	
-	ui.headerFrame->setHeaderImage(QPixmap(":/icons/collections.png"));
+    ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/collections.png"));
 
 	if(creation)
 	{

retroshare-gui/src/gui/connect/ConfCertDialog.cpp

@@ -38,6 +38,7 @@
 #include "gui/RetroShareLink.h"
 #include "gui/notifyqt.h"
 #include "gui/common/AvatarDefs.h"
+#include "gui/common/FilesDefs.h"
 #include "gui/MainWindow.h"
 #include "mainpage.h"
 #include "util/DateTime.h"
@@ -83,7 +84,7 @@ ConfCertDialog::ConfCertDialog(const RsPeerId& id, const RsPgpId &pgp_id, QWidge
     /* Invoke Qt Designer generated QObject setup routine */
     ui.setupUi(this);
 	Settings->loadWidgetInformation(this);
-    ui.headerFrame->setHeaderImage(QPixmap(":/images/user/identityinfo64.png"));
+    ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/images/user/identityinfo64.png"));
     //ui.headerFrame->setHeaderText(tr("Friend node details"));
 
     //ui._chat_CB->hide() ;

retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp

@@ -95,10 +95,10 @@ ConnectFriendWizard::ConnectFriendWizard(QWidget *parent) :
 //	setOption(HaveHelpButton, true);
 //	connect(this, SIGNAL(helpRequested()), this, SLOT(showHelp()));
 
-	setPixmap(QWizard::LogoPixmap, QPixmap(":/icons/invite64.png"));
+    setPixmap(QWizard::LogoPixmap, FilesDefs::getPixmapFromQtResourcePath(":/icons/invite64.png"));
 
 // we have no good pictures for watermarks
-//	setPixmap(QWizard::WatermarkPixmap, QPixmap(":/images/connectFriendWatermark.png"));
+//	setPixmap(QWizard::WatermarkPixmap, FilesDefs::getPixmapFromQtResourcePath(":/images/connectFriendWatermark.png"));
 
 	/* register global fields */
 	ui->ErrorMessagePage->registerField("errorMessage", ui->messageLabel, "text");
@@ -563,7 +563,7 @@ void ConnectFriendWizard::initializePage(int id)
 				ui->_addIPToWhiteList_ComboBox_2->addItem("(Hidden node)") ;
 				int S = QFontMetricsF(ui->ipEdit->font()).height() ;
 				ui->ipEdit->setToolTip("This is a Hidden node - you need tor/i2p proxy to connect");
-				ui->ipLabel->setPixmap(QPixmap(":/images/anonymous_128_blue.png").scaledToHeight(S*2,Qt::SmoothTransformation));
+                ui->ipLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/anonymous_128_blue.png").scaledToHeight(S*2,Qt::SmoothTransformation));
 				ui->ipLabel->setToolTip("This is a Hidden node - you need tor/i2p proxy to connect");
 			}
 			if(mIsShortInvite)
@@ -813,7 +813,7 @@ void ConnectFriendWizard::cleanFriendCert()
 	std::string cert = ui->friendCertEdit->toPlainText().toUtf8().constData();
 
 	if (cert.empty()) {
-		ui->friendCertCleanLabel->setPixmap(QPixmap(":/images/delete.png"));
+        ui->friendCertCleanLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/delete.png"));
 		ui->friendCertCleanLabel->setToolTip("");
 		ui->friendCertCleanLabel->setStyleSheet("");
 		errorMsg = tr("");
@@ -837,7 +837,7 @@ void ConnectFriendWizard::cleanFriendCert()
 			}
 			errorMsg = tr("Valid certificate") + (mIsShortInvite?" (Short format)":" (plain format with profile key)");
 
-			ui->friendCertCleanLabel->setPixmap(QPixmap(":/images/accepted16.png"));
+            ui->friendCertCleanLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/accepted16.png"));
 		} else {
 			if (error_code > 0) {
 				switch (error_code) {
@@ -856,11 +856,11 @@ void ConnectFriendWizard::cleanFriendCert()
 					ui->friendCertCleanLabel->setStyleSheet("QLabel#friendCertCleanLabel {border: 2px solid red; border-radius: 6px;}");
 				}
 			}
-			ui->friendCertCleanLabel->setPixmap(QPixmap(":/images/delete.png"));
+            ui->friendCertCleanLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/delete.png"));
 		}
 	}
 
-	ui->friendCertCleanLabel->setPixmap(certValid ? QPixmap(":/images/accepted16.png") : QPixmap(":/images/delete.png"));
+    ui->friendCertCleanLabel->setPixmap(certValid ? FilesDefs::getPixmapFromQtResourcePath(":/images/accepted16.png") : FilesDefs::getPixmapFromQtResourcePath(":/images/delete.png"));
 	ui->friendCertCleanLabel->setToolTip(errorMsg);
 	ui->friendCertCleanLabel->setText(errorMsg);
 

retroshare-gui/src/gui/connect/ConnectProgressDialog.cpp

@@ -29,6 +29,7 @@
 #include <retroshare/rsdht.h>
 
 #include "gui/common/StatusDefs.h"
+#include "gui/common/FilesDefs.h"
 
 /* maintain one static dialog per SSL ID */
 
@@ -56,7 +57,7 @@ ConnectProgressDialog::ConnectProgressDialog(const RsPeerId& id, QWidget *parent
 	ui->setupUi(this);
 	setAttribute(Qt::WA_DeleteOnClose, true);
 
-	ui->headerFrame->setHeaderImage(QPixmap(":/images/user/identityinfo64.png"));
+    ui->headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/images/user/identityinfo64.png"));
 	ui->headerFrame->setHeaderText(tr("Connection Assistant"));
 
 	connect(ui->buttonBox, SIGNAL(accepted()), this, SLOT(stopAndClose()));

retroshare-gui/src/gui/connect/PGPKeyDialog.cpp

@@ -74,7 +74,7 @@ PGPKeyDialog::PGPKeyDialog(const RsPeerId& id, const RsPgpId &pgp_id, QWidget *p
 //		 ui._useOldFormat_CB->setEnabled(false) ;
 //	 }
 
-	ui.headerFrame->setHeaderImage(QPixmap(":/images/user/identityinfo64.png"));
+    ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/images/user/identityinfo64.png"));
     ui.headerFrame->setHeaderText(tr("Retroshare profile"));
 
     //ui._chat_CB->hide() ;

retroshare-gui/src/gui/feeds/GxsChannelGroupItem.cpp

@@ -148,7 +148,7 @@ void GxsChannelGroupItem::fill()
 	if (mGroup.mImage.mData != NULL) {
 		QPixmap chanImage;
 		GxsIdDetails::loadPixmapFromData(mGroup.mImage.mData, mGroup.mImage.mSize, chanImage,GxsIdDetails::ORIGINAL);
-		ui->logoLabel->setPixmap(QPixmap(chanImage));
+        ui->logoLabel->setPixmap(chanImage);
 	}
 
 	if (IS_GROUP_SUBSCRIBED(mGroup.mMeta.mSubscribeFlags)) {

retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp

@@ -159,9 +159,9 @@ void GxsForumGroupItem::fill()
 	ui->descLabel->setText(QString::fromUtf8(mGroup.mDescription.c_str()));
 
 	if (IS_GROUP_PUBLISHER(mGroup.mMeta.mSubscribeFlags)) {
-		ui->forumlogo_label->setPixmap(QPixmap(":/icons/png/forums.png"));
+        ui->forumlogo_label->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/forums.png"));
 	} else {
-		ui->forumlogo_label->setPixmap(QPixmap(":/icons/png/forums-default.png"));
+        ui->forumlogo_label->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/forums-default.png"));
 	}
 
 	if (IS_GROUP_SUBSCRIBED(mGroup.mMeta.mSubscribeFlags)) {

retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp

@@ -335,9 +335,9 @@ void GxsForumMsgItem::fill()
 	}
 
 	if (IS_GROUP_PUBLISHER(mGroup.mMeta.mSubscribeFlags)) {
-		ui->iconLabel->setPixmap(QPixmap(":/icons/png/forums.png"));
+        ui->iconLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/forums.png"));
 	} else {
-		ui->iconLabel->setPixmap(QPixmap(":/icons/png/forums-default.png"));
+        ui->iconLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/forums-default.png"));
 	}
 
 	if (!mIsHome) {

retroshare-gui/src/gui/feeds/PostedGroupItem.cpp

@@ -157,15 +157,15 @@ void PostedGroupItem::fill()
 		GxsIdDetails::loadPixmapFromData(mGroup.mGroupImage.mData, mGroup.mGroupImage.mSize, postedImage,GxsIdDetails::ORIGINAL);
 		ui->logoLabel->setPixmap(QPixmap(postedImage));
 	} else {
-		ui->logoLabel->setPixmap(QPixmap(":/icons/png/posted.png"));
+        ui->logoLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/posted.png"));
 	}
 
 
 	//TODO - nice icon for subscribed group
 //	if (IS_GROUP_PUBLISHER(mGroup.mMeta.mSubscribeFlags)) {
-//		ui->logoLabel->setPixmap(QPixmap(":/icons/png/posted.png"));
+//		ui->logoLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/posted.png"));
 //	} else {
-//		ui->logoLabel->setPixmap(QPixmap(":/icons/png/posted.png"));
+//		ui->logoLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/posted.png"));
 //	}
 
 	if (IS_GROUP_SUBSCRIBED(mGroup.mMeta.mSubscribeFlags)) {

retroshare-gui/src/gui/groups/CreateGroup.cpp

@@ -26,6 +26,7 @@
 #include "gui/common/GroupDefs.h"
 #include "gui/settings/rsharesettings.h"
 #include "util/misc.h"
+#include "gui/common/FilesDefs.h"
 
 #include <algorithm>
 
@@ -40,7 +41,7 @@ CreateGroup::CreateGroup(const RsNodeGroupId &groupId, QWidget *parent)
 
 	mIsStandard = false;
 
-	ui.headerFrame->setHeaderImage(QPixmap(":/images/user/add_group256.png"));
+    ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/images/user/add_group256.png"));
 
 	mGroupId = groupId;
 
@@ -68,7 +69,7 @@ CreateGroup::CreateGroup(const RsNodeGroupId &groupId, QWidget *parent)
 			}
 
 			setWindowTitle(tr("Edit Group"));
-			ui.headerFrame->setHeaderImage(QPixmap(":/images/user/edit_group64.png"));
+            ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/images/user/edit_group64.png"));
 			ui.headerFrame->setHeaderText(tr("Edit Group"));
 
 			ui.groupName->setDisabled(mIsStandard);

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

@@ -146,7 +146,7 @@ void GxsGroupFrameDialog::initUi()
 {
 	registerHelpButton(ui->helpButton, getHelpString(),pageName()) ;
 
-	ui->titleBarPixmap->setPixmap(QPixmap(icon(ICON_NAME)));
+    ui->titleBarPixmap->setPixmap(FilesDefs::getPixmapFromQtResourcePath(icon(ICON_NAME)));
 	ui->titleBarLabel->setText(text(TEXT_NAME));
 
 	/* Initialize group tree */

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

@@ -29,6 +29,7 @@
 #include <retroshare/rsposted.h>
 
 #include "gui/common/PeerDefs.h"
+#include "gui/common/FilesDefs.h"
 
 GroupShareKey::GroupShareKey(QWidget *parent, const RsGxsGroupId &grpId, int grpType) :
 	QDialog(parent, Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint), mGrpId(grpId), mGrpType(grpType)
@@ -36,7 +37,7 @@ GroupShareKey::GroupShareKey(QWidget *parent, const RsGxsGroupId &grpId, int grp
 	ui = new Ui::ShareKey();
 	ui->setupUi(this);
 
-	ui->headerFrame->setHeaderImage(QPixmap(":/images/user/agt_forum64.png"));
+    ui->headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/images/user/agt_forum64.png"));
 	ui->headerFrame->setHeaderText(tr("Share"));
 
 	connect( ui->buttonBox, SIGNAL(accepted()), this, SLOT(shareKey()));
@@ -76,14 +77,14 @@ void GroupShareKey::setTyp()
         if (!rsGxsChannels)
             return;
             
-        ui->headerFrame->setHeaderImage(QPixmap(":/icons/png/channels.png"));
+        ui->headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/channels.png"));
         ui->headerFrame->setHeaderText(tr("Share channel publish permissions"));
         ui->sharekeyinfo_label->setText(tr("You can allow your friends to publish in your channel, or send the publish permissions to another Retroshare instance of yours. Select the friends which you want to be allowed to publish in this channel. Note: it is currently not possible to revoke channel publish permissions."));
     }
     else if(mGrpType == FORUM_KEY_SHARE)
     {
         
-        ui->headerFrame->setHeaderImage(QPixmap(":/icons/png/forums.png"));
+        ui->headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/forums.png"));
         ui->headerFrame->setHeaderText(tr("Share forum admin permissions"));
         ui->sharekeyinfo_label->setText(tr("You can let your friends know about your forum by sharing it with them. Select the friends with which you want to share your forum."));
 
@@ -93,7 +94,7 @@ void GroupShareKey::setTyp()
         if (!rsPosted)
             return;
         
-        ui->headerFrame->setHeaderImage(QPixmap(":/icons/png/posted.png"));    
+        ui->headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/posted.png"));
         ui->headerFrame->setHeaderText(tr("Share board admin permissions"));
         ui->sharekeyinfo_label->setText(tr("You can allow your friends to edit the board. Select them in the list below. Note: it is not possible to revoke Board admin permissions."));
 

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

@@ -161,7 +161,7 @@ QVariant GxsIdRSTreeWidgetItem::data(int column, int role) const
 			if(mId.isNull())
                 return RSTreeWidgetItem::data(column, role);
 			else if( rsReputations->overallReputationLevel(mId) == RsReputationLevel::LOCALLY_NEGATIVE )
-				pix = QPixmap(BANNED_IMAGE);
+                pix = FilesDefs::getPixmapFromQtResourcePath(BANNED_IMAGE);
 			else if ( mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(mAvatar.mData, mAvatar.mSize, pix,GxsIdDetails::LARGE) )
 				pix = GxsIdDetails::makeDefaultIcon(mId,GxsIdDetails::LARGE);
 

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

@@ -87,7 +87,7 @@ void WikiGroupDialog::initUi()
 
 QPixmap WikiGroupDialog::serviceImage()
 {
-	return QPixmap(":/icons/png/wiki.png");
+    return FilesDefs::getPixmapFromQtResourcePath(":/icons/png/wiki.png");
 }
 
 

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

@@ -56,7 +56,7 @@ CreateGxsChannelMsg::CreateGxsChannelMsg(const RsGxsGroupId &cId, RsGxsMessageId
 	setupUi(this);
 	Settings->loadWidgetInformation(this);
 
-	headerFrame->setHeaderImage(QPixmap(":/icons/png/channel.png"));
+    headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/channel.png"));
 
     if(!existing_post.isNull())
 		headerFrame->setHeaderText(tr("Edit Channel Post"));

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

@@ -21,6 +21,7 @@
 #include <QBuffer>
 
 #include "gui/gxs/GxsIdDetails.h"
+#include "gui/common/FilesDefs.h"
 #include "GxsChannelGroupDialog.h"
 
 #include <retroshare/rsgxschannels.h>
@@ -99,11 +100,9 @@ QPixmap GxsChannelGroupDialog::serviceImage()
 	switch (mode())
 	{
 	case MODE_CREATE:
-		return QPixmap(":/icons/png/channel.png");
 	case MODE_SHOW:
-		return QPixmap(":/icons/png/channel.png");
 	case MODE_EDIT:
-		return QPixmap(":/icons/png/channel.png");
+        return FilesDefs::getPixmapFromQtResourcePath(":/icons/png/channel.png");
 	}
 
 	return QPixmap();

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

@@ -116,8 +116,8 @@ GxsChannelPostsWidget::GxsChannelPostsWidget(const RsGxsGroupId &channelId, QWid
 
 	/* Initialize subscribe button */
 	QIcon icon;
-	icon.addPixmap(QPixmap(":/images/redled.png"), QIcon::Normal, QIcon::On);
+    icon.addPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/redled.png"), QIcon::Normal, QIcon::On);
-	icon.addPixmap(QPixmap(":/images/start.png"), QIcon::Normal, QIcon::Off);
+    icon.addPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/start.png"), QIcon::Normal, QIcon::Off);
 	mAutoDownloadAction = new QAction(icon, "", this);
 	mAutoDownloadAction->setCheckable(true);
 	connect(mAutoDownloadAction, SIGNAL(triggered()), this, SLOT(toggleAutoDownload()));
@@ -211,7 +211,7 @@ void GxsChannelPostsWidget::groupNameChanged(const QString &name)
 {
 	if (groupId().isNull()) {
 		ui->nameLabel->setText(tr("No Channel Selected"));
-		ui->logoLabel->setPixmap(QPixmap(":/icons/png/channels.png"));
+        ui->logoLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/channels.png"));
 	} else {
 		ui->nameLabel->setText(name);
 	}
@@ -280,7 +280,7 @@ void GxsChannelPostsWidget::insertChannelDetails(const RsGxsChannelGroup &group)
 	if (group.mImage.mData != NULL) {
 		GxsIdDetails::loadPixmapFromData(group.mImage.mData, group.mImage.mSize, chanImage,GxsIdDetails::ORIGINAL);
 	} else {
-		chanImage = QPixmap(CHAN_DEFAULT_IMAGE);
+        chanImage = FilesDefs::getPixmapFromQtResourcePath(CHAN_DEFAULT_IMAGE);
 	}
 	ui->logoLabel->setPixmap(chanImage);
 

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

@@ -309,8 +309,8 @@ GxsChannelPostsWidgetWithModel::GxsChannelPostsWidgetWithModel(const RsGxsGroupI
 
 	/* Initialize subscribe button */
 	QIcon icon;
-	icon.addPixmap(QPixmap(":/images/redled.png"), QIcon::Normal, QIcon::On);
+    icon.addPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/redled.png"), QIcon::Normal, QIcon::On);
-	icon.addPixmap(QPixmap(":/images/start.png"), QIcon::Normal, QIcon::Off);
+    icon.addPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/start.png"), QIcon::Normal, QIcon::Off);
 	mAutoDownloadAction = new QAction(icon, "", this);
 	mAutoDownloadAction->setCheckable(true);
 	connect(mAutoDownloadAction, SIGNAL(triggered()), this, SLOT(toggleAutoDownload()));
@@ -695,7 +695,7 @@ void GxsChannelPostsWidgetWithModel::groupNameChanged(const QString &name)
 {
 //	if (groupId().isNull()) {
 //		ui->nameLabel->setText(tr("No Channel Selected"));
-//		ui->logoLabel->setPixmap(QPixmap(":/icons/png/channels.png"));
+//		ui->logoLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/channels.png"));
 //	} else {
 //		ui->nameLabel->setText(name);
 //	}
@@ -749,7 +749,7 @@ void GxsChannelPostsWidgetWithModel::insertChannelDetails(const RsGxsChannelGrou
 	if (group.mImage.mData != NULL) {
 		GxsIdDetails::loadPixmapFromData(group.mImage.mData, group.mImage.mSize, chanImage,GxsIdDetails::ORIGINAL);
 	} else {
-		chanImage = QPixmap(ChannelPostThumbnailView::CHAN_DEFAULT_IMAGE);
+        chanImage = FilesDefs::getPixmapFromQtResourcePath(ChannelPostThumbnailView::CHAN_DEFAULT_IMAGE);
 	}
     if(group.mMeta.mGroupName.empty())
 		ui->channelName_LB->setText(tr("[No name]"));

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

@@ -35,6 +35,7 @@
 #include "gui/common/Emoticons.h"
 #include "gui/common/UIStateHelper.h"
 #include "gui/Identity/IdEditDialog.h"
+#include "gui/common/FilesDefs.h"
 
 #include "util/HandleRichText.h"
 #include "util/misc.h"
@@ -89,7 +90,7 @@ CreateGxsForumMsg::CreateGxsForumMsg(const RsGxsGroupId &fId, const RsGxsMessage
 	
 	ui.forumMessage->setPlaceholderText(tr ("Text"));
 
-	ui.headerFrame->setHeaderImage(QPixmap(":/icons/png/forums.png"));
+    ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/forums.png"));
 	ui.headerFrame->setHeaderText(text);
 
 	ui.generateSpinBox->setEnabled(false);

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

@@ -19,6 +19,7 @@
  *******************************************************************************/
 
 #include "GxsForumGroupDialog.h"
+#include "gui/common/FilesDefs.h"
 
 #include <retroshare/rsgxsforums.h>
 #include <iostream>
@@ -96,7 +97,7 @@ void GxsForumGroupDialog::initUi()
 
 QPixmap GxsForumGroupDialog::serviceImage()
 {
-	return QPixmap(":/icons/png/forums.png");
+    return FilesDefs::getPixmapFromQtResourcePath(":/icons/png/forums.png");
 }
 
 bool GxsForumGroupDialog::service_createGroup(RsGroupMetaData& meta)

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

@@ -32,6 +32,7 @@
 #include "IMHistoryItemDelegate.h"
 #include "IMHistoryItemPainter.h"
 #include "util/HandleRichText.h"
+#include "gui/common/FilesDefs.h"
 
 #include "rshare.h"
 #include <retroshare/rshistory.h>
@@ -96,7 +97,7 @@ ImHistoryBrowser::ImHistoryBrowser(const ChatId &chatId, QTextEdit *edit, QWidge
     /* Invoke Qt Designer generated QObject setup routine */
     ui.setupUi(this);
 
-    ui.headerFrame->setHeaderImage(QPixmap(":/images/user/agt_forum64.png"));
+    ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/images/user/agt_forum64.png"));
     ui.headerFrame->setHeaderText(tr("Message History"));
 
     m_chatId = chatId;

retroshare-gui/src/gui/profile/ProfileManager.cpp

@@ -51,7 +51,7 @@ ProfileManager::ProfileManager(QWidget *parent)
 	/* Invoke Qt Designer generated QObject setup routine */
 	ui.setupUi(this);
 
-	ui.headerFrame->setHeaderImage(QPixmap(":/icons/png/profile.png"));
+    ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/profile.png"));
 	ui.headerFrame->setHeaderText(tr("Profile Manager"));
 
 	connect(ui.identityTreeWidget, SIGNAL( customContextMenuRequested(QPoint)), this, SLOT( identityTreeWidgetCostumPopupMenu(QPoint)));

retroshare-gui/src/gui/settings/AboutPage.h

@@ -22,8 +22,9 @@
 
 #include <QFileDialog>
 
-#include <retroshare-gui/configpage.h>
+#include "retroshare-gui/configpage.h"
 #include "ui_AboutPage.h"
+#include "gui/common/FilesDefs.h"
 
 class AboutPage : public ConfigPage
 {
@@ -38,7 +39,7 @@ public:
 	/** Loads the settings for this page */
 	virtual void load();
 
-	virtual QPixmap iconPixmap() const { return QPixmap(":/icons/svg/info.svg") ; }
+    virtual QPixmap iconPixmap() const { return FilesDefs::getPixmapFromQtResourcePath(":/icons/svg/info.svg") ; }
 	virtual QString pageName() const { return tr("About") ; }
 	virtual QString helpText() const { return ""; }
 

retroshare-gui/src/gui/settings/AppearancePage.h

@@ -21,9 +21,10 @@
 #ifndef _APPERARANCEPAGE_H
 #define _APPERARANCEPAGE_H
 
-#include <retroshare-gui/configpage.h>
+#include "retroshare-gui/configpage.h"
 #include "gui/MainWindow.h"
 #include "ui_AppearancePage.h"
+#include "gui/common/FilesDefs.h"
 
 class AppearancePage : public ConfigPage
 {
@@ -36,7 +37,7 @@ public:
 	/** Loads the settings for this page */
 	virtual void load();
 
-	virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/appearance.svg") ; }
+    virtual QPixmap iconPixmap() const { return FilesDefs::getPixmapFromQtResourcePath(":/icons/settings/appearance.svg") ; }
 	virtual QString pageName() const { return tr("Appearance") ; }
 	virtual QString helpText() const { return ""; }
 

retroshare-gui/src/gui/settings/ChannelPage.h

@@ -21,8 +21,9 @@
 #ifndef CHANNELPAGE_H
 #define CHANNELPAGE_H
 
-#include <retroshare-gui/configpage.h>
+#include "retroshare-gui/configpage.h"
 #include "ui_ChannelPage.h"
+#include "gui/common/FilesDefs.h"
 
 class ChannelPage : public ConfigPage
 {
@@ -35,7 +36,7 @@ public:
 	/** Loads the settings for this page */
 	virtual void load();
 
-	virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/channels.svg") ; }
+    virtual QPixmap iconPixmap() const { return FilesDefs::getPixmapFromQtResourcePath(":/icons/settings/channels.svg") ; }
 	virtual QString pageName() const { return tr("Channels") ; }
 	virtual QString helpText() const { return ""; }
 

retroshare-gui/src/gui/settings/ChatPage.h

@@ -21,9 +21,10 @@
 #ifndef _CHATPAGE_H
 #define _CHATPAGE_H
 
-#include <retroshare-gui/configpage.h>
+#include "retroshare-gui/configpage.h"
 #include "gui/chat/ChatStyle.h"
 #include "ui_ChatPage.h"
+#include "gui/common/FilesDefs.h"
 
 class ChatPage : public ConfigPage
 {
@@ -38,7 +39,7 @@ class ChatPage : public ConfigPage
       /** Loads the settings for this page */
       virtual void load();
 
-		virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/chat.svg") ; }
+        virtual QPixmap iconPixmap() const { return FilesDefs::getPixmapFromQtResourcePath(":/icons/settings/chat.svg") ; }
 		virtual QString pageName() const { return tr("Chats") ; }
 		virtual QString helpText() const { return ""; }
 

retroshare-gui/src/gui/settings/CryptoPage.h

@@ -21,8 +21,9 @@
 #ifndef _CRYPTOPAGE_H
 #define _CRYPTOPAGE_H
 
-#include <retroshare-gui/configpage.h>
+#include "retroshare-gui/configpage.h"
 #include "ui_CryptoPage.h"
+#include "gui/common/FilesDefs.h"
 
 class CryptoPage : public ConfigPage
 {
@@ -36,7 +37,7 @@ class CryptoPage : public ConfigPage
 
       /** Loads the settings for this page */
 
-		virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/profile.svg") ; }
+        virtual QPixmap iconPixmap() const { return FilesDefs::getPixmapFromQtResourcePath(":/icons/settings/profile.svg") ; }
 		virtual QString pageName() const { return tr("Node") ; }
 		virtual QString helpText() const { return ""; }
 

retroshare-gui/src/gui/settings/FileAssociationsPage.h

@@ -22,7 +22,8 @@
 #ifndef __FileAssociationsPage__
 #define __FileAssociationsPage__
 
-#include <retroshare-gui/configpage.h>
+#include "retroshare-gui/configpage.h"
+#include "gui/common/FilesDefs.h"
 
 class QToolBar;
 class QAction;
@@ -52,7 +53,7 @@ public:
     virtual ~FileAssociationsPage();
 
     virtual void load();
-	 virtual QPixmap iconPixmap() const { return QPixmap(":/images/filetype-association.png") ; }
+     virtual QPixmap iconPixmap() const { return FilesDefs::getPixmapFromQtResourcePath(":/images/filetype-association.png") ; }
 	 virtual QString pageName() const { return tr("Associations") ; }
 
 protected:

retroshare-gui/src/gui/settings/ForumPage.h

@@ -21,8 +21,9 @@
 #ifndef FORUMPAGE_H
 #define FORUMPAGE_H
 
-#include <retroshare-gui/configpage.h>
+#include "retroshare-gui/configpage.h"
 #include "ui_ForumPage.h"
+#include "gui/common/FilesDefs.h"
 
 class ForumPage : public ConfigPage
 {
@@ -35,7 +36,7 @@ public:
 	/** Loads the settings for this page */
 	virtual void load();
 
-	virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/forums.svg") ; }
+    virtual QPixmap iconPixmap() const { return FilesDefs::getPixmapFromQtResourcePath(":/icons/settings/forums.svg") ; }
 	virtual QString pageName() const { return tr("Forums") ; }
 	virtual QString helpText() const { return ""; }
 

retroshare-gui/src/gui/settings/GeneralPage.h

@@ -22,8 +22,9 @@
 #ifndef _GENERALPAGE_H
 #define _GENERALPAGE_H
 
-#include <retroshare-gui/configpage.h>
+#include "retroshare-gui/configpage.h"
 #include "ui_GeneralPage.h"
+#include "gui/common/FilesDefs.h"
 
 class GeneralPage : public ConfigPage
 {
@@ -39,7 +40,7 @@ public:
 	/** Loads the settings for this page */
 	virtual void load();
 
-	virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/general.svg") ; }
+    virtual QPixmap iconPixmap() const { return FilesDefs::getPixmapFromQtResourcePath(":/icons/settings/general.svg") ; }
 	virtual QString pageName() const { return tr("General") ; }
 	virtual QString helpText() const { return ""; }
 

retroshare-gui/src/gui/settings/JsonApiPage.h

@@ -35,7 +35,7 @@ public:
 	/** Loads the settings for this page */
 
 	virtual QPixmap iconPixmap() const
-	{ return QPixmap(":/icons/svg/empty-circle.svg"); }
+    { return FilesDefs::getPixmapFromQtResourcePath(":/icons/svg/empty-circle.svg"); }
 	virtual QString pageName() const { return tr("JSON API"); }
 	virtual QString helpText() const;
 

retroshare-gui/src/gui/settings/MessagePage.h

@@ -23,10 +23,11 @@
 
 #include <stdint.h>
 
-#include <retroshare-gui/configpage.h>
+#include "retroshare-gui/configpage.h"
 #include "ui_MessagePage.h"
 
 #include "gui/msgs/MessageInterface.h"
+#include "gui/common/FilesDefs.h"
 
 class MessagePage : public ConfigPage
 {
@@ -39,7 +40,7 @@ public:
     /** Loads the settings for this page */
     virtual void load();
 
-	 virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/messages.svg") ; }
+     virtual QPixmap iconPixmap() const { return FilesDefs::getPixmapFromQtResourcePath(":/icons/settings/messages.svg") ; }
 	 virtual QString pageName() const { return tr("Mail") ; }
 	 virtual QString helpText() const { return ""; }
 

retroshare-gui/src/gui/settings/NotifyPage.h

@@ -25,6 +25,7 @@
 #include "ui_NotifyPage.h"
 
 #include "gui/chat/ChatLobbyUserNotify.h"
+#include "gui/common/FilesDefs.h"
 
 class UserNotify;
 class FeedNotify;
@@ -78,7 +79,7 @@ public:
     /** Loads the settings for this page */
     virtual void load();
 
-	 virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/notify.svg") ; }
+     virtual QPixmap iconPixmap() const { return FilesDefs::getPixmapFromQtResourcePath(":/icons/settings/notify.svg") ; }
 	 virtual QString pageName() const { return tr("Notify") ; }
 	 virtual QString helpText() const ;
 

retroshare-gui/src/gui/settings/PeoplePage.h

@@ -21,8 +21,9 @@
 #ifndef PEOPLEPAGE_H
 #define PEOPLEPAGE_H
 
-#include <retroshare-gui/configpage.h>
+#include "retroshare-gui/configpage.h"
 #include "ui_PeoplePage.h"
+#include "gui/common/FilesDefs.h"
 
 class PeoplePage : public ConfigPage
 {
@@ -35,7 +36,7 @@ public:
 	/** Loads the settings for this page */
 	virtual void load();
 
-	virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/people.svg") ; }
+    virtual QPixmap iconPixmap() const { return FilesDefs::getPixmapFromQtResourcePath(":/icons/settings/people.svg") ; }
 	virtual QString pageName() const { return tr("People") ; }
 	virtual QString helpText() const { return ""; }
 

retroshare-gui/src/gui/settings/PluginsPage.h

@@ -20,8 +20,9 @@
 
 #pragma once
 
-#include <retroshare-gui/configpage.h>
+#include "retroshare-gui/configpage.h"
 #include "ui_PluginsPage.h"
+#include "gui/common/FilesDefs.h"
 
 namespace settings {
 
@@ -36,7 +37,7 @@ class PluginsPage : public ConfigPage
 		/** Loads the settings for this page */
 		virtual void load();
 
-		virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/plugins.svg") ; }
+        virtual QPixmap iconPixmap() const { return FilesDefs::getPixmapFromQtResourcePath(":/icons/settings/plugins.svg") ; }
 		virtual QString pageName() const { return tr("Plugins") ; }
 		virtual QString helpText() const ;
 

retroshare-gui/src/gui/settings/PostedPage.h

@@ -21,7 +21,8 @@
 #ifndef POSTEDPAGE_H
 #define POSTEDPAGE_H
 
-#include <retroshare-gui/configpage.h>
+#include "retroshare-gui/configpage.h"
+#include "gui/common/FilesDefs.h"
 
 namespace Ui {
 class PostedPage;
@@ -38,7 +39,7 @@ public:
 	/** Loads the settings for this page */
 	virtual void load();
 
-	virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/posted.svg") ; }
+    virtual QPixmap iconPixmap() const { return FilesDefs::getPixmapFromQtResourcePath(":/icons/settings/posted.svg") ; }
 	virtual QString pageName() const { return tr("Boards") ; }
 	virtual QString helpText() const { return ""; }
 

retroshare-gui/src/gui/settings/ServerPage.cpp

@@ -884,19 +884,19 @@ void ServerPage::updateStatus()
     /******* Network Status Tab *******/
 
     if(net_status.netUpnpOk)
-        ui.iconlabel_upnp->setPixmap(QPixmap(":/images/ledon1.png"));
+        ui.iconlabel_upnp->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/ledon1.png"));
     else
-        ui.iconlabel_upnp->setPixmap(QPixmap(":/images/ledoff1.png"));
+        ui.iconlabel_upnp->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/ledoff1.png"));
 
     if (net_status.netLocalOk)
-        ui.iconlabel_netLimited->setPixmap(QPixmap(":/images/ledon1.png"));
+        ui.iconlabel_netLimited->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/ledon1.png"));
     else
-        ui.iconlabel_netLimited->setPixmap(QPixmap(":/images/ledoff1.png"));
+        ui.iconlabel_netLimited->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/ledoff1.png"));
 
     if (net_status.netExtAddressOk)
-        ui.iconlabel_ext->setPixmap(QPixmap(":/images/ledon1.png"));
+        ui.iconlabel_ext->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/ledon1.png"));
     else
-        ui.iconlabel_ext->setPixmap(QPixmap(":/images/ledoff1.png"));
+        ui.iconlabel_ext->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/ledoff1.png"));
 
 }
 
@@ -1080,7 +1080,7 @@ void ServerPage::loadHiddenNode()
 	
     ui.textlabel_hiddenMode->show();
     ui.iconlabel_hiddenMode->show() ;
-    ui.iconlabel_hiddenMode->setPixmap(QPixmap(":/images/ledon1.png"));
+    ui.iconlabel_hiddenMode->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/ledon1.png"));
     
     // CHANGE OPTIONS ON
     whileBlocking(ui.discComboBox)->removeItem(3);
@@ -1129,9 +1129,9 @@ void ServerPage::loadHiddenNode()
     for(std::list<std::string>::const_iterator it(detail.ipAddressList.begin());it!=detail.ipAddressList.end();++it)
         whileBlocking(ui.ipAddressList)->addItem(QString::fromStdString(*it));
 
-    ui.iconlabel_upnp->setPixmap(QPixmap(":/images/ledoff1.png"));
+    ui.iconlabel_upnp->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/ledoff1.png"));
-    ui.iconlabel_netLimited->setPixmap(QPixmap(":/images/ledoff1.png"));
+    ui.iconlabel_netLimited->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/ledoff1.png"));
-    ui.iconlabel_ext->setPixmap(QPixmap(":/images/ledoff1.png"));
+    ui.iconlabel_ext->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/ledoff1.png"));
 
     whileBlocking(ui.allowIpDeterminationCB)->setChecked(false);
     whileBlocking(ui.allowIpDeterminationCB)->setEnabled(false);
@@ -1235,19 +1235,19 @@ void ServerPage::updateStatusHiddenNode()
     /******* Network Status Tab *******/
 
     if(net_status.netUpnpOk)
-        ui.iconlabel_upnp->setPixmap(QPixmap(":/images/ledon1.png"));
+        ui.iconlabel_upnp->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/ledon1.png"));
     else
-        ui.iconlabel_upnp->setPixmap(QPixmap(":/images/ledoff1.png"));
+        ui.iconlabel_upnp->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/ledoff1.png"));
 
     if (net_status.netLocalOk)
-        ui.iconlabel_netLimited->setPixmap(QPixmap(":/images/ledon1.png"));
+        ui.iconlabel_netLimited->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/ledon1.png"));
     else
-        ui.iconlabel_netLimited->setPixmap(QPixmap(":/images/ledoff1.png"));
+        ui.iconlabel_netLimited->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/ledoff1.png"));
 
     if (net_status.netExtAddressOk)
-        ui.iconlabel_ext->setPixmap(QPixmap(":/images/ledon1.png"));
+        ui.iconlabel_ext->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/ledon1.png"));
     else
-        ui.iconlabel_ext->setPixmap(QPixmap(":/images/ledoff1.png"));
+        ui.iconlabel_ext->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/ledoff1.png"));
 
 #endif
 }
@@ -1306,12 +1306,12 @@ void ServerPage::updateOutProxyIndicator()
     if(socket.waitForConnected(500))
     {
         socket.disconnectFromHost();
-        ui.iconlabel_tor_outgoing->setPixmap(QPixmap(ICON_STATUS_OK)) ;
+        ui.iconlabel_tor_outgoing->setPixmap(FilesDefs::getPixmapFromQtResourcePath(ICON_STATUS_OK)) ;
         ui.iconlabel_tor_outgoing->setToolTip(tr("Proxy seems to work.")) ;
     }
     else
     {
-        ui.iconlabel_tor_outgoing->setPixmap(QPixmap(ICON_STATUS_UNKNOWN)) ;
+        ui.iconlabel_tor_outgoing->setPixmap(FilesDefs::getPixmapFromQtResourcePath(ICON_STATUS_UNKNOWN)) ;
         ui.iconlabel_tor_outgoing->setToolTip(tr("Tor proxy is not enabled")) ;
     }
 
@@ -1320,12 +1320,12 @@ void ServerPage::updateOutProxyIndicator()
     if(socket.waitForConnected(500))
     {
         socket.disconnectFromHost();
-        ui.iconlabel_i2p_outgoing->setPixmap(QPixmap(ICON_STATUS_OK)) ;
+        ui.iconlabel_i2p_outgoing->setPixmap(FilesDefs::getPixmapFromQtResourcePath(ICON_STATUS_OK)) ;
         ui.iconlabel_i2p_outgoing->setToolTip(tr("Proxy seems to work.")) ;
     }
     else
     {
-        ui.iconlabel_i2p_outgoing->setPixmap(QPixmap(ICON_STATUS_UNKNOWN)) ;
+        ui.iconlabel_i2p_outgoing->setPixmap(FilesDefs::getPixmapFromQtResourcePath(ICON_STATUS_UNKNOWN)) ;
         ui.iconlabel_i2p_outgoing->setToolTip(tr("I2P proxy is not enabled")) ;
     }
 
@@ -1334,12 +1334,12 @@ void ServerPage::updateOutProxyIndicator()
     if(true == (mBobAccessible = socket.waitForConnected(500)))
     {
         socket.disconnectFromHost();
-        ui.iconlabel_i2p_outgoing_2->setPixmap(QPixmap(ICON_STATUS_OK)) ;
+        ui.iconlabel_i2p_outgoing_2->setPixmap(FilesDefs::getPixmapFromQtResourcePath(ICON_STATUS_OK)) ;
         ui.iconlabel_i2p_outgoing_2->setToolTip(tr("BOB is running and accessible")) ;
     }
     else
     {
-        ui.iconlabel_i2p_outgoing_2->setPixmap(QPixmap(ICON_STATUS_UNKNOWN)) ;
+        ui.iconlabel_i2p_outgoing_2->setPixmap(FilesDefs::getPixmapFromQtResourcePath(ICON_STATUS_UNKNOWN)) ;
         ui.iconlabel_i2p_outgoing_2->setToolTip(tr("BOB is not accessible! Is it running?")) ;
     }
 }
@@ -1351,7 +1351,7 @@ void ServerPage::updateInProxyIndicator()
     if(!mIsHiddenNode)
         return ;
 
-    //ui.iconlabel_tor_incoming->setPixmap(QPixmap(ICON_STATUS_UNKNOWN)) ;
+    //ui.iconlabel_tor_incoming->setPixmap(FilesDefs::getPixmapFromQtResourcePath(ICON_STATUS_UNKNOWN)) ;
     //ui.testIncomingTor_PB->setIcon(FilesDefs::getIconFromQtResourcePath(":/loader/circleball-16.gif")) ;
     QMovie *movie = new QMovie(":/images/loader/circleball-16.gif");
     ui.iconlabel_service_incoming->setMovie(movie);
@@ -1674,7 +1674,7 @@ void ServerPage::updateStatusBob()
     case csConnected:
     case csDoDisconnect:
     case csWaitForBob:
-        ui.iconlabel_i2p_bob->setPixmap(QPixmap(ICON_STATUS_WORKING));
+        ui.iconlabel_i2p_bob->setPixmap(FilesDefs::getPixmapFromQtResourcePath(ICON_STATUS_WORKING));
         ui.iconlabel_i2p_bob->setToolTip(tr("BOB is processing a request"));
 
         enableBobElements(false);
@@ -1707,7 +1707,7 @@ void ServerPage::updateStatusBob()
         // get error msg from bob
         rsAutoProxyMonitor::taskSync(autoProxyType::I2PBOB, autoProxyTask::getErrorInfo, &errorString);
 
-        ui.iconlabel_i2p_bob->setPixmap(QPixmap(ICON_STATUS_ERROR));
+        ui.iconlabel_i2p_bob->setPixmap(FilesDefs::getPixmapFromQtResourcePath(ICON_STATUS_ERROR));
         ui.iconlabel_i2p_bob->setToolTip(tr("BOB is broken\n") + QString::fromStdString(errorString));
 
         enableBobElements(false);
@@ -1723,7 +1723,7 @@ void ServerPage::updateStatusBob()
     case csIdel:
         switch (bs.ct) {
         case ctRunSetUp:
-            ui.iconlabel_i2p_bob->setPixmap(QPixmap(ICON_STATUS_OK));
+            ui.iconlabel_i2p_bob->setPixmap(FilesDefs::getPixmapFromQtResourcePath(ICON_STATUS_OK));
             ui.iconlabel_i2p_bob->setToolTip(tr("BOB tunnel is running"));
 
             enableBobElements(false);
@@ -1736,7 +1736,7 @@ void ServerPage::updateStatusBob()
             break;
         case ctRunCheck:
         case ctRunGetKeys:
-			ui.iconlabel_i2p_bob->setPixmap(QPixmap(ICON_STATUS_WORKING));
+            ui.iconlabel_i2p_bob->setPixmap(FilesDefs::getPixmapFromQtResourcePath(ICON_STATUS_WORKING));
 			ui.iconlabel_i2p_bob->setToolTip(tr("BOB is processing a request"));
 
 			enableBobElements(false);
@@ -1749,7 +1749,7 @@ void ServerPage::updateStatusBob()
 			break;
 		case ctRunShutDown:
         case ctIdle:
-            ui.iconlabel_i2p_bob->setPixmap(QPixmap(ICON_STATUS_UNKNOWN));
+            ui.iconlabel_i2p_bob->setPixmap(FilesDefs::getPixmapFromQtResourcePath(ICON_STATUS_UNKNOWN));
             ui.iconlabel_i2p_bob->setToolTip(tr("BOB tunnel is not running"));
 
             enableBobElements(true);
@@ -1844,14 +1844,14 @@ void ServerPage::updateInProxyIndicatorResult(bool success)
     if (success) {
         std::cerr <<"Connected!" << std::endl;
 
-        ui.iconlabel_service_incoming->setPixmap(QPixmap(ICON_STATUS_OK)) ;
+        ui.iconlabel_service_incoming->setPixmap(FilesDefs::getPixmapFromQtResourcePath(ICON_STATUS_OK)) ;
         ui.iconlabel_service_incoming->setToolTip(tr("You are reachable through the hidden service.")) ;
         //ui.testIncomingTor_PB->setIcon(FilesDefs::getIconFromQtResourcePath(ICON_STATUS_OK)) ;
     } else {
         std::cerr <<"Failed!" << std::endl;
 
         //ui.testIncomingTor_PB->setIcon(FilesDefs::getIconFromQtResourcePath(ICON_STATUS_UNKNOWN)) ;
-        ui.iconlabel_service_incoming->setPixmap(QPixmap(ICON_STATUS_UNKNOWN)) ;
+        ui.iconlabel_service_incoming->setPixmap(FilesDefs::getPixmapFromQtResourcePath(ICON_STATUS_UNKNOWN)) ;
         ui.iconlabel_service_incoming->setToolTip(tr("The proxy is not enabled or broken.\nAre all services up and running fine??\nAlso check your ports!")) ;
     }
     // delete movie

retroshare-gui/src/gui/settings/ServerPage.h

@@ -36,8 +36,9 @@
 #include <services/autoproxy/rsautoproxymonitor.h>
 #include <services/autoproxy/p3i2pbob.h>
 
-#include <retroshare-gui/configpage.h>
+#include "retroshare-gui/configpage.h"
-#include <retroshare-gui/RsAutoUpdatePage.h>
+#include "retroshare-gui/RsAutoUpdatePage.h"
+#include "gui/common/FilesDefs.h"
 
 
 class QNetworkReply;
@@ -55,7 +56,7 @@ public:
     /** Loads the settings for this page */
     virtual void load();
 
-    virtual QPixmap iconPixmap() const { return QPixmap(":/icons/png/network.png") ; }
+    virtual QPixmap iconPixmap() const { return FilesDefs::getPixmapFromQtResourcePath(":/icons/png/network.png") ; }
     virtual QString pageName() const { return tr("Network") ; }
     virtual QString helpText() const { return ""; }
 

retroshare-gui/src/gui/settings/ServicePermissionsPage.h

@@ -25,6 +25,7 @@
 
 #include <retroshare-gui/configpage.h>
 #include "ui_ServicePermissionsPage.h"
+#include "gui/common/FilesDefs.h"
 
 class ServicePermissionsPage: public ConfigPage
 {
@@ -37,7 +38,7 @@ public:
     /** Loads the settings for this page */
     virtual void load() {}
 
-    virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/permissions.svg") ; }
+    virtual QPixmap iconPixmap() const { return FilesDefs::getPixmapFromQtResourcePath(":/icons/settings/permissions.svg") ; }
     virtual QString pageName() const { return tr("Permissions") ; }
     virtual QString helpText() const ;
 

retroshare-gui/src/gui/settings/SoundPage.h

@@ -23,8 +23,9 @@
 
 #include <QFileDialog>
 
-#include <retroshare-gui/configpage.h>
+#include "retroshare-gui/configpage.h"
 #include "ui_SoundPage.h"
+#include "gui/common/FilesDefs.h"
 
 class SoundPage : public ConfigPage
 {
@@ -39,7 +40,7 @@ public:
 	/** Loads the settings for this page */
 	virtual void load();
 
-	virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/sound.svg") ; }
+    virtual QPixmap iconPixmap() const { return FilesDefs::getPixmapFromQtResourcePath(":/icons/settings/sound.svg") ; }
 	virtual QString pageName() const { return tr("Sound") ; }
 	virtual QString helpText() const { return ""; }
 

retroshare-gui/src/gui/settings/TransferPage.h

@@ -23,8 +23,9 @@
 
 # include <QWidget>
 
-#include <retroshare-gui/configpage.h>
+#include "retroshare-gui/configpage.h"
 #include "ui_TransferPage.h"
+#include "gui/common/FilesDefs.h"
 
 class TransferPage: public ConfigPage
 {
@@ -37,7 +38,7 @@ class TransferPage: public ConfigPage
 		/** Loads the settings for this page */
 		virtual void load() ;
 
-		virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/filesharing.svg") ; }
+        virtual QPixmap iconPixmap() const { return FilesDefs::getPixmapFromQtResourcePath(":/icons/settings/filesharing.svg") ; }
         virtual QString pageName() const { return tr("Files") ; }
 		virtual QString helpText() const { return ""; }
 

retroshare-gui/src/gui/settings/WebuiPage.h

@@ -43,7 +43,7 @@ public:
   /** Loads the settings for this page */
   virtual void load();
 
-  virtual QPixmap iconPixmap() const { return QPixmap(":/icons/settings/webinterface.svg") ; }
+  virtual QPixmap iconPixmap() const { return FilesDefs::getPixmapFromQtResourcePath(":/icons/settings/webinterface.svg") ; }
   virtual QString pageName() const { return tr("Webinterface") ; }
   virtual QString helpText() const;
 

retroshare-gui/src/gui/statusbar/ToasterDisable.cpp

@@ -23,6 +23,7 @@
 
 #include "ToasterDisable.h"
 #include "gui/notifyqt.h"
+#include "gui/common/FilesDefs.h"
 
 #define IMAGE_TOASTERDISABLE   ":/images/toasterDisable.png"
 #define IMAGE_TOASTERENABLE    ":/images/toasterEnable.png"
@@ -57,7 +58,7 @@ ToasterDisable::ToasterDisable(QWidget *parent)
 
 void ToasterDisable::disable(bool isDisable)
 {
-	imageButton->setIcon(QPixmap(isDisable ? IMAGE_TOASTERDISABLE : IMAGE_TOASTERENABLE));
+    imageButton->setIcon(FilesDefs::getPixmapFromQtResourcePath(isDisable ? IMAGE_TOASTERDISABLE : IMAGE_TOASTERENABLE));
 	imageButton->setToolTip(isDisable ? tr("All Toasters are disabled") : tr("Toasters are enabled"));
 	imageButton->setChecked(isDisable);
 }

retroshare-gui/src/gui/statusbar/dhtstatus.cpp

@@ -27,6 +27,7 @@
 
 #include "retroshare/rsconfig.h"
 #include "retroshare/rspeers.h"
+#include "gui/common/FilesDefs.h"
 
 #include "util/misc.h"
 
@@ -46,7 +47,7 @@ DHTStatus::DHTStatus(QWidget *parent)
     hbox->addWidget(statusDHT);
     
     dhtstatusLabel = new QLabel( this );
-    dhtstatusLabel->setPixmap(QPixmap(":/icons/bullet_grey_128.png"));
+    dhtstatusLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/bullet_grey_128.png"));
     hbox->addWidget(dhtstatusLabel);
     
     spaceLabel = new QLabel( "|", this );
@@ -56,7 +57,7 @@ DHTStatus::DHTStatus(QWidget *parent)
     dhtnetworkLabel = new QLabel( this );
     dhtnetworkLabel->setVisible(false);
     int S = QFontMetricsF(dhtnetworkLabel->font()).height();
-    dhtnetworkLabel->setPixmap(QPixmap(":/images/dht32.png").scaledToHeight(S,Qt::SmoothTransformation));
+    dhtnetworkLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/dht32.png").scaledToHeight(S,Qt::SmoothTransformation));
     hbox->addWidget(dhtnetworkLabel);
 
     dhtnetworksizeLabel = new QLabel( "0 (0) ",this );
@@ -84,7 +85,7 @@ void DHTStatus::getDHTStatus()
 	if (!(config.DHTActive))
 	{
 		// GRAY.
-        dhtstatusLabel->setPixmap(QPixmap(":/icons/bullet_grey_128.png").scaledToHeight(S,Qt::SmoothTransformation));
+        dhtstatusLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/bullet_grey_128.png").scaledToHeight(S,Qt::SmoothTransformation));
 		dhtstatusLabel->setToolTip( text + tr("DHT Off"));
 
 		spaceLabel->setVisible(false);
@@ -102,7 +103,7 @@ void DHTStatus::getDHTStatus()
 			// YELLOW or GREEN.
 			if (config.netDhtRsNetSize < MIN_RS_NET_SIZE)
 			{
-                dhtstatusLabel->setPixmap(QPixmap(":/icons/bullet_yellow_128.png").scaledToHeight(S,Qt::SmoothTransformation));
+                dhtstatusLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/bullet_yellow_128.png").scaledToHeight(S,Qt::SmoothTransformation));
                 dhtstatusLabel->setToolTip( text + tr("DHT Searching for RetroShare Peers"));
 
 				spaceLabel->setVisible(true);
@@ -114,7 +115,7 @@ void DHTStatus::getDHTStatus()
 			}
 			else
 			{
-                dhtstatusLabel->setPixmap(QPixmap(":/icons/bullet_green_128.png").scaledToHeight(S,Qt::SmoothTransformation));
+                dhtstatusLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/bullet_green_128.png").scaledToHeight(S,Qt::SmoothTransformation));
 				dhtstatusLabel->setToolTip( text + tr("DHT Good"));
 
 				spaceLabel->setVisible(true);
@@ -128,7 +129,7 @@ void DHTStatus::getDHTStatus()
 		else
 		{
 			// RED - some issue.
-                dhtstatusLabel->setPixmap(QPixmap(":/icons/bullet_red_128.png").scaledToHeight(S,Qt::SmoothTransformation));
+                dhtstatusLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/bullet_red_128.png").scaledToHeight(S,Qt::SmoothTransformation));
             dhtstatusLabel->setToolTip( text + tr("No peer found in DHT"));
 
 			spaceLabel->setVisible(false);

retroshare-gui/src/gui/statusbar/discstatus.cpp

@@ -23,6 +23,7 @@
 
 #include "discstatus.h"
 #include "gui/settings/rsharesettings.h"
+#include "gui/common/FilesDefs.h"
 
 #include <retroshare/rsdisc.h>
 
@@ -36,7 +37,7 @@ DiscStatus::DiscStatus(QWidget *parent)
 	hbox->setSpacing(6);
 
 	QLabel *iconLabel = new QLabel(this);
-	iconLabel->setPixmap(QPixmap(":/images/uploads.png"));
+    iconLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/uploads.png"));
 	iconLabel->setToolTip(tr("Waiting outgoing discovery operations"));
 	hbox->addWidget(iconLabel);
 
@@ -45,7 +46,7 @@ DiscStatus::DiscStatus(QWidget *parent)
 	hbox->addWidget(sendLabel);
 
 	iconLabel = new QLabel(this);
-	iconLabel->setPixmap(QPixmap(":/images/download.png"));
+    iconLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/download.png"));
 	iconLabel->setToolTip(tr("Waiting incoming discovery operations"));
 	hbox->addWidget(iconLabel);
 

retroshare-gui/src/gui/statusbar/hashingstatus.cpp

@@ -27,6 +27,7 @@
 #include "hashingstatus.h"
 #include "gui/common/ElidedLabel.h"
 #include "gui/notifyqt.h"
+#include "gui/common/FilesDefs.h"
 
 HashingStatus::HashingStatus(QWidget *parent)
  : QWidget(parent)
@@ -124,7 +125,7 @@ void HashingStatus::mousePressEvent(QMouseEvent *)
 	if(rsFiles->hashingProcessPaused())
 	{
 		movie->stop() ;
-		hashloader->setPixmap(QPixmap(":/images/resume.png")) ;
+        hashloader->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/resume.png")) ;
 
 		mLastText = statusHashing->text();
 		statusHashing->setText(QObject::tr("[Hashing is paused]"));

retroshare-gui/src/gui/statusbar/natstatus.cpp

@@ -25,6 +25,7 @@
 
 #include "retroshare/rsiface.h"
 #include "retroshare/rsconfig.h"
+#include "gui/common/FilesDefs.h"
 
 NATStatus::NATStatus(QWidget *parent)
  : QWidget(parent)
@@ -38,7 +39,7 @@ NATStatus::NATStatus(QWidget *parent)
     hbox->addWidget(statusNAT);
     
     iconLabel = new QLabel(this);
-    iconLabel->setPixmap(QPixmap(":/images/grayled.png"));
+    iconLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/grayled.png"));
     // iconLabel doesn't change over time, so we didn't need a minimum size
     hbox->addWidget(iconLabel);
 
@@ -62,14 +63,14 @@ void NATStatus::getNATStatus()
 		default:
 		case RSNET_NETSTATE_BAD_UNKNOWN:
 		{
-            iconLabel->setPixmap(QPixmap(":/icons/bullet_yellow_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
+            iconLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/bullet_yellow_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
             iconLabel->setToolTip( text + tr("Network Status Unknown")) ;
 		}
 		break ;
 
 		case RSNET_NETSTATE_BAD_OFFLINE:
 		{
-            iconLabel->setPixmap(QPixmap(":/icons/bullet_grey_129.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
+            iconLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/bullet_grey_129.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
             iconLabel->setToolTip( text + tr("Offline")) ;
 		}
 		break ;
@@ -77,14 +78,14 @@ void NATStatus::getNATStatus()
 // BAD. (RED)
 		case RSNET_NETSTATE_BAD_NATSYM:
 		{
-            iconLabel->setPixmap(QPixmap(":/icons/bullet_red_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
+            iconLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/bullet_red_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
             iconLabel->setToolTip( text + tr("Nasty Firewall")) ;
 		}
 		break ;
 
 		case RSNET_NETSTATE_BAD_NODHT_NAT:
 		{
-            iconLabel->setPixmap(QPixmap(":/icons/bullet_red_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
+            iconLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/bullet_red_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
             iconLabel->setToolTip( text + tr("DHT Disabled and Firewalled")) ;
 		}
 		break ;
@@ -92,21 +93,21 @@ void NATStatus::getNATStatus()
 // CAUTION. (ORANGE)
 		case RSNET_NETSTATE_WARNING_RESTART:
 		{
-            iconLabel->setPixmap(QPixmap(":/icons/bullet_yellow_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
+            iconLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/bullet_yellow_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
             iconLabel->setToolTip( text + tr("Network Restarting")) ;
 		}
 		break ;
 
 		case RSNET_NETSTATE_WARNING_NATTED:
 		{
-            iconLabel->setPixmap(QPixmap(":/icons/bullet_yellow_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
+            iconLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/bullet_yellow_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
             iconLabel->setToolTip( text + tr("Behind Firewall")) ;
 		}
 		break ;
 
 		case RSNET_NETSTATE_WARNING_NODHT:
 		{
-            iconLabel->setPixmap(QPixmap(":/icons/bullet_yellow_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
+            iconLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/bullet_yellow_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
 			iconLabel->setToolTip( text + tr("DHT Disabled")) ;
 		}
 		break ;
@@ -114,14 +115,14 @@ void NATStatus::getNATStatus()
 // GOOD (GREEN)
 		case RSNET_NETSTATE_GOOD:
 		{
-            iconLabel->setPixmap(QPixmap(":/icons/bullet_green_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
+            iconLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/bullet_green_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
 			iconLabel->setToolTip( text + tr("RetroShare Server")) ;
 		}
 		break ;
 
 		case RSNET_NETSTATE_ADV_FORWARD:
 		{
-            iconLabel->setPixmap(QPixmap(":/icons/bullet_green_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
+            iconLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/bullet_green_128.png").scaledToHeight(S,Qt::SmoothTransformation)) ;
 			iconLabel->setToolTip( text + tr("Forwarded Port")) ;
 		}
 		break ;

retroshare-gui/src/gui/statusbar/peerstatus.cpp

@@ -22,6 +22,7 @@
 #include <QLabel>
 
 #include "peerstatus.h"
+#include "gui/common/FilesDefs.h"
 
 PeerStatus::PeerStatus(QWidget *parent)
  : QWidget(parent)
@@ -33,7 +34,7 @@ PeerStatus::PeerStatus(QWidget *parent)
 
     iconLabel = new QLabel( this );
     int S = QFontMetricsF(iconLabel->font()).height();
-	 iconLabel->setPixmap(QPixmap(":/icons/avatar_grey_128.png").scaledToHeight(S,Qt::SmoothTransformation));
+     iconLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/avatar_grey_128.png").scaledToHeight(S,Qt::SmoothTransformation));
     hbox->addWidget(iconLabel);
     
     statusPeers = new QLabel( tr("Friends: 0/0"), this );
@@ -59,7 +60,7 @@ void PeerStatus::getPeerStatus(unsigned int nFriendCount, unsigned int nOnlineCo
 	int S = QFontMetricsF(iconLabel->font()).height();
 
 	if (nOnlineCount > 0)
-		iconLabel->setPixmap(QPixmap(":/icons/avatar_128.png").scaledToHeight(S,Qt::SmoothTransformation));
+        iconLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/avatar_128.png").scaledToHeight(S,Qt::SmoothTransformation));
 	else
-		iconLabel->setPixmap(QPixmap(":/icons/avatar_grey_128.png").scaledToHeight(S,Qt::SmoothTransformation));
+        iconLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/avatar_grey_128.png").scaledToHeight(S,Qt::SmoothTransformation));
 }

retroshare-gui/src/gui/statusbar/ratesstatus.cpp

@@ -24,6 +24,7 @@
 #include "ratesstatus.h"
 #include <retroshare/rsiface.h>
 #include "util/misc.h"
+#include "gui/common/FilesDefs.h"
 
 #include <iomanip>
 
@@ -35,7 +36,7 @@ RatesStatus::RatesStatus(QWidget *parent)
     hbox->setSpacing(6);
     
     iconLabel = new QLabel( this );
-    iconLabel->setPixmap(QPixmap(":/images/up0down0.png"));
+    iconLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/up0down0.png"));
     // iconLabel doesn't change over time, so we didn't need a minimum size
     hbox->addWidget(iconLabel);
     
@@ -64,7 +65,7 @@ void RatesStatus::getRatesStatus(float downKb, uint64_t down, float upKb, uint64
 
     QString up = (upKb   > 0)?"1":"0";
     QString dw = (downKb > 0)?"1":"0";
-    iconLabel->setPixmap(QPixmap(QString(":/images/")
+    iconLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(QString(":/images/")
                                  + "up"   + up
                                  + "down" + dw
                                  + ".png"));

retroshare-gui/src/gui/statusbar/torstatus.cpp

@@ -31,6 +31,7 @@
 
 #include "TorControl/TorManager.h"
 #include "TorControl/TorControl.h"
+#include "gui/common/FilesDefs.h"
 
 #include <iomanip>
 
@@ -46,7 +47,7 @@ TorStatus::TorStatus(QWidget *parent)
     hbox->addWidget(statusTor);
     
     torstatusLabel = new QLabel( this );
-    torstatusLabel->setPixmap(QPixmap(":/icons/no-tor.png"));
+    torstatusLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/no-tor.png"));
     hbox->addWidget(torstatusLabel);
     
     _compactMode = false;
@@ -117,24 +118,24 @@ void TorStatus::getTorStatus()
 		if(torstatus == Tor::TorControl::TorOffline || !online || !tor_control_ok)
 		{
 			// RED - some issue.
-			torstatusLabel->setPixmap(QPixmap(":/icons/tor-stopping.png").scaledToHeight(1.5*S,Qt::SmoothTransformation));
+            torstatusLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/tor-stopping.png").scaledToHeight(1.5*S,Qt::SmoothTransformation));
 			torstatusLabel->setToolTip( text + tr("Tor is currently offline"));
 		}
 		else if(torstatus == Tor::TorControl::TorReady && online && tor_control_ok)
 		{
-			torstatusLabel->setPixmap(QPixmap(":/icons/tor-on.png").scaledToHeight(1.5*S,Qt::SmoothTransformation));
+            torstatusLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/tor-on.png").scaledToHeight(1.5*S,Qt::SmoothTransformation));
 			torstatusLabel->setToolTip( text + tr("Tor is OK"));
 		}
 		else // torstatus == Tor::TorControl::TorUnknown
 		{
 			// GRAY.
-			torstatusLabel->setPixmap(QPixmap(":/icons/no-tor.png").scaledToHeight(1.5*S,Qt::SmoothTransformation));
+            torstatusLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/no-tor.png").scaledToHeight(1.5*S,Qt::SmoothTransformation));
 			torstatusLabel->setToolTip( text + tr("No tor configuration"));
 		}
 	}
 	else
 	{
-		torstatusLabel->setPixmap(QPixmap(":/icons/tor-stopping.png").scaledToHeight(S,Qt::SmoothTransformation));
+        torstatusLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/tor-stopping.png").scaledToHeight(S,Qt::SmoothTransformation));
 		torstatusLabel->setToolTip( text + tr("Tor is currently offline"));
 	}
 }

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

@@ -24,6 +24,7 @@
 
 #include "StyleDialog.h"
 #include "gui/style/RSStyle.h"
+#include "gui/common/FilesDefs.h"
 
 /** Default constructor */
 StyleDialog::StyleDialog(RSStyle &style, QWidget *parent)
@@ -32,7 +33,7 @@ StyleDialog::StyleDialog(RSStyle &style, QWidget *parent)
 	/* Invoke Qt Designer generated QObject setup routine */
 	ui.setupUi(this);
 
-	ui.headerFrame->setHeaderImage(QPixmap(":/icons/collections.png"));
+    ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/collections.png"));
 	ui.headerFrame->setHeaderText(tr("Define Style"));
 
 	/* Load window postion */

retroshare-gui/src/main.cpp

@@ -441,7 +441,7 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
 		}
 	}
 
-	QSplashScreen splashScreen(QPixmap(":/images/logo/logo_splash.png")/* , Qt::WindowStaysOnTopHint*/);
+    QSplashScreen splashScreen(FilesDefs::getPixmapFromQtResourcePath(":/images/logo/logo_splash.png")/* , Qt::WindowStaysOnTopHint*/);
 
 	splashScreen.show();
 	splashScreen.showMessage(rshare.translate("SplashScreen", "Load configuration"), Qt::AlignHCenter | Qt::AlignBottom);

retroshare-gui/src/util/misc.cpp

@@ -29,6 +29,7 @@
 
 #include "misc.h"
 #include "util/rsdebug.h"
+#include "gui/common/FilesDefs.h"
 
 // return best userfriendly storage unit (B, KiB, MiB, GiB, TiB)
 // use Binary prefix standards from IEC 60027-2
@@ -307,8 +308,8 @@ QPixmap misc::getOpenThumbnailedPicture(QWidget *parent, const QString &caption,
 	if (!getOpenFileName(parent, RshareSettings::LASTDIR_IMAGES, caption, tr("Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)"), fileName))
 		return QPixmap();
 
-    return QPixmap(fileName).scaledToHeight(height, Qt::SmoothTransformation).copy( 0, 0, width, height);
+    return FilesDefs::getPixmapFromQtResourcePath(fileName).scaledToHeight(height, Qt::SmoothTransformation).copy( 0, 0, width, height);
-	//return QPixmap(fileName).scaledToHeight(width, height, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
+    //return FilesDefs::getPixmapFromQtResourcePath(fileName).scaledToHeight(width, height, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
 }
 
 bool misc::getOpenFileName(QWidget *parent, RshareSettings::enumLastDir type