UI/DiffDialog.py

changeset 2101
5bac7dee9e1a
parent 1509
c0b5e693b0eb
child 2302
f29e9405c851
diff -r fb16f4650860 -r 5bac7dee9e1a UI/DiffDialog.py
--- a/UI/DiffDialog.py	Wed Oct 03 20:07:50 2012 +0200
+++ b/UI/DiffDialog.py	Thu Oct 04 19:28:49 2012 +0200
@@ -12,13 +12,16 @@
 
 from PyQt4.QtCore import QFileInfo, QEvent, pyqtSlot
 from PyQt4.QtGui import QWidget, QColor, QBrush, QApplication, QTextCursor, \
-    QDialogButtonBox, QMainWindow
+    QDialogButtonBox
 
 from E5Gui.E5Completers import E5FileCompleter
 from E5Gui import E5MessageBox, E5FileDialog
+from E5Gui.E5MainWindow import E5MainWindow
 
 from .Ui_DiffDialog import Ui_DiffDialog
+
 import Utilities
+import Preferences
 
 from difflib import SequenceMatcher
 
@@ -487,7 +490,7 @@
         self.__selectFile(self.file2Edit)
 
 
-class DiffWindow(QMainWindow):
+class DiffWindow(E5MainWindow):
     """
     Main window class for the standalone dialog.
     """
@@ -498,6 +501,9 @@
         @param parent reference to the parent widget (QWidget)
         """
         super().__init__(parent)
+        
+        self.setStyle(Preferences.getUI("Style"), Preferences.getUI("StyleSheet"))
+        
         self.cw = DiffDialog(self)
         self.cw.installEventFilter(self)
         size = self.cw.size()

eric ide

mercurial