From 5d1776287fa39a2cb7bd71f854f176f666c4b538 Mon Sep 17 00:00:00 2001
From: stefan <stefan@5a81b35b-ba03-0410-adc8-b2c5c5119f08>
Date: Tue, 9 Mar 2010 09:52:19 +0000
Subject: [PATCH] Added tooltips for inspector gadget icons
git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@1795 5a81b35b-ba03-0410-adc8-b2c5c5119f08
---
modules/gui/pymod/scene/inspector_widget.py | 8 ++++----
modules/gui/pymod/scene/toolbar_options_widget.py | 7 +++++--
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/modules/gui/pymod/scene/inspector_widget.py b/modules/gui/pymod/scene/inspector_widget.py
index b5c76307b..7116f8d98 100644
--- a/modules/gui/pymod/scene/inspector_widget.py
+++ b/modules/gui/pymod/scene/inspector_widget.py
@@ -35,12 +35,12 @@ class InspectorWidget(ToolBarOptionsWidget):
ToolBarOptionsWidget.__init__(self, parent)
app=gui.GostyApp.Instance()
options = [
- [InspectorWidget.ICONS_PATH+"render_icon.png",RenderOptionsWidget(self)],
- [InspectorWidget.ICONS_PATH+"color_icon.png",ColorOptionsWidget(self)],
- [InspectorWidget.ICONS_PATH+"tool_icon.png",sip.wrapinstance(app.GetToolOptionsWin().GetSipHandle(),QtGui.QWidget)]
+ [InspectorWidget.ICONS_PATH+"render_icon.png",RenderOptionsWidget(self),None],
+ [InspectorWidget.ICONS_PATH+"color_icon.png",ColorOptionsWidget(self),None],
+ [InspectorWidget.ICONS_PATH+"tool_icon.png",sip.wrapinstance(app.GetToolOptionsWin().GetSipHandle(),QtGui.QWidget),"Tool Options"]
]
for o in options:
- ToolBarOptionsWidget.AddWidget(self,o[0], o[1])
+ ToolBarOptionsWidget.AddWidget(self,o[0], o[1], o[2])
self.obs = SceneObserverImpl()
self.obs.AttachObserver(self)
diff --git a/modules/gui/pymod/scene/toolbar_options_widget.py b/modules/gui/pymod/scene/toolbar_options_widget.py
index 37c967e0c..006c09b16 100644
--- a/modules/gui/pymod/scene/toolbar_options_widget.py
+++ b/modules/gui/pymod/scene/toolbar_options_widget.py
@@ -67,7 +67,7 @@ class ToolBarOptionsWidget(QtGui.QWidget):
widget.Update()
- def AddWidget(self, ident, widget):
+ def AddWidget(self, ident, widget, text=None):
"""Adds a Widget to this Options Widget.
The Widget must have a identifier. If another Widget has the same identifier,
@@ -75,7 +75,9 @@ class ToolBarOptionsWidget(QtGui.QWidget):
Returns True, if widget is added. Otherwise it returns False
"""
if isinstance(widget, QtGui.QWidget) and ident is not None:
- if hasattr(widget, "GetText"):
+ if text is not None:
+ string = QtCore.QString(text)
+ elif hasattr(widget, "GetText"):
string = QtCore.QString(widget.GetText())
else:
string = QtCore.QString(ident)
@@ -83,6 +85,7 @@ class ToolBarOptionsWidget(QtGui.QWidget):
self.stackedWidget.addWidget(widget)
action = self.tool_bar_.addAction(ident)
action.setIcon(QtGui.QIcon(ident))
+ action.setToolTip(string)
pair = ident, widget
action.setData(QtCore.QVariant(pair))
action.setCheckable(True);
--
GitLab