diff --git a/libretroshare/src/pqi/authgpg.cc b/libretroshare/src/pqi/authgpg.cc index f5d5e4a55..eac0de832 100644 --- a/libretroshare/src/pqi/authgpg.cc +++ b/libretroshare/src/pqi/authgpg.cc @@ -30,6 +30,7 @@ #ifdef WINDOWS_SYS #include "retroshare/rsinit.h" #endif +#include "pqi/pqinotify.h" #include #include @@ -1520,9 +1521,11 @@ bool AuthGPGimpl::AllowConnection(const std::string &gpg_id, bool accept) mAcceptToConnectMap[gpg_id] = accept; } - IndicateConfigChanged(); + IndicateConfigChanged(); - return true; + rsicontrol->getNotify().notifyListChange(NOTIFY_LIST_FRIENDS, accept ? NOTIFY_TYPE_ADD : NOTIFY_TYPE_DEL); + + return true; } /* These take PGP Ids */ diff --git a/libretroshare/src/retroshare/rsnotify.h b/libretroshare/src/retroshare/rsnotify.h index 6147184a9..aabd86245 100644 --- a/libretroshare/src/retroshare/rsnotify.h +++ b/libretroshare/src/retroshare/rsnotify.h @@ -55,14 +55,14 @@ const uint32_t RS_CHAT_OPEN = 0x0001; const uint32_t RS_CHAT_FOCUS = 0x0004; const uint32_t RS_CHAT_TABBED_WINDOW = 0x0008; -const uint32_t RS_FEED_TYPE_PEER = 0x0010; -const uint32_t RS_FEED_TYPE_CHAN = 0x0020; -const uint32_t RS_FEED_TYPE_FORUM = 0x0040; -const uint32_t RS_FEED_TYPE_BLOG = 0x0080; -const uint32_t RS_FEED_TYPE_CHAT = 0x0100; -const uint32_t RS_FEED_TYPE_MSG = 0x0200; -const uint32_t RS_FEED_TYPE_FILES = 0x0400; -const uint32_t RS_FEED_TYPE_SECURITY = 0x0800; +const uint32_t RS_FEED_TYPE_PEER = 0x0010; +const uint32_t RS_FEED_TYPE_CHAN = 0x0020; +const uint32_t RS_FEED_TYPE_FORUM = 0x0040; +const uint32_t RS_FEED_TYPE_BLOG = 0x0080; +const uint32_t RS_FEED_TYPE_CHAT = 0x0100; +const uint32_t RS_FEED_TYPE_MSG = 0x0200; +const uint32_t RS_FEED_TYPE_FILES = 0x0400; +const uint32_t RS_FEED_TYPE_SECURITY = 0x0800; const uint32_t RS_FEED_ITEM_PEER_CONNECT = RS_FEED_TYPE_PEER | 0x0001; const uint32_t RS_FEED_ITEM_PEER_DISCONNECT = RS_FEED_TYPE_PEER | 0x0002; diff --git a/retroshare-gui/src/gui/NewsFeed.cpp b/retroshare-gui/src/gui/NewsFeed.cpp index 9f980ab37..b746b5f5a 100644 --- a/retroshare-gui/src/gui/NewsFeed.cpp +++ b/retroshare-gui/src/gui/NewsFeed.cpp @@ -77,8 +77,6 @@ NewsFeed::NewsFeed(QWidget *parent) timer->start(1000); } - - void NewsFeed::updateFeed() { if (!rsNotify) @@ -86,9 +84,6 @@ void NewsFeed::updateFeed() uint flags = Settings->getNewsFeedFlags(); - /* HACK until SECURITY is in feeds */ - flags |= RS_FEED_TYPE_SECURITY; - /* check for new messages */ RsFeedItem fi; if (rsNotify->GetFeedItem(fi)) @@ -238,7 +233,6 @@ void NewsFeed::addFeedItemPeerConnect(RsFeedItem &fi) } - void NewsFeed::addFeedItemPeerDisconnect(RsFeedItem &fi) { /* make new widget */ @@ -255,7 +249,6 @@ void NewsFeed::addFeedItemPeerDisconnect(RsFeedItem &fi) #endif } - void NewsFeed::addFeedItemPeerHello(RsFeedItem &fi) { /* make new widget */ @@ -272,7 +265,6 @@ void NewsFeed::addFeedItemPeerHello(RsFeedItem &fi) #endif } - void NewsFeed::addFeedItemPeerNew(RsFeedItem &fi) { /* make new widget */ @@ -289,8 +281,6 @@ void NewsFeed::addFeedItemPeerNew(RsFeedItem &fi) #endif } - - void NewsFeed::addFeedItemSecurityConnectAttempt(RsFeedItem &fi) { /* make new widget */ @@ -307,7 +297,6 @@ void NewsFeed::addFeedItemSecurityConnectAttempt(RsFeedItem &fi) #endif } - void NewsFeed::addFeedItemSecurityAuthDenied(RsFeedItem &fi) { /* make new widget */ @@ -356,8 +345,6 @@ void NewsFeed::addFeedItemSecurityUnknownOut(RsFeedItem &fi) #endif } - - void NewsFeed::addFeedItemChanNew(RsFeedItem &fi) { /* make new widget */ @@ -374,7 +361,6 @@ void NewsFeed::addFeedItemChanNew(RsFeedItem &fi) #endif } - void NewsFeed::addFeedItemChanUpdate(RsFeedItem &fi) { /* make new widget */ @@ -391,7 +377,6 @@ void NewsFeed::addFeedItemChanUpdate(RsFeedItem &fi) #endif } - void NewsFeed::addFeedItemChanMsg(RsFeedItem &fi) { /* make new widget */ @@ -408,7 +393,6 @@ void NewsFeed::addFeedItemChanMsg(RsFeedItem &fi) #endif } - void NewsFeed::addFeedItemForumNew(RsFeedItem &fi) { /* make new widget */ @@ -426,7 +410,6 @@ void NewsFeed::addFeedItemForumNew(RsFeedItem &fi) #endif } - void NewsFeed::addFeedItemForumUpdate(RsFeedItem &fi) { /* make new widget */ @@ -444,7 +427,6 @@ void NewsFeed::addFeedItemForumUpdate(RsFeedItem &fi) #endif } - void NewsFeed::addFeedItemForumMsg(RsFeedItem &fi) { /* make new widget */ @@ -501,7 +483,6 @@ void NewsFeed::addFeedItemBlogMsg(RsFeedItem &fi) #endif } - void NewsFeed::addFeedItemChatNew(RsFeedItem &fi) { #ifdef NEWS_DEBUG @@ -555,9 +536,9 @@ void NewsFeed::deleteFeedItem(QWidget *item, uint32_t /*type*/) std::cerr << std::endl; #endif - if (item) { - item->close (); - } + if (item) { + item->close (); + } } void NewsFeed::openChat(std::string peerId) diff --git a/retroshare-gui/src/gui/feeds/PeerItem.cpp b/retroshare-gui/src/gui/feeds/PeerItem.cpp index 1834839e0..6fee61eca 100644 --- a/retroshare-gui/src/gui/feeds/PeerItem.cpp +++ b/retroshare-gui/src/gui/feeds/PeerItem.cpp @@ -64,7 +64,8 @@ PeerItem::PeerItem(FeedHolder *parent, uint32_t feedId, std::string peerId, uint connect( sendmsgButton, SIGNAL( clicked( ) ), this, SLOT( sendMessage() ) ); connect(NotifyQt::getInstance(), SIGNAL(peerHasNewAvatar(const QString&)), this, SLOT(updateAvatar(const QString&))); - + connect(NotifyQt::getInstance(), SIGNAL(friendsChanged()), this, SLOT(updateItem())); + QMenu *msgmenu = new QMenu(); msgmenu->addAction(actionNew_Message); @@ -82,46 +83,44 @@ void PeerItem::updateItemStatic() if (!rsPeers) return; - /* fill in */ #ifdef DEBUG_ITEM std::cerr << "PeerItem::updateItemStatic()"; std::cerr << std::endl; #endif + QString title; + + switch(mType) + { + case PEER_TYPE_STD: + title = tr("Friend"); + break; + case PEER_TYPE_CONNECT: + title = tr("Friend Connected"); + break; + case PEER_TYPE_HELLO: + title = tr("Connect Attempt"); + break; + case PEER_TYPE_NEW_FOF: + title = tr("Friend of Friend"); + break; + default: + title = tr("Peer"); + break; + } + + titleLabel->setText(title); + + /* set textcolor for peer name */ + QString nameStr("%1"); + RsPeerDetails details; if (rsPeers->getPeerDetails(mPeerId, details)) { - QString title; - - switch(mType) - { - case PEER_TYPE_STD: - title = tr("Friend"); - break; - case PEER_TYPE_CONNECT: - title = tr("Friend Connected"); - break; - case PEER_TYPE_HELLO: - title = tr("Connect Attempt"); - break; - case PEER_TYPE_NEW_FOF: - title = tr("Friend of Friend"); - break; - default: - title = tr("Peer"); - break; - } - - titleLabel->setText(title); - - /* set textcolor for peername */ - QString nameStr("%1"); - - /* set Blog name */ - QString peername = QString::fromUtf8(details.name.c_str()); - peernameLabel->setText(nameStr.arg(peername)); + /* set peer name */ + QString peername = QString::fromUtf8(details.name.c_str()); + peernameLabel->setText(nameStr.arg(peername)); QDateTime date = QDateTime::fromTime_t(details.lastConnect); QString stime = date.toString(Qt::LocalDate); @@ -134,33 +133,29 @@ void PeerItem::updateItemStatic() } else { - statusLabel->setText(tr("Unknown Peer")); - titleLabel->setText(tr("Unknown Peer")); - trustLabel->setText(tr("Unknown Peer")); - nameLabel->setText(tr("Unknown Peer")); - idLabel->setText(tr("Unknown Peer")); - locLabel->setText(tr("Unknown Peer")); - ipLabel->setText(tr("Unknown Peer")); - connLabel->setText(tr("Unknown Peer")); - lastLabel->setText(tr("Unknown Peer")); + statusLabel->setText(tr("Unknown Peer")); + titleLabel->setText(tr("Unknown Peer")); + trustLabel->setText(tr("Unknown Peer")); + nameLabel->setText(tr("Unknown Peer")); + idLabel->setText(tr("Unknown Peer")); + locLabel->setText(tr("Unknown Peer")); + ipLabel->setText(tr("Unknown Peer")); + connLabel->setText(tr("Unknown Peer")); + lastLabel->setText(tr("Unknown Peer")); chatButton->setEnabled(false); - } if (mIsHome) { /* disable buttons */ clearButton->setEnabled(false); - //gotoButton->setEnabled(false); - /* disable buttons */ + /* hide buttons */ clearButton->hide(); } - } - void PeerItem::updateItem() { if (!rsPeers) @@ -172,9 +167,15 @@ void PeerItem::updateItem() std::cerr << std::endl; #endif if(!RsAutoUpdatePage::eventsLocked()) { + /* set textcolor for peer name */ + QString nameStr("%1"); + RsPeerDetails details; if (!rsPeers->getPeerDetails(mPeerId, details)) { + chatButton->setEnabled(false); + quickmsgButton->setEnabled(false); + return; } @@ -190,8 +191,7 @@ void PeerItem::updateItem() } #endif statusLabel->setText(status); - trustLabel->setText(QString::fromStdString( - RsPeerTrustString(details.trustLvl))); + trustLabel->setText(QString::fromStdString(RsPeerTrustString(details.trustLvl))); { std::ostringstream out; @@ -208,14 +208,10 @@ void PeerItem::updateItem() chatButton->setEnabled(details.state & RS_PEER_STATE_CONNECTED); if (details.state & RS_PEER_STATE_FRIEND) { - //addButton->setEnabled(false); - //removeButton->setEnabled(true); quickmsgButton->setEnabled(true); } else { - //addButton->setEnabled(true); - //removeButton->setEnabled(false); quickmsgButton->setEnabled(false); } } @@ -238,13 +234,13 @@ void PeerItem::toggle() { expandFrame->show(); expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png"))); - expandButton->setToolTip(tr("Hide")); + expandButton->setToolTip(tr("Hide")); } else { expandFrame->hide(); expandButton->setIcon(QIcon(QString(":/images/edit_add24.png"))); - expandButton->setToolTip(tr("Expand")); + expandButton->setToolTip(tr("Expand")); } } @@ -262,15 +258,6 @@ void PeerItem::removeItem() } } - -void PeerItem::gotoHome() -{ -#ifdef DEBUG_ITEM - std::cerr << "PeerItem::gotoHome()"; - std::cerr << std::endl; -#endif -} - /*********** SPECIFIC FUNCTIOSN ***********************/ void PeerItem::addFriend() @@ -281,8 +268,6 @@ void PeerItem::addFriend() #endif } - - void PeerItem::removeFriend() { #ifdef DEBUG_ITEM @@ -291,8 +276,6 @@ void PeerItem::removeFriend() #endif } - - void PeerItem::sendMsg() { #ifdef DEBUG_ITEM @@ -300,10 +283,6 @@ void PeerItem::sendMsg() std::cerr << std::endl; #endif - if (mParent) - { - //mParent->openMsg(FEEDHOLDER_MSG_MESSAGE, mPeerId, ""); - MessageComposer *nMsgDialog = MessageComposer::newMsg(); if (nMsgDialog == NULL) { return; @@ -314,7 +293,6 @@ void PeerItem::sendMsg() nMsgDialog->activateWindow(); /* window will destroy itself! */ - } } @@ -332,32 +310,28 @@ void PeerItem::openChat() void PeerItem::updateAvatar(const QString &peer_id) { - if (peer_id.toStdString() != mPeerId) { - /* it 's not me */ - return; - } + if (peer_id.toStdString() != mPeerId) { + /* it 's not me */ + return; + } - unsigned char *data = NULL; - int size = 0 ; - - rsMsgs->getAvatarData(mPeerId,data,size); - - - if(size != 0) - { - // set the image - QPixmap pix ; - pix.loadFromData(data,size,"PNG") ; - avatar_label->setPixmap(pix); - delete[] data ; - - } - else - { - avatar_label->setPixmap(QPixmap(":/images/user/personal64.png")); - } + unsigned char *data = NULL; + int size = 0 ; + rsMsgs->getAvatarData(mPeerId,data,size); + if(size != 0) + { + // set the image + QPixmap pix ; + pix.loadFromData(data,size,"PNG") ; + avatar_label->setPixmap(pix); + delete[] data ; + } + else + { + avatar_label->setPixmap(QPixmap(":/images/user/personal64.png")); + } } void PeerItem::togglequickmessage() @@ -370,7 +344,6 @@ void PeerItem::togglequickmessage() { messageframe->setVisible(false); } - } void PeerItem::sendMessage() diff --git a/retroshare-gui/src/gui/feeds/PeerItem.h b/retroshare-gui/src/gui/feeds/PeerItem.h index 551659fec..009fe6ab5 100644 --- a/retroshare-gui/src/gui/feeds/PeerItem.h +++ b/retroshare-gui/src/gui/feeds/PeerItem.h @@ -48,7 +48,6 @@ public: private slots: /* default stuff */ - void gotoHome(); void removeItem(); void toggle(); diff --git a/retroshare-gui/src/gui/feeds/PeerItem.ui b/retroshare-gui/src/gui/feeds/PeerItem.ui index 1db0e6d0f..7d07769b9 100644 --- a/retroshare-gui/src/gui/feeds/PeerItem.ui +++ b/retroshare-gui/src/gui/feeds/PeerItem.ui @@ -421,7 +421,7 @@ border-radius: 10px} - Location + Location: @@ -434,7 +434,7 @@ border-radius: 10px} - IP Address + IP Address: @@ -447,7 +447,7 @@ border-radius: 10px} - Connection Method + Connection Method: diff --git a/retroshare-gui/src/gui/feeds/SecurityItem.cpp b/retroshare-gui/src/gui/feeds/SecurityItem.cpp index 75c3cb61d..f79ad0345 100644 --- a/retroshare-gui/src/gui/feeds/SecurityItem.cpp +++ b/retroshare-gui/src/gui/feeds/SecurityItem.cpp @@ -21,12 +21,14 @@ #include #include +#include #include "SecurityItem.h" #include "FeedHolder.h" #include "../RsAutoUpdatePage.h" #include "gui/msgs/MessageComposer.h" #include "gui/common/StatusDefs.h" +#include "gui/connect/ConfCertDialog.h" #include "gui/notifyqt.h" @@ -49,6 +51,12 @@ SecurityItem::SecurityItem(FeedHolder *parent, uint32_t feedId, std::string gpgI messageframe->setVisible(false); sendmsgButton->setEnabled(false); + quickmsgButton->setEnabled(false); + chatButton->setEnabled(false); + addFriendButton->setEnabled(false); + removeFriendButton->setEnabled(false); + removeFriendButton->hide(); + peerDetailsButton->setEnabled(false); /* general ones */ connect( expandButton, SIGNAL( clicked( void ) ), this, SLOT( toggle ( void ) ) ); @@ -62,9 +70,13 @@ SecurityItem::SecurityItem(FeedHolder *parent, uint32_t feedId, std::string gpgI connect( cancelButton, SIGNAL( clicked( ) ), this, SLOT( togglequickmessage() ) ); connect( sendmsgButton, SIGNAL( clicked( ) ), this, SLOT( sendMessage() ) ); + connect(addFriendButton, SIGNAL(clicked()), this, SLOT(addFriend())); + connect(removeFriendButton, SIGNAL(clicked()), this, SLOT(removeFriend())); + connect(peerDetailsButton, SIGNAL(clicked()), this, SLOT(peerDetails())); connect(NotifyQt::getInstance(), SIGNAL(peerHasNewAvatar(const QString&)), this, SLOT(updateAvatar(const QString&))); - + connect(NotifyQt::getInstance(), SIGNAL(friendsChanged()), this, SLOT(updateItem())); + QMenu *msgmenu = new QMenu(); msgmenu->addAction(actionNew_Message); @@ -73,7 +85,7 @@ SecurityItem::SecurityItem(FeedHolder *parent, uint32_t feedId, std::string gpgI small(); updateItemStatic(); updateItem(); - updateAvatar(QString::fromStdString(mGpgId)); + updateAvatar(QString::fromStdString(mSslId)); } @@ -92,7 +104,6 @@ void SecurityItem::updateItemStatic() if (!rsPeers) return; - /* fill in */ #ifdef DEBUG_ITEM std::cerr << "SecurityItem::updateItemStatic()"; @@ -121,63 +132,16 @@ void SecurityItem::updateItemStatic() titleLabel->setText(title); - - RsPeerDetails details; - if (rsPeers->getPeerDetails(mGpgId, details)) - { - - /* set textcolor for peername */ - QString nameStr("%1"); - - /* set Blog name */ - QString peername = QString::fromStdString(details.name); - peernameLabel->setText(nameStr.arg(peername)); - - QDateTime date = QDateTime::fromTime_t(details.lastConnect); - QString stime = date.toString(Qt::LocalDate); - lastLabel-> setText(stime); - - /* expanded Info */ - nameLabel->setText(QString::fromUtf8(details.name.c_str())); - idLabel->setText(QString::fromStdString(details.id)); - locLabel->setText(QString::fromUtf8(details.location.c_str())); - } - else - { - /* it is very likely that we will end up here for some of the - * Unknown peer cases.... so allow them here - */ - - QDateTime date = QDateTime::currentDateTime(); - QString stime = date.toString(Qt::LocalDate); - lastLabel-> setText(stime); - nameLabel->setText(QString::fromStdString(mGpgId)); - idLabel->setText(QString::fromStdString(mSslId)); - - statusLabel->setText(tr("Unknown Peer")); - trustLabel->setText(tr("Unknown Peer")); - locLabel->setText(tr("Unknown Peer")); - ipLabel->setText(tr("Unknown Peer")); - connLabel->setText(tr("Unknown Peer")); - - chatButton->setEnabled(false); - - } - if (mIsHome) { /* disable buttons */ clearButton->setEnabled(false); - //gotoButton->setEnabled(false); - /* disable buttons */ + /* hide buttons */ clearButton->hide(); } - } - void SecurityItem::updateItem() { if (!rsPeers) @@ -188,13 +152,58 @@ void SecurityItem::updateItem() std::cerr << "SecurityItem::updateItem()"; std::cerr << std::endl; #endif + QDateTime currentTime = QDateTime::currentDateTime(); + timeLabel->setText(currentTime.toString(Qt::LocalDate)); + if(!RsAutoUpdatePage::eventsLocked()) { + /* set textcolor for peer name */ + QString nameStr("%1"); + RsPeerDetails details; - if (!rsPeers->getPeerDetails(mGpgId, details)) + /* first try sslid */ + if (!rsPeers->getPeerDetails(mSslId, details)) { - return; + /* then gpgid */ + if (!rsPeers->getPeerDetails(mGpgId, details)) + { + /* it is very likely that we will end up here for some of the + * Unknown peer cases.... so allow them here + */ + + /* set peer name */ + peernameLabel->setText(nameStr.arg(tr("Unknown Peer"))); + + nameLabel->setText(QString::fromStdString(mGpgId)); + idLabel->setText(QString::fromStdString(mSslId)); + + statusLabel->setText(tr("Unknown Peer")); + trustLabel->setText(tr("Unknown Peer")); + locLabel->setText(tr("Unknown Peer")); + ipLabel->setText(tr("Unknown Peer")); + connLabel->setText(tr("Unknown Peer")); + + chatButton->setEnabled(false); + quickmsgButton->setEnabled(false); + + addFriendButton->setEnabled(false); + addFriendButton->show(); + removeFriendButton->setEnabled(false); + removeFriendButton->hide(); + peerDetailsButton->setEnabled(false); + + return; + } } + /* set peer name */ + QString peername = QString::fromUtf8(details.name.c_str()); + peernameLabel->setText(nameStr.arg(peername)); + + /* expanded Info */ + nameLabel->setText(QString::fromUtf8(details.name.c_str())); + idLabel->setText(QString::fromStdString(details.id)); + locLabel->setText(QString::fromUtf8(details.location.c_str())); + /* top Level info */ QString status = StatusDefs::peerStateString(details.state); @@ -207,8 +216,7 @@ void SecurityItem::updateItem() } #endif statusLabel->setText(status); - trustLabel->setText(QString::fromStdString( - RsPeerTrustString(details.trustLvl))); + trustLabel->setText(QString::fromStdString(RsPeerTrustString(details.trustLvl))); { std::ostringstream out; @@ -223,23 +231,36 @@ void SecurityItem::updateItem() /* do buttons */ chatButton->setEnabled(details.state & RS_PEER_STATE_CONNECTED); + peerDetailsButton->setEnabled(true); + + if (details.accept_connection) + { + addFriendButton->setEnabled(false); + addFriendButton->hide(); + removeFriendButton->setEnabled(true); + removeFriendButton->show(); + } + else + { + addFriendButton->setEnabled(true); + addFriendButton->show(); + removeFriendButton->setEnabled(false); + removeFriendButton->hide(); + } + if (details.state & RS_PEER_STATE_FRIEND) { - //addButton->setEnabled(false); - //removeButton->setEnabled(true); quickmsgButton->setEnabled(true); } else { - //addButton->setEnabled(true); - //removeButton->setEnabled(false); quickmsgButton->setEnabled(false); } } /* slow Tick */ int msec_rate = 10129; - + QTimer::singleShot( msec_rate, this, SLOT(updateItem( void ) )); return; } @@ -255,17 +276,16 @@ void SecurityItem::toggle() { expandFrame->show(); expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png"))); - expandButton->setToolTip(tr("Hide")); + expandButton->setToolTip(tr("Hide")); } else { expandFrame->hide(); expandButton->setIcon(QIcon(QString(":/images/edit_add24.png"))); - expandButton->setToolTip(tr("Expand")); + expandButton->setToolTip(tr("Expand")); } } - void SecurityItem::removeItem() { #ifdef DEBUG_ITEM @@ -279,15 +299,6 @@ void SecurityItem::removeItem() } } - -void SecurityItem::gotoHome() -{ -#ifdef DEBUG_ITEM - std::cerr << "SecurityItem::gotoHome()"; - std::cerr << std::endl; -#endif -} - /*********** SPECIFIC FUNCTIOSN ***********************/ void SecurityItem::addFriend() @@ -296,19 +307,44 @@ void SecurityItem::addFriend() std::cerr << "SecurityItem::addFriend()"; std::cerr << std::endl; #endif + + ConfCertDialog::showIt(mGpgId, ConfCertDialog::PageTrust); } - - void SecurityItem::removeFriend() { #ifdef DEBUG_ITEM std::cerr << "SecurityItem::removeFriend()"; std::cerr << std::endl; #endif + + if ((QMessageBox::question(this, "RetroShare", tr("Do you want to remove this Friend?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes)) == QMessageBox::Yes) + { + rsPeers->removeFriend(mGpgId); + } } +void SecurityItem::peerDetails() +{ +#ifdef DEBUG_ITEM + std::cerr << "SecurityItem::peerDetails()"; + std::cerr << std::endl; +#endif + RsPeerDetails details; + /* first try sslid */ + if (rsPeers->getPeerDetails(mSslId, details)) + { + ConfCertDialog::showIt(mSslId, ConfCertDialog::PageDetails); + return; + } + + /* then gpgid */ + if (rsPeers->getPeerDetails(mGpgId, details)) + { + ConfCertDialog::showIt(mGpgId, ConfCertDialog::PageDetails); + } +} void SecurityItem::sendMsg() { @@ -317,23 +353,17 @@ void SecurityItem::sendMsg() std::cerr << std::endl; #endif - if (mParent) - { - //mParent->openMsg(FEEDHOLDER_MSG_MESSAGE, mPeerId, ""); - - MessageComposer *nMsgDialog = MessageComposer::newMsg(); - if (nMsgDialog == NULL) { - return; - } - - nMsgDialog->addRecipient(MessageComposer::TO, mGpgId, false); - nMsgDialog->show(); - nMsgDialog->activateWindow(); - - /* window will destroy itself! */ + MessageComposer *nMsgDialog = MessageComposer::newMsg(); + if (nMsgDialog == NULL) { + return; } -} + nMsgDialog->addRecipient(MessageComposer::TO, mGpgId, false); + nMsgDialog->show(); + nMsgDialog->activateWindow(); + + /* window will destroy itself! */ +} void SecurityItem::openChat() { @@ -349,70 +379,65 @@ void SecurityItem::openChat() void SecurityItem::updateAvatar(const QString &peer_id) { - if (peer_id.toStdString() != mGpgId) { - /* it 's not me */ - return; - } + if (peer_id.toStdString() != mSslId) { + /* it 's not me */ + return; + } - unsigned char *data = NULL; - int size = 0 ; - - rsMsgs->getAvatarData(mGpgId,data,size); - - - if(size != 0) - { - // set the image - QPixmap pix ; - pix.loadFromData(data,size,"PNG") ; - avatar_label->setPixmap(pix); - delete[] data ; - - } - else - { - avatar_label->setPixmap(QPixmap(":/images/user/personal64.png")); - } + unsigned char *data = NULL; + int size = 0 ; + rsMsgs->getAvatarData(mSslId, data, size); + if(size != 0) + { + // set the image + QPixmap pix ; + pix.loadFromData(data,size,"PNG") ; + avatar_label->setPixmap(pix); + delete[] data ; + } + else + { + avatar_label->setPixmap(QPixmap(":/images/user/personal64.png")); + } } void SecurityItem::togglequickmessage() { if (messageframe->isHidden()) { - messageframe->setVisible(true); - } + messageframe->setVisible(true); + } else { - messageframe->setVisible(false); - } - + messageframe->setVisible(false); + } } void SecurityItem::sendMessage() { - /* construct a message */ - MessageInfo mi; - - mi.title = tr("Quick Message").toStdWString(); - mi.msg = quickmsgText->toHtml().toStdWString(); - mi.msgto.push_back(mGpgId); - - rsMsgs->MessageSend(mi); + /* construct a message */ + MessageInfo mi; - quickmsgText->clear(); - messageframe->setVisible(false); + mi.title = tr("Quick Message").toStdWString(); + mi.msg = quickmsgText->toHtml().toStdWString(); + mi.msgto.push_back(mGpgId); + + rsMsgs->MessageSend(mi); + + quickmsgText->clear(); + messageframe->setVisible(false); } void SecurityItem::on_quickmsgText_textChanged() { - if (quickmsgText->toPlainText().isEmpty()) - { - sendmsgButton->setEnabled(false); - } - else - { - sendmsgButton->setEnabled(true); - } + if (quickmsgText->toPlainText().isEmpty()) + { + sendmsgButton->setEnabled(false); + } + else + { + sendmsgButton->setEnabled(true); + } } diff --git a/retroshare-gui/src/gui/feeds/SecurityItem.h b/retroshare-gui/src/gui/feeds/SecurityItem.h index a72ae5f6c..fd9054249 100644 --- a/retroshare-gui/src/gui/feeds/SecurityItem.h +++ b/retroshare-gui/src/gui/feeds/SecurityItem.h @@ -25,47 +25,44 @@ #include "ui_SecurityItem.h" #include -const uint32_t SEC_TYPE_CONNECT_ATTEMPT = 0x0001; /* failed Connect Attempt */ -const uint32_t SEC_TYPE_AUTH_DENIED = 0x0002; /* failed outgoing attempt */ -const uint32_t SEC_TYPE_UNKNOWN_IN = 0x0003; /* failed incoming with unknown peer */ -const uint32_t SEC_TYPE_UNKNOWN_OUT = 0x0004; /* failed outgoing with unknown peer */ +const uint32_t SEC_TYPE_CONNECT_ATTEMPT = 0x0001; /* failed Connect Attempt */ +const uint32_t SEC_TYPE_AUTH_DENIED = 0x0002; /* failed outgoing attempt */ +const uint32_t SEC_TYPE_UNKNOWN_IN = 0x0003; /* failed incoming with unknown peer */ +const uint32_t SEC_TYPE_UNKNOWN_OUT = 0x0004; /* failed outgoing with unknown peer */ class FeedHolder; - class SecurityItem : public QWidget, private Ui::SecurityItem { - Q_OBJECT + Q_OBJECT public: - /** Default Constructor */ - SecurityItem(FeedHolder *parent, uint32_t feedId, std::string gpgId, std::string sslId, uint32_t type, bool isHome); - - /** Default Destructor */ + /** Default Constructor */ + SecurityItem(FeedHolder *parent, uint32_t feedId, std::string gpgId, std::string sslId, uint32_t type, bool isHome); void updateItemStatic(); - void small(); + void small(); bool isSame(const std::string &sslId, uint32_t type); + private slots: /* default stuff */ - void gotoHome(); - void removeItem(); + void removeItem(); void toggle(); void addFriend(); void removeFriend(); + void peerDetails(); void sendMsg(); void openChat(); void updateItem(); void updateAvatar(const QString &peer_id); - - void togglequickmessage(); - void sendMessage(); - - void on_quickmsgText_textChanged(); + void togglequickmessage(); + void sendMessage(); + + void on_quickmsgText_textChanged(); private: FeedHolder *mParent; diff --git a/retroshare-gui/src/gui/feeds/SecurityItem.ui b/retroshare-gui/src/gui/feeds/SecurityItem.ui index d6afff92f..43ff63086 100644 --- a/retroshare-gui/src/gui/feeds/SecurityItem.ui +++ b/retroshare-gui/src/gui/feeds/SecurityItem.ui @@ -6,13 +6,10 @@ 0 0 - 476 + 675 382 - - - 6 @@ -149,7 +146,7 @@ border-radius: 10px} - + 0 @@ -230,6 +227,57 @@ border-radius: 10px} + + + + Peer details + + + + :/images/peerdetails_16x16.png:/images/peerdetails_16x16.png + + + Qt::ToolButtonTextBesideIcon + + + true + + + + + + + Deny friend + + + + :/images/denied16.png:/images/denied16.png + + + Qt::ToolButtonTextBesideIcon + + + true + + + + + + + Make friend + + + + :/images/user/add_user16.png:/images/user/add_user16.png + + + Qt::ToolButtonTextBesideIcon + + + true + + + @@ -421,7 +469,7 @@ border-radius: 10px} - Location + Location: @@ -434,7 +482,7 @@ border-radius: 10px} - IP Address + IP Address: @@ -447,7 +495,7 @@ border-radius: 10px} - Connection Method + Connection Method: diff --git a/retroshare-gui/src/gui/notifyqt.cpp b/retroshare-gui/src/gui/notifyqt.cpp index 427d4814b..1f8c46019 100644 --- a/retroshare-gui/src/gui/notifyqt.cpp +++ b/retroshare-gui/src/gui/notifyqt.cpp @@ -292,9 +292,9 @@ void NotifyQt::notifyListChange(int list, int type) { case NOTIFY_LIST_NEIGHBOURS: #ifdef NOTIFY_DEBUG - std::cerr << "received neighbrs changed" << std::endl ; + std::cerr << "received neighbours changed" << std::endl ; #endif - emit neighborsChanged(); + emit neighboursChanged(); break; case NOTIFY_LIST_FRIENDS: #ifdef NOTIFY_DEBUG @@ -433,7 +433,7 @@ void NotifyQt::UpdateGUI() if(!already_updated) { emit messagesChanged() ; - emit neighborsChanged(); + emit neighboursChanged(); emit configChanged(); already_updated = true ; diff --git a/retroshare-gui/src/gui/notifyqt.h b/retroshare-gui/src/gui/notifyqt.h index dc3915bb4..085f075a3 100644 --- a/retroshare-gui/src/gui/notifyqt.h +++ b/retroshare-gui/src/gui/notifyqt.h @@ -66,7 +66,7 @@ class NotifyQt: public QObject, public NotifyBase void filesPostModChanged(bool) const ; void transfersChanged() const ; void friendsChanged() const ; - void neighborsChanged() const ; + void neighboursChanged() const ; void messagesChanged() const ; void messagesTagsChanged() const; void forumsChanged() const ; // use connect with Qt::QueuedConnection diff --git a/retroshare-gui/src/gui/settings/NotifyPage.cpp b/retroshare-gui/src/gui/settings/NotifyPage.cpp index 96c81f625..b7f72ecec 100755 --- a/retroshare-gui/src/gui/settings/NotifyPage.cpp +++ b/retroshare-gui/src/gui/settings/NotifyPage.cpp @@ -84,6 +84,8 @@ NotifyPage::save(QString &/*errmsg*/) newsflags |= RS_FEED_TYPE_MSG; if (ui.notify_Chat->isChecked()) newsflags |= RS_FEED_TYPE_CHAT; + if (ui.notify_Security->isChecked()) + newsflags |= RS_FEED_TYPE_SECURITY; if (ui.chat_NewWindow->isChecked()) chatflags |= RS_CHAT_OPEN; @@ -157,6 +159,7 @@ void NotifyPage::load() ui.notify_Chat->setChecked(newsflags & RS_FEED_TYPE_CHAT); ui.notify_Messages->setChecked(newsflags & RS_FEED_TYPE_MSG); ui.notify_Chat->setChecked(newsflags & RS_FEED_TYPE_CHAT); + ui.notify_Security->setChecked(newsflags & RS_FEED_TYPE_SECURITY); ui.chat_NewWindow->setChecked(chatflags & RS_CHAT_OPEN); ui.chat_Focus->setChecked(chatflags & RS_CHAT_FOCUS); diff --git a/retroshare-gui/src/gui/settings/NotifyPage.ui b/retroshare-gui/src/gui/settings/NotifyPage.ui index f33656abc..ce20a639f 100755 --- a/retroshare-gui/src/gui/settings/NotifyPage.ui +++ b/retroshare-gui/src/gui/settings/NotifyPage.ui @@ -6,7 +6,7 @@ 0 0 - 427 + 516 425 @@ -558,6 +558,13 @@ + + + + Security + + + diff --git a/retroshare-gui/src/gui/settings/rsharesettings.cpp b/retroshare-gui/src/gui/settings/rsharesettings.cpp index 34137d396..a9e830921 100644 --- a/retroshare-gui/src/gui/settings/rsharesettings.cpp +++ b/retroshare-gui/src/gui/settings/rsharesettings.cpp @@ -130,7 +130,7 @@ void RshareSettings::initSettings() uint defNewsFeed = (RS_FEED_TYPE_PEER | RS_FEED_TYPE_CHAN | RS_FEED_TYPE_FORUM | RS_FEED_TYPE_BLOG | RS_FEED_TYPE_CHAT | RS_FEED_TYPE_MSG | - RS_FEED_TYPE_FILES); + RS_FEED_TYPE_FILES | RS_FEED_TYPE_SECURITY); setDefault(SETTING_NEWSFEED_FLAGS, defNewsFeed); setDefault(SETTING_CHAT_FLAGS, defChat); @@ -309,7 +309,7 @@ void RshareSettings::setNotifyFlags(uint flags) uint RshareSettings::getTrayNotifyFlags() { - return value(SETTING_TRAYNOTIFY_FLAGS, TRAYNOTIFY_PRIVATECHAT | TRAYNOTIFY_MESSAGES | TRAYNOTIFY_CHANNELS | TRAYNOTIFY_FORUMS | TRAYNOTIFY_TRANSFERS).toUInt(); + return value(SETTING_TRAYNOTIFY_FLAGS, TRAYNOTIFY_PRIVATECHAT | TRAYNOTIFY_MESSAGES | TRAYNOTIFY_CHANNELS | TRAYNOTIFY_FORUMS ).toUInt(); } void RshareSettings::setTrayNotifyFlags(uint flags) diff --git a/retroshare-gui/src/lang/retroshare_de.qm b/retroshare-gui/src/lang/retroshare_de.qm index ffc9d2190..8ae9e5929 100644 Binary files a/retroshare-gui/src/lang/retroshare_de.qm and b/retroshare-gui/src/lang/retroshare_de.qm differ diff --git a/retroshare-gui/src/lang/retroshare_de.ts b/retroshare-gui/src/lang/retroshare_de.ts index 112f43709..2be848e4d 100644 --- a/retroshare-gui/src/lang/retroshare_de.ts +++ b/retroshare-gui/src/lang/retroshare_de.ts @@ -75,73 +75,6 @@ - - AddLinksDialog - - Add Link - Link hinzufügen - - - Add a new Link - Neuen Link hinzufügen - - - Title: - Titel: - - - Url: - URL: - - - +2 Great! - +2 Super! - - - +1 Good - +1 Gut - - - 0 Okay - 0 In Ordnung - - - -1 Sux - -1 Schrott - - - -2 Bad Link - -2 Pfui - - - Add Anonymous Link - Anonyme Verknüpfung hinzufügen - - - <!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; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'DejaVu Sans'; font-size:18pt; font-weight:600; color:#ffffff;">Add Link to Cloud</span></p></body></html> - <!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; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'DejaVu Sans'; font-size:18pt; font-weight:600; color:#ffffff;">Link zur Verknüpfungs-Wolke hinzufügen</span></p></body></html> - - - Cancel - Abbrechen - - - Add Link Failure - Fehle beim Hinzufügen des Links - - - Missing Link and/or Title - Fehlernder Link oder Titel - - AdvancedSearchDialog @@ -863,14 +796,6 @@ p, li { white-space: pre-wrap; } Play Abspielen - - <!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; } -</style></head><body style=" font-family:'Sans'; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Toggle Message Read Status</p></body></html> - Gelesen Status umschalten - New @@ -881,10 +806,6 @@ p, li { white-space: pre-wrap; } Unsubscribe From Channel Kanal abbestellen - - Go to Channel Message - Gehe zum Kanalbeitrag - Copy RetroShare Link @@ -918,10 +839,6 @@ p, li { white-space: pre-wrap; } Subscribe to Channel Kanal abonnieren - - Go to Channel - Gehe zum Kanal - Unknown Channel @@ -1032,10 +949,6 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt; font-weight:600;">Kanäle</span></p></body></html> - - Add - Hinzufügen - Display @@ -1672,10 +1585,6 @@ und meinen GPG Schlüssel nicht unterzeichnet RetroShare ID - - Copy Peer - Kopiere Nachbar - Certificate @@ -2227,14 +2136,6 @@ Möchten Sie die Änderungen speichern? Load channel logo Lade Kanal Logo - - Load File - Lade Datei - - - Pictures (*.png *.xpm *.jpg) - Bilder (*.png *.xpm *.jpg) - CreateChannelMsg @@ -2368,14 +2269,6 @@ p, li { white-space: pre-wrap; } Load thumbnail picture Lade Miniaturbild - - Load File - Lade Datei - - - Pictures (*.png *.xpm *.jpg) - Bilder (*.png *.xpm *.jpg) - CreateForum @@ -2671,10 +2564,6 @@ p, li { white-space: pre-wrap; } DHT DHT - - DHT On - DHT An - DHT Off @@ -3193,14 +3082,6 @@ Das ist nützlich, wenn Du eine externe Festplatte freigibst und die Datei nicht Add Channel Logo Kanal Logo hinzufügen - - Load File - Lade Datei - - - Pictures (*.png *.xpm *.jpg) - Bilder (*.png *.xpm *.jpg) - Load channel logo @@ -3760,10 +3641,6 @@ p, li { white-space: pre-wrap; } Subject: Betreff: - - Go to Forum Message - Gehe zum Forumbeitrag - Unsubscribe To Forum @@ -3829,10 +3706,6 @@ p, li { white-space: pre-wrap; } Subscribe to Forum Forum abonnieren - - Go to Forum - Gehe zum Forum - Expand @@ -3945,18 +3818,6 @@ p, li { white-space: pre-wrap; } AUTHD - - Anonymous - Anonym - - - signed - unterzeichnet - - - none - keine - @@ -4006,10 +3867,6 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-weight:600;">Foren</span></p></body></html> - - Add - Hinzufügen - Start new Thread for Selected Forum @@ -4238,10 +4095,6 @@ p, li { white-space: pre-wrap; } Group Chat Gruppenchat - - Messages entered here are sent to all collected friends - Nachrichten, die Du hier eingibst, werden an alle verbundenen Freunde versendet - Messages entered here are sent to all connected friends @@ -4541,10 +4394,6 @@ p, li { white-space: pre-wrap; } Collapse all Alle reduzieren - - location - Standort - @@ -4582,14 +4431,6 @@ p, li { white-space: pre-wrap; } Do you really want to physically delete the history? Willst Du wirklich den Nachrichtenverlauf physisch löschen? - - Load File - Lade Datei - - - Pictures (*.png *.xpm *.jpg *.tiff *.gif) - Bilder (*.png *.xpm *.jpg *.tiff *.gif) - Add Extra File @@ -5041,10 +4882,6 @@ Gib Dein GPG Passwort wenn Du gefragt wirst ein, um Deinen neuen Schlüssel zu u Do not Minimize to Tray Icon Nicht in den Systemabschnitt minimieren - - You need administrator rights to set this option. - Du benötigst Administratorrechte zum aktivieren der Einstellung. - seconds @@ -5956,195 +5793,6 @@ Die folgenden Wege sind möglich: (Er/Sie erhält eine Email mit der Anleitung zum Herunterladen von RetroShare) - - LinksDialog - - Share Link Anonymously - Verknüpfung anonym teilen - - - Vote on Link - Über diese Verknüpfung abstimmen - - - Download - Herunterladen - - - Expand - Erweitern - - - Hide - Verbergen - - - File Request Confirmation - Bestätigung der Dateianforderung - - - The file has been added to your download list. - Die Datei wurde zur Downloadliste hinzugefügt. - - - File Request canceled - Dateianforderung abgebrochen - - - The file has not been added to your download list, because you already have it. - Die Datei wurde nicht zur Downloadliste hinzugefügt, da Sie sie schon haben. - - - File Request Error - Fehler bei der Dateianforderung - - - The file link is malformed. - Link ist fehlerhaft. - - - Title / Comment - Titel / Kommentar - - - Score - Punkte - - - Peer / Link - Nachbar / Verknüpfung - - - Sort by - Sortieren nach - - - Time - Zeit - - - Ranking - Rangfolge - - - In last - Seit letztem - - - Month - Monat - - - Week - Woche - - - Day - Tag - - - From - Von - - - All Peers - Alle Nachbarn - - - Own Links - Eigene Verknüpfungen - - - Show - Zeigen - - - Top 100 - Top 100 - - - 101-200 - 101-200 - - - 201-300 - 201-300 - - - 301-400 - 301-400 - - - 401-500 - 401-500 - - - Bottom 100 - Letzte 100 - - - Link: - Verknüpfung: - - - Add Anonymous Link - Anonyme Verknüpfung hinzufügen - - - Add Link/Comment - Verknüpfung/Kommentar hinzufügen - - - Title: - Titel: - - - Score: - Punkte: - - - +2 Great! - +2 Super! - - - +1 Good - +1 Gut - - - 0 Okay - 0 Okay - - - -1 Sux - -1 Schrott - - - -2 Bad Link - -2 Pfui - - - Url: - URL: - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><span style=" font-weight:600;">Links Cloud</span></p></body></html> - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><span style=" font-weight:600;">Verknüpfungs-Wolke</span></p></body></html> - - - Add new link - Neuen Link hinzufügen - - - Combo - Kombiniert - - MainWindow @@ -6192,10 +5840,6 @@ p, li { white-space: pre-wrap; } Dht Details - - Chat - Chat - @@ -6382,10 +6026,6 @@ p, li { white-space: pre-wrap; } Maximize Maximieren - - Links Cloud - Verknüpfungs-Wolke - Unfinished @@ -6998,10 +6638,6 @@ Willst Du die Nachricht speichern ? MessagePage - - Misc - Verschiedenes - Reading @@ -7065,10 +6701,6 @@ Willst Du die Nachricht speichern ? MessageToaster - - <b>1 new Message from</b> - <b>1 neue Nachricht von</b> - 1 new Message from @@ -7092,10 +6724,6 @@ Willst Du die Nachricht speichern ? MessageWidget - - MainWindow - Hauptfenster - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -7217,10 +6845,6 @@ p, li { white-space: pre-wrap; } MessageWindow - - MainWindow - Hauptfenster - New Message @@ -7392,17 +7016,6 @@ p, li { white-space: pre-wrap; } From Von - - Size - Grösse - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> -<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;">Recommended Files</span></p></body></html> - <html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"><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;">Empfohlene Dateien</span></p></body></html> - Reply @@ -7500,22 +7113,6 @@ p, li { white-space: pre-wrap; } Quick View Schnellansicht - - Download all Recommended Files - Alle Dateien runterladen - - - Cc: - Cc: - - - Bcc: - Bcc: - - - Tags: - Schlagwörter: - @@ -7558,36 +7155,12 @@ p, li { white-space: pre-wrap; } Save As... Speichern unter... - - Print Document - Dokument drucken - Subject Betreff - - Subject: - Betreff: - - - From: - Von: - - - To: - An: - - - File Name - Dateiname - - - Hash - Prüfsumme - Print @@ -7654,56 +7227,17 @@ p, li { white-space: pre-wrap; } Click to sort by tags Klicken, um nach Schlagwörter zu sortieren - - Click to sort by mark - Klicken, um nach Kennzeichnung zu sortieren - - - Download - Herunterladen - - - Hide - Empfohlene Dateien ausblenden - - - Expand - Empfohlene Dateien einblenden - Click to sort by to Klicken, um nach Empfänger zu sortieren - - File - Datei - - - Files - Dateien - - - Save as... - Speichern unter... - - - HTML-Files (*.htm *.html);;All Files (*) - HTML-Dateien (*.htm *.html);;Alle Dateien (*) - Reply to All Allen antworten - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Download all Recommended Files</p></body></html> - <html><head><meta name="qrichtext" content="1" /><style type="text/css">p, li { white-space: pre-wrap; }</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Alle Dateien runterladen</p></body></html> - Total Inbox: @@ -7724,10 +7258,6 @@ p, li { white-space: pre-wrap; } Tags Schlagwörter - - Tag - Schlagwort - @@ -7736,23 +7266,11 @@ p, li { white-space: pre-wrap; } Trash Papierkorb - - Favorite Tags - Schlagwörter - Folders Ordner - - Remove All Tags - Alle Schlagwörter entfernen - - - New tag ... - Neues Schlagwort... - Mark as read @@ -7790,10 +7308,6 @@ p, li { white-space: pre-wrap; } To An - - Edit... - Editieren... - Click to sort by star @@ -8445,7 +7959,7 @@ p, li { white-space: pre-wrap; } Chat - + Chat @@ -8458,7 +7972,12 @@ p, li { white-space: pre-wrap; } Nachrichten - + + Security + Sicherheit + + + Systray Icon Systray Icon @@ -8488,10 +8007,6 @@ p, li { white-space: pre-wrap; } Download completed Download fertig - - Combined icon - Kombiniertes Icon - @@ -8567,7 +8082,7 @@ p, li { white-space: pre-wrap; } Feeds am Ende anfügen - + Top Left Oben Links @@ -8646,12 +8161,27 @@ p, li { white-space: pre-wrap; } - + Expand Erweitern - + + Location: + Standort: + + + + IP Address: + IP-Adresse: + + + + Connection Method: + Verbindungsmethode: + + + Status: Status: @@ -8676,22 +8206,7 @@ p, li { white-space: pre-wrap; } Peer ID: - - Location - Ort - - - - IP Address - IP-Adresse - - - - Connection Method - Verbindungsmethode - - - + Write Message Nachricht schreiben @@ -8716,7 +8231,7 @@ p, li { white-space: pre-wrap; } Abbrechen - + Friend Connected Freund verbunden @@ -8741,7 +8256,7 @@ p, li { white-space: pre-wrap; } Nachbar - + @@ -8754,12 +8269,12 @@ p, li { white-space: pre-wrap; } Unbekannter Nachbar - + Hide Verbergen - + Quick Message Schnelle Nachrricht @@ -8782,333 +8297,6 @@ p, li { white-space: pre-wrap; } Freunde - - PeersDialog - - Chat - Chat - - - Save Certificate - Zertifikat speichern - - - Certificates (*.pqi) - Zertifikate (*.pqi) - - - Status - Status - - - Connect To Friend - Verbinde zum Freund - - - Profile - Profil - - - Welcome to RetroShare's group chat. - Willkommen bei RetroShare's Gruppenchat. - - - me - ich - - - Group - Gruppe - - - Friend - Freund - - - Location - Standort - - - Friend Details - Freund-Details - - - Expand all - Alle erweitern - - - Collapse all - Alle reduzieren - - - Message Friend - Freund anschreiben - - - News Feed - Neuigkeiten - - - Paste RetroShare Link - RetroShare Link einfügen - - - Recommend this Friend to... - Freund weiterempfehlen... - - - Copy RetroShare Link - Kopiere RetroShare Link - - - Deny Friend - Blockiere Freund - - - Remove Friend Location - Freund entfernen - - - Add to group - Hinzufügen zur Gruppe - - - Move to group - Verschiebe in Gruppe - - - Groups - Gruppen - - - Remove from group - Aus Gruppe entfernen - - - Remove from all groups - Aus allen Gruppen entfernen - - - Available - Verfügbar - - - New group chat - Neuer Gruppenchat - - - Do you really want to physically delete the history? - Willst Du wirklich den Nachrichtenverlauf physisch löschen? - - - Load File - Lade Datei - - - Pictures (*.png *.xpm *.jpg *.tiff *.gif) - Bilder (*.png *.xpm *.jpg *.tiff *.gif) - - - Add Extra File - Zusätzliche Datei hinzufügen - - - Drop file error. - Dateifehler bei Drag'n'Drop. - - - File not found or file name not accepted. - Datei nicht gefunden oder Dateiname nicht akzeptiert. - - - Directory can't be dropped, only files are accepted. - Ordner können nicht für Drag'n'Drop genutzt werden. Nur Dateien werden akzeptiert. - - - Italic - Kursiv - - - Underline - Unterstrichen - - - <!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; } -</style></head><body style=" font-family:'Arial'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Friends</span></p></body></html> - <!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; } -</style></head><body style=" font-family:'Arial'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Freunde</span></p></body></html> - - - Add - Hinzufügen - - - Display - Anzeige - - - Add or Change your Avatar - Wähle oder ändere dein Avatar Bild - - - Edit Personal message - Statusnachricht ändern - - - Messages entered here are sent to all collected friends - Nachrichten, die Du hier eingibst, werden an alle verbundenen Freunde versendet - - - Bold - Fett - - - Text Color - Textfarbe - - - Create new Forum - Erstelle neues Forum - - - Create new Channel - Erstelle neuen Kanal - - - Add your Avatar Picture - Wähle dein Avatar Bild - - - Set your Personal Message - Statusnachricht ändern - - - Edit your status Message - Statusnachricht ändern - - - Sort by State - Sortiere nach Status - - - Hide State - Status ausblenden - - - Add a new Group - Neue Gruppe hinzufügen - - - Sort Descending Order - Absteigend sortieren - - - Sort Ascending Order - Aufsteigend sortieren - - - Delete Chat History - Nachrichtenverlauf löschen - - - Deletes all stored and displayed chat history - Löscht den gespeicherten und angezeigten Chat Verlauf - - - Add Friend - Freund hinzufügen - - - Create new Profile - Erstelle neues Profil - - - Font - Schriftart - - - Group Chat - Gruppenchat - - - Attach File - Datei anhängen - - - Send - Senden - - - Clear Chat History - Nachrichtenverlauf leeren - - - Save Chat History - Nachrichtenverlauf speichern - - - Message Group - Gruppe anschreiben - - - Edit Group - Gruppe ändern - - - Remove Group - Gruppe entfernen - - - Do you want to remove this Friend? - Willst du diesen Freund entfernen? - - - Save as... - Speichern unter... - - - Text File (*.txt );;All Files (*) - Text Datei (*.txt );;Alle Dateien (*) - - - Hide Offline Friends - Verstecke offline Freunde - - - Hide Status Column - Status Spalte ausblenden - - - is typing... - tippt... - - - Browse Message History - Nachrichtenverlauf anzeigen - - - Browse History - Nachrichtenverlauf - - - Friends - Freunde - - - Paste Friend Link - RetroShare Link einfügen - - - location - Standort - - PhotoDialog @@ -9470,10 +8658,6 @@ p, li { white-space: pre-wrap; } Plugin look-up directories - - Description - Beschreibung - Hash rejected. Add to white list. @@ -9758,14 +8942,6 @@ Do you want to send them a Message instead RetroShare RetroShare - - Load File - Lade Datei - - - Pictures (*.png *.xpm *.jpg *.tiff *.gif) - Bilder (*.png *.xpm *.jpg *.tiff *.gif) - PrintPreview @@ -10247,14 +9423,6 @@ Lockdatei: Lockdatei: - - Another RetroShare using the same profile is already running on your system. Please close that instance first - Ein laufendes RetroShare benutzt das gleiche Profil. Bitte schliesse diese Instanz - - - An unexpected error occurred when Retrosharetried to acquire the single instance lock - Ein unerwartete Fehler während des "Single instance lock" ist aufgetreten - Login Failure @@ -10356,19 +9524,11 @@ Lockdatei: %1 of %2 RetroShare links processed. %1 von %2 RetroShare Links verarbeitet. - - %1 of %2 RetroShare links processed - %1 von %2 RetroShare Links verarbeitet. - Request Confirmation Anfrage bestätigen - - The forum message could not be found. - Der Forumbeitrag "%1" konnte nicht gefunden werden. - @@ -10391,10 +9551,6 @@ Lockdatei: Message Request canceled Nachrichtenanfrage abgebrochen - - The receipient of the message "%1" is unknown. - Der Empfänger der Nachricht "%1" ist unbekannt. - File Request Error @@ -10420,10 +9576,6 @@ Lockdatei: Peer details Nachbar Details - - No running instance of RetroShare found. - Kein laufendes RetroShare gefunden. - Start with a RetroShare link is only supported for Windows. @@ -10850,65 +10002,6 @@ p, li { white-space: pre-wrap; } <strong>Hoch:</strong> - - RemoteDirModel - - Friends Directories - Dateien von Freunden - - - My Directories - Meine Ordner - - - Size - Grösse - - - Share Type - Freigabe Typ - - - What's new - Was ist neu - - - Age - Alter - - - Anonymous - Anonym - - - Anonymous and browsable by friends - Anonym und Durchsuchbar von Freunden - - - Only browsable by friends - Nur Durchsuchbar von Freunden - - - NEW - NEU - - - FILE - DATEI - - - Files - Dateien - - - File - Datei - - - DIR - ORDNER - - RetroshareDirModel @@ -11074,22 +10167,6 @@ p, li { white-space: pre-wrap; } Enter a keyword here (at least 3 char long) Gib einen Suchbegriff ein (min. 3 Zeichen) - - Copy retroshare Link - Kopiere RetroShare Link - - - Send retroshare Link - Sende RetroShare Link - - - Broadcast on Channel - Im Kanal bekanntgeben - - - Recommend to Friends - Freunden empfehlen - @@ -11330,124 +10407,145 @@ p, li { white-space: pre-wrap; } SecurityItem - - + + Expand - + Erweitern Remove Item - + Entferne Element + Peer details + Nachbar Details + + + + Deny friend + Blockiere Freund + + + + Make friend + Freund hinzufügen + + + Write a quick Message - Schnelle Nachricht schreiben + Schnelle Nachricht schreiben Chat - + Chat Start Chat - Chat starten + Chat starten Cancel - Abbrechen + Abbrechen Send - Senden + Senden Name: - Name: + Name: Peer ID: - Peer ID: + Peer ID: Trust: - Vertrauen: + Vertrauen: - Location - + Location: + Standort: - IP Address - IP-Adresse + IP Address: + IP-Adresse: - Connection Method - Verbindungsmethode + Connection Method: + Verbindungsmethode: Status: - Status: + Status: Write Message - Nachricht schreiben + Nachricht schreiben - + Connect Attempt - Verbindungsversuch + Verbindungsversuch Not Yet Friends - + Noch keine Freunde Unknown (Incoming) Connect Attempt - + Unbekannter (eingehender) Verbindungsversuch Unknown (Outgoing) Connect Attempt - + Unbekannter (ausgehender) Verbindungsversuch Unknown Security Issue - + Unbekanntes Sicherheitsproblem - + + Unknown Peer - Unbekannter Nachbar + Unbekannter Nachbar Hide - + Verbergen - + + Do you want to remove this Friend? + Willst du diesen Freund entfernen? + + + Quick Message - Schnelle Nachrricht + Schnelle Nachrricht @@ -12312,14 +11410,6 @@ p, li { white-space: pre-wrap; } Multiple instances Mehrere Instanzen - - Another RetroShare using the same profile is already running on your system. Please close that instance first, or choose another profile - Ein laufendes RetroShare benutzt das gleiche Profil. Bitte schliesse diese Instanz oder benutze ein anderes Profil - - - An unexpected error occurred when Retrosharetried to acquire the single instance lock - Ein unerwartete Fehler während des "Single instance lock" ist aufgetreten - Another RetroShare using the same profile is already running on your system. Please close that instance first, or choose another profile @@ -12741,10 +11831,6 @@ p, li { white-space: pre-wrap; } Cancel Abbrechen - - Paste RetroShare Link - RetroShare Link einfügen - StyleDialog diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp index d418b7684..e86012f56 100644 --- a/retroshare-gui/src/main.cpp +++ b/retroshare-gui/src/main.cpp @@ -276,7 +276,7 @@ int main(int argc, char *argv[]) QObject::connect(notify,SIGNAL(publicChatChanged(int)) ,w->friendsDialog ,SLOT(publicChatChanged(int) )); QObject::connect(notify,SIGNAL(groupsChanged(int)) ,w->friendsDialog ,SLOT(groupsChanged(int) )); QObject::connect(notify,SIGNAL(privateChatChanged(int, int)) ,w ,SLOT(privateChatChanged(int, int) )); - QObject::connect(notify,SIGNAL(neighborsChanged()) ,w->networkDialog ,SLOT(insertConnect() )) ; + QObject::connect(notify,SIGNAL(neighboursChanged()) ,w->networkDialog ,SLOT(insertConnect() )) ; QObject::connect(notify,SIGNAL(messagesChanged()) ,w->messagesDialog ,SLOT(insertMessages() )) ; QObject::connect(notify,SIGNAL(messagesTagsChanged()) ,w->messagesDialog ,SLOT(messagesTagsChanged() )) ; QObject::connect(notify,SIGNAL(messagesChanged()) ,w ,SLOT(updateMessages() )) ;