mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-22 15:51:29 -04:00
Added new action "Load images always for this message" to image blocking.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6760 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
0a3419c692
commit
6a9dfed408
16 changed files with 255 additions and 97 deletions
|
@ -1,3 +1,26 @@
|
|||
/****************************************************************
|
||||
* RetroShare is distributed under the following license:
|
||||
*
|
||||
* Copyright (C) 2013 RetroShare Team
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
* Boston, MA 02110-1301, USA.
|
||||
****************************************************************/
|
||||
|
||||
#include <QMenu>
|
||||
|
||||
#include "RSImageBlockWidget.h"
|
||||
#include "ui_RSImageBlockWidget.h"
|
||||
|
||||
|
@ -14,3 +37,30 @@ RSImageBlockWidget::~RSImageBlockWidget()
|
|||
{
|
||||
delete ui;
|
||||
}
|
||||
|
||||
void RSImageBlockWidget::addButtonAction(const QString &text, const QObject *receiver, const char *member, bool standardAction)
|
||||
{
|
||||
QMenu *menu = ui->loadImagesButton->menu();
|
||||
if (!menu) {
|
||||
/* Set popup mode */
|
||||
ui->loadImagesButton->setPopupMode(QToolButton::MenuButtonPopup);
|
||||
ui->loadImagesButton->setIcon(ui->loadImagesButton->icon()); // Sometimes Qt doesn't recalculate sizeHint
|
||||
|
||||
/* Create popup menu */
|
||||
menu = new QMenu;
|
||||
ui->loadImagesButton->setMenu(menu);
|
||||
|
||||
/* Add 'click' action as action */
|
||||
QAction *action = menu->addAction(ui->loadImagesButton->text(), this, SIGNAL(showImages()));
|
||||
menu->setDefaultAction(action);
|
||||
}
|
||||
|
||||
/* Add new action */
|
||||
QAction *action = menu->addAction(text, receiver, member);
|
||||
ui->loadImagesButton->addAction(action);
|
||||
|
||||
if (standardAction) {
|
||||
/* Connect standard action */
|
||||
connect(action, SIGNAL(triggered()), this, SIGNAL(showImages()));
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue