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

Fix Notify Settings

Browse source
This commit is contained in:
Phenom 2017-02-27 23:00:49 +01:00
parent f70cbbe065
commit 064202296d
3 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -425,6 +425,18 @@ void MainWindow::initStackedPage()
addPage(getStartedPage = new GetStartedDialog(ui->stackPages), grp, NULL); addPage(getStartedPage = new GetStartedDialog(ui->stackPages), grp, NULL);
} }
#endif #endif
//List All notify before Setting was created
QList<QPair<MainPage*, QPair<QAction*, QListWidgetItem*> > >::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,&notify); addPage(settingsDialog = new SettingsPage(ui->stackPages),grp,&notify);
/* Create the toolbar */ /* Create the toolbar */
@ -449,16 +461,6 @@ void MainWindow::initStackedPage()
addAction(new QAction(QIcon(IMAGE_QUIT), tr("Quit"), ui->toolBarAction), &MainWindow::doQuit, SLOT(doQuit())); addAction(new QAction(QIcon(IMAGE_QUIT), tr("Quit"), ui->toolBarAction), &MainWindow::doQuit, SLOT(doQuit()));
QList<QPair<MainPage*, QPair<QAction*, QListWidgetItem*> > >::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. */ /** Creates a new action associated with a config page. */

2
retroshare-gui/src/gui/settings/ChatPage.ui
View file

@ -14,7 +14,7 @@
<item row="3" column="0"> <item row="3" column="0">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>2</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="general"> <widget class="QWidget" name="general">
<attribute name="title"> <attribute name="title">

2
retroshare-gui/src/gui/settings/NotifyPage.cpp
View file

@ -114,7 +114,7 @@ NotifyPage::NotifyPage(QWidget * parent, Qt::WindowFlags flags)
} }
/* add user notify */ /* Add user notify */
const QList<UserNotify*> &userNotifyList = MainWindow::getInstance()->getUserNotifyList() ; const QList<UserNotify*> &userNotifyList = MainWindow::getInstance()->getUserNotifyList() ;
QList<UserNotify*>::const_iterator it; QList<UserNotify*>::const_iterator it;
rowFeed = 0; rowFeed = 0;