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

Simplify layout of NewsFeed dialog.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6531 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2013-07-22 19:14:49 +00:00
parent 83f0920721
commit fef4a87c7c
3 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
retroshare-gui/src/gui/NewsFeed.cpp
View file

@ -20,7 +20,6 @@
****************************************************************/ ****************************************************************/
#include <QTimer> #include <QTimer>
#include <QSpacerItem>
#include "NewsFeed.h" #include "NewsFeed.h"
@ -101,11 +100,6 @@ NewsFeed::NewsFeed(QWidget *parent)
") ; ") ;
registerHelpButton(helpButton,hlp_str) ; registerHelpButton(helpButton,hlp_str) ;
QFrame * frame = new QFrame ;
scrollArea->setWidget(frame) ;
mLayout = new QVBoxLayout(scrollArea->widget()) ;
mLayout->addItem(new QSpacerItem(10,0,QSizePolicy::Minimum, QSizePolicy::MinimumExpanding)) ;
} }
NewsFeed::~NewsFeed() NewsFeed::~NewsFeed()
@ -464,9 +458,9 @@ void NewsFeed::addFeedItem(QWidget *item)
lockLayout(NULL, true); lockLayout(NULL, true);
if (Settings->getAddFeedsAtEnd()) { if (Settings->getAddFeedsAtEnd()) {
mLayout->addWidget(item); itemsLayout->addWidget(item);
} else { } else {
mLayout->insertWidget(0, item); itemsLayout->insertWidget(0, item);
} }
item->show(); item->show();

6
retroshare-gui/src/gui/NewsFeed.h
View file

@ -94,18 +94,12 @@ private:
void sendNewsFeedChanged(); void sendNewsFeedChanged();
QVBoxLayout *mLayout;
QSet<QObject*> widgets; QSet<QObject*> widgets;
/* lists of feedItems */ /* lists of feedItems */
std::list<ForumNewItem *> mForumNewItems; std::list<ForumNewItem *> mForumNewItems;
std::list<ChanMsgItem *> mChanMsgItems; std::list<ChanMsgItem *> mChanMsgItems;
}; };
#endif #endif

8
retroshare-gui/src/gui/NewsFeed.ui
View file

@ -142,6 +142,14 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<layout class="QVBoxLayout" name="itemsLayout">
<property name="spacing">
<number>3</number>
</property>
<property name="margin">
<number>3</number>
</property>
</layout>
</widget> </widget>
</widget> </widget>
</item> </item>