diff --git a/modules/gui/pymod/CMakeLists.txt b/modules/gui/pymod/CMakeLists.txt
index d1cd7bd190916516ef1960303d7ac00b494a4575..200515b96aa0b9986eb890f68f03f957b6a1196e 100644
--- a/modules/gui/pymod/CMakeLists.txt
+++ b/modules/gui/pymod/CMakeLists.txt
@@ -45,7 +45,6 @@ render_mode_widget.py
render_op.py
render_options_widget.py
scene_observer_impl.py
-sequence_widget.py
simple_widget.py
sline_widget.py
toolbar_options_widget.py
@@ -97,7 +96,6 @@ set(INSPECTOR_ICONS
scene/icons/color_icon.png
scene/icons/preset_icon.png
scene/icons/render_icon.png
- scene/icons/seq_icon.png
scene/icons/tool_icon.png
)
copy_if_different("./" "${STAGE_DIR}/share/openstructure/scene/icons"
diff --git a/modules/gui/pymod/scene/icons/seq_icon.png b/modules/gui/pymod/scene/icons/seq_icon.png
deleted file mode 100644
index a9cc5487aac7c1f6f8f37820190268ec7774f4b3..0000000000000000000000000000000000000000
Binary files a/modules/gui/pymod/scene/icons/seq_icon.png and /dev/null differ
diff --git a/modules/gui/pymod/scene/inspector_widget.py b/modules/gui/pymod/scene/inspector_widget.py
index 20cf1d4961b7015e44f9d4df509dc5dab9edc488..8ebb96e5d7274e19dd9c6b43d6a2606370bf7bb7 100644
--- a/modules/gui/pymod/scene/inspector_widget.py
+++ b/modules/gui/pymod/scene/inspector_widget.py
@@ -40,7 +40,6 @@ class InspectorWidget(ToolBarOptionsWidget):
[InspectorWidget.ICONS_PATH+"render_icon.png",RenderOptionsWidget(self),None],
[InspectorWidget.ICONS_PATH+"color_icon.png",ColorOptionsWidget(self),None],
[InspectorWidget.ICONS_PATH+"preset_icon.png", PresetWidget(self),None],
- [InspectorWidget.ICONS_PATH+"seq_icon.png", SequenceWidget(self),None],
[InspectorWidget.ICONS_PATH+"tool_icon.png",app.tool_options_win.qobject,"Tool Options"]
]
for o in options:
diff --git a/modules/gui/pymod/scene/sequence_widget.py b/modules/gui/pymod/scene/sequence_widget.py
deleted file mode 100644
index 573149d5a2cd5dad58ceb7b7fa9c642db1820702..0000000000000000000000000000000000000000
--- a/modules/gui/pymod/scene/sequence_widget.py
+++ /dev/null
@@ -1,92 +0,0 @@
-#------------------------------------------------------------------------------
-# This file is part of the OpenStructure project <www.openstructure.org>
-#
-# Copyright (C) 2008-2010 by the OpenStructure authors
-#
-# This library is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation; either version 3.0 of the License, or (at your option)
-# any later version.
-# This library is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this library; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-#------------------------------------------------------------------------------
-
-import ost
-
-from ost import gui
-from ost import gfx
-from ost import seq
-
-from PyQt4 import QtCore, QtGui
-
-
-class SequenceWidget(QtGui.QWidget):
- def __init__(self, parent=None):
- QtGui.QWidget.__init__(self, parent)
-
- self.text_ = "Sequences"
-
- self.display_modes_ = QtGui.QComboBox(self);
- QtCore.QObject.connect(self.display_modes_, QtCore.SIGNAL("activated(int)"), self.__ChangeDisplayMode)
- self.setMinimumSize(250,150)
-
-
- def Update(self):
- self.display_modes_.setEnabled(True)
- scene_selection = gui.SceneSelection.Instance()
- seq_viewer = gui.GostyApp.Instance().GetSequenceViewerV2()
- self.display_modes_.clear()
-
- if scene_selection.GetActiveNodeCount() == 0 and scene_selection.GetActiveViewCount() == 0:
- self.display_modes_.setEnabled(False)
- return
- elif scene_selection.GetActiveNodeCount() == 1 and scene_selection.GetActiveViewCount() == 0:
- node = scene_selection.GetActiveNode(0)
- if (isinstance(node, gfx.Entity)) or (isinstance(node, seq.AlignmentHandle)):
- selected = seq_viewer.GetCurrentDisplayMode(node)
- modes = seq_viewer.GetDisplayModes(node)
- elif (isinstance(node,gfx.GfxNode)) and (node.GetName() == "Scene"):
- selected = seq_viewer.GetCurrentDisplayMode()
- modes = seq_viewer.GetDisplayModes()
- else:
- self.display_modes_.setEnabled(self,False)
- selected = None
- modes = list()
- for m in modes:
- self.display_modes_.addItem(m)
- for i in range(0,self.display_modes_.count()):
- if(selected == self.display_modes_.itemText(i)):
- self.display_modes_.setCurrentIndex(i)
- elif scene_selection.GetActiveNodeCount() > 1 and scene_selection.GetActiveViewCount() == 0:
- for i in range(0,scene_selection.GetActiveNodeCount()):
- node = scene_selection.GetActiveNode(i)
- if not (isinstance(node, gfx.Entity) or (isinstance(node, seq.AlignmentHandle))) :
- self.display_modes_.setEnabled(self,False)
- return
- selected = seq_viewer.GetCurrentDisplayMode()
- modes = seq_viewer.GetDisplayModes()
- for m in modes:
- self.display_modes_.addItem(m)
- for i in range(0,self.display_modes_.count()):
- if(selected == self.display_modes_.itemText(i)):
- self.display_modes_.setCurrentIndex(i)
- else:
- self.display_modes_.setEnabled(self,False)
-
-
- def __ChangeDisplayMode(self):
- seq_viewer = gui.GostyApp.Instance().GetSequenceViewerV2()
- scene_selection = gui.SceneSelection.Instance()
- for i in range(0,scene_selection.GetActiveNodeCount()):
- node = scene_selection.GetActiveNode(i)
- if (isinstance(node,gfx.GfxNode)) and (node.GetName() == "Scene"):
- seq_viewer.ChangeDisplayMode(str(self.display_modes_.currentText()))
- else:
- seq_viewer.ChangeDisplayMode(node, str(self.display_modes_.currentText()))
-
\ No newline at end of file
diff --git a/modules/gui/share/CMakeLists.txt b/modules/gui/share/CMakeLists.txt
index d755bcd3a784ad2af217bc54b2456627126a16c5..6b08487687699784398223b61eb72e95b34290dd 100644
--- a/modules/gui/share/CMakeLists.txt
+++ b/modules/gui/share/CMakeLists.txt
@@ -3,7 +3,9 @@ set(GUI_ICONS
icons/add_icon.png
icons/close_icon.png
icons/distance_icon.png
+ icons/find_icon.png
icons/map_icon.png
+ icons/menubar_icon.png
icons/rigid_body_manipulator_icon.png
icons/selection_icon.png
icons/show_sidebar_icon.png