Applied to develop,
thanks.
Note that this patch also "fixes" the rejected ticket #197
On Fri 30 October 2015 11:27:22 cfalcon wrote:
> Taurusgui does not create a default documentation when an URL is not
> given in the taurusgui creation.
> If the given URL is not valid or does not-exist, an empty pannel will
> be shown as documentation.
>
> Change the URL for example01 to the taurus official webpage.
> ---
> .../qt/qtgui/taurusgui/conf/tgconf_example01/config.py | 4
> ++-- lib/taurus/qt/qtgui/taurusgui/taurusgui.py |
> 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-)
>
> diff --git
> a/lib/taurus/qt/qtgui/taurusgui/conf/tgconf_example01/config.py
> b/lib/taurus/qt/qtgui/taurusgui/conf/tgconf_example01/config.py index
> e03d005..2340157 100644
> --- a/lib/taurus/qt/qtgui/taurusgui/conf/tgconf_example01/config.py
> +++ b/lib/taurus/qt/qtgui/taurusgui/conf/tgconf_example01/config.py
> @@ -56,7 +56,7 @@ ORGANIZATION = 'Taurus'
> # You can provide an URI for a manual in html format
> # (comment out or make MANUAL_URI=None to skip creating a Manual
> panel)
> #====================================================================
> =========== -MANUAL_URI = 'http://packages.python.org/taurus'
> +MANUAL_URI = 'http://www.taurus-scada.org'
>
> #====================================================================
> =========== # If you want to have a main synoptic panel, set the
> SYNOPTIC variable @@ -173,4 +173,4 @@ EXTRA_CATALOG_WIDGETS =
> [('PyQt4.Qt.QLineEdit',':/taurus.png'), # a resource # Possible
> items for console are 'ipython', 'tango', 'spock' # Note: This is
> still experimental
> #====================================================================
> =========== -#CONSOLE = ['tango']
> \ No newline at end of file
> +#CONSOLE = ['tango']
> diff --git a/lib/taurus/qt/qtgui/taurusgui/taurusgui.py
> b/lib/taurus/qt/qtgui/taurusgui/taurusgui.py index 406a397..c2b8d64
> 100644
> --- a/lib/taurus/qt/qtgui/taurusgui/taurusgui.py
> +++ b/lib/taurus/qt/qtgui/taurusgui/taurusgui.py
> @@ -995,11 +995,13 @@ class TaurusGui(TaurusMainWindow):
>
>
> #manual panel
> - MANUAL_URI = getattr(conf, 'MANUAL_URI',
> self.__getVarFromXML(xmlroot, "MANUAL_URI", None)) - if
> MANUAL_URI is not None:
> - self.setHelpManualURI(MANUAL_URI)
> - self.createPanel(self.helpManualBrowser, 'Manual',
> permanent=True, -
> icon=getThemeIcon('help-browser')) + MANUAL_URI =
> getattr(conf, 'MANUAL_URI',
> + self.__getVarFromXML(xmlroot,
> "MANUAL_URI", +
> taurus.Release.url)) + self.setHelpManualURI(MANUAL_URI)
> +
> + self.createPanel(self.helpManualBrowser, 'Manual',
> permanent=True, +
> icon=getThemeIcon('help-browser'))
>
> #configure the macro infrastructure
> MACROSERVER_NAME = getattr(conf, 'MACROSERVER_NAME',
> self.__getVarFromXML(xmlroot, "MACROSERVER_NAME", None))
--
+----------------------------------------------------+
Carlos Pascual Izarra
Scientific Software Coordinator
Computing Division
ALBA Synchrotron [http://www.albasynchrotron.es]
Carrer de la Llum 2-26
E-08290 Cerdanyola del Valles (Barcelona), Spain
E-mail: cpa...@ce...
Phone: +34 93 592 4428
+----------------------------------------------------+
|
