Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-11 10:35:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Removed all usages of the old windows icon (rstray3.png) and used the standard icon of the application

Browse source 
- Added possibility to change the icon of the GxsGroupDialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7471 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-07-24 23:26:04 +00:00
parent 6792348402
commit d20ce41c96
37 changed files with 82 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

6
retroshare-gui/src/main.cpp
View file

@ -92,7 +92,7 @@ static void displayWarningAboutDSAKeys()
msgBox.setInformativeText(QObject::tr("DSA keys are not yet supported by this version of RetroShare. All these locations will be unusable. We're very sorry for that."));
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setDefaultButton(QMessageBox::Ok);
msgBox.setWindowIcon(QIcon(":/images/rstray3.png"));
msgBox.setWindowIcon(QIcon(":/images/logo/logo_32.png"));
msgBox.exec();
}
@ -184,7 +184,7 @@ int main(int argc, char *argv[])
msgBox.setInformativeText(QObject::tr("Choose between:<br><ul><li><b>Ok</b> to copy the existing keyring from gnupg (safest bet), or </li><li><b>Close without saving</b> to start fresh with an empty keyring (you will be asked to create a new PGP key to work with RetroShare, or import a previously saved pgp keypair). </li><li><b>Cancel</b> to quit and forge a keyring by yourself (needs some PGP skills)</li></ul>"));
msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Discard | QMessageBox::Cancel);
msgBox.setDefaultButton(QMessageBox::Ok);
msgBox.setWindowIcon(QIcon(":/images/rstray3.png"));
msgBox.setWindowIcon(QIcon(":/images/logo/logo_32.png"));
int ret = msgBox.exec();
@ -213,7 +213,7 @@ int main(int argc, char *argv[])
displayWarningAboutDSAKeys();
QMessageBox mb(QMessageBox::Critical, QObject::tr("RetroShare"), "", QMessageBox::Ok);
mb.setWindowIcon(QIcon(":/images/rstray3.png"));
mb.setWindowIcon(QIcon(":/images/logo/logo_32.png"));
switch (initResult)
{