diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index 31c7f71ad..d9a8735f0 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -213,12 +213,12 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags) createPageAction(QIcon(IMAGE_NEWSFEED), tr("News Feed"), grp)); #endif - #ifndef RS_RELEASE_VERSION + #ifndef RS_RELEASE_VERSION #ifdef PLUGINMGR ui.stackPages->add(pluginsPage = new PluginsPage(ui.stackPages), createPageAction(QIcon(IMAGE_PLUGINS), tr("Plugins"), grp)); #endif - #endif + #endif /* Create the toolbar */ ui.toolBar->addActions(grp->actions()); @@ -343,8 +343,21 @@ void MainWindow::updateStatus() std::list ids; rsPeers->getOnlineList(ids); int online = ids.size(); + + std::list msgList; + std::list::const_iterator it; - if (online == 0) + rsMsgs -> getMessageSummaries(msgList); + + for(it = msgList.begin(); it != msgList.end(); it++) + { + + if (it -> msgflags & RS_MSG_NEW) + { + trayIcon->setIcon(QIcon(":/images/newmsg.png")); + trayIcon->setToolTip(tr("RetroShare") + "\n" + tr("You has a new message")); + } + else if (online == 0) { trayIcon->setIcon(QIcon(IMAGE_NOONLINE)); } @@ -361,6 +374,12 @@ void MainWindow::updateStatus() trayIcon->setIcon(QIcon(IMAGE_RETROSHARE)); } + + } + + + + } void MainWindow::updateHashingInfo(const QString& s) @@ -658,9 +677,9 @@ void MainWindow::updateToolBaricons() for(it = msgList.begin(); it != msgList.end(); it++) { - if ((it -> msgflags & RS_MSG_NEW) == RS_MSG_NEW) + if (it -> msgflags & RS_MSG_NEW) { - MessageIcon.addPixmap(QPixmap(":/images/messages_new.png"), QIcon::Normal, QIcon::On ); + MessageIcon.addPixmap(QPixmap(":/images/messages_new.png"), QIcon::Normal, QIcon::On ); } else { diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp index 41ee3f123..1d5d9c84a 100644 --- a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp +++ b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp @@ -239,12 +239,21 @@ void ConfCertDialog::loadDialog() if (detail.trustLvl == 4) { ui.web_of_trust_label->setText(tr("Your trust in this peer is full.")); ui.radioButton_trust_fully->setChecked(true); + ui.radioButton_trust_fully->setIcon(QIcon(":/images/security-high-48.png")); + ui.radioButton_trust_marginnaly->setIcon(QIcon(":/images/security-medium-off-48.png")); + ui.radioButton_trust_never->setIcon(QIcon(":/images/security-low-off-48.png")); } else if (detail.trustLvl == 3) { ui.web_of_trust_label->setText(tr("Your trust in this peer is marginal.")); ui.radioButton_trust_marginnaly->setChecked(true); + ui.radioButton_trust_marginnaly->setIcon(QIcon(":/images/security-medium-48.png")); + ui.radioButton_trust_never->setIcon(QIcon(":/images/security-low-off-48.png")); + ui.radioButton_trust_fully->setIcon(QIcon(":/images/security-high-off-48.png")); } else if (detail.trustLvl == 2) { ui.web_of_trust_label->setText(tr("Your trust in this peer is none.")); ui.radioButton_trust_never->setChecked(true); + ui.radioButton_trust_never->setIcon(QIcon(":/images/security-low-48.png")); + ui.radioButton_trust_fully->setIcon(QIcon(":/images/security-high-off-48.png")); + ui.radioButton_trust_marginnaly->setIcon(QIcon(":/images/security-medium-off-48.png")); } else { ui.web_of_trust_label->setText(tr("Your trust in this peer is not set.")); ui.radioButton_trust_fully->setChecked(false); diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index b5c9a656e..814b77634 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -48,6 +48,7 @@ images/contacts24.png images/connection.png images/contact_new.png + images/contact.png images/Client0.png images/Client1.png images/Client2.png @@ -267,6 +268,7 @@ images/network32.png images/new-mail-alert.png images/new_forum16.png + images/newmsg.png images/no_avatar.png images/no_avatar_70.png images/pasterslink.png @@ -312,6 +314,9 @@ images/security-high-48.png images/security-low-48.png images/security-medium-48.png + images/security-high-off-48.png + images/security-low-off-48.png + images/security-medium-off-48.png images/save24.png images/send24.png images/settings.png diff --git a/retroshare-gui/src/gui/images/inbox_22.png b/retroshare-gui/src/gui/images/inbox_22.png new file mode 100644 index 000000000..3f161a78a Binary files /dev/null and b/retroshare-gui/src/gui/images/inbox_22.png differ diff --git a/retroshare-gui/src/gui/images/newmsg.png b/retroshare-gui/src/gui/images/newmsg.png new file mode 100644 index 000000000..6f011f878 Binary files /dev/null and b/retroshare-gui/src/gui/images/newmsg.png differ diff --git a/retroshare-gui/src/gui/images/security-high-off-48.png b/retroshare-gui/src/gui/images/security-high-off-48.png new file mode 100644 index 000000000..d4149def2 Binary files /dev/null and b/retroshare-gui/src/gui/images/security-high-off-48.png differ diff --git a/retroshare-gui/src/gui/images/security-low-off-48.png b/retroshare-gui/src/gui/images/security-low-off-48.png new file mode 100644 index 000000000..80901511d Binary files /dev/null and b/retroshare-gui/src/gui/images/security-low-off-48.png differ diff --git a/retroshare-gui/src/gui/images/security-medium-off-48.png b/retroshare-gui/src/gui/images/security-medium-off-48.png new file mode 100644 index 000000000..89c83df46 Binary files /dev/null and b/retroshare-gui/src/gui/images/security-medium-off-48.png differ