diff -r fb16f4650860 -r 5bac7dee9e1a IconEditor/IconEditorWindow.py --- a/IconEditor/IconEditorWindow.py Wed Oct 03 20:07:50 2012 +0200 +++ b/IconEditor/IconEditorWindow.py Thu Oct 04 19:28:49 2012 +0200 @@ -9,11 +9,12 @@ from PyQt4.QtCore import pyqtSignal, Qt, QSize, QSignalMapper, QFileInfo, QFile, \ QEvent -from PyQt4.QtGui import QMainWindow, QScrollArea, QPalette, QImage, QImageReader, \ - QImageWriter, QKeySequence, qApp, QLabel, QDockWidget, QDialog, QWhatsThis +from PyQt4.QtGui import QScrollArea, QPalette, QImage, QImageReader, QImageWriter, \ + QKeySequence, qApp, QLabel, QDockWidget, QDialog, QWhatsThis from E5Gui.E5Action import E5Action, createActionGroup from E5Gui import E5FileDialog, E5MessageBox +from E5Gui.E5MainWindow import E5MainWindow from .IconEditorGrid import IconEditorGrid from .IconZoomDialog import IconZoomDialog @@ -25,7 +26,7 @@ import Preferences -class IconEditorWindow(QMainWindow): +class IconEditorWindow(E5MainWindow): """ Class implementing the web browser main window. @@ -58,6 +59,8 @@ if self.initShortcutsOnly: self.__initActions() else: + if not self.fromEric: + self.setStyle(Preferences.getUI("Style"), Preferences.getUI("StyleSheet")) self.__editor = IconEditorGrid() self.__scrollArea = QScrollArea() self.__scrollArea.setWidget(self.__editor)