New setting for adding the feeds at the end in friend storm.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3422 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-09-01 20:54:24 +00:00
parent 7f837e9778
commit e67412cc8c
6 changed files with 55 additions and 21 deletions

View file

@ -155,6 +155,15 @@ void NewsFeed::updateFeed()
} }
} }
void NewsFeed::addFeedItem(QWidget *item)
{
if (Settings->getAddFeedsAtEnd()) {
verticalLayout->addWidget(item);
} else {
verticalLayout->insertWidget(0, item);
}
}
void NewsFeed::addFeedItemPeerConnect(RsFeedItem &fi) void NewsFeed::addFeedItemPeerConnect(RsFeedItem &fi)
{ {
/* make new widget */ /* make new widget */
@ -163,7 +172,7 @@ void NewsFeed::addFeedItemPeerConnect(RsFeedItem &fi)
/* store */ /* store */
/* add to layout */ /* add to layout */
verticalLayout->insertWidget(0, pi); addFeedItem(pi);
#ifdef NEWS_DEBUG #ifdef NEWS_DEBUG
std::cerr << "NewsFeed::addFeedItemPeerConnect()"; std::cerr << "NewsFeed::addFeedItemPeerConnect()";
@ -181,9 +190,7 @@ void NewsFeed::addFeedItemPeerDisconnect(RsFeedItem &fi)
/* store */ /* store */
/* add to layout */ /* add to layout */
verticalLayout->insertWidget(0, pi); addFeedItem(pi);
#ifdef NEWS_DEBUG #ifdef NEWS_DEBUG
std::cerr << "NewsFeed::addFeedItemPeerDisconnect()"; std::cerr << "NewsFeed::addFeedItemPeerDisconnect()";
@ -200,8 +207,7 @@ void NewsFeed::addFeedItemPeerHello(RsFeedItem &fi)
/* store */ /* store */
/* add to layout */ /* add to layout */
verticalLayout->insertWidget(0, pi); addFeedItem(pi);
#ifdef NEWS_DEBUG #ifdef NEWS_DEBUG
std::cerr << "NewsFeed::addFeedItemPeerHello()"; std::cerr << "NewsFeed::addFeedItemPeerHello()";
@ -218,7 +224,7 @@ void NewsFeed::addFeedItemPeerNew(RsFeedItem &fi)
/* store */ /* store */
/* add to layout */ /* add to layout */
verticalLayout->insertWidget(0, pi); addFeedItem(pi);
#ifdef NEWS_DEBUG #ifdef NEWS_DEBUG
std::cerr << "NewsFeed::addFeedItemPeerNew()"; std::cerr << "NewsFeed::addFeedItemPeerNew()";
@ -235,7 +241,7 @@ void NewsFeed::addFeedItemChanNew(RsFeedItem &fi)
/* store in list */ /* store in list */
/* add to layout */ /* add to layout */
verticalLayout->insertWidget(0, cni); addFeedItem(cni);
#ifdef NEWS_DEBUG #ifdef NEWS_DEBUG
std::cerr << "NewsFeed::addFeedItemChanNew()"; std::cerr << "NewsFeed::addFeedItemChanNew()";
@ -252,7 +258,7 @@ void NewsFeed::addFeedItemChanUpdate(RsFeedItem &fi)
/* store in list */ /* store in list */
/* add to layout */ /* add to layout */
verticalLayout->insertWidget(0, cni); addFeedItem(cni);
#ifdef NEWS_DEBUG #ifdef NEWS_DEBUG
std::cerr << "NewsFeed::addFeedItemChanUpdate()"; std::cerr << "NewsFeed::addFeedItemChanUpdate()";
@ -269,7 +275,7 @@ void NewsFeed::addFeedItemChanMsg(RsFeedItem &fi)
/* store in forum list */ /* store in forum list */
/* add to layout */ /* add to layout */
verticalLayout->insertWidget(0, cm); addFeedItem(cm);
#ifdef NEWS_DEBUG #ifdef NEWS_DEBUG
std::cerr << "NewsFeed::addFeedItemChanMsg()"; std::cerr << "NewsFeed::addFeedItemChanMsg()";
@ -287,8 +293,7 @@ void NewsFeed::addFeedItemForumNew(RsFeedItem &fi)
mForumNewItems.push_back(fni); mForumNewItems.push_back(fni);
/* add to layout */ /* add to layout */
verticalLayout->insertWidget(0, fni); addFeedItem(fni);
#ifdef NEWS_DEBUG #ifdef NEWS_DEBUG
std::cerr << "NewsFeed::addFeedItemForumNew()"; std::cerr << "NewsFeed::addFeedItemForumNew()";
@ -306,7 +311,7 @@ void NewsFeed::addFeedItemForumUpdate(RsFeedItem &fi)
mForumNewItems.push_back(fni); mForumNewItems.push_back(fni);
/* add to layout */ /* add to layout */
verticalLayout->insertWidget(0, fni); addFeedItem(fni);
#ifdef NEWS_DEBUG #ifdef NEWS_DEBUG
std::cerr << "NewsFeed::addFeedItemForumUpdate()"; std::cerr << "NewsFeed::addFeedItemForumUpdate()";
@ -323,7 +328,7 @@ void NewsFeed::addFeedItemForumMsg(RsFeedItem &fi)
/* store in forum list */ /* store in forum list */
/* add to layout */ /* add to layout */
verticalLayout->insertWidget(0, fm); addFeedItem(fm);
#ifdef NEWS_DEBUG #ifdef NEWS_DEBUG
std::cerr << "NewsFeed::addFeedItemForumMsg()"; std::cerr << "NewsFeed::addFeedItemForumMsg()";
@ -340,7 +345,7 @@ void NewsFeed::addFeedItemBlogNew(RsFeedItem &fi)
/* store in list */ /* store in list */
/* add to layout */ /* add to layout */
verticalLayout->insertWidget(0, bni); addFeedItem(bni);
#endif #endif
#ifdef NEWS_DEBUG #ifdef NEWS_DEBUG
@ -358,7 +363,7 @@ void NewsFeed::addFeedItemBlogMsg(RsFeedItem &fi)
/* store in forum list */ /* store in forum list */
/* add to layout */ /* add to layout */
verticalLayout->insertWidget(0, bm); addFeedItem(bm);
#endif #endif
#ifdef NEWS_DEBUG #ifdef NEWS_DEBUG
@ -386,7 +391,7 @@ void NewsFeed::addFeedItemChatNew(RsFeedItem &fi)
/* store in forum list */ /* store in forum list */
/* add to layout */ /* add to layout */
verticalLayout->insertWidget(0, cm); addFeedItem(cm);
} }
void NewsFeed::addFeedItemMessage(RsFeedItem &fi) void NewsFeed::addFeedItemMessage(RsFeedItem &fi)
@ -397,7 +402,7 @@ void NewsFeed::addFeedItemMessage(RsFeedItem &fi)
/* store in list */ /* store in list */
/* add to layout */ /* add to layout */
verticalLayout->insertWidget(0, mi); addFeedItem(mi);
#ifdef NEWS_DEBUG #ifdef NEWS_DEBUG
std::cerr << "NewsFeed::addFeedItemMessage()"; std::cerr << "NewsFeed::addFeedItemMessage()";

View file

@ -51,6 +51,7 @@ private slots:
void updateFeed(); void updateFeed();
private: private:
void addFeedItem(QWidget *item);
void addFeedItemPeerConnect(RsFeedItem &fi); void addFeedItemPeerConnect(RsFeedItem &fi);
void addFeedItemPeerDisconnect(RsFeedItem &fi); void addFeedItemPeerDisconnect(RsFeedItem &fi);

View file

@ -113,6 +113,8 @@ NotifyPage::save(QString &errmsg)
Settings->setDisplayTrayGroupChat(ui.systray_GroupChat->isChecked()); Settings->setDisplayTrayGroupChat(ui.systray_GroupChat->isChecked());
MainWindow::installGroupChatNotifier(); MainWindow::installGroupChatNotifier();
Settings->setAddFeedsAtEnd(ui.addFeedsAtEnd->isChecked());
load(); load();
return true; return true;
} }
@ -128,7 +130,6 @@ void NotifyPage::load()
ui.popup_Connect->setChecked(notifyflags & RS_POPUP_CONNECT); ui.popup_Connect->setChecked(notifyflags & RS_POPUP_CONNECT);
ui.popup_NewMsg->setChecked(notifyflags & RS_POPUP_MSG); ui.popup_NewMsg->setChecked(notifyflags & RS_POPUP_MSG);
ui.systray_GroupChat->setChecked(true) ;
//ui.popup_NewChat->setChecked(notifyflags & RS_POPUP_CHAT); //ui.popup_NewChat->setChecked(notifyflags & RS_POPUP_CHAT);
//ui.popup_Call->setChecked(notifyflags & RS_POPUP_CALL); //ui.popup_Call->setChecked(notifyflags & RS_POPUP_CALL);
@ -146,8 +147,7 @@ void NotifyPage::load()
ui.systray_GroupChat->setChecked(Settings->getDisplayTrayGroupChat()); ui.systray_GroupChat->setChecked(Settings->getDisplayTrayGroupChat());
/* disable ones that don't work yet */ ui.addFeedsAtEnd->setChecked(Settings->getAddFeedsAtEnd());
} }

View file

@ -558,6 +558,20 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="addFeedsAtEnd">
<property name="text">
<string>Add feeds at end</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>

View file

@ -136,6 +136,7 @@ void RshareSettings::initSettings()
setDefault(SETTING_NOTIFY_FLAGS, defNotify); setDefault(SETTING_NOTIFY_FLAGS, defNotify);
setDefault("DisplayTrayGroupChat", true); setDefault("DisplayTrayGroupChat", true);
setDefault("AddFeedsAtEnd", false);
} }
/** Gets/sets the currently saved chat avatar. */ /** Gets/sets the currently saved chat avatar. */
@ -278,6 +279,16 @@ void RshareSettings::setDisplayTrayGroupChat(bool bValue)
setValue("DisplayTrayGroupChat", bValue); setValue("DisplayTrayGroupChat", bValue);
} }
bool RshareSettings::getAddFeedsAtEnd()
{
return value("AddFeedsAtEnd").toBool();
}
void RshareSettings::setAddFeedsAtEnd(bool bValue)
{
setValue("AddFeedsAtEnd", bValue);
}
/** Returns true if RetroShare is set to run on system boot. */ /** Returns true if RetroShare is set to run on system boot. */
bool bool
RshareSettings::runRetroshareOnBoot() RshareSettings::runRetroshareOnBoot()

View file

@ -117,6 +117,9 @@ public:
bool getDisplayTrayGroupChat(); bool getDisplayTrayGroupChat();
void setDisplayTrayGroupChat(bool bValue); void setDisplayTrayGroupChat(bool bValue);
bool getAddFeedsAtEnd();
void setAddFeedsAtEnd(bool bValue);
//! Save placement, state and size information of a window. //! Save placement, state and size information of a window.
void saveWidgetInformation(QWidget *widget); void saveWidgetInformation(QWidget *widget);