Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-13 08:29:32 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged revision 7443 from branches v0.5.5

Browse Source 
Added patch from Henry:
- Added translation for password input
- Fixed utf8 issue in ProfileManager

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7444 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-07-07 19:37:04 +00:00
parent 1164344976
commit eb22610145
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/pqi/authgpg.cc
View File

@ -93,7 +93,7 @@ std::string pgp_pwd_callback(void * /*hook*/, const char *uid_hint, const char *
fprintf(stderr, "pgp_pwd_callback() called.\n");
#endif
std::string password;
RsServer::notify()->askForPassword(std::string("\n ")+uid_hint+" :", prev_was_bad, password) ;
RsServer::notify()->askForPassword(uid_hint, prev_was_bad, password) ;
return password ;
}

2
retroshare-gui/src/gui/notifyqt.cpp
View File

@ -271,7 +271,7 @@ bool NotifyQt::askForPassword(const std::string& key_details, bool prev_is_bad,
QInputDialog dialog;
dialog.setWindowTitle(tr("PGP key passphrase"));
dialog.setLabelText(prev_is_bad?tr("Wrong password !") + "\n\n" : tr("Please enter your PGP password for key:") + QString::fromUtf8(key_details.c_str()));
dialog.setLabelText((prev_is_bad ? QString("%1\n\n").arg(tr("Wrong password !")) : QString()) + QString("%1:\n %2").arg(tr("Please enter your PGP password for key"), QString::fromUtf8(key_details.c_str())));
dialog.setTextEchoMode(QLineEdit::Password);
dialog.setWindowIcon(QIcon(":/images/rstray3.png"));
dialog.setModal(true);

4
retroshare-gui/src/gui/profile/ProfileManager.cpp
View File

@ -166,9 +166,7 @@ void ProfileManager::importIdentity()
RsAccounts::GetPGPLoginDetails(gpg_id, name, email);
std::cerr << "Adding PGPUser: " << name << " id: " << gpg_id << std::endl;
QMessageBox::information(this,tr("New identity imported"),tr("Your identity was imported successfully:")+" \n"+"\nName :"
+QString::fromStdString(name)+"\nemail: " + QString::fromStdString(email)+"\nKey ID: "
+QString::fromStdString(gpg_id.toStdString())+"\n\n"+tr("You can use it now to create a new location.")) ;
QMessageBox::information(this,tr("New identity imported"),tr("Your identity was imported successfully:")+" \n"+"\nName :"+QString::fromUtf8(name.c_str())+"\nemail: " + QString::fromStdString(email)+"\nKey ID: "+QString::fromStdString(gpg_id.toStdString())+"\n\n"+tr("You can use it now to create a new location.")) ;
}
fillIdentities();

3
retroshare-nogui/src/notifytxt.cc
View File

@ -103,7 +103,8 @@ bool NotifyTxt::askForPluginConfirmation(const std::string& plugin_file_name, co
bool NotifyTxt::askForPassword(const std::string& question, bool prev_is_bad, std::string& password)
{
char *passwd = getpass(question.c_str()) ;
std::string question1="Please enter your PGP password for key:\n " + question + " :";
char *passwd = getpass(question1.c_str()) ;
password = passwd;
return !password.empty();