diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index 07ab07a4b..9b56a267b 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -425,6 +425,18 @@ void MainWindow::initStackedPage() addPage(getStartedPage = new GetStartedDialog(ui->stackPages), grp, NULL); } #endif + + //List All notify before Setting was created + QList > >::iterator notifyIt; + for (notifyIt = notify.begin(); notifyIt != notify.end(); ++notifyIt) { + UserNotify *userNotify = notifyIt->first->getUserNotify(this); + if (userNotify) { + userNotify->initialize(ui->toolBarPage, notifyIt->second.first, notifyIt->second.second); + connect(userNotify, SIGNAL(countChanged()), this, SLOT(updateTrayCombine())); + userNotifyList.push_back(userNotify); + } + } + addPage(settingsDialog = new SettingsPage(ui->stackPages),grp,¬ify); /* Create the toolbar */ @@ -449,16 +461,6 @@ void MainWindow::initStackedPage() addAction(new QAction(QIcon(IMAGE_QUIT), tr("Quit"), ui->toolBarAction), &MainWindow::doQuit, SLOT(doQuit())); - QList > >::iterator notifyIt; - for (notifyIt = notify.begin(); notifyIt != notify.end(); ++notifyIt) { - UserNotify *userNotify = notifyIt->first->getUserNotify(this); - if (userNotify) { - userNotify->initialize(ui->toolBarPage, notifyIt->second.first, notifyIt->second.second); - connect(userNotify, SIGNAL(countChanged()), this, SLOT(updateTrayCombine())); - userNotifyList.push_back(userNotify); - } - } - } /** Creates a new action associated with a config page. */ diff --git a/retroshare-gui/src/gui/settings/ChatPage.ui b/retroshare-gui/src/gui/settings/ChatPage.ui index 152e3530e..5104a5e49 100644 --- a/retroshare-gui/src/gui/settings/ChatPage.ui +++ b/retroshare-gui/src/gui/settings/ChatPage.ui @@ -14,7 +14,7 @@ - 2 + 0 diff --git a/retroshare-gui/src/gui/settings/NotifyPage.cpp b/retroshare-gui/src/gui/settings/NotifyPage.cpp index 2c9dbde5b..f78bb95da 100755 --- a/retroshare-gui/src/gui/settings/NotifyPage.cpp +++ b/retroshare-gui/src/gui/settings/NotifyPage.cpp @@ -69,7 +69,7 @@ NotifyPage::NotifyPage(QWidget * parent, Qt::WindowFlags flags) mFeedNotifySettingList.push_back(FeedNotifySetting(feedNotify, enabledCheckBox)); - connect(enabledCheckBox,SIGNAL(toggled(bool)),this,SLOT(updateFeedNotifySettings())) ; + connect(enabledCheckBox,SIGNAL(toggled(bool)),this,SLOT(updateFeedNotifySettings())); } } @@ -84,7 +84,7 @@ NotifyPage::NotifyPage(QWidget * parent, Qt::WindowFlags flags) mToasterNotifySettingList.push_back(ToasterNotifySetting(toasterNotify, enabledCheckBox)); - connect(enabledCheckBox,SIGNAL(toggled(bool)),this,SLOT(updateToasterNotifySettings())) ; + connect(enabledCheckBox,SIGNAL(toggled(bool)),this,SLOT(updateToasterNotifySettings())); } QMap map; @@ -114,8 +114,8 @@ NotifyPage::NotifyPage(QWidget * parent, Qt::WindowFlags flags) } - /* add user notify */ - const QList &userNotifyList = MainWindow::getInstance()->getUserNotifyList(); + /* Add user notify */ + const QList &userNotifyList = MainWindow::getInstance()->getUserNotifyList() ; QList::const_iterator it; rowFeed = 0; mChatLobbyUserNotify = 0; @@ -169,11 +169,11 @@ NotifyPage::NotifyPage(QWidget * parent, Qt::WindowFlags flags) connect(ui.notify_Security, SIGNAL(toggled(bool)), this, SLOT(updateNewsFeedFlags())); connect(ui.notify_SecurityIp, SIGNAL(toggled(bool)), this, SLOT(updateNewsFeedFlags())); - connect(ui.systray_ChatLobby, SIGNAL(toggled(bool)),this,SLOT(updateSystrayChatLobby())); - connect(ui.systray_GroupChat, SIGNAL(toggled(bool)),this,SLOT(updateSystrayGroupChat())); + connect(ui.systray_ChatLobby, SIGNAL(toggled(bool)), this, SLOT(updateSystrayChatLobby())); + connect(ui.systray_GroupChat, SIGNAL(toggled(bool)), this, SLOT(updateSystrayGroupChat())); - connect(ui.spinBoxToasterXMargin, SIGNAL(valueChanged(int)),this, SLOT(updateToasterMargin())) ; - connect(ui.spinBoxToasterYMargin, SIGNAL(valueChanged(int)),this, SLOT(updateToasterMargin())) ; + connect(ui.spinBoxToasterXMargin, SIGNAL(valueChanged(int)), this, SLOT(updateToasterMargin())); + connect(ui.spinBoxToasterYMargin, SIGNAL(valueChanged(int)), this, SLOT(updateToasterMargin())); connect(ui.comboBoxToasterPosition, SIGNAL(currentIndexChanged(int)),this, SLOT(updateToasterPosition())) ;