From 928e23610384982bd9b4b75c24f1d0a0b2ee3e5c Mon Sep 17 00:00:00 2001 From: thunder2 Date: Thu, 7 Oct 2010 21:50:15 +0000 Subject: [PATCH] Added new settings on the NotifyPage to enable or disable the systray icons for messages and posts. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3647 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/MainWindow.cpp | 8 +- .../src/gui/settings/NotifyPage.cpp | 20 +- retroshare-gui/src/gui/settings/NotifyPage.ui | 1421 +++++++++-------- .../src/gui/settings/rsharesettings.cpp | 11 + .../src/gui/settings/rsharesettings.h | 9 + retroshare-gui/src/lang/retroshare_de.qm | Bin 274428 -> 274209 bytes retroshare-gui/src/lang/retroshare_de.ts | 168 +- 7 files changed, 857 insertions(+), 780 deletions(-) diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index 6783cdbe3..e81f88dc9 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -446,7 +446,7 @@ void MainWindow::updateMessages() messageAction->setIcon(QIcon(QPixmap(":/images/evolution.png"))) ; } - if (newInboxCount) { + if (newInboxCount && (Settings->getTrayNotifyFlags() & TRAYNOTIFY_MESSAGES)) { if (newInboxCount > 1) { trayIconMessages->setToolTip(tr("RetroShare") + "\n" + tr("You have %1 new messages").arg(newInboxCount)); } else { @@ -470,7 +470,7 @@ void MainWindow::updateForums() forumAction->setIcon(QIcon(IMAGE_FORUMS)) ; } - if (newMessageCount) { + if (newMessageCount && (Settings->getTrayNotifyFlags() & TRAYNOTIFY_FORUMS)) { if (newMessageCount > 1) { trayIconForums->setToolTip(tr("RetroShare") + "\n" + tr("You have %1 new messages").arg(newMessageCount)); } else { @@ -494,7 +494,7 @@ void MainWindow::updateChannels(int type) channelAction->setIcon(QIcon(IMAGE_CHANNELS)) ; } - if (newMessageCount) { + if (newMessageCount && (Settings->getTrayNotifyFlags() & TRAYNOTIFY_CHANNELS)) { if (newMessageCount > 1) { trayIconChannels->setToolTip(tr("RetroShare") + "\n" + tr("You have %1 new messages").arg(newMessageCount)); } else { @@ -552,7 +552,7 @@ void MainWindow::privateChatChanged(int list, int type) /* than count the chat messages */ int chatCount = rsMsgs->getPrivateChatQueueCount(true); - if (chatCount) { + if (chatCount && (Settings->getTrayNotifyFlags() & TRAYNOTIFY_PRIVATECHAT)) { trayIconChat->show(); } else { trayIconChat->hide(); diff --git a/retroshare-gui/src/gui/settings/NotifyPage.cpp b/retroshare-gui/src/gui/settings/NotifyPage.cpp index 07b31d470..eca10859b 100755 --- a/retroshare-gui/src/gui/settings/NotifyPage.cpp +++ b/retroshare-gui/src/gui/settings/NotifyPage.cpp @@ -42,9 +42,6 @@ NotifyPage::NotifyPage(QWidget * parent, Qt::WFlags flags) setAttribute(Qt::WA_QuitOnClose, false); setWindowTitle(windowTitle() + QLatin1String(" - Notify")); - - - /* Hide platform specific features */ #ifdef Q_WS_WIN @@ -68,6 +65,7 @@ NotifyPage::save(QString &errmsg) /* extract from rsNotify the flags */ uint notifyflags = 0; + uint traynotifyflags = 0; uint newsflags = 0; uint chatflags = 0; @@ -106,7 +104,17 @@ NotifyPage::save(QString &errmsg) if (ui.chat_Focus->isChecked()) chatflags |= RS_CHAT_FOCUS; + if (ui.trayNotify_PrivateChat->isChecked()) + traynotifyflags |= TRAYNOTIFY_PRIVATECHAT; + if (ui.trayNotify_Messages->isChecked()) + traynotifyflags |= TRAYNOTIFY_MESSAGES; + if (ui.trayNotify_Channels->isChecked()) + traynotifyflags |= TRAYNOTIFY_CHANNELS; + if (ui.trayNotify_Forums->isChecked()) + traynotifyflags |= TRAYNOTIFY_FORUMS; + Settings->setNotifyFlags(notifyflags); + Settings->setTrayNotifyFlags(traynotifyflags); Settings->setNewsFeedFlags(newsflags); Settings->setChatFlags(chatflags); @@ -125,6 +133,7 @@ void NotifyPage::load() { /* extract from rsNotify the flags */ uint notifyflags = Settings->getNotifyFlags(); + uint traynotifyflags = Settings->getTrayNotifyFlags(); uint newsflags = Settings->getNewsFeedFlags(); uint chatflags = Settings->getChatFlags(); @@ -147,6 +156,11 @@ void NotifyPage::load() ui.systray_GroupChat->setChecked(Settings->getDisplayTrayGroupChat()); + ui.trayNotify_PrivateChat->setChecked(traynotifyflags & TRAYNOTIFY_PRIVATECHAT); + ui.trayNotify_Messages->setChecked(traynotifyflags & TRAYNOTIFY_MESSAGES); + ui.trayNotify_Channels->setChecked(traynotifyflags & TRAYNOTIFY_CHANNELS); + ui.trayNotify_Forums->setChecked(traynotifyflags & TRAYNOTIFY_FORUMS); + ui.addFeedsAtEnd->setChecked(Settings->getAddFeedsAtEnd()); } diff --git a/retroshare-gui/src/gui/settings/NotifyPage.ui b/retroshare-gui/src/gui/settings/NotifyPage.ui index 54455c3a7..a69ba7d26 100755 --- a/retroshare-gui/src/gui/settings/NotifyPage.ui +++ b/retroshare-gui/src/gui/settings/NotifyPage.ui @@ -1,693 +1,728 @@ - - - NotifyPage - - - - 0 - 0 - 388 - 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 - - - - - - - - - 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 - - - - - - - - - 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 - - - - - - - - - Arial - 10 - 50 - false - false - false - false - - - - Qt::NoContextMenu - - - - - - - - - - News Feed - - - - 0 - - - 6 - - - - - Peers - - - - - - - Channels - - - - - - - Forums - - - - - - - Blogs - - - - - - - Messages - - - - - - - Chat - - - - - - - Qt::Horizontal - - - - - - - Add feeds at end - - - - - - - - - - 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 - - - - - - - - - - - - - - Qt::Vertical - - - - 20 - 130 - - - - - - - - - - - + + + NotifyPage + + + + 0 + 0 + 396 + 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 + + + + + + + + + 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 + + + + + + + + + 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 + + + + + + + + + Arial + 10 + 50 + false + false + false + false + + + + Qt::NoContextMenu + + + + + + + + + + News Feed + + + + 0 + + + 6 + + + + + Peers + + + + + + + Channels + + + + + + + Forums + + + + + + + Blogs + + + + + + + Messages + + + + + + + Chat + + + + + + + Qt::Horizontal + + + + + + + Add feeds at end + + + + + + + + + + Systray Icon + + + + + + Private Message + + + + + + + Message + + + + + + + Channel Post + + + + + + + Forum Post + + + + + + + + + + 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 + + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 130 + + + + + + + + + diff --git a/retroshare-gui/src/gui/settings/rsharesettings.cpp b/retroshare-gui/src/gui/settings/rsharesettings.cpp index c3257eea1..887929b8e 100644 --- a/retroshare-gui/src/gui/settings/rsharesettings.cpp +++ b/retroshare-gui/src/gui/settings/rsharesettings.cpp @@ -54,6 +54,7 @@ #define SETTING_NEWSFEED_FLAGS "NewsFeedFlags" #define SETTING_CHAT_FLAGS "ChatFlags" #define SETTING_NOTIFY_FLAGS "NotifyFlags" +#define SETTING_TRAYNOTIFY_FLAGS "TrayNotifyFlags" #define SETTING_CHAT_AVATAR "ChatAvatar" /* Default Retroshare Settings */ @@ -269,6 +270,16 @@ void RshareSettings::setNotifyFlags(uint flags) setValue(SETTING_NOTIFY_FLAGS, flags); } +uint RshareSettings::getTrayNotifyFlags() +{ + return value(SETTING_TRAYNOTIFY_FLAGS, TRAYNOTIFY_ALL).toUInt(); +} + +void RshareSettings::setTrayNotifyFlags(uint flags) +{ + setValue(SETTING_TRAYNOTIFY_FLAGS, flags); +} + bool RshareSettings::getDisplayTrayGroupChat() { return value("DisplayTrayGroupChat").toBool(); diff --git a/retroshare-gui/src/gui/settings/rsharesettings.h b/retroshare-gui/src/gui/settings/rsharesettings.h index b6183b233..ef728475a 100644 --- a/retroshare-gui/src/gui/settings/rsharesettings.h +++ b/retroshare-gui/src/gui/settings/rsharesettings.h @@ -31,6 +31,12 @@ #include #include "rsettings.h" +/* Defines for get/setTrayNotifyFlags */ +#define TRAYNOTIFY_PRIVATECHAT 0x01 +#define TRAYNOTIFY_MESSAGES 0x02 +#define TRAYNOTIFY_CHANNELS 0x04 +#define TRAYNOTIFY_FORUMS 0x08 +#define TRAYNOTIFY_ALL 0x0F //Forward declaration. class QWidget; @@ -113,6 +119,9 @@ public: uint getNotifyFlags(); void setNotifyFlags(uint flags); + uint getTrayNotifyFlags(); + void setTrayNotifyFlags(uint flags); + bool getDisplayTrayGroupChat(); void setDisplayTrayGroupChat(bool bValue); diff --git a/retroshare-gui/src/lang/retroshare_de.qm b/retroshare-gui/src/lang/retroshare_de.qm index 38dd93e3619a2fb95d9c096a3b2c0739f63364d3..dd1e953025b19ed54299beb98de20387ec029bd2 100644 GIT binary patch delta 15781 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 Zj6c$|39Ck%S&6xo#`43J#)_LM{|9IA-G%@F delta 15887 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 diff --git a/retroshare-gui/src/lang/retroshare_de.ts b/retroshare-gui/src/lang/retroshare_de.ts index f4a13810d..b76bec24d 100644 --- a/retroshare-gui/src/lang/retroshare_de.ts +++ b/retroshare-gui/src/lang/retroshare_de.ts @@ -856,13 +856,13 @@ p, li { white-space: pre-wrap; } ChanMsgItem - + Remove Item Eintrag entfernen - + Expand Erweitern @@ -877,7 +877,12 @@ p, li { white-space: pre-wrap; } Abspielen - + + New + Neu + + + Unsubscribe From Channel Kanal abbestellen @@ -1000,12 +1005,17 @@ p, li { white-space: pre-wrap; } Hinzufügen - + + Set all to read + + + + Create Channel Kanal erstellen - + Unsubscribe Abbestellen @@ -1025,7 +1035,7 @@ p, li { white-space: pre-wrap; } Kanal abbestellen - + Name Name @@ -1035,12 +1045,7 @@ p, li { white-space: pre-wrap; } Beliebtheit - - ID - - - - + Own Channels Meine Kanäle @@ -1061,7 +1066,7 @@ p, li { white-space: pre-wrap; } - + Post to Channel Kanalbeitrag erstellen @@ -1086,10 +1091,7 @@ p, li { white-space: pre-wrap; } Verteile Kanal - - - - + Popularity: %1 Fetches: %2 Available: %3 @@ -1098,30 +1100,12 @@ Abgeholt: %2 Verfügbar: %3 - - - - - Unknown Channel - Unbekannter Kanal - - - - - - - Unknown Channel -No Description - Unbekannter Kanal -Keine Beschreibung - - - + No Channel Selected Keinen Kanal gewählt - + Restore Publish Rights for Channel Stelle Veröffentlichungsrechte für Kanal wieder her @@ -2230,7 +2214,7 @@ p, li { white-space: pre-wrap; } Drag'n'Drop Dateien aus den Suchergebnissen - + Add Extra File Zusätzlich eine Datei hinzufügen @@ -3550,7 +3534,7 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Forum:</p></body></html> - + Last Post Letzter Beitrag @@ -3566,24 +3550,24 @@ p, li { white-space: pre-wrap; } - + Date Datum - - + + Title Titel - - + + Author Autor - + Signed Unterzeichnet @@ -3601,7 +3585,7 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600;">Thema:</span></p></body></html> - + Previous Thread Vorheriger Beitrag @@ -4933,7 +4917,7 @@ p, li { white-space: pre-wrap; } MainWindow - + Network Netzwerk @@ -4963,7 +4947,7 @@ p, li { white-space: pre-wrap; } Blogs - + Internal Error Interener Fehler @@ -4984,10 +4968,12 @@ p, li { white-space: pre-wrap; } Zeigen - - + + - + + + RetroShare @@ -5019,7 +5005,7 @@ p, li { white-space: pre-wrap; } Schnellstart Assistent - + Search Suchen @@ -5034,7 +5020,7 @@ p, li { white-space: pre-wrap; } Messenger - + Show/Hide Anzeigen/Verbergen @@ -5044,19 +5030,21 @@ p, li { white-space: pre-wrap; } &Schliessen - - + + + You have %1 new messages Du hast %1 neue Beiträge - - + + + You have %1 new message Du hast %1 neuen Beitrag - + Bandwidth Graph Bandbreiten-Graph @@ -5071,7 +5059,7 @@ p, li { white-space: pre-wrap; } Schliessen - + Minimize Minimieren @@ -5081,7 +5069,7 @@ p, li { white-space: pre-wrap; } Maximieren - + Links Cloud Verknüpfungs-Wolke @@ -5096,7 +5084,7 @@ p, li { white-space: pre-wrap; } - + Help Hilfe @@ -5106,7 +5094,7 @@ p, li { white-space: pre-wrap; } Über - + Forums Foren @@ -5116,7 +5104,7 @@ p, li { white-space: pre-wrap; } RetroShare %1 eine sichere und dezentralisierte Kommunikationsplattform - + Open Messages Öffne Nachrichten @@ -5126,12 +5114,12 @@ p, li { white-space: pre-wrap; } Anwendungen - + Plugins - + Do you really want to exit RetroShare ? Wollen Sie RetroShare wirklich beenden? @@ -5141,7 +5129,7 @@ p, li { white-space: pre-wrap; } Wirklich beenden? - + Low disk space warning Wenig Festplatenspeicher @@ -6180,12 +6168,7 @@ p, li { white-space: pre-wrap; } Klick zum Ändern deines Avatars - - Change your Personal Status here... - Ändere deinen persönlichen Status... - - - + Add a Friend Einen Freund hinzufügen @@ -6247,7 +6230,7 @@ p, li { white-space: pre-wrap; } RetroShare Link einfügen - + RetroShare Messenger @@ -6842,7 +6825,32 @@ p, li { white-space: pre-wrap; } Nachrichten - + + Systray Icon + Systray Icon + + + + Private Message + Private Nachricht + + + + Message + Nachricht + + + + Channel Post + Kanalbeitrag + + + + Forum Post + Forumbeitrag + + + Toasters @@ -6887,7 +6895,7 @@ p, li { white-space: pre-wrap; } Zeige Systemabschnitts-Nachricht an - + Add feeds at end Feeds am Ende anfügen @@ -7063,8 +7071,8 @@ p, li { white-space: pre-wrap; } - <span style="color:#000000"><strong>Friends:</strong></span> - <span style="color:#000000"><strong>Freunde:</strong></span> + <strong>Friends:</strong> + @@ -10379,7 +10387,7 @@ p, li { white-space: pre-wrap; } - + Play File Datei abspielen @@ -10630,7 +10638,7 @@ p, li { white-space: pre-wrap; } Fertiggestellt - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -10648,7 +10656,7 @@ p, li { white-space: pre-wrap; } Zeige Cache Übertragungen - + Uploads