Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mantidproject
mantid
Commits
90a343bb
Commit
90a343bb
authored
May 21, 2019
by
Samuel Jones
Browse files
Re #25383 Clean up code left from legacy attempts
parent
ec6d9b71
Changes
7
Hide whitespace changes
Inline
Side-by-side
docs/source/concepts/PropertiesFile.rst
View file @
90a343bb
...
...
@@ -88,7 +88,7 @@ Directory Properties
| ``framework.plugins.directory`` | The path to the directory that contains the | ``../plugins`` |
| | Mantid plugin libraries | |
+--------------------------------------+---------------------------------------------------+-------------------------------------+
| ``framework.plugins.exclude`` | A list of substrings to allow libraries to be | ``Qt4`` |
| ``framework.plugins.exclude`` | A list of substrings to allow libraries to be | ``Qt4
;Qt5
`` |
| | skipped | |
+--------------------------------------+---------------------------------------------------+-------------------------------------+
| ``instrumentDefinition.directory`` | Where to load instrument definition files from | ``../Test/Instrument`` |
...
...
qt/python/mantidqt/_common.sip
View file @
90a343bb
...
...
@@ -230,12 +230,8 @@ class UserSubWindow : QMainWindow {
#include "MantidQtWidgets/Common/UserSubWindow.h"
using namespace MantidQt::API;
%End
p
ublic
:
p
rivate
:
UserSubWindow(QWidget *parent = nullptr);
void setInterfaceName(const QString &iface_name);
void initializeLayout();
protected:
virtual void initLayout() = 0;
};
class UserSubWindowFactoryImpl /PyName=UserSubWindowFactory/ {
...
...
qt/scientific_interfaces/ISISReflectometry/GUI/Runs/RunsWidget.ui
View file @
90a343bb
...
...
@@ -380,10 +380,6 @@
</property>
</action>
<action
name=
"actionTransfer"
>
<property
name=
"icon"
>
<iconset
resource=
"../../../../../MantidPlot/icons/icons.qrc"
>
<normaloff>
:/append_drag_curves.png
</normaloff>
:/append_drag_curves.png
</iconset>
</property>
<property
name=
"text"
>
<string>
Transfer
</string>
</property>
...
...
@@ -410,9 +406,6 @@
<tabstop>
comboSearchInstrument
</tabstop>
<tabstop>
tableSearchResults
</tabstop>
</tabstops>
<resources>
<include
location=
"../../../../../MantidPlot/icons/icons.qrc"
/>
</resources>
<connections>
<connection>
<sender>
buttonSearch
</sender>
...
...
qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTableView.ui
View file @
90a343bb
...
...
@@ -99,8 +99,5 @@
</item>
</layout>
</widget>
<resources>
<include
location=
"../../../../widgets/common/MantidPlot/icons/icons.qrc"
/>
</resources>
<connections/>
</ui>
qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmDialogFactoryImpl.h
deleted
100644 → 0
View file @
ec6d9b71
// Mantid Repository : https://github.com/mantidproject/mantid
//
// Copyright © 2019 ISIS Rutherford Appleton Laboratory UKRI,
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTIDQT_API_ALGORITHMDIALOGFACTORYIMPL_H_
#define MANTIDQT_API_ALGORITHMDIALOGFACTORYIMPL_H_
//------------------------
// Includes
//------------------------
#include
"DllOption.h"
#include
"MantidKernel/DynamicFactory.h"
#include
"MantidKernel/SingletonHolder.h"
#include
<QHash>
#include
<QSetIterator>
#include
<QStringList>
#include
<set>
namespace
MantidQt
{
namespace
API
{
//-------------------------------
// MantidQt forward declarations
//-------------------------------
class
AlgorithmDialog
;
class
UserSubWindow
;
/**
The AlgorithmDialogFactory is responsible for creating concrete instances of
AlgorithmDialog classes. It is implemented as a singleton class.
@author Martyn Gigg, Tessella plc
@date 24/02/2009
*/
class
EXPORT_OPT_MANTIDQT_COMMON
AlgorithmDialogFactoryImpl
:
public
Mantid
::
Kernel
::
DynamicFactory
<
AlgorithmDialog
>
{
public:
// Unhide the inherited create method
using
Mantid
::
Kernel
::
DynamicFactory
<
AlgorithmDialog
>::
createUnwrapped
;
AlgorithmDialogFactoryImpl
(
const
AlgorithmDialogFactoryImpl
&
)
=
delete
;
AlgorithmDialogFactoryImpl
&
operator
=
(
const
AlgorithmDialogFactoryImpl
&
)
=
delete
;
private:
friend
struct
Mantid
::
Kernel
::
CreateUsingNew
<
AlgorithmDialogFactoryImpl
>
;
/// Private Constructor for singleton class
AlgorithmDialogFactoryImpl
()
=
default
;
/// Private Destructor
~
AlgorithmDialogFactoryImpl
()
override
=
default
;
};
/// The specific instantiation of the templated type
using
AlgorithmDialogFactory
=
Mantid
::
Kernel
::
SingletonHolder
<
AlgorithmDialogFactoryImpl
>
;
}
// namespace API
}
// namespace MantidQt
namespace
Mantid
{
namespace
Kernel
{
EXTERN_MANTIDQT_COMMON
template
class
EXPORT_OPT_MANTIDQT_COMMON
Mantid
::
Kernel
::
SingletonHolder
<
MantidQt
::
API
::
AlgorithmDialogFactoryImpl
>;
}
// namespace Kernel
}
// namespace Mantid
#endif
\ No newline at end of file
qt/widgets/common/inc/MantidQtWidgets/Common/UserSubWindow.h
View file @
90a343bb
...
...
@@ -86,9 +86,6 @@ public:
/// Has the Python initialization function been run
bool
isPyInitialized
()
const
;
/// Set the interface name, made public so possible from Python
void
setInterfaceName
(
const
QString
&
iface_name
);
signals:
/// Emitted to start a (generally small) script running
void
runAsPythonScript
(
const
QString
&
code
,
bool
/*_t2*/
);
...
...
@@ -116,6 +113,14 @@ protected:
QLabel
*
newValidator
(
QWidget
*
parent
);
private:
// This is so that it can set the name
// I can't pass anything as an argument to the constructor as I am using
// the DynamicFactory
friend
class
InterfaceManager
;
/// Set the interface name, made public so possible from Python
void
setInterfaceName
(
const
QString
&
iface_name
);
/// Has this already been initialized
bool
m_bIsInitialized
;
/// Has the python initialization been run
...
...
qt/widgets/common/src/UserSubWindow.cpp
View file @
90a343bb
...
...
@@ -20,11 +20,6 @@
using
namespace
MantidQt
::
API
;
namespace
{
// Load libraries once
std
::
once_flag
DLLS_LOADED
;
}
// namespace
//------------------------------------------------------
// Public member functions
//------------------------------------------------------
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment