Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-16 09:03:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1780 from defnax/rename-posted-to-boards-and-cleanup-icons

Browse source 
Rename posted to boards and cleanup icons
This commit is contained in:
csoler 2020-02-15 14:37:25 +01:00 • committed by GitHub
commit 659955752d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
37 changed files with 43 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -141,15 +141,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(":/images/posted_64.png"));
ui->logoLabel->setPixmap(QPixmap(":/icons/png/posted.png"));
}
//TODO - nice icon for subscribed group
// if (IS_GROUP_PUBLISHER(mGroup.mMeta.mSubscribeFlags)) {
// ui->logoLabel->setPixmap(QPixmap(":/images/posted_64.png"));
// ui->logoLabel->setPixmap(QPixmap(":/icons/png/posted.png"));
// } else {
// ui->logoLabel->setPixmap(QPixmap(":/images/posted_64.png"));
// ui->logoLabel->setPixmap(QPixmap(":/icons/png/posted.png"));
// }
if (IS_GROUP_SUBSCRIBED(mGroup.mMeta.mSubscribeFlags)) {
@ -160,11 +160,11 @@ void PostedGroupItem::fill()
// if (mIsNew)
// {
ui->titleLabel->setText(tr("New Posted"));
ui->titleLabel->setText(tr("New Board"));
// }
// else
// {
// ui->titleLabel->setText(tr("Updated Posted"));
// ui->titleLabel->setText(tr("Updated Board"));
// }
if (mIsHome)

11
retroshare-gui/src/gui/feeds/PostedGroupItem.ui
View file

@ -125,7 +125,10 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="../Posted/Posted_images.qrc">:/images/posted_64.png</pixmap>
<pixmap resource="../icons.qrc">:/icons/png/posted.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget>
</item>
@ -147,7 +150,7 @@
</font>
</property>
<property name="text">
<string notr="true">Posted</string>
<string notr="true">Board</string>
</property>
</widget>
</item>
@ -298,7 +301,7 @@
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Posted Description</string>
<string>Board Description</string>
</property>
<layout class="QHBoxLayout">
<item>
@ -321,7 +324,7 @@
</property>
<property name="text">
<string notr="true">Description
of Posted</string>
of Board</string>
</property>
</widget>
</item>