mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-08-03 03:36:58 -04:00
merged upstream/master
This commit is contained in:
commit
0e3739b9d7
145 changed files with 723 additions and 809 deletions
|
@ -46,7 +46,7 @@
|
|||
#define IMAGE_INFO ":/images/info16.png"
|
||||
//#define IMAGE_GROUPAUTHD ":/images/konv_message2.png"
|
||||
#define IMAGE_COPYLINK ":/images/copyrslink.png"
|
||||
#define IMAGE_EDIT ":/images/edit_16.png"
|
||||
#define IMAGE_EDIT ":/icons/png/pencil-edit-button.png"
|
||||
#define IMAGE_SHARE ":/images/share-icon-16.png"
|
||||
#define IMAGE_TABNEW ":/images/tab-new.png"
|
||||
#define IMAGE_DELETE ":/images/delete.png"
|
||||
|
@ -146,7 +146,7 @@ void GxsGroupFrameDialog::initUi()
|
|||
{
|
||||
registerHelpButton(ui->helpButton, getHelpString(),pageName()) ;
|
||||
|
||||
ui->titleBarPixmap->setPixmap(QPixmap(icon(ICON_NAME)));
|
||||
ui->titleBarPixmap->setPixmap(FilesDefs::getPixmapFromQtResourcePath(icon(ICON_NAME)));
|
||||
ui->titleBarLabel->setText(text(TEXT_NAME));
|
||||
|
||||
/* Initialize group tree */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue