Re: [tauruslib-devel] [PATCH] Show context menu of TaurusImageDialog

[Carlos P. <cpa...@ce...>]

applied to develop  (with changed commit subject)

Thanks!

On Thu 2 July 2015 17:18:44 Marc Josep Rosanes Siscart wrote:
> When a widget TaurusImageDialog is docked in the Main Window, the
> shown context menu is the one of the Main Window and it is not
> the one of the TaurusImageDialog.
> 
> Show the context menu of TaurusImageDialog when right-clicking in
> a TaurusImageDialog widget, even if this widget is docked in the
> Main Window.
> 
> Solve this bug also for TaurusCurveDialog and for TaurusTrendDialog.
> ---
>  lib/taurus/qt/qtgui/extra_guiqwt/plot.py | 13 ++++++++-----
>  1 file changed, 8 insertions(+), 5 deletions(-)
> 
> diff --git a/lib/taurus/qt/qtgui/extra_guiqwt/plot.py
> b/lib/taurus/qt/qtgui/extra_guiqwt/plot.py index c2fc04c..17c555a
> 100644
> --- a/lib/taurus/qt/qtgui/extra_guiqwt/plot.py
> +++ b/lib/taurus/qt/qtgui/extra_guiqwt/plot.py
> @@ -63,7 +63,8 @@ class TaurusCurveDialog(CurveDialog,
> TaurusBaseWidget): from taurus.qt.qtgui.extra_guiqwt.tools import
> TaurusCurveChooserTool self.add_tool(TaurusCurveChooserTool)
>          self.setModifiableByUser(self._modifiableByUser)
> -
> +        self.setContextMenuPolicy(Qt.Qt.CustomContextMenu)
> +
>      def keyPressEvent(self,event):
>          if(event.key() == Qt.Qt.Key_Escape):
>              event.ignore()
> @@ -203,7 +204,8 @@ class TaurusTrendDialog(CurveDialog,
> TaurusBaseWidget): if taurusparam is None:
>              taurusparam = TaurusTrendParam()
>          self.defaultTaurusparam = taurusparam
> -
> +        self.setContextMenuPolicy(Qt.Qt.CustomContextMenu)
> +
>      def keyPressEvent(self,event):
>          if(event.key() == Qt.Qt.Key_Escape):
>              event.ignore()
> @@ -417,7 +419,8 @@ class TaurusImageDialog(ImageDialog,
> TaurusBaseWidget): from taurus.qt.qtgui.extra_guiqwt.tools import
> TaurusModelChooserTool self.add_tool(TaurusModelChooserTool,
> singleModel=True) self.setModifiableByUser(True)
> -
> +        self.setContextMenuPolicy(Qt.Qt.CustomContextMenu)
> +
>      def keyPressEvent(self,event):
>          if(event.key() == Qt.Qt.Key_Escape):
>              event.ignore()
> @@ -623,5 +626,5 @@ def taurusImageDlgMain():
>  if __name__ == "__main__":
>  #    taurusCurveDlgMain()
>      taurusTrendDlgMain()
> -#    taurusImageDlgMain()
> -
> +#    taurusImageDlgMain()
> +

-- 
+----------------------------------------------------+
 Carlos Pascual Izarra
 Scientific Software Coordinator
 Computing Division
 ALBA Synchrotron  [http://www.albasynchrotron.es]
 Carretera BP 1413 de Cerdanyola-Sant Cugat, Km. 3.3
 E-08290 Cerdanyola del Valles (Barcelona), Spain
 E-mail: cpa...@ce...
 Phone: +34 93 592 4428
+----------------------------------------------------+