Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-01 12:54:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge remote-tracking branch 'upstream/master' into v0.6-TorV3

Browse source
This commit is contained in:
csoler 2020-10-10 23:12:27 +02:00
commit 74660b916a
119 changed files with 1012 additions and 1284 deletions
Download patch file Download diff file Expand all files Collapse all files

3
retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp
View file

@ -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()));

15
retroshare-gui/src/gui/FileTransfer/FileTransferInfoWidget.cpp
View file

@ -23,11 +23,12 @@
#include <math.h>
#include <QStylePainter>
#include <QDebug>
#include <retroshare/rsfiles.h>
#include <retroshare/rstypes.h>
#include "retroshare/rsfiles.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);
downloadingPixmap = QPixmap(":/icons/tile_downloading_48.png").scaledToHeight(S,Qt::SmoothTransformation);
notDownloadPixmap = QPixmap(":/icons/tile_inactive_48.png").scaledToHeight(S,Qt::SmoothTransformation);
checkingPixmap = QPixmap(":/icons/tile_checking_48.png").scaledToHeight(S,Qt::SmoothTransformation);
downloadedPixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/tile_downloaded_48.png").scaledToHeight(S,Qt::SmoothTransformation);
downloadingPixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/tile_downloading_48.png").scaledToHeight(S,Qt::SmoothTransformation);
notDownloadPixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/tile_inactive_48.png").scaledToHeight(S,Qt::SmoothTransformation);
checkingPixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/tile_checking_48.png").scaledToHeight(S,Qt::SmoothTransformation);
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
}

4
retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
View file

@ -268,7 +268,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()) ;
}
@ -500,7 +500,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("") ;
}

7
retroshare-gui/src/gui/GenCertDialog.cpp
View file

@ -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();
}

16
retroshare-gui/src/gui/GetStartedDialog.cpp
View file

@ -105,7 +105,7 @@ void GetStartedDialog::showEvent ( QShowEvent * /*event*/ )
void GetStartedDialog::updateFromUserLevel()
{
uint32_t userLevel = RSCONFIG_USER_LEVEL_NEW;
RsConfigUserLvl userLevel = RsConfigUserLvl::NEW;
userLevel = rsConfig->getUserLevel();
ui.inviteCheckBox->setChecked(false);
@ -116,19 +116,19 @@ void GetStartedDialog::updateFromUserLevel()
switch(userLevel)
{
// FALLS THROUGH EVERYWHERE.
case RSCONFIG_USER_LEVEL_POWER:
case RSCONFIG_USER_LEVEL_OVERRIDE:
case RsConfigUserLvl::POWER:
case RsConfigUserLvl::OVERRIDE:
ui.firewallCheckBox->setChecked(true);
/* fallthrough */
case RSCONFIG_USER_LEVEL_CASUAL:
case RsConfigUserLvl::CASUAL:
ui.connectCheckBox->setChecked(true);
/* fallthrough */
case RSCONFIG_USER_LEVEL_BASIC:
case RsConfigUserLvl::BASIC:
ui.addCheckBox->setChecked(true);
ui.inviteCheckBox->setChecked(true);
default:
case RSCONFIG_USER_LEVEL_NEW:
case RsConfigUserLvl::NEW:
break;
}
@ -325,7 +325,7 @@ void GetStartedDialog::emailSupport()
return;
}
uint32_t userLevel;
RsConfigUserLvl userLevel;
{
RsAutoUpdatePage::lockAllEvents();
@ -427,7 +427,7 @@ void GetStartedDialog::emailSupport()
sysVersion = "Linux";
#endif
#endif
text += QString("My RetroShare Configuration is: (%1, %2, 0x60%3)").arg(Rshare::retroshareVersion(true)).arg(sysVersion).arg(userLevel) + "\n";
text += QString("My RetroShare Configuration is: (%1, %2, %3)").arg(Rshare::retroshareVersion(true)).arg(sysVersion).arg(static_cast<typename std::underlying_type<RsConfigUserLvl>::type>(userLevel)) + "\n";
text += "\n";
text += QString("I am having trouble with RetroShare.");

3
retroshare-gui/src/gui/Identity/IdDetailsDialog.cpp
View file

@ -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()));

6
retroshare-gui/src/gui/Identity/IdDialog.cpp
View file

@ -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);

5
retroshare-gui/src/gui/Identity/IdEditDialog.cpp
View file

@ -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);

17
retroshare-gui/src/gui/LogoBar.cpp
View file

@ -20,8 +20,9 @@
#include "LogoBar.h"
#include <util/RetroStyleLabel.h>
#include <util/MouseEventFilter.h>
#include "util/RetroStyleLabel.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);

8
retroshare-gui/src/gui/MainWindow.cpp
View file

@ -1563,13 +1563,13 @@ void MainWindow::processLastArgs()
if (opModeStatus) {
QString opmode = Rshare::opmode().toLower();
if (opmode == "noturtle") {
opModeStatus->setCurrentIndex(RS_OPMODE_NOTURTLE - 1);
opModeStatus->setCurrentIndex(static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::NOTURTLE) - 1);
} else if (opmode == "gaming") {
opModeStatus->setCurrentIndex(RS_OPMODE_GAMING - 1);
opModeStatus->setCurrentIndex(static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::GAMING) - 1);
} else if (opmode == "minimal") {
opModeStatus->setCurrentIndex(RS_OPMODE_MINIMAL - 1);
opModeStatus->setCurrentIndex(static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::MINIMAL) - 1);
} else if (opmode != "") {
opModeStatus->setCurrentIndex(RS_OPMODE_FULL - 1);
opModeStatus->setCurrentIndex(static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::FULL) - 1);
}
opModeStatus->setOpMode();
} else {

4
retroshare-gui/src/gui/PhotoShare/AlbumDialog.cpp
View file

@ -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"));
}
}

4
retroshare-gui/src/gui/PhotoShare/AlbumGroupDialog.cpp
View file

@ -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....

2
retroshare-gui/src/gui/PhotoShare/AlbumItem.cpp
View file

@ -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"));
}
}

2
retroshare-gui/src/gui/PhotoShare/PhotoItem.cpp
View file

@ -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));

3
retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp
View file

@ -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 );

5
retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp
View file

@ -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;
}

2
retroshare-gui/src/gui/Posted/PostedItem.cpp
View file

@ -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;

3
retroshare-gui/src/gui/Posted/PostedListWidget.cpp
View file

@ -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()));

3
retroshare-gui/src/gui/QuickStartWizard.cpp
View file

@ -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);

3
retroshare-gui/src/gui/ServicePermissionDialog.cpp
View file

@ -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()));

3
retroshare-gui/src/gui/ShareManager.cpp
View file

@ -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;

2
retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
View file

@ -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;

4
retroshare-gui/src/gui/TheWire/PulseTopLevel.cpp
View file

@ -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"));
}
}

2
retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp
View file

@ -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);
}

4
retroshare-gui/src/gui/TheWire/PulseViewItem.cpp
View file

@ -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"));
}

4
retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp
View file

@ -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

2
retroshare-gui/src/gui/TheWire/WireGroupItem.cpp
View file

@ -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);
}

4
retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp
View file

@ -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"));

8
retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
View file

@ -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);
}

2
retroshare-gui/src/gui/chat/ChatWidget.cpp
View file

@ -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;

3
retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp
View file

@ -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 ;

9
retroshare-gui/src/gui/common/AvatarDefs.cpp
View file

@ -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;
}

3
retroshare-gui/src/gui/common/AvatarDialog.cpp
View file

@ -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()));

4
retroshare-gui/src/gui/common/Emoticons.cpp
View file

@ -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());

2
retroshare-gui/src/gui/common/FilesDefs.cpp
View file

@ -102,7 +102,7 @@ QPixmap FilesDefs::getPixmapFromQtResourcePath(const QString& resource_path)
#ifdef DEBUG_FILESDEFS
std::cerr << " Not in cache. Creating new one." << std::endl;
#endif
pixmap = QPixmap(resource_path);
pixmap = QPixmap(resource_path);
mPixmapCache[resource_path] = pixmap;
}
else

24
retroshare-gui/src/gui/common/FriendList.cpp
View file

@ -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;

4
retroshare-gui/src/gui/common/NewFriendList.cpp
View file

@ -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);
@ -534,7 +534,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);

3
retroshare-gui/src/gui/common/RSTextBrowser.cpp
View file

@ -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)

3
retroshare-gui/src/gui/common/RSTreeView.cpp
View file

@ -30,7 +30,10 @@ RSTreeView::RSTreeView(QWidget *parent) : QTreeView(parent)
void RSTreeView::wheelEvent(QWheelEvent *e)
{
if(e->modifiers() == Qt::ControlModifier)
{
emit zoomRequested(e->delta() > 0);
return;
}
else
QTreeView::wheelEvent(e);
}

3
retroshare-gui/src/gui/common/RSTreeWidget.cpp
View file

@ -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);

2
retroshare-gui/src/gui/common/RsCollectionDialog.cpp
View file

@ -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)
{

3
retroshare-gui/src/gui/connect/ConfCertDialog.cpp
View file

@ -40,6 +40,7 @@
#include "gui/RetroShareLink.h"
#include "gui/notifyqt.h"
#include "gui/common/AvatarDefs.h"
#include "gui/common/FilesDefs.h"
#include "gui/MainWindow.h"
#include "util/DateTime.h"
#include "util/misc.h"
@ -84,7 +85,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() ;

14
retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
View file

@ -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);

37
retroshare-gui/src/gui/connect/ConnectProgressDialog.cpp
View file

@ -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()));
@ -281,39 +282,39 @@ void ConnectProgressDialog::stopAndClose()
void ConnectProgressDialog::updateNetworkStatus()
{
uint32_t netState = rsConfig->getNetState();
RsNetState netState = rsConfig->getNetState();
QLabel *label = ui->NetResult;
switch(netState)
{
case RSNET_NETSTATE_BAD_UNKNOWN:
case RsNetState::BAD_UNKNOWN:
label->setText(tr("Unknown State"));
break;
case RSNET_NETSTATE_BAD_OFFLINE:
case RsNetState::BAD_OFFLINE:
label->setText(tr("Offline"));
break;
case RSNET_NETSTATE_BAD_NATSYM:
case RsNetState::BAD_NATSYM:
label->setText(tr("Behind Symmetric NAT"));
break;
case RSNET_NETSTATE_BAD_NODHT_NAT:
case RsNetState::BAD_NODHT_NAT:
label->setText(tr("Behind NAT & No DHT"));
break;
case RSNET_NETSTATE_WARNING_RESTART:
case RsNetState::WARNING_RESTART:
label->setText(tr("NET Restart"));
break;
case RSNET_NETSTATE_WARNING_NATTED:
case RsNetState::WARNING_NATTED:
label->setText(tr("Behind NAT"));
break;
case RSNET_NETSTATE_WARNING_NODHT:
case RsNetState::WARNING_NODHT:
label->setText(tr("No DHT"));
break;
case RSNET_NETSTATE_GOOD:
case RsNetState::GOOD:
label->setText(tr("NET STATE GOOD!"));
break;
case RSNET_NETSTATE_ADV_FORWARD:
case RsNetState::ADV_FORWARD:
label->setText(tr("UNVERIFIABLE FORWARD!"));
break;
case RSNET_NETSTATE_ADV_DARK_FORWARD:
case RsNetState::ADV_DARK_FORWARD:
label->setText(tr("UNVERIFIABLE FORWARD & NO DHT"));
break;
}
@ -521,30 +522,30 @@ void ConnectProgressDialog::updateLookupStatus()
switch(status.mDhtState)
{
default:
case RSDHT_PEERDHT_NOT_ACTIVE:
case RsDhtPeerDht::NOT_ACTIVE:
ui->LookupProgressBar->setValue(0);
ui->LookupResult->setText(tr("Peer DHT NOT ACTIVE"));
mLookupStatus = CONNECT_LOOKUP_NODHTCONFIG;
break;
case RSDHT_PEERDHT_SEARCHING:
case RsDhtPeerDht::SEARCHING:
ui->LookupResult->setText(tr("Searching"));
break;
case RSDHT_PEERDHT_FAILURE:
case RsDhtPeerDht::FAILURE:
ui->LookupProgressBar->setValue(0);
ui->LookupResult->setText(tr("Lookup Failure"));
mLookupStatus = CONNECT_LOOKUP_FAIL;
break;
case RSDHT_PEERDHT_OFFLINE:
case RsDhtPeerDht::OFFLINE:
ui->LookupProgressBar->setValue(100);
ui->LookupResult->setText(tr("Peer Offline"));
mLookupStatus = CONNECT_LOOKUP_OFFLINE;
break;
case RSDHT_PEERDHT_UNREACHABLE:
case RsDhtPeerDht::UNREACHABLE:
ui->LookupProgressBar->setValue(100);
ui->LookupResult->setText(tr("Peer Firewalled"));
mLookupStatus = CONNECT_LOOKUP_UNREACHABLE;
break;
case RSDHT_PEERDHT_ONLINE:
case RsDhtPeerDht::ONLINE:
ui->LookupProgressBar->setValue(100);
ui->LookupResult->setText(tr("Peer Online"));
mLookupStatus = CONNECT_LOOKUP_ONLINE;

2
retroshare-gui/src/gui/connect/PGPKeyDialog.cpp
View file

@ -75,7 +75,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() ;

2
retroshare-gui/src/gui/feeds/GxsChannelGroupItem.cpp
View file

@ -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)) {

44
retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
View file

@ -156,7 +156,7 @@ void GxsChannelPostItem::setup()
// memory.
ui->logoLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/thumb-default-video.png"));
ui->warn_image_label->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/status_unknown.png"));
//ui->warn_image_label->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/status_unknown.png"));
ui->readButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/images/message-state-unread.png"));
ui->voteUpButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/images/vote_up.png"));
ui->voteDownButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/images/vote_down.png"));
@ -211,12 +211,12 @@ void GxsChannelPostItem::setup()
ui->downloadButton->hide();
ui->playButton->hide();
ui->warn_image_label->hide();
ui->warning_label->hide();
//ui->warn_image_label->hide();
//ui->warning_label->hide();
ui->titleLabel->setMinimumWidth(100);
//ui->subjectLabel->setMinimumWidth(100);
ui->warning_label->setMinimumWidth(100);
//ui->warning_label->setMinimumWidth(100);
ui->mainFrame->setProperty("new", false);
ui->mainFrame->style()->unpolish(ui->mainFrame);
@ -466,7 +466,7 @@ void GxsChannelPostItem::fill()
ui->titleLabel->setText(title);
RetroShareLink msgLink = RetroShareLink::createGxsMessageLink(RetroShareLink::TYPE_CHANNEL, mPost.mMeta.mGroupId, mPost.mMeta.mMsgId, messageName());
//ui->subjectLabel->setText(msgLink.toHtml());
ui->subjectLabel->setText(msgLink.toHtml());
if (IS_GROUP_SUBSCRIBED(mGroupMeta.mSubscribeFlags) || IS_GROUP_ADMIN(mGroupMeta.mSubscribeFlags))
{
@ -489,12 +489,12 @@ void GxsChannelPostItem::fill()
/* subject */
ui->titleLabel->setText(QString::fromUtf8(mPost.mMeta.mMsgName.c_str()));
//uint32_t autorized_lines = (int)floor((ui->logoLabel->height() - ui->titleLabel->height() - ui->buttonHLayout->sizeHint().height())/QFontMetricsF(ui->subjectLabel->font()).height());
uint32_t autorized_lines = (int)floor((ui->logoLabel->height() - ui->titleLabel->height() - ui->buttonHLayout->sizeHint().height())/QFontMetricsF(ui->subjectLabel->font()).height());
// fill first 4 lines of message. (csoler) Disabled the replacement of smileys and links, because the cost is too crazy
//ui->subjectLabel->setText(RsHtml().formatText(NULL, RsStringUtil::CopyLines(QString::fromUtf8(mPost.mMsg.c_str()), autorized_lines), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS));
//ui->subjectLabel->setText(RsStringUtil::CopyLines(QString::fromUtf8(mPost.mMsg.c_str()), 2)) ;
ui->subjectLabel->setText(RsStringUtil::CopyLines(QString::fromUtf8(mPost.mMsg.c_str()), 2)) ;
//QString score = QString::number(post.mTopScore);
// scoreLabel->setText(score);
@ -654,21 +654,21 @@ void GxsChannelPostItem::setReadStatus(bool isNew, bool isUnread)
ui->mainFrame->style()->polish( ui->mainFrame);
}
void GxsChannelPostItem::setFileCleanUpWarning(uint32_t time_left)
{
int hours = (int)time_left/3600;
int minutes = (time_left - hours*3600)%60;
ui->warning_label->setText(tr("Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it.").arg(
QString::number(hours)).arg(QString::number(minutes)));
QFont warnFont = ui->warning_label->font();
warnFont.setBold(true);
ui->warning_label->setFont(warnFont);
ui->warn_image_label->setVisible(true);
ui->warning_label->setVisible(true);
}
// void GxsChannelPostItem::setFileCleanUpWarning(uint32_t time_left)
// {
// int hours = (int)time_left/3600;
// int minutes = (time_left - hours*3600)%60;
//
// ui->warning_label->setText(tr("Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it.").arg(
// QString::number(hours)).arg(QString::number(minutes)));
//
// QFont warnFont = ui->warning_label->font();
// warnFont.setBold(true);
// ui->warning_label->setFont(warnFont);
//
// ui->warn_image_label->setVisible(true);
// ui->warning_label->setVisible(true);
// }
void GxsChannelPostItem::updateItem()
{

2
retroshare-gui/src/gui/feeds/GxsChannelPostItem.h
View file

@ -56,7 +56,7 @@ public:
bool setGroup(const RsGxsChannelGroup& group, bool doFill = true);
bool setPost(const RsGxsChannelPost& post, bool doFill = true);
void setFileCleanUpWarning(uint32_t time_left);
//void setFileCleanUpWarning(uint32_t time_left);
QString getTitleLabel();
QString getMsgLabel();

56
retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui
View file

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>922</width>
<height>187</height>
<width>1092</width>
<height>231</height>
</rect>
</property>
<layout class="QGridLayout" name="gxsChannelPostItem_GLayout">
@ -124,6 +124,16 @@
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="subjectLabel">
<property name="text">
<string notr="true">TextLabel</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
@ -137,33 +147,6 @@
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="subjectHLayout"/>
</item>
<item>
<layout class="QHBoxLayout" name="warningHLayout">
<item>
<widget class="QLabel" name="warn_image_label">
<property name="maximumSize">
<size>
<width>24</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="warning_label">
<property name="text">
<string notr="true">TextLabel</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="newCommHLayout">
<property name="topMargin">
@ -486,21 +469,18 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>StyledElidedLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledElidedLabel.h</header>
</customwidget>
<customwidget>
<class>ElidedLabel</class>
<extends>QLabel</extends>
<header location="global">gui/common/ElidedLabel.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>StyledElidedLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledElidedLabel.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../icons.qrc"/>
<include location="../images.qrc"/>
</resources>
<resources/>
<connections/>
</ui>

4
retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp
View file

@ -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)) {

4
retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
View file

@ -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) {

6
retroshare-gui/src/gui/feeds/PostedGroupItem.cpp
View file

@ -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)) {

5
retroshare-gui/src/gui/groups/CreateGroup.cpp
View file

@ -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);

2
retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
View file

@ -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 */

9
retroshare-gui/src/gui/gxs/GxsGroupShareKey.cpp
View file

@ -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."));

2
retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp
View file

@ -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);

2
retroshare-gui/src/gui/gxs/WikiGroupDialog.cpp
View file

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

2
retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp
View file

@ -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"));

5
retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp
View file

@ -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();

245
retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
View file

@ -121,7 +121,11 @@ void ChannelPostDelegate::paint(QPainter * painter, const QStyleOptionViewItem &
RsGxsChannelPost post = index.data(Qt::UserRole).value<RsGxsChannelPost>() ;
painter->fillRect( option.rect, option.backgroundBrush);
// if(index.row() & 0x01)
// painter->fillRect( option.rect, option.palette.alternateBase().color());
// else
painter->fillRect( option.rect, option.palette.base().color());
painter->restore();
if(mUseGrid || index.column()==0)
@ -130,6 +134,7 @@ void ChannelPostDelegate::paint(QPainter * painter, const QStyleOptionViewItem &
uint32_t flags = (mUseGrid)?(ChannelPostThumbnailView::FLAG_SHOW_TEXT | ChannelPostThumbnailView::FLAG_SCALE_FONT):0;
ChannelPostThumbnailView w(post,flags);
w.setBackgroundRole(QPalette::AlternateBase);
w.setAspectRatio(mAspectRatio);
w.updateGeometry();
w.adjustSize();
@ -139,7 +144,14 @@ void ChannelPostDelegate::paint(QPainter * painter, const QStyleOptionViewItem &
if((option.state & QStyle::State_Selected) && post.mMeta.mPublishTs > 0) // check if post is selected and is not empty (end of last row)
pixmap.fill(SelectedColor); // I dont know how to grab the backgroud color for selected objects automatically.
else
pixmap.fill(QRgb(0x00ffffff)); // choose a fully transparent background
{
// we need to do the alternate color manually
//if(index.row() & 0x01)
// pixmap.fill(option.palette.alternateBase().color());
//else
pixmap.fill(option.palette.base().color());
}
w.render(&pixmap,QPoint(),QRegion(),QWidget::DrawChildren );// draw the widgets, not the background
@ -198,8 +210,11 @@ void ChannelPostDelegate::paint(QPainter * painter, const QStyleOptionViewItem &
painter->drawText(QPoint(p.x()+0.5*font_height,y),QDateTime::fromSecsSinceEpoch(post.mMeta.mPublishTs).toString(Qt::DefaultLocaleShortDate));
y += font_height;
painter->drawText(QPoint(p.x()+0.5*font_height,y),QString::number(post.mCount)+ " " +((post.mCount>1)?tr("files"):tr("file")) + " (" + QString::number(post.mSize) + " " + tr("bytes") + ")" );
y += font_height;
if(post.mCount > 0)
{
painter->drawText(QPoint(p.x()+0.5*font_height,y),QString::number(post.mCount)+ " " +((post.mCount>1)?tr("files"):tr("file")) + " (" + QString::number(post.mSize) + " " + tr("bytes") + ")" );
y += font_height;
}
painter->restore();
}
@ -285,8 +300,14 @@ void ChannelPostFilesDelegate::paint(QPainter * painter, const QStyleOptionViewI
w.setFixedHeight(option.rect.height());
QPixmap pixmap(w.size());
pixmap.fill(QRgb(0x00ffffff)); // choose a fully transparent background
w.render(&pixmap,QPoint(),QRegion(),QWidget::DrawChildren );// draw the widgets, not the background
// apparently we need to do the alternate colors manually
//if(index.row() & 0x01)
// pixmap.fill(option.palette.alternateBase().color());
//else
pixmap.fill(option.palette.base().color());
w.render(&pixmap,QPoint(),QRegion(),QWidget::DrawChildren );// draw the widgets, not the background
painter->drawPixmap(option.rect.topLeft(),pixmap);
}
@ -335,6 +356,7 @@ GxsChannelPostsWidgetWithModel::GxsChannelPostsWidgetWithModel(const RsGxsGroupI
ui->showUnread_TB->setToolTip(tr("Show unread posts only"));
connect(ui->showUnread_TB,SIGNAL(toggled(bool)),this,SLOT(switchOnlyUnread(bool)));
ui->postsTree->setAlternatingRowColors(false);
ui->postsTree->setModel(mChannelPostsModel = new RsGxsChannelPostsModel());
ui->postsTree->setItemDelegate(mChannelPostsDelegate = new ChannelPostDelegate());
ui->postsTree->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); // prevents bug on w10, since row size depends on widget width
@ -351,6 +373,7 @@ GxsChannelPostsWidgetWithModel::GxsChannelPostsWidgetWithModel(const RsGxsGroupI
ui->channelPostFiles_TV->setPlaceholderText(tr("No files in this post, or no post selected"));
ui->channelPostFiles_TV->setSortingEnabled(true);
ui->channelPostFiles_TV->sortByColumn(0, Qt::AscendingOrder);
ui->channelPostFiles_TV->setAlternatingRowColors(false);
ui->channelFiles_TV->setModel(mChannelFilesModel = new RsGxsChannelPostFilesModel());
ui->channelFiles_TV->setItemDelegate(mFilesDelegate = new ChannelPostFilesDelegate());
@ -418,8 +441,8 @@ GxsChannelPostsWidgetWithModel::GxsChannelPostsWidgetWithModel(const RsGxsGroupI
/* Initialize subscribe button */
QIcon icon;
icon.addPixmap(QPixmap(":/images/redled.png"), QIcon::Normal, QIcon::On);
icon.addPixmap(QPixmap(":/images/start.png"), QIcon::Normal, QIcon::Off);
icon.addPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/redled.png"), QIcon::Normal, QIcon::On);
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()));
@ -894,15 +917,7 @@ void GxsChannelPostsWidgetWithModel::processSettings(bool load)
Settings->beginGroup(QString("ChannelPostsWidget"));
if (load) {
#ifdef TO_REMOVE
// load settings
/* Filter */
//ui->filterLineEdit->setCurrentFilter(Settings->value("filter", FILTER_TITLE).toInt());
/* View mode */
//setViewMode(Settings->value("viewMode", VIEW_MODE_FEEDS).toInt());
#endif
// state of files tree
channelpostfilesheader->restoreState(Settings->value("PostFilesTree").toByteArray());
channelfilesheader->restoreState(Settings->value("FilesTree").toByteArray());
@ -910,15 +925,6 @@ void GxsChannelPostsWidgetWithModel::processSettings(bool load)
// state of splitter
ui->splitter->restoreState(Settings->value("SplitterChannelPosts").toByteArray());
} else {
#ifdef TO_REMOVE
// save settings
/* Filter */
//Settings->setValue("filter", ui->filterLineEdit->currentFilter());
/* View mode */
//Settings->setValue("viewMode", viewMode());
#endif
// state of files tree
Settings->setValue("PostFilesTree", channelpostfilesheader->saveState());
Settings->setValue("FilesTree", channelfilesheader->saveState());
@ -946,7 +952,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);
// }
@ -1000,7 +1006,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]"));
@ -1106,47 +1112,6 @@ void GxsChannelPostsWidgetWithModel::insertChannelDetails(const RsGxsChannelGrou
showPostDetails();
}
#ifdef TODO
int GxsChannelPostsWidgetWithModel::viewMode()
{
if (ui->feedToolButton->isChecked()) {
return VIEW_MODE_FEEDS;
} else if (ui->fileToolButton->isChecked()) {
return VIEW_MODE_FILES;
}
/* Default */
return VIEW_MODE_FEEDS;
}
#endif
void GxsChannelPostsWidgetWithModel::setViewMode(int viewMode)
{
#ifdef TODO
switch (viewMode) {
case VIEW_MODE_FEEDS:
ui->feedWidget->show();
ui->fileWidget->hide();
ui->feedToolButton->setChecked(true);
ui->fileToolButton->setChecked(false);
break;
case VIEW_MODE_FILES:
ui->feedWidget->hide();
ui->fileWidget->show();
ui->feedToolButton->setChecked(false);
ui->fileToolButton->setChecked(true);
break;
default:
setViewMode(VIEW_MODE_FEEDS);
return;
}
#endif
}
void GxsChannelPostsWidgetWithModel::switchOnlyUnread(bool)
{
filterChanged(ui->filterLineEdit->text());
@ -1160,150 +1125,6 @@ void GxsChannelPostsWidgetWithModel::filterChanged(QString s)
mChannelFilesModel->setFilter(ql,count);
}
#ifdef TODO
/*static*/ bool GxsChannelPostsWidgetWithModel::filterItem(FeedItem *feedItem, const QString &text, int filter)
{
GxsChannelPostItem *item = dynamic_cast<GxsChannelPostItem*>(feedItem);
if (!item) {
return true;
}
bool bVisible = text.isEmpty();
if (!bVisible)
{
switch(filter)
{
case FILTER_TITLE:
bVisible = item->getTitleLabel().contains(text,Qt::CaseInsensitive);
break;
case FILTER_MSG:
bVisible = item->getMsgLabel().contains(text,Qt::CaseInsensitive);
break;
case FILTER_FILE_NAME:
{
std::list<SubFileItem *> fileItems = item->getFileItems();
std::list<SubFileItem *>::iterator lit;
for(lit = fileItems.begin(); lit != fileItems.end(); ++lit)
{
SubFileItem *fi = *lit;
QString fileName = QString::fromUtf8(fi->FileName().c_str());
bVisible = (bVisible || fileName.contains(text,Qt::CaseInsensitive));
}
break;
}
default:
bVisible = true;
break;
}
}
return bVisible;
}
void GxsChannelPostsWidget::createPostItemFromMetaData(const RsGxsMsgMetaData& meta,bool related)
{
GxsChannelPostItem *item = NULL;
RsGxsChannelPost post;
if(!meta.mOrigMsgId.isNull())
{
FeedItem *feedItem = ui->feedWidget->findFeedItem(GxsChannelPostItem::computeIdentifier(meta.mOrigMsgId)) ;
item = dynamic_cast<GxsChannelPostItem*>(feedItem);
if(item)
{
post = feedItem->post();
ui->feedWidget->removeFeedItem(item) ;
post.mOlderVersions.insert(post.mMeta.mMsgId);
GxsChannelPostItem *item = new GxsChannelPostItem(this, 0, post, true, false,post.mOlderVersions);
ui->feedWidget->addFeedItem(item, ROLE_PUBLISH, QDateTime::fromTime_t(post.mMeta.mPublishTs));
return ;
}
}
if (related)
{
FeedItem *feedItem = ui->feedWidget->findFeedItem(GxsChannelPostItem::computeIdentifier(meta.mMsgId)) ;
item = dynamic_cast<GxsChannelPostItem*>(feedItem);
}
if (item)
{
item->setPost(post);
ui->feedWidget->setSort(item, ROLE_PUBLISH, QDateTime::fromTime_t(meta.mPublishTs));
}
else
{
GxsChannelPostItem *item = new GxsChannelPostItem(this, 0, meta.mGroupId,meta.mMsgId, true, true);
ui->feedWidget->addFeedItem(item, ROLE_PUBLISH, QDateTime::fromTime_t(post.mMeta.mPublishTs));
}
#ifdef TODO
ui->fileWidget->addFiles(post, related);
#endif
}
void GxsChannelPostsWidget::createPostItem(const RsGxsChannelPost& post, bool related)
{
GxsChannelPostItem *item = NULL;
const RsMsgMetaData& meta(post.mMeta);
if(!meta.mOrigMsgId.isNull())
{
FeedItem *feedItem = ui->feedWidget->findFeedItem(GxsChannelPostItem::computeIdentifier(meta.mOrigMsgId)) ;
item = dynamic_cast<GxsChannelPostItem*>(feedItem);
if(item)
{
std::set<RsGxsMessageId> older_versions(item->olderVersions()); // we make a copy because the item will be deleted
ui->feedWidget->removeFeedItem(item) ;
older_versions.insert(meta.mMsgId);
GxsChannelPostItem *item = new GxsChannelPostItem(this, 0, mGroup.mMeta,meta.mMsgId, true, false,older_versions);
ui->feedWidget->addFeedItem(item, ROLE_PUBLISH, QDateTime::fromTime_t(meta.mPublishTs));
return ;
}
}
if (related)
{
FeedItem *feedItem = ui->feedWidget->findFeedItem(GxsChannelPostItem::computeIdentifier(meta.mMsgId)) ;
item = dynamic_cast<GxsChannelPostItem*>(feedItem);
}
if (item)
{
item->setPost(post);
ui->feedWidget->setSort(item, ROLE_PUBLISH, QDateTime::fromTime_t(meta.mPublishTs));
}
else
{
GxsChannelPostItem *item = new GxsChannelPostItem(this, 0, mGroup.mMeta,meta.mMsgId, true, true);
ui->feedWidget->addFeedItem(item, ROLE_PUBLISH, QDateTime::fromTime_t(meta.mPublishTs));
}
ui->fileWidget->addFiles(post, related);
}
void GxsChannelPostsWidget::fillThreadCreatePost(const QVariant &post, bool related, int current, int count)
{
/* show fill progress */
if (count) {
ui->progressBar->setValue(current * ui->progressBar->maximum() / count);
}
if (!post.canConvert<RsGxsChannelPost>()) {
return;
}
createPostItem(post.value<RsGxsChannelPost>(), related);
}
#endif
void GxsChannelPostsWidgetWithModel::blank()
{
ui->postButton->setEnabled(false);

3
retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
View file

@ -147,7 +147,6 @@ private slots:
void toggleAutoDownload();
void subscribeGroup(bool subscribe);
void filterChanged(QString);
void setViewMode(int viewMode);
void settingsChanged();
void handlePostsTreeSizeChange(QSize s, bool force=false);
void postChannelPostLoad();
@ -172,8 +171,6 @@ private:
void setAutoDownload(bool autoDl);
static bool filterItem(FeedItem *feedItem, const QString &text, int filter);
int viewMode();
void insertChannelDetails(const RsGxsChannelGroup &group);
void handleEvent_main_thread(std::shared_ptr<const RsEvent> event);

21
retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui
View file

@ -393,6 +393,9 @@ p, li { white-space: pre-wrap; }
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click to view post. &lt;/p&gt;&lt;p&gt;Use Ctrl+mouse wheel &lt;/p&gt;&lt;p&gt;to zoom/unzoom.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="sizeAdjustPolicy">
<enum>QAbstractScrollArea::AdjustToContents</enum>
</property>
@ -428,7 +431,7 @@ p, li { white-space: pre-wrap; }
</font>
</property>
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
@ -593,16 +596,16 @@ p, li { white-space: pre-wrap; }
<extends>QToolButton</extends>
<header>gui/common/SubscribeToolButton.h</header>
</customwidget>
<customwidget>
<class>StyledElidedLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledElidedLabel.h</header>
</customwidget>
<customwidget>
<class>RSTreeView</class>
<extends>QTreeView</extends>
<header>gui/common/RSTreeView.h</header>
</customwidget>
<customwidget>
<class>LineEditClear</class>
<extends>QLineEdit</extends>
<header>gui/common/LineEditClear.h</header>
</customwidget>
<customwidget>
<class>GxsCommentDialog</class>
<extends>QWidget</extends>
@ -610,9 +613,9 @@ p, li { white-space: pre-wrap; }
<container>1</container>
</customwidget>
<customwidget>
<class>LineEditClear</class>
<extends>QLineEdit</extends>
<header>gui/common/LineEditClear.h</header>
<class>StyledElidedLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledElidedLabel.h</header>
</customwidget>
</customwidgets>
<resources>

3
retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp
View file

@ -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);

3
retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp
View file

@ -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)

3
retroshare-gui/src/gui/im_history/ImHistoryBrowser.cpp
View file

@ -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;

2
retroshare-gui/src/gui/profile/ProfileManager.cpp
View file

@ -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)));

5
retroshare-gui/src/gui/settings/AboutPage.h
View file

@ -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 ""; }

5
retroshare-gui/src/gui/settings/AppearancePage.h
View file

@ -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 ""; }

5
retroshare-gui/src/gui/settings/ChannelPage.h
View file

@ -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 ""; }

5
retroshare-gui/src/gui/settings/ChatPage.h
View file

@ -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 ""; }

5
retroshare-gui/src/gui/settings/CryptoPage.h
View file

@ -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 ""; }

5
retroshare-gui/src/gui/settings/FileAssociationsPage.h
View file

@ -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:

5
retroshare-gui/src/gui/settings/ForumPage.h
View file

@ -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 ""; }

5
retroshare-gui/src/gui/settings/GeneralPage.h
View file

@ -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 ""; }

19
retroshare-gui/src/gui/settings/JsonApiPage.h
View file

@ -1,7 +1,7 @@
/*******************************************************************************
* gui/settings/JsonApiPage.h *
* *
* Copyright (C) 2018 Gioacchino Mazzurco <gio@eigenlab.org> *
* Copyright (C) 2018-2020 Gioacchino Mazzurco <gio@eigenlab.org> *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Affero General Public License as *
@ -20,7 +20,8 @@
#pragma once
#include <retroshare-gui/configpage.h>
#include "retroshare-gui/configpage.h"
#include "gui/common/FilesDefs.h"
#include "ui_JsonApiPage.h"
class JsonApiPage : public ConfigPage
@ -30,14 +31,16 @@ class JsonApiPage : public ConfigPage
public:
JsonApiPage(QWidget * parent = nullptr, Qt::WindowFlags flags = 0);
~JsonApiPage() {}
~JsonApiPage() override = default;
/** Loads the settings for this page */
virtual QPixmap iconPixmap() const override
{
return FilesDefs::getPixmapFromQtResourcePath(
":/icons/svg/empty-circle.svg" );
}
virtual QPixmap iconPixmap() const
{ return QPixmap(":/icons/svg/empty-circle.svg"); }
virtual QString pageName() const { return tr("JSON API"); }
virtual QString helpText() const;
virtual QString pageName() const override { return tr("JSON API"); }
virtual QString helpText() const override;
/** Call this after start of libretroshare/Retroshare
* checks the settings and starts JSON API if required */

5
retroshare-gui/src/gui/settings/MessagePage.h
View file

@ -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 ""; }

3
retroshare-gui/src/gui/settings/NotifyPage.h
View file

@ -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 ;

5
retroshare-gui/src/gui/settings/PeoplePage.h
View file

@ -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 ""; }

5
retroshare-gui/src/gui/settings/PluginsPage.h
View file

@ -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 ;

5
retroshare-gui/src/gui/settings/PostedPage.h
View file

@ -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 ""; }

90
retroshare-gui/src/gui/settings/ServerPage.cpp
View file

@ -448,26 +448,26 @@ void ServerPage::load()
//Relay Tab
uint32_t count;
uint32_t bandwidth;
rsDht->getRelayAllowance(RSDHT_RELAY_CLASS_FRIENDS, count, bandwidth);
rsDht->getRelayAllowance(RsDhtRelayClass::FRIENDS, count, bandwidth);
whileBlocking(ui.noFriendSpinBox)->setValue(count);
whileBlocking(ui.bandFriendSpinBox)->setValue(bandwidth / 1024);
rsDht->getRelayAllowance(RSDHT_RELAY_CLASS_FOF, count, bandwidth);
rsDht->getRelayAllowance(RsDhtRelayClass::FOF, count, bandwidth);
whileBlocking(ui.noFOFSpinBox)->setValue(count);
whileBlocking(ui.bandFOFSpinBox)->setValue(bandwidth / 1024);
rsDht->getRelayAllowance(RSDHT_RELAY_CLASS_GENERAL, count, bandwidth);
rsDht->getRelayAllowance(RsDhtRelayClass::GENERAL, count, bandwidth);
whileBlocking(ui.noGeneralSpinBox)->setValue(count);
whileBlocking(ui.bandGeneralSpinBox)->setValue(bandwidth / 1024);
updateTotals();
uint32_t relayMode = rsDht->getRelayMode();
if (relayMode & RSDHT_RELAY_ENABLED)
RsDhtRelayMode relayMode = rsDht->getRelayMode();
if (!!(relayMode & RsDhtRelayMode::ENABLED))
{
whileBlocking(ui.enableCheckBox)->setCheckState(Qt::Checked);
if ((relayMode & RSDHT_RELAY_MODE_MASK) == RSDHT_RELAY_MODE_OFF)
if ((relayMode & RsDhtRelayMode::MASK) == RsDhtRelayMode::OFF)
{
whileBlocking(ui.serverCheckBox)->setCheckState(Qt::Unchecked);
}
@ -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_netLimited->setPixmap(QPixmap(":/images/ledoff1.png"));
ui.iconlabel_ext->setPixmap(QPixmap(":/images/ledoff1.png"));
ui.iconlabel_upnp->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/ledoff1.png"));
ui.iconlabel_netLimited->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/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
@ -1887,33 +1887,33 @@ void ServerPage::updateTotals()
int total = nFriends + nFOF + nGeneral;
rsDht->setRelayAllowance(RSDHT_RELAY_CLASS_ALL, total, 0);
rsDht->setRelayAllowance(RSDHT_RELAY_CLASS_FRIENDS, nFriends, 1024 * friendBandwidth);
rsDht->setRelayAllowance(RSDHT_RELAY_CLASS_FOF, nFOF, 1024 * fofBandwidth);
rsDht->setRelayAllowance(RSDHT_RELAY_CLASS_GENERAL, nGeneral, 1024 * genBandwidth);
rsDht->setRelayAllowance(RsDhtRelayClass::ALL, total, 0);
rsDht->setRelayAllowance(RsDhtRelayClass::FRIENDS, nFriends, 1024 * friendBandwidth);
rsDht->setRelayAllowance(RsDhtRelayClass::FOF, nFOF, 1024 * fofBandwidth);
rsDht->setRelayAllowance(RsDhtRelayClass::GENERAL, nGeneral, 1024 * genBandwidth);
}
/** Saves the changes on this page */
void ServerPage::updateRelayMode()
{
uint32_t relayMode = 0;
RsDhtRelayMode relayMode = static_cast<RsDhtRelayMode>(0);
if (ui.enableCheckBox->isChecked())
{
relayMode |= RSDHT_RELAY_ENABLED;
relayMode |= RsDhtRelayMode::ENABLED;
if (ui.serverCheckBox->isChecked())
{
relayMode |= RSDHT_RELAY_MODE_ON;
relayMode |= RsDhtRelayMode::ON;
}
else
{
relayMode |= RSDHT_RELAY_MODE_OFF;
relayMode |= RsDhtRelayMode::OFF;
}
}
else
{
relayMode |= RSDHT_RELAY_MODE_OFF;
relayMode |= RsDhtRelayMode::OFF;
}
rsDht->setRelayMode(relayMode);

7
retroshare-gui/src/gui/settings/ServerPage.h
View file

@ -36,8 +36,9 @@
#include <services/autoproxy/rsautoproxymonitor.h>
#include <services/autoproxy/p3i2pbob.h>
#include <retroshare-gui/configpage.h>
#include <retroshare-gui/RsAutoUpdatePage.h>
#include "retroshare-gui/configpage.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 ""; }

3
retroshare-gui/src/gui/settings/ServicePermissionsPage.h
View file

@ -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 ;

5
retroshare-gui/src/gui/settings/SoundPage.h
View file

@ -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 ""; }

5
retroshare-gui/src/gui/settings/TransferPage.h
View file

@ -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 ""; }

2
retroshare-gui/src/gui/settings/WebuiPage.h
View file

@ -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;

115
retroshare-gui/src/gui/statistics/DhtWindow.cpp
View file

@ -137,52 +137,55 @@ void DhtWindow::updateNetStatus()
ui.peerAddressLabel->setText(status);
}
uint32_t netMode = rsConfig->getNetworkMode();
RsNetworkMode netMode = rsConfig->getNetworkMode();
QLabel *label = ui.networkLabel;
switch(netMode)
{
case RSNET_NETWORK_UNKNOWN:
case RsNetworkMode::UNKNOWN:
label->setText(tr("Unknown NetState"));
break;
case RSNET_NETWORK_OFFLINE:
case RsNetworkMode::RESTARTING:
label->setText(tr("Restarting"));
break;
case RsNetworkMode::OFFLINE:
label->setText(tr("Offline"));
break;
case RSNET_NETWORK_LOCALNET:
case RsNetworkMode::LOCALNET:
label->setText(tr("Local Net"));
break;
case RSNET_NETWORK_BEHINDNAT:
case RsNetworkMode::BEHINDNAT:
label->setText(tr("Behind NAT"));
break;
case RSNET_NETWORK_EXTERNALIP:
case RsNetworkMode::EXTERNALIP:
label->setText(tr("External IP"));
break;
}
label = ui.natTypeLabel;
uint32_t natType = rsConfig->getNatTypeMode();
RsNatTypeMode natType = rsConfig->getNatTypeMode();
switch(natType)
{
case RSNET_NATTYPE_UNKNOWN:
case RsNatTypeMode::UNKNOWN:
label->setText(tr("UNKNOWN NAT STATE"));
break;
case RSNET_NATTYPE_SYMMETRIC:
case RsNatTypeMode::SYMMETRIC:
label->setText(tr("SYMMETRIC NAT"));
break;
case RSNET_NATTYPE_DETERM_SYM:
case RsNatTypeMode::DETERM_SYM:
label->setText(tr("DETERMINISTIC SYM NAT"));
break;
case RSNET_NATTYPE_RESTRICTED_CONE:
case RsNatTypeMode::RESTRICTED_CONE:
label->setText(tr("RESTRICTED CONE NAT"));
break;
case RSNET_NATTYPE_FULL_CONE:
case RsNatTypeMode::FULL_CONE:
label->setText(tr("FULL CONE NAT"));
break;
case RSNET_NATTYPE_OTHER:
case RsNatTypeMode::OTHER:
label->setText(tr("OTHER NAT"));
break;
case RSNET_NATTYPE_NONE:
case RsNatTypeMode::NONE:
label->setText(tr("NO NAT"));
break;
}
@ -190,87 +193,87 @@ void DhtWindow::updateNetStatus()
label = ui.natHoleLabel;
uint32_t natHole = rsConfig->getNatHoleMode();
RsNatHoleMode natHole = rsConfig->getNatHoleMode();
switch(natHole)
{
case RSNET_NATHOLE_UNKNOWN:
case RsNatHoleMode::UNKNOWN:
label->setText(tr("UNKNOWN NAT HOLE STATUS"));
break;
case RSNET_NATHOLE_NONE:
case RsNatHoleMode::NONE:
label->setText(tr("NO NAT HOLE"));
break;
case RSNET_NATHOLE_UPNP:
case RsNatHoleMode::UPNP:
label->setText(tr("UPNP FORWARD"));
break;
case RSNET_NATHOLE_NATPMP:
case RsNatHoleMode::NATPMP:
label->setText(tr("NATPMP FORWARD"));
break;
case RSNET_NATHOLE_FORWARDED:
case RsNatHoleMode::FORWARDED:
label->setText(tr("MANUAL FORWARD"));
break;
}
uint32_t connect = rsConfig->getConnectModes();
RsConnectModes connect = rsConfig->getConnectModes();
label = ui.connectLabel;
QString connOut;
if (connect & RSNET_CONNECT_OUTGOING_TCP)
if (!!(connect & RsConnectModes::OUTGOING_TCP))
{
connOut += "TCP_OUT ";
}
if (connect & RSNET_CONNECT_ACCEPT_TCP)
if (!!(connect & RsConnectModes::ACCEPT_TCP))
{
connOut += "TCP_IN ";
}
if (connect & RSNET_CONNECT_DIRECT_UDP)
if (!!(connect & RsConnectModes::DIRECT_UDP))
{
connOut += "DIRECT_UDP ";
}
if (connect & RSNET_CONNECT_PROXY_UDP)
if (!!(connect & RsConnectModes::PROXY_UDP))
{
connOut += "PROXY_UDP ";
}
if (connect & RSNET_CONNECT_RELAY_UDP)
if (!!(connect & RsConnectModes::RELAY_UDP))
{
connOut += "RELAY_UDP ";
}
label->setText(connOut);
uint32_t netState = rsConfig->getNetState();
RsNetState netState = rsConfig->getNetState();
label = ui.netStatusLabel;
switch(netState)
{
case RSNET_NETSTATE_BAD_UNKNOWN:
case RsNetState::BAD_UNKNOWN:
label->setText(tr("NET BAD: Unknown State"));
break;
case RSNET_NETSTATE_BAD_OFFLINE:
case RsNetState::BAD_OFFLINE:
label->setText(tr("NET BAD: Offline"));
break;
case RSNET_NETSTATE_BAD_NATSYM:
case RsNetState::BAD_NATSYM:
label->setText(tr("NET BAD: Behind Symmetric NAT"));
break;
case RSNET_NETSTATE_BAD_NODHT_NAT:
case RsNetState::BAD_NODHT_NAT:
label->setText(tr("NET BAD: Behind NAT & No DHT"));
break;
case RSNET_NETSTATE_WARNING_RESTART:
case RsNetState::WARNING_RESTART:
label->setText(tr("NET WARNING: NET Restart"));
break;
case RSNET_NETSTATE_WARNING_NATTED:
case RsNetState::WARNING_NATTED:
label->setText(tr("NET WARNING: Behind NAT"));
break;
case RSNET_NETSTATE_WARNING_NODHT:
case RsNetState::WARNING_NODHT:
label->setText(tr("NET WARNING: No DHT"));
break;
case RSNET_NETSTATE_GOOD:
case RsNetState::GOOD:
label->setText(tr("NET STATE GOOD!"));
break;
case RSNET_NETSTATE_ADV_FORWARD:
case RsNetState::ADV_FORWARD:
label->setText(tr("CAUTION: UNVERIFIABLE FORWARD!"));
break;
case RSNET_NETSTATE_ADV_DARK_FORWARD:
case RsNetState::ADV_DARK_FORWARD:
label->setText(tr("CAUTION: UNVERIFIABLE FORWARD & NO DHT"));
break;
}
@ -378,24 +381,24 @@ void DhtWindow::updateNetPeers()
switch(status.mDhtState)
{
default:
case RSDHT_PEERDHT_NOT_ACTIVE:
case RsDhtPeerDht::NOT_ACTIVE:
dhtstate = tr("Not Active (Maybe Connected!)");
break;
case RSDHT_PEERDHT_SEARCHING:
case RsDhtPeerDht::SEARCHING:
dhtstate = tr("Searching");
break;
case RSDHT_PEERDHT_FAILURE:
case RsDhtPeerDht::FAILURE:
dhtstate = tr("Failed");
break;
case RSDHT_PEERDHT_OFFLINE:
case RsDhtPeerDht::OFFLINE:
dhtstate = tr("offline");
++nOfflinePeers;
break;
case RSDHT_PEERDHT_UNREACHABLE:
case RsDhtPeerDht::UNREACHABLE:
dhtstate = tr("Unreachable");
++nUnreachablePeers;
break;
case RSDHT_PEERDHT_ONLINE:
case RsDhtPeerDht::ONLINE:
dhtstate = tr("ONLINE");
++nOnlinePeers;
break;
@ -407,17 +410,17 @@ void DhtWindow::updateNetPeers()
QString cpmstr;
switch(status.mPeerConnectMode)
{
case RSDHT_TOU_MODE_DIRECT:
case RsDhtTouMode::DIRECT:
cpmstr = tr("Direct");
break;
case RSDHT_TOU_MODE_PROXY:
case RsDhtTouMode::PROXY:
cpmstr = tr("Proxy VIA")+" " + QString::fromStdString(status.mPeerConnectProxyId);
break;
case RSDHT_TOU_MODE_RELAY:
case RsDhtTouMode::RELAY:
cpmstr = tr("Relay VIA")+" " + QString::fromStdString(status.mPeerConnectProxyId);
break;
default:
case RSDHT_TOU_MODE_NONE:
case RsDhtTouMode::NONE:
cpmstr = tr("None");
break;
}
@ -427,27 +430,27 @@ void DhtWindow::updateNetPeers()
switch(status.mPeerConnectState)
{
default:
case RSDHT_PEERCONN_DISCONNECTED:
case RsDhtPeerConnectState::DISCONNECTED:
cpsstr = tr("Disconnected");
++nDisconnPeers;
break;
case RSDHT_PEERCONN_UDP_STARTED:
case RsDhtPeerConnectState::UDP_STARTED:
cpsstr = tr("Udp Started");
break;
case RSDHT_PEERCONN_CONNECTED:
case RsDhtPeerConnectState::CONNECTED:
{
cpsstr = tr("Connected");
switch(status.mPeerConnectMode)
{
default:
case RSDHT_TOU_MODE_DIRECT:
case RsDhtTouMode::DIRECT:
++nDirectPeers;
break;
case RSDHT_TOU_MODE_PROXY:
case RsDhtTouMode::PROXY:
++nProxyPeers;
break;
case RSDHT_TOU_MODE_RELAY:
case RsDhtTouMode::RELAY:
++nRelayPeers;
break;
}
@ -457,7 +460,7 @@ void DhtWindow::updateNetPeers()
peer_item -> setData(PTW_COL_PEER_CONNECT_STATUS, Qt::DisplayRole, cpsstr);
if (status.mPeerConnectState == RSDHT_PEERCONN_DISCONNECTED)
if (status.mPeerConnectState == RsDhtPeerConnectState::DISCONNECTED)
{
peer_item -> setData(PTW_COL_PEER_CONNECT_MODE, Qt::DisplayRole, "");
}
@ -474,10 +477,10 @@ void DhtWindow::updateNetPeers()
}
switch(status.mPeerReqState)
{
case RSDHT_PEERREQ_RUNNING:
case RsDhtPeerRequest::RUNNING:
reqstr += tr("Request Active");
break;
case RSDHT_PEERREQ_STOPPED:
case RsDhtPeerRequest::STOPPED:
reqstr += tr("No Request");
break;
default:

28
retroshare-gui/src/gui/statusbar/OpModeStatus.cpp
View file

@ -39,13 +39,13 @@ OpModeStatus::OpModeStatus(QWidget *parent)
opMode_Minimal_Color = QColor("#FFCCCC");
/* add the options */
addItem(tr("Normal Mode"), RS_OPMODE_FULL);
addItem(tr("Normal Mode"), static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::FULL));
setItemData(0, opMode_Full_Color, Qt::BackgroundRole);
addItem(tr("No Anon D/L"), RS_OPMODE_NOTURTLE);
addItem(tr("No Anon D/L"), static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::NOTURTLE));
setItemData(1, opMode_NoTurtle_Color, Qt::BackgroundRole);
addItem(tr("Gaming Mode"), RS_OPMODE_GAMING);
addItem(tr("Gaming Mode"), static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::GAMING));
setItemData(2, opMode_Gaming_Color, Qt::BackgroundRole);
addItem(tr("Low Traffic"), RS_OPMODE_MINIMAL);
addItem(tr("Low Traffic"), static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::MINIMAL));
setItemData(3, opMode_Minimal_Color, Qt::BackgroundRole);
connect(this, SIGNAL(activated( int )), this, SLOT(setOpMode()));
@ -59,23 +59,23 @@ OpModeStatus::OpModeStatus(QWidget *parent)
void OpModeStatus::getOpMode()
{
int opMode = rsConfig->getOperatingMode();
RsOpMode opMode = rsConfig->getOperatingMode();
switch(opMode)
{
default:
case RS_OPMODE_FULL:
case RsOpMode::FULL:
setCurrentIndex(0);
setProperty("opMode", "Full");
break;
case RS_OPMODE_NOTURTLE:
case RsOpMode::NOTURTLE:
setCurrentIndex(1);
setProperty("opMode", "NoTurtle");
break;
case RS_OPMODE_GAMING:
case RsOpMode::GAMING:
setCurrentIndex(2);
setProperty("opMode", "Gaming");
break;
case RS_OPMODE_MINIMAL:
case RsOpMode::MINIMAL:
setCurrentIndex(3);
setProperty("opMode", "Minimal");
break;
@ -94,19 +94,19 @@ void OpModeStatus::setOpMode()
int idx = currentIndex();
QVariant var = itemData(idx);
uint32_t opMode = var.toUInt();
RsOpMode opMode = static_cast<RsOpMode>(var.toUInt());
QString message = tr("<p>Warning: This Operating mode disables the tunneling service. This means you can use distant chat not anonymously download files and the mail service will be slower.</p><p>This state will be saved after restart, so do not forget that you changed it!</p>");
if(opMode == RS_OPMODE_NOTURTLE && ! Settings->getPageAlreadyDisplayed(QString("RS_OPMODE_NO_TURTLE")))
if(opMode == RsOpMode::NOTURTLE && ! Settings->getPageAlreadyDisplayed(QString("RsOpMode::NO_TURTLE")))
{
QMessageBox::warning(NULL,tr("Turtle routing disabled!"),message);
Settings->setPageAlreadyDisplayed(QString("RS_OPMODE_NO_TURTLE"),true) ;
Settings->setPageAlreadyDisplayed(QString("RsOpMode::NO_TURTLE"),true) ;
}
if( (opMode == RS_OPMODE_MINIMAL && ! Settings->getPageAlreadyDisplayed(QString("RS_OPMODE_MINIMAL"))))
if( (opMode == RsOpMode::MINIMAL && ! Settings->getPageAlreadyDisplayed(QString("RsOpMode::MINIMAL"))))
{
QMessageBox::warning(NULL,tr("Turtle routing disabled!"),message);
Settings->setPageAlreadyDisplayed(QString("RS_OPMODE_MINIMAL"),true) ;
Settings->setPageAlreadyDisplayed(QString("RsOpMode::MINIMAL"),true) ;
}
rsConfig->setOperatingMode(opMode);

3
retroshare-gui/src/gui/statusbar/ToasterDisable.cpp
View file

@ -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);
}

13
retroshare-gui/src/gui/statusbar/dhtstatus.cpp
View file

@ -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);

5
retroshare-gui/src/gui/statusbar/discstatus.cpp
View file

@ -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);

3
retroshare-gui/src/gui/statusbar/hashingstatus.cpp
View file

@ -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]"));

41
retroshare-gui/src/gui/statusbar/natstatus.cpp
View file

@ -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);
@ -51,7 +52,7 @@ NATStatus::NATStatus(QWidget *parent)
void NATStatus::getNATStatus()
{
uint32_t netState = rsConfig -> getNetState();
RsNetState netState = rsConfig -> getNetState();
statusNAT->setVisible(!_compactMode);
QString text = _compactMode?statusNAT->text():"";
@ -60,68 +61,68 @@ void NATStatus::getNATStatus()
switch(netState)
{
default:
case RSNET_NETSTATE_BAD_UNKNOWN:
case RsNetState::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:
case RsNetState::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 ;
// BAD. (RED)
case RSNET_NETSTATE_BAD_NATSYM:
case RsNetState::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:
case RsNetState::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 ;
// CAUTION. (ORANGE)
case RSNET_NETSTATE_WARNING_RESTART:
case RsNetState::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:
case RsNetState::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:
case RsNetState::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 ;
// GOOD (GREEN)
case RSNET_NETSTATE_GOOD:
case RsNetState::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:
case RsNetState::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 ;

7
retroshare-gui/src/gui/statusbar/peerstatus.cpp
View file

@ -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));
}

5
retroshare-gui/src/gui/statusbar/ratesstatus.cpp
View file

@ -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"));

31
retroshare-gui/src/gui/statusbar/torstatus.cpp
View file

@ -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;
@ -60,24 +61,24 @@ void TorStatus::getTorStatus()
QString text = _compactMode?statusTor->text():"";
/* check local network state. We cannot make sure that Tor is running yet. */
uint32_t netState = rsConfig -> getNetState();
RsNetState netState = rsConfig -> getNetState();
bool online ;
switch(netState)
{
default:
case RSNET_NETSTATE_BAD_UNKNOWN:
case RSNET_NETSTATE_BAD_OFFLINE: online = false ;
case RsNetState::BAD_UNKNOWN:
case RsNetState::BAD_OFFLINE: online = false ;
break ;
case RSNET_NETSTATE_WARNING_RESTART:
case RsNetState::WARNING_RESTART:
case RSNET_NETSTATE_BAD_NATSYM:
case RSNET_NETSTATE_BAD_NODHT_NAT:
case RSNET_NETSTATE_WARNING_NATTED:
case RSNET_NETSTATE_WARNING_NODHT:
case RSNET_NETSTATE_GOOD:
case RSNET_NETSTATE_ADV_FORWARD: online = true ;
case RsNetState::BAD_NATSYM:
case RsNetState::BAD_NODHT_NAT:
case RsNetState::WARNING_NATTED:
case RsNetState::WARNING_NODHT:
case RsNetState::GOOD:
case RsNetState::ADV_FORWARD: online = true ;
break ;
}
@ -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"));
}
}

3
retroshare-gui/src/gui/style/StyleDialog.cpp
View file

@ -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 */

2
retroshare-gui/src/main.cpp
View file

@ -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);

7
retroshare-gui/src/util/misc.cpp
View file

@ -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
@ -308,11 +309,9 @@ QPixmap misc::getOpenThumbnailedPicture(QWidget *parent, const QString &caption,
return QPixmap();
if(width > 0 && height > 0)
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);
else
return QPixmap(fileName);
//return QPixmap(fileName).scaledToHeight(width, height, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
return FilesDefs::getPixmapFromQtResourcePath(fileName);
}
bool misc::getOpenFileName(QWidget *parent, RshareSettings::enumLastDir type