Removed own settings for news feed.

Added parameter to RSettingsWin::showYourself to show the options with a specific page.
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4104 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-03-26 22:17:15 +00:00
parent c820826260
commit 5250c27fed
10 changed files with 20 additions and 353 deletions

View file

@ -68,15 +68,21 @@ RSettingsWin::closeEvent (QCloseEvent * event)
QWidget::closeEvent(event);
}
/*static*/ void RSettingsWin::showYourself(QWidget *parent)
/*static*/ void RSettingsWin::showYourself(QWidget *parent, PageType page /*= LastPage*/)
{
if(_instance == NULL) {
_instance = new RSettingsWin(parent);
}
if (_instance->isHidden()) {
_instance->setNewPage(lastPage);
if (page != LastPage) {
/* show given page */
_instance->setNewPage(page);
} else {
if (_instance->isHidden()) {
_instance->setNewPage(lastPage);
}
}
_instance->show();
_instance->activateWindow();
}