Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-21 05:39:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

renamed BoardPostDisplayWidget into BoardPostDisplayWidget_compact

Browse source
This commit is contained in:
csoler 2020-09-25 23:18:01 +02:00
parent 4787675e91
commit 4ae61ddbca
4 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

38
retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp
View file

@ -45,7 +45,7 @@
/** Constructor */ /** Constructor */
const char *BoardPostDisplayWidget::DEFAULT_BOARD_IMAGE = ":/icons/png/newsfeed2.png"; const char *BoardPostDisplayWidget_compact::DEFAULT_BOARD_IMAGE = ":/icons/png/newsfeed2.png";
//=================================================================================================================================== //===================================================================================================================================
//== Base class BoardPostDisplayWidgetBase == //== Base class BoardPostDisplayWidgetBase ==
@ -107,7 +107,7 @@ void BoardPostDisplayWidgetBase::setReadStatus(bool isNew, bool isUnread)
newLabel()->setVisible(isNew); newLabel()->setVisible(isNew);
} }
void BoardPostDisplayWidget::doExpand(bool e) void BoardPostDisplayWidget_compact::doExpand(bool e)
{ {
std::cerr << "Expanding" << std::endl; std::cerr << "Expanding" << std::endl;
if(e) if(e)
@ -299,7 +299,7 @@ void BoardPostDisplayWidgetBase::setup()
//== class BoardPostDisplayWidget == //== class BoardPostDisplayWidget ==
//=================================================================================================================================== //===================================================================================================================================
BoardPostDisplayWidget::BoardPostDisplayWidget(const RsPostedPost& post, uint8_t display_flags,QWidget *parent=nullptr) BoardPostDisplayWidget_compact::BoardPostDisplayWidget_compact(const RsPostedPost& post, uint8_t display_flags,QWidget *parent=nullptr)
: BoardPostDisplayWidgetBase(post,display_flags,parent), ui(new Ui::BoardPostDisplayWidget_compact()) : BoardPostDisplayWidgetBase(post,display_flags,parent), ui(new Ui::BoardPostDisplayWidget_compact())
{ {
ui->setupUi(this); ui->setupUi(this);
@ -315,12 +315,12 @@ BoardPostDisplayWidget::BoardPostDisplayWidget(const RsPostedPost& post, uint8_t
adjustSize(); adjustSize();
} }
BoardPostDisplayWidget::~BoardPostDisplayWidget() BoardPostDisplayWidget_compact::~BoardPostDisplayWidget_compact()
{ {
delete ui; delete ui;
} }
void BoardPostDisplayWidget::setup() void BoardPostDisplayWidget_compact::setup()
{ {
BoardPostDisplayWidgetBase::setup(); BoardPostDisplayWidgetBase::setup();
@ -384,7 +384,7 @@ void BoardPostDisplayWidget::setup()
#endif #endif
} }
void BoardPostDisplayWidget::viewPicture() void BoardPostDisplayWidget_compact::viewPicture()
{ {
if(mPost.mImage.mData == NULL) if(mPost.mImage.mData == NULL)
return; return;
@ -408,19 +408,19 @@ void BoardPostDisplayWidget::viewPicture()
/* window will destroy itself! */ /* window will destroy itself! */
} }
QToolButton *BoardPostDisplayWidget::voteUpButton() { return ui->voteUpButton; } QToolButton *BoardPostDisplayWidget_compact::voteUpButton() { return ui->voteUpButton; }
QToolButton *BoardPostDisplayWidget::commentButton() { return ui->commentButton; } QToolButton *BoardPostDisplayWidget_compact::commentButton() { return ui->commentButton; }
QToolButton *BoardPostDisplayWidget::voteDownButton() { return ui->voteDownButton; } QToolButton *BoardPostDisplayWidget_compact::voteDownButton() { return ui->voteDownButton; }
QLabel *BoardPostDisplayWidget::newLabel() { return ui->newLabel; } QLabel *BoardPostDisplayWidget_compact::newLabel() { return ui->newLabel; }
QToolButton *BoardPostDisplayWidget::readButton() { return ui->readButton; } QToolButton *BoardPostDisplayWidget_compact::readButton() { return ui->readButton; }
QLabel *BoardPostDisplayWidget::siteLabel() { return ui->siteLabel; } QLabel *BoardPostDisplayWidget_compact::siteLabel() { return ui->siteLabel; }
GxsIdLabel *BoardPostDisplayWidget::fromLabel() { return ui->fromLabel; } GxsIdLabel *BoardPostDisplayWidget_compact::fromLabel() { return ui->fromLabel; }
QLabel *BoardPostDisplayWidget::dateLabel() { return ui->dateLabel; } QLabel *BoardPostDisplayWidget_compact::dateLabel() { return ui->dateLabel; }
QLabel *BoardPostDisplayWidget::titleLabel() { return ui->titleLabel; } QLabel *BoardPostDisplayWidget_compact::titleLabel() { return ui->titleLabel; }
QLabel *BoardPostDisplayWidget::scoreLabel() { return ui->scoreLabel; } QLabel *BoardPostDisplayWidget_compact::scoreLabel() { return ui->scoreLabel; }
QLabel *BoardPostDisplayWidget::notes() { return ui->notes; } QLabel *BoardPostDisplayWidget_compact::notes() { return ui->notes; }
QPushButton *BoardPostDisplayWidget::shareButton() { return ui->shareButton; } QPushButton *BoardPostDisplayWidget_compact::shareButton() { return ui->shareButton; }
QLabel *BoardPostDisplayWidget::pictureLabel() { return ui->pictureLabel; } QLabel *BoardPostDisplayWidget_compact::pictureLabel() { return ui->pictureLabel; }
//=================================================================================================================================== //===================================================================================================================================
//== class BoardPostDisplayWidget_card == //== class BoardPostDisplayWidget_card ==

6
retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.h
View file

@ -99,13 +99,13 @@ protected:
uint8_t mDisplayFlags; uint8_t mDisplayFlags;
}; };
class BoardPostDisplayWidget : public BoardPostDisplayWidgetBase class BoardPostDisplayWidget_compact : public BoardPostDisplayWidgetBase
{ {
Q_OBJECT Q_OBJECT
public: public:
BoardPostDisplayWidget(const RsPostedPost& post, uint8_t display_flags, QWidget *parent); BoardPostDisplayWidget_compact(const RsPostedPost& post, uint8_t display_flags, QWidget *parent);
virtual ~BoardPostDisplayWidget(); virtual ~BoardPostDisplayWidget_compact();
static const char *DEFAULT_BOARD_IMAGE; static const char *DEFAULT_BOARD_IMAGE;

28
retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
View file

@ -94,9 +94,9 @@ void PostedPostDelegate::paint(QPainter * painter, const QStyleOptionViewItem &
QPixmap pixmap(option.rect.size()); QPixmap pixmap(option.rect.size());
pixmap.fill(QRgb(0x00f0f0f0)); // choose a fully transparent background pixmap.fill(QRgb(0x00f0f0f0)); // choose a fully transparent background
if(mDisplayMode == BoardPostDisplayWidget::DISPLAY_MODE_COMPACT) if(mDisplayMode == BoardPostDisplayWidget_compact::DISPLAY_MODE_COMPACT)
{ {
BoardPostDisplayWidget w(post,displayFlags(post.mMeta.mMsgId),nullptr); BoardPostDisplayWidget_compact w(post,displayFlags(post.mMeta.mMsgId),nullptr);
w.setFixedSize(option.rect.size()); w.setFixedSize(option.rect.size());
w.adjustSize(); w.adjustSize();
@ -141,9 +141,9 @@ QSize PostedPostDelegate::sizeHint(const QStyleOptionViewItem& option, const QMo
RsPostedPost post = index.data(Qt::UserRole).value<RsPostedPost>() ; RsPostedPost post = index.data(Qt::UserRole).value<RsPostedPost>() ;
if(mDisplayMode == BoardPostDisplayWidget::DISPLAY_MODE_COMPACT) if(mDisplayMode == BoardPostDisplayWidget_compact::DISPLAY_MODE_COMPACT)
{ {
BoardPostDisplayWidget w(post,displayFlags(post.mMeta.mMsgId),nullptr); BoardPostDisplayWidget_compact w(post,displayFlags(post.mMeta.mMsgId),nullptr);
w.adjustSize(); w.adjustSize();
return w.size(); return w.size();
} }
@ -170,10 +170,10 @@ uint8_t PostedPostDelegate::displayFlags(const RsGxsMessageId &id) const
uint8_t flags=0; uint8_t flags=0;
if(mExpandedItems.find(id) != mExpandedItems.end()) if(mExpandedItems.find(id) != mExpandedItems.end())
flags |= BoardPostDisplayWidget::SHOW_NOTES; flags |= BoardPostDisplayWidget_compact::SHOW_NOTES;
if(mShowCommentItems.find(id) != mShowCommentItems.end()) if(mShowCommentItems.find(id) != mShowCommentItems.end())
flags |= BoardPostDisplayWidget::SHOW_COMMENTS; flags |= BoardPostDisplayWidget_compact::SHOW_COMMENTS;
return flags; return flags;
} }
@ -186,8 +186,8 @@ QWidget *PostedPostDelegate::createEditor(QWidget *parent, const QStyleOptionVie
{ {
QWidget *w ; QWidget *w ;
if(mDisplayMode==BoardPostDisplayWidget::DISPLAY_MODE_COMPACT) if(mDisplayMode==BoardPostDisplayWidget_compact::DISPLAY_MODE_COMPACT)
w = new BoardPostDisplayWidget(post,displayFlags(post.mMeta.mMsgId),parent); w = new BoardPostDisplayWidget_compact(post,displayFlags(post.mMeta.mMsgId),parent);
else else
w = new BoardPostDisplayWidget_card(post,displayFlags(post.mMeta.mMsgId),parent); w = new BoardPostDisplayWidget_card(post,displayFlags(post.mMeta.mMsgId),parent);
@ -278,7 +278,7 @@ PostedListWidgetWithModel::PostedListWidgetWithModel(const RsGxsGroupId& postedI
settingsChanged(); settingsChanged();
setGroupId(postedId); setGroupId(postedId);
mPostedPostsDelegate->setDisplayMode(BoardPostDisplayWidget::DISPLAY_MODE_CARD); mPostedPostsDelegate->setDisplayMode(BoardPostDisplayWidget_compact::DISPLAY_MODE_CARD);
switchDisplayMode(); // makes everything consistent and chooses classic view as default switchDisplayMode(); // makes everything consistent and chooses classic view as default
updateSorting(ui->sortStrategy_CB->currentIndex()); updateSorting(ui->sortStrategy_CB->currentIndex());
@ -293,19 +293,19 @@ PostedListWidgetWithModel::PostedListWidgetWithModel(const RsGxsGroupId& postedI
void PostedListWidgetWithModel::switchDisplayMode() void PostedListWidgetWithModel::switchDisplayMode()
{ {
if(mPostedPostsDelegate->getDisplayMode() == BoardPostDisplayWidget::DISPLAY_MODE_CARD) if(mPostedPostsDelegate->getDisplayMode() == BoardPostDisplayWidget_compact::DISPLAY_MODE_CARD)
{ {
ui->viewModeButton->setIcon(FilesDefs::getIconFromQtResourcePath(":images/classic.png")); ui->viewModeButton->setIcon(FilesDefs::getIconFromQtResourcePath(":images/classic.png"));
ui->viewModeButton->setToolTip(tr("Click to switch to card view")); ui->viewModeButton->setToolTip(tr("Click to switch to card view"));
mPostedPostsDelegate->setDisplayMode(BoardPostDisplayWidget::DISPLAY_MODE_COMPACT); mPostedPostsDelegate->setDisplayMode(BoardPostDisplayWidget_compact::DISPLAY_MODE_COMPACT);
} }
else else
{ {
ui->viewModeButton->setIcon(FilesDefs::getIconFromQtResourcePath(":images/card.png")); ui->viewModeButton->setIcon(FilesDefs::getIconFromQtResourcePath(":images/card.png"));
ui->viewModeButton->setToolTip(tr("Click to switch to compact view")); ui->viewModeButton->setToolTip(tr("Click to switch to compact view"));
mPostedPostsDelegate->setDisplayMode(BoardPostDisplayWidget::DISPLAY_MODE_CARD); mPostedPostsDelegate->setDisplayMode(BoardPostDisplayWidget_compact::DISPLAY_MODE_CARD);
} }
mPostedPostsModel->triggerRedraw(); mPostedPostsModel->triggerRedraw();
} }
@ -651,7 +651,7 @@ QIcon PostedListWidgetWithModel::groupIcon()
if (mGroup.mGroupImage.mData != NULL) if (mGroup.mGroupImage.mData != NULL)
GxsIdDetails::loadPixmapFromData(mGroup.mGroupImage.mData, mGroup.mGroupImage.mSize, postedImage,GxsIdDetails::ORIGINAL); GxsIdDetails::loadPixmapFromData(mGroup.mGroupImage.mData, mGroup.mGroupImage.mSize, postedImage,GxsIdDetails::ORIGINAL);
else else
postedImage = FilesDefs::getPixmapFromQtResourcePath(BoardPostDisplayWidget::DEFAULT_BOARD_IMAGE); postedImage = FilesDefs::getPixmapFromQtResourcePath(BoardPostDisplayWidget_compact::DEFAULT_BOARD_IMAGE);
return QIcon(postedImage); return QIcon(postedImage);
} }
@ -729,7 +729,7 @@ void PostedListWidgetWithModel::insertBoardDetails(const RsPostedGroup& group)
if (group.mGroupImage.mData != NULL) { if (group.mGroupImage.mData != NULL) {
GxsIdDetails::loadPixmapFromData(group.mGroupImage.mData, group.mGroupImage.mSize, chanImage,GxsIdDetails::ORIGINAL); GxsIdDetails::loadPixmapFromData(group.mGroupImage.mData, group.mGroupImage.mSize, chanImage,GxsIdDetails::ORIGINAL);
} else { } else {
chanImage = QPixmap(BoardPostDisplayWidget::DEFAULT_BOARD_IMAGE); chanImage = QPixmap(BoardPostDisplayWidget_compact::DEFAULT_BOARD_IMAGE);
} }
if(group.mMeta.mGroupName.empty()) if(group.mMeta.mGroupName.empty())
ui->namelabel->setText(tr("[No name]")); ui->namelabel->setText(tr("[No name]"));

8
retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.h
View file

@ -45,7 +45,7 @@ class PostedPostDelegate: public QAbstractItemDelegate
Q_OBJECT Q_OBJECT
public: public:
PostedPostDelegate(PostedListWidgetWithModel *p,QObject *parent=0) : QAbstractItemDelegate(parent),mCellWidthPix(100),mPostListWidget(p),mDisplayMode(BoardPostDisplayWidget::DISPLAY_MODE_COMPACT){} PostedPostDelegate(PostedListWidgetWithModel *p,QObject *parent=0) : QAbstractItemDelegate(parent),mCellWidthPix(100),mPostListWidget(p),mDisplayMode(BoardPostDisplayWidget_compact::DISPLAY_MODE_COMPACT){}
virtual ~PostedPostDelegate(){} virtual ~PostedPostDelegate(){}
void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const override; void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const override;
@ -54,8 +54,8 @@ public:
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override; QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
void setCellWidth(int pix) { mCellWidthPix = pix; } void setCellWidth(int pix) { mCellWidthPix = pix; }
void setDisplayMode(BoardPostDisplayWidget::DisplayMode dm) { mDisplayMode = dm; } void setDisplayMode(BoardPostDisplayWidget_compact::DisplayMode dm) { mDisplayMode = dm; }
BoardPostDisplayWidget::DisplayMode getDisplayMode() const { return mDisplayMode; } BoardPostDisplayWidget_compact::DisplayMode getDisplayMode() const { return mDisplayMode; }
public slots: public slots:
void expandItem(RsGxsMessageId msgId,bool expanded); void expandItem(RsGxsMessageId msgId,bool expanded);
@ -69,7 +69,7 @@ private:
int mCellWidthPix; int mCellWidthPix;
PostedListWidgetWithModel *mPostListWidget; // used for sending vote signals and so on. PostedListWidgetWithModel *mPostListWidget; // used for sending vote signals and so on.
BoardPostDisplayWidget::DisplayMode mDisplayMode; BoardPostDisplayWidget_compact::DisplayMode mDisplayMode;
std::set<RsGxsMessageId> mExpandedItems; std::set<RsGxsMessageId> mExpandedItems;
std::set<RsGxsMessageId> mShowCommentItems; std::set<RsGxsMessageId> mShowCommentItems;
}; };