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

Added setting for the count of messages to load from the history for group and private chat

Browse source 
Restore the last active page in MainWindow on startup
Removed not needed methods RshareSettings::getChatAvatar and RshareSettings::setChatAvatar


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3747 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-11-04 11:14:47 +00:00
parent 5a6456ebf1
commit ad6b10272b
11 changed files with 161 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -246,8 +246,10 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
addAction(new QAction(QIcon(IMAGE_UNFINISHED), tr("Unfinished"), ui.toolBar), SLOT(showApplWindow()));
#endif
/* Select the first action */
grp->actions()[0]->setChecked(true);
if (activatePage((Page) Settings->getLastPageInMainWindow()) == false) {
/* Select the first action */
grp->actions()[0]->setChecked(true);
}
/** StatusBar section ********/
/* initialize combobox in status bar */
@ -306,6 +308,8 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
/** Destructor. */
MainWindow::~MainWindow()
{
Settings->setLastPageInMainWindow(getActivatePage());
delete _bandwidthGraph;
delete _messengerwindowAct;
delete peerstatus;
@ -600,10 +604,10 @@ void MainWindow::addAction(QAction *action, const char *slot)
}
/** Set focus to the given page. */
/*static*/ void MainWindow::activatePage(Page page)
/*static*/ bool MainWindow::activatePage(Page page)
{
if (_instance == NULL) {
return;
return false;
}
MainPage *Page = NULL;
@ -648,7 +652,57 @@ void MainWindow::addAction(QAction *action, const char *slot)
if (Page) {
/* Set the focus to the specified page. */
_instance->ui.stackPages->setCurrentPage(Page);
return true;
}
return false;
}
/** Get the active page. */
/*static*/ MainWindow::Page MainWindow::getActivatePage()
{
if (_instance == NULL) {
return Network;
}
QWidget *page = _instance->ui.stackPages->currentWidget();
if (page == _instance->networkDialog) {
return Network;
}
if (page == _instance->peersDialog) {
return Friends;
}
if (page == _instance->searchDialog) {
return Search;
}
if (page == _instance->transfersDialog) {
return Transfers;
}
if (page == _instance->sharedfilesDialog) {
return SharedDirectories;
}
if (page == _instance->messagesDialog) {
return Messages;
}
#ifndef RS_RELEASE_VERSION
if (page == _instance->linksDialog) {
return Links;
}
if (page == _instance->channelFeed) {
return Channels;
}
#endif
if (page == _instance->forumsDialog) {
return Forums;
}
#ifdef BLOGS
if (page == _instance->blogsFeed) {
return Blogs;
}
#endif
return Network;
}
/** get page */