Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-21 23:40:26 -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

1
retroshare-gui/src/gui/common/Emoticons.cpp
View file

@ -134,7 +134,6 @@ void Emoticons::showSmileyWidget(QWidget *parent, QWidget *button, const char *s
smWidget->setAttribute( Qt::WA_DeleteOnClose);
smWidget->setWindowTitle("Emoticons");
smWidget->setWindowIcon(QIcon(QString(":/images/rstray3.png")));
smWidget->setBaseSize(countPerLine*buttonWidth, rowCount*buttonHeight);
//Warning: this part of code was taken from kadu instant messenger;

1
retroshare-gui/src/gui/common/RsCollectionFile.cpp
View file

@ -205,7 +205,6 @@ void RsCollectionFile::recursAddElements(QDomDocument& doc,const ColFileInfo& co
static void showErrorBox(const QString& fileName, const QString& error)
{
QMessageBox mb(QMessageBox::Warning, QObject::tr("Failed to process collection file"), QObject::tr("The collection file %1 could not be opened.\nReported error is: \n\n%2").arg(fileName).arg(error), QMessageBox::Ok);
mb.setWindowIcon(QIcon(":/images/rstray3.png"));
mb.exec();
}