diff --git a/retroshare-gui/src/gui/Preferences/NotifyDialog.cpp b/retroshare-gui/src/gui/Preferences/NotifyDialog.cpp index b1bcc9196..71b89585c 100644 --- a/retroshare-gui/src/gui/Preferences/NotifyDialog.cpp +++ b/retroshare-gui/src/gui/Preferences/NotifyDialog.cpp @@ -69,7 +69,7 @@ NotifyDialog::save(QString &errmsg) if (ui.popup_NewMsg->isChecked()) notifyflags |= RS_POPUP_MSG; - if (ui.popup_NewChat->isChecked()) +// if (ui.popup_NewChat->isChecked()) notifyflags |= RS_POPUP_CHAT; //if (ui.popup_Call->isChecked()) @@ -118,7 +118,8 @@ void NotifyDialog::load() ui.popup_Connect->setChecked(notifyflags & RS_POPUP_CONNECT); ui.popup_NewMsg->setChecked(notifyflags & RS_POPUP_MSG); - ui.popup_NewChat->setChecked(notifyflags & RS_POPUP_CHAT); + ui.systray_GroupChat->setChecked(true) ; +// ui.popup_NewChat->setChecked(notifyflags & RS_POPUP_CHAT); //ui.popup_Call->setChecked(notifyflags & RS_POPUP_CALL); ui.notify_Peers->setChecked(newsflags & RS_FEED_TYPE_PEER); @@ -138,7 +139,8 @@ void NotifyDialog::load() ui.notify_Chat->setEnabled(false); ui.notify_Blogs->setEnabled(false); ui.notify_Downloads->setEnabled(false); - ui.popup_NewChat->setEnabled(false); + ui.systray_GroupChat->setEnabled(false); +// ui.popup_NewChat->setEnabled(false); } diff --git a/retroshare-gui/src/gui/Preferences/NotifyDialog.ui b/retroshare-gui/src/gui/Preferences/NotifyDialog.ui index a3d1570e7..0ff5e3b11 100644 --- a/retroshare-gui/src/gui/Preferences/NotifyDialog.ui +++ b/retroshare-gui/src/gui/Preferences/NotifyDialog.ui @@ -1,170 +1,171 @@ - + + NotifyDialog - - + + 0 0 388 - 332 + 425 - - + + 0 0 - + - - - + + + 0 0 0 - - - + + + 208 208 208 - - - + + + 255 255 255 - - - + + + 247 247 247 - - - + + + 104 104 104 - - - + + + 139 139 139 - - - + + + 0 0 0 - - - + + + 255 255 255 - - - + + + 0 0 0 - - - + + + 255 255 255 - - - + + + 240 240 240 - - - + + + 0 0 0 - - - + + + 0 0 128 - - - + + + 255 255 255 - - - + + + 0 0 255 - - - + + + 255 0 255 - - - + + + 231 231 231 @@ -173,153 +174,153 @@ - - - + + + 0 0 0 - - - + + + 208 208 208 - - - + + + 255 255 255 - - - + + + 247 247 247 - - - + + + 104 104 104 - - - + + + 139 139 139 - - - + + + 0 0 0 - - - + + + 255 255 255 - - - + + + 0 0 0 - - - + + + 255 255 255 - - - + + + 240 240 240 - - - + + + 0 0 0 - - - + + + 192 192 192 - - - + + + 0 0 0 - - - + + + 0 0 255 - - - + + + 255 0 255 - - - + + + 231 231 231 @@ -328,153 +329,153 @@ - - - + + + 104 104 104 - - - + + + 208 208 208 - - - + + + 255 255 255 - - - + + + 247 247 247 - - - + + + 104 104 104 - - - + + + 139 139 139 - - - + + + 104 104 104 - - - + + + 255 255 255 - - - + + + 104 104 104 - - - + + + 240 240 240 - - - + + + 240 240 240 - - - + + + 0 0 0 - - - + + + 0 0 128 - - - + + + 255 255 255 - - - + + + 0 0 255 - - - + + + 255 0 255 - - - + + + 231 231 231 @@ -484,7 +485,7 @@ - + Arial 10 @@ -495,170 +496,183 @@ false - + Qt::NoContextMenu - - - 6 - - - 6 - - - 6 - - - 6 - - - - - News Feed - - - - 0 - - - 6 - - - 6 - - - 6 - - - 6 - - - - - Peers - - - - - - - Channels - - - - - - - Forums - - - - - - - Chat - - - - - - - Blogs - - - - - - - Messages - - - - - - - Downloads - - - - - + + + + + + + + + News Feed + + + + 0 + + + 6 + + + + + Peers + + + + + + + Channels + + + + + + + Forums + + + + + + + Chat + + + + + + + Blogs + + + + + + + Messages + + + + + + + Downloads + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + Toasters + + + + 9 + + + 9 + + + + + Peer Connect + + + + + + + New Message + + + + + + + + + + Private Chat + + + + + + Open Window for new Peer Chat + + + + + + + Reopen if closed by user: + + + + + + + Grab Focus when chat arrives + + + + + + + + + + Group chat + + + + + + Display systray message + + + + + + + + + - - - - Popups - - - - 9 - - - 9 - - - - - Peer Connect - - - - - - - New Message - - - - - - - New Chat - - - - - - - - - - Private Chat Behaviour - - - - - - Open Window for new Peer Chat - - - - - - - Reopen if closed by user: - - - - - - - Grab Focus when chat arrives - - - - - - - - - + + + Qt::Vertical - + - 361 - 40 + 20 + 130 @@ -666,7 +680,7 @@ - +