Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-30 09:56:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

renaming strings and changed icons for Network/People

Browse Source 
added Peer def for Identities.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7862 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2015-01-23 14:42:28 +00:00
parent e5203e1f6a
commit b155c36170
9 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
retroshare-gui/src/gui/FriendsDialog.h
View File

@ -26,7 +26,7 @@
#include "ui_FriendsDialog.h"
#define IMAGE_PEERS ":/images/groupchat.png"
#define IMAGE_NETWORK ":/images/logo/logo_32.png"
class QAction;
class NetworkDialog;
@ -56,7 +56,7 @@ public:
/** Default Destructor */
~FriendsDialog ();
virtual QIcon iconPixmap() const { return QIcon(IMAGE_PEERS) ; } //MainPage
virtual QIcon iconPixmap() const { return QIcon(IMAGE_NETWORK) ; } //MainPage
virtual QString pageName() const { return tr("Network") ; } //MainPage
virtual QString helpText() const { return ""; } //MainPage

2
retroshare-gui/src/gui/FriendsDialog.ui
View File

@ -38,7 +38,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="images.qrc">:/images/user/friends24.png</pixmap>
<pixmap resource="images.qrc">:/images/logo/logo_24.png</pixmap>
</property>
</widget>
</item>

4
retroshare-gui/src/gui/Identity/IdDialog.cpp
View File

@ -147,8 +147,8 @@ IdDialog::IdDialog(QWidget *parent) :
connect(ui->filterLineEdit, SIGNAL(textChanged(QString)), this, SLOT(filterChanged(QString)));
connect(ui->repModButton, SIGNAL(clicked()), this, SLOT(modifyReputation()));
ui->headerFrame->setHeaderImage(QPixmap(":/images/identity/identity_64.png"));
ui->headerFrame->setHeaderText(tr("Identities"));
ui->headerFrame->setHeaderImage(QPixmap(":/images/user/friends64.png"));
ui->headerFrame->setHeaderText(tr("People"));
/* Initialize splitter */
ui->splitter->setStretchFactor(0, 1);

4
retroshare-gui/src/gui/Identity/IdDialog.h
View File

@ -30,7 +30,7 @@
#include "util/TokenQueue.h"
#define IMAGE_IDDIALOG ":/images/identity/identities_32.png"
#define IMAGE_IDDIALOG ":/images/user/friends32.png"
namespace Ui {
class IdDialog;
@ -48,7 +48,7 @@ public:
~IdDialog();
virtual QIcon iconPixmap() const { return QIcon(IMAGE_IDDIALOG) ; } //MainPage
virtual QString pageName() const { return tr("Identities") ; } //MainPage
virtual QString pageName() const { return tr("People") ; } //MainPage
virtual QString helpText() const { return ""; } //MainPage
void loadRequest(const TokenQueue *queue, const TokenRequest &req);

15
retroshare-gui/src/gui/Identity/IdDialog.ui
View File

@ -20,16 +20,7 @@
<string/>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<property name="margin">
<number>0</number>
</property>
<item>
@ -68,7 +59,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="../images.qrc">:/images/identity/identities_32.png</pixmap>
<pixmap resource="../images.qrc">:/images/user/friends24.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@ -78,7 +69,7 @@
<item>
<widget class="StyledLabel" name="titleBarLabel">
<property name="text">
<string>Identities</string>
<string>People</string>
</property>
</widget>
</item>

2
retroshare-gui/src/gui/chat/ChatUserNotify.cpp
View File

@ -78,7 +78,7 @@ QIcon ChatUserNotify::getIcon()
QIcon ChatUserNotify::getMainIcon(bool hasNew)
{
return hasNew ? QIcon(":/images/user/friends24_notify.png") : QIcon(":/images/groupchat.png");
return hasNew ? QIcon(":/images/user/friends24_notify.png") : QIcon(":/images/logo/logo_32.png");
}
unsigned int ChatUserNotify::getNewCount()

6
retroshare-gui/src/gui/common/PeerDefs.cpp
View File

@ -39,6 +39,12 @@ const QString PeerDefs::nameWithLocation(const RsIdentityDetails &details)
{
return QString::fromUtf8(details.mNickname.c_str()) + " (" + QString::fromStdString(details.mId.toStdString()) + ")";
}
const QString PeerDefs::nameWithId(const RsIdentityDetails &details)
{
return QString::fromUtf8(details.mNickname.c_str()) + " <" + QString::fromUtf8(details.mNickname.c_str()) + "@" + QString::fromStdString(details.mId.toStdString()) + ">";
}
const QString PeerDefs::rsid(const std::string &name, const RsPgpId &id)
{
if (name.empty()) {

1
retroshare-gui/src/gui/common/PeerDefs.h
View File

@ -33,6 +33,7 @@ class PeerDefs
public:
static const QString nameWithLocation(const RsPeerDetails &details);
static const QString nameWithLocation(const RsIdentityDetails &details);
static const QString nameWithId(const RsIdentityDetails &details);
static const QString rsid(const RsPeerDetails &details);
static const QString rsid(const std::string &name, const RsPeerId &id);

1
retroshare-gui/src/gui/images.qrc
View File

@ -503,6 +503,7 @@
<file>images/user/remove_user24.png</file>
<file>images/user/deny_user48.png</file>
<file>images/user/friends24.png</file>
<file>images/user/friends32.png</file>
<file>images/user/friends64.png</file>
<file>images/user/friends24_notify.png</file>
<file>images/user/friend_suggestion16.png</file>