Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-02 06:06:10 -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

8
retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp
View file

@ -58,12 +58,12 @@ const uint32_t ChannelEditEnabledFlags = ChannelCreateEnabledFlags;
const uint32_t ChannelEditDefaultsFlags = ChannelCreateDefaultsFlags;
GxsChannelGroupDialog::GxsChannelGroupDialog(TokenQueue *tokenQueue, QWidget *parent)
:GxsGroupDialog(tokenQueue, ChannelCreateEnabledFlags, ChannelCreateDefaultsFlags, parent)
: GxsGroupDialog(tokenQueue, ChannelCreateEnabledFlags, ChannelCreateDefaultsFlags, parent)
{
}
GxsChannelGroupDialog::GxsChannelGroupDialog(TokenQueue *tokenExternalQueue, RsTokenService *tokenService, Mode mode, RsGxsGroupId groupId, QWidget *parent)
:GxsGroupDialog(tokenExternalQueue, tokenService, mode, groupId, ChannelEditEnabledFlags, ChannelEditDefaultsFlags, parent)
: GxsGroupDialog(tokenExternalQueue, tokenService, mode, groupId, ChannelEditEnabledFlags, ChannelEditDefaultsFlags, parent)
{
}
@ -97,11 +97,11 @@ QPixmap GxsChannelGroupDialog::serviceImage()
break;
case MODE_SHOW:
return QPixmap(":/images/channels.png");
break;
case MODE_EDIT:
return QPixmap(":/images/channels.png");
break;
}
return QPixmap();
}
bool GxsChannelGroupDialog::service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta)

1
retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.h
View file

@ -39,7 +39,6 @@ protected:
virtual bool service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta);
virtual bool service_loadGroup(uint32_t token, Mode mode, RsGroupMetaData& groupMetaData, QString &description);
virtual bool service_EditGroup(uint32_t &token, RsGroupMetaData &editedMeta);
};
#endif