Commit 0be91fd0 authored by Shawn Waldon's avatar Shawn Waldon Committed by Kitware Robot
Browse files

Merge topic 'remove-broken-button'

9f625e22

 Remove help button from Find Data dialog
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Cory Quammen's avatarCory Quammen <cory.quammen@kitware.com>
Merge-request: !2041
parents 6a052221 9f625e22
Pipeline #84241 canceled with stage
in 0 seconds
......@@ -53,14 +53,6 @@ pqDataQueryReaction::~pqDataQueryReaction()
{
}
//-----------------------------------------------------------------------------
void pqDataQueryReaction::showHelp()
{
#ifdef PARAVIEW_USE_QTHELP
pqHelpReaction::showHelp("qthelp://paraview.org/paraview/Book/Book_Chapter6.html");
#endif
}
//-----------------------------------------------------------------------------
void pqDataQueryReaction::showQueryDialog()
{
......@@ -68,7 +60,6 @@ void pqDataQueryReaction::showQueryDialog()
if (pqFindDataSingleton.isNull())
{
pqFindDataDialog* dialog = new pqFindDataDialog(pqCoreUtilities::mainWidget());
this->connect(dialog, SIGNAL(helpRequested()), SLOT(showHelp()));
pqFindDataSingleton = dialog;
}
......
......@@ -56,9 +56,6 @@ public:
*/
void showQueryDialog();
public slots:
void showHelp();
protected:
/**
* Called when the action is triggered.
......
......@@ -193,13 +193,6 @@
</widget>
</widget>
</item>
<item>
<widget class="QToolButton" name="helpButton">
<property name="text">
<string>?</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
......@@ -226,7 +219,6 @@
<tabstop>value</tabstop>
<tabstop>value_block</tabstop>
<tabstop>showCompositeTree</tabstop>
<tabstop>helpButton</tabstop>
</tabstops>
<resources/>
<connections/>
......
......@@ -95,7 +95,6 @@ public:
self->connect(
this->Ui.source, SIGNAL(currentIndexChanged(pqOutputPort*)), SLOT(setPort(pqOutputPort*)));
self->connect(this->Ui.selectionType, SIGNAL(currentIndexChanged(int)), SLOT(refreshQuery()));
self->connect(this->Ui.queryClauseWidget, SIGNAL(helpRequested()), SIGNAL(helpRequested()));
self->connect(this->Ui.runQuery, SIGNAL(clicked()), SLOT(runQuery()));
// when the selection manager reports a new selection, we reset the query
......
......@@ -71,12 +71,6 @@ public slots:
*/
void setPort(pqOutputPort*);
signals:
/**
* Fired when the user clicks on the help button for the query clause widget.
*/
void helpRequested();
private slots:
/**
* marks if the underlying data has changed
......
......@@ -56,7 +56,6 @@ public:
this->Ui.setupUi(self);
self->connect(
this->Ui.currentSelectionFrame, SIGNAL(showing(pqOutputPort*)), SLOT(showing(pqOutputPort*)));
self->connect(this->Ui.createSelectionFrame, SIGNAL(helpRequested()), SIGNAL(helpRequested()));
self->connect(this->Ui.freezeSelection, SIGNAL(clicked()), SLOT(freezeSelection()));
self->connect(this->Ui.extractSelection, SIGNAL(clicked()), SLOT(extractSelection()));
......
......@@ -52,12 +52,6 @@ public:
pqFindDataDialog(QWidget* parent = 0, Qt::WindowFlags flags = 0);
~pqFindDataDialog() override;
signals:
/**
* triggered to request help about the pqFindDataDialog.
*/
void helpRequested();
private slots:
/**
* called when pqFindDataCurrentSelectionFrame notifies the dialog that it's
......
......@@ -143,7 +143,6 @@ pqQueryClauseWidget::pqQueryClauseWidget(QWidget* parentObject, Qt::WindowFlags
this->Internals->setupUi(this);
this->connect(this->Internals->showCompositeTree, SIGNAL(clicked()), SLOT(showCompositeTree()));
this->connect(this->Internals->helpButton, SIGNAL(clicked()), SIGNAL(helpRequested()));
this->connect(this->Internals->criteria, SIGNAL(currentIndexChanged(int)),
SLOT(populateSelectionCondition()));
......@@ -515,7 +514,6 @@ void pqQueryClauseWidget::updateDependentClauseWidgets()
foreach (CriteriaTypes t_flag, sub_widgets)
{
pqQueryClauseWidget* sub_widget = new pqQueryClauseWidget(this);
sub_widget->Internals->helpButton->hide();
sub_widget->setProducer(this->producer());
sub_widget->setAttributeType(this->attributeType());
sub_widget->initialize(t_flag, true);
......
......@@ -137,12 +137,6 @@ public slots:
*/
void initialize(CriteriaTypes type_flags, bool qualifier_mode = false);
signals:
/**
* Fired when the user clicks on the help button.
*/
void helpRequested();
protected slots:
/**
* Based on the selection criteria, populate the options in the selection
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment