From 207d86543c200cc43cc98aa32f10e43021e1d643 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Thu, 11 Jul 2013 08:14:38 +0000 Subject: [PATCH] Fixed some spaces in the sourcecode. Updated english translation. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6496 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/Identity/IdDialog.cpp | 58 +++---- .../src/gui/Identity/IdEditDialog.cpp | 6 +- retroshare-gui/src/lang/retroshare_en.ts | 159 +++++++++++++++--- 3 files changed, 165 insertions(+), 58 deletions(-) diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp index 06410e18b..1652b2317 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp @@ -46,14 +46,14 @@ /**************************************************************** */ -#define RSID_COL_NICKNAME 0 -#define RSID_COL_KEYID 1 -#define RSID_COL_IDTYPE 2 +#define RSID_COL_NICKNAME 0 +#define RSID_COL_KEYID 1 +#define RSID_COL_IDTYPE 2 -#define RSIDREP_COL_NAME 0 -#define RSIDREP_COL_OPINION 1 -#define RSIDREP_COL_COMMENT 2 -#define RSIDREP_COL_REPUTATION 3 +#define RSIDREP_COL_NAME 0 +#define RSIDREP_COL_OPINION 1 +#define RSIDREP_COL_COMMENT 2 +#define RSIDREP_COL_REPUTATION 3 #define RSID_FILTER_YOURSELF 0x0001 #define RSID_FILTER_FRIENDS 0x0002 @@ -161,9 +161,9 @@ void IdDialog::todo() } void IdDialog::filterComboBoxChanged() - { - requestIdList(); - } +{ + requestIdList(); +} void IdDialog::filterChanged(const QString& /*text*/) { @@ -371,13 +371,13 @@ void IdDialog::requestIdDetails(std::string &id) mStateHelper->setLoading(IDDIALOG_REPLIST, true); RsTokReqOptions opts; - opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA; + opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA; uint32_t token; std::list groupIds; groupIds.push_back(id); - mIdQueue->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, groupIds, IDDIALOG_IDDETAILS); + mIdQueue->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, groupIds, IDDIALOG_IDDETAILS); } void IdDialog::insertIdDetails(uint32_t token) @@ -421,7 +421,7 @@ void IdDialog::insertIdDetails(uint32_t token) /* get GPG Details from rsPeers */ std::string ownPgpId = rsPeers->getGPGOwnId(); - + ui.lineEdit_Nickname->setText(QString::fromStdString(data.mMeta.mGroupName)); ui.lineEdit_KeyId->setText(QString::fromStdString(data.mMeta.mGroupId)); ui.lineEdit_GpgHash->setText(QString::fromStdString(data.mPgpIdHash)); @@ -464,7 +464,7 @@ void IdDialog::insertIdDetails(uint32_t token) ui.radioButton_IdFOF->setChecked(true); } } - else + else { ui.radioButton_IdOther->setChecked(true); } @@ -502,7 +502,7 @@ void IdDialog::insertIdDetails(uint32_t token) { ui.line_RatingImplicit->setText("+10 UnKnown PGP"); } - else + else { ui.line_RatingImplicit->setText("+5 Anon Id"); } @@ -561,14 +561,14 @@ void IdDialog::requestRepList(const RsGxsGroupId &aboutId) mIdQueue->cancelActiveRequestTokens(IDDIALOG_REPLIST); - std::list groupIds; - groupIds.push_back(aboutId); + std::list groupIds; + groupIds.push_back(aboutId); - RsTokReqOptions opts; - opts.mReqType = GXS_REQUEST_TYPE_MSG_DATA; + RsTokReqOptions opts; + opts.mReqType = GXS_REQUEST_TYPE_MSG_DATA; - uint32_t token; - mIdQueue->requestMsgInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, groupIds, IDDIALOG_REPLIST); + uint32_t token; + mIdQueue->requestMsgInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, groupIds, IDDIALOG_REPLIST); } void IdDialog::insertRepList(uint32_t token) @@ -615,26 +615,26 @@ void IdDialog::insertRepList(uint32_t token) void IdDialog::loadRequest(const TokenQueue */*queue*/, const TokenRequest &req) { - std::cerr << "IdDialog::loadRequest() UserType: " << req.mUserType; - std::cerr << std::endl; - + std::cerr << "IdDialog::loadRequest() UserType: " << req.mUserType; + std::cerr << std::endl; + switch(req.mUserType) { case IDDIALOG_IDLIST: insertIdList(req.mToken); break; - + case IDDIALOG_IDDETAILS: insertIdDetails(req.mToken); break; - + case IDDIALOG_REPLIST: insertRepList(req.mToken); break; - + default: - std::cerr << "IdDialog::loadRequest() ERROR"; - std::cerr << std::endl; + std::cerr << "IdDialog::loadRequest() ERROR"; + std::cerr << std::endl; break; } } diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp index c98972806..0a815d28b 100644 --- a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp @@ -151,7 +151,7 @@ void IdEditDialog::loadExistingId(uint32_t token) ui.lineEdit_KeyId->setText(tr("Error getting key!")); return; } - + if (datavector.size() != 1) { std::cerr << "IdDialog::insertIdDetails() Invalid datavector size"; @@ -253,7 +253,7 @@ void IdEditDialog::updateId() //rid.mGpgName = ""; //rid.mGpgEmail = ""; } - + // Can only create Identities for the moment! RsIdentityParameters params; params.nickname = rid.mMeta.mGroupName; @@ -269,7 +269,7 @@ void IdEditDialog::loadRequest(const TokenQueue */*queue*/, const TokenRequest & { std::cerr << "IdDialog::loadRequest() UserType: " << req.mUserType; std::cerr << std::endl; - + // only one here! loadExistingId(req.mToken); } diff --git a/retroshare-gui/src/lang/retroshare_en.ts b/retroshare-gui/src/lang/retroshare_en.ts index d93b1ac38..7b516df0c 100644 --- a/retroshare-gui/src/lang/retroshare_en.ts +++ b/retroshare-gui/src/lang/retroshare_en.ts @@ -7299,10 +7299,6 @@ p, li { white-space: pre-wrap; } New ID - - Showing: - - Yourself @@ -7323,10 +7319,6 @@ p, li { white-space: pre-wrap; } All - - filter - - Nickname @@ -7379,10 +7371,6 @@ p, li { white-space: pre-wrap; } PGP Name - - PGP Email - - PGP Id @@ -7419,6 +7407,34 @@ p, li { white-space: pre-wrap; } Local Reputation + + Todo + + + + Show: + + + + Search + + + + PGP Linked Id + + + + Anon Id + + + + Unknown real name + + + + Anonymous Id + + IdEditDialog @@ -7434,10 +7450,6 @@ p, li { white-space: pre-wrap; } PGP Name - - PGP Email - - PGP Hash @@ -7446,10 +7458,6 @@ p, li { white-space: pre-wrap; } PGP Id - - New Identity - - PGP Associated ID @@ -7459,11 +7467,35 @@ p, li { white-space: pre-wrap; } - Cancel + New identity - Create/Update ID + To be generated + + + + N/A + + + + Edit identity + + + + Error getting key! + + + + Error KeyID invalid + + + + Unknown GpgId + + + + Unknown real name @@ -12513,10 +12545,6 @@ p, li { white-space: pre-wrap; } i.e: Estimated Time of Arrival / Time left - - Core-ID - - Peer i.e: user name @@ -12802,6 +12830,78 @@ Try to be patient! Collapse all + + Size + + + + Show Size Column + + + + Show Completed Column + + + + Speed + + + + Show Speed Column + + + + Progress / Availability + + + + Show Progress / Availability Column + + + + Sources + + + + Show Sources Column + + + + Show Status Column + + + + Show Speed / Queue position Column + + + + Show Remaining Column + + + + Download time + + + + Show Download time Column + + + + Show Hash Column + + + + Last Time Seen + + + + Show Last Time Seen Column + + + + Columns + + TreeStyle_RDM @@ -13025,6 +13125,13 @@ Try to be patient! + + UIStateHelper + + Loading + + + ULListDelegate